From 212280675c71575a7294686aed72705b797fe9f0 Mon Sep 17 00:00:00 2001
From: Phil DeJarnett <phil@overzealous.com>
Date: Mon, 15 Feb 2016 21:07:28 -0500
Subject: [PATCH] Replaced ruby-sass with node-sass

- Also cleaned up NPM deps
- Added some common values to .gitignore, to make it easier to work with public PRs
---
 .gitignore   | 81 +++++++++++++++++++++++++++++++++++++++++++++++++---
 gulpfile.js  |  9 +++---
 package.json | 20 ++++++-------
 3 files changed, 90 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 794ad9a..2d42716 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,77 @@
-node_modules
-bower_components
-build
-.sass-cache
\ No newline at end of file
+### Project Directories ###
+build/
+
+### Node ###
+node_modules/
+# Logs
+logs/
+*.log
+npm-debug.log*
+.npm
+
+### Bower ###
+bower_components/
+.bower-cache
+.bower-registry
+.bower-tmp
+
+### Sass ###
+.sass-cache/
+
+### Intellij ###
+## Directory-based project format:
+.idea/
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+*.iml
+
+#### OS-Specific Excludes ###
+
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### Windows ###
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
diff --git a/gulpfile.js b/gulpfile.js
index 4bf8568..29f8997 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -73,11 +73,10 @@ gulp.task('yaml:dist', function(){
 
 // Sass
 gulp.task('sass', function () {
-  return $.rubySass('app/styles/app.scss', { sourcemap: true })
-    .on('error', function (err) {
-      console.error('Error!', err.message);
-    })
-    .pipe($.sourcemaps.write())
+  return gulp.src('app/styles/app.scss')
+    .pipe($.sourcemaps.init())
+    .pipe($.sass().on('error', $.sass.logError))
+    .pipe($.sourcemaps.write('.'))
     .pipe(gulp.dest('build/dev/styles'))
     .pipe($.browserSync.reload({stream:true}));
 });
diff --git a/package.json b/package.json
index a15c705..ab23470 100644
--- a/package.json
+++ b/package.json
@@ -17,38 +17,36 @@
   },
   "readmeFilename": "README",
   "devDependencies": {
+    "bower": "^1.4.2",
     "browser-sync": "^1.8.3",
     "connect-modrewrite": "^0.7.9",
     "del": "^1.1.1",
+    "gulp": "^3.8.11",
     "gulp-bower": "0.0.7",
     "gulp-csso": "^0.2.9",
+    "gulp-gh-pages": "~0.5.2",
     "gulp-if": "^1.2.5",
     "gulp-jade": "^1.0.0",
     "gulp-jade-find-affected": "^0.2.1",
-    "gulp-livereload": "~2.1.1",
     "gulp-load-plugins": "^0.8.0",
     "gulp-minify-html": "^0.1.8",
     "gulp-ng-annotate": "^0.4.3",
     "gulp-protractor": "0.0.12",
     "gulp-rev": "^2.0.1",
     "gulp-rev-replace": "^0.3.1",
-    "gulp-ruby-sass": "~1.0.0-alpha",
+    "gulp-sass": "^2.2.0",
     "gulp-size": "^1.2.0",
-    "gulp-sourcemaps": "^1.3.0",
+    "gulp-sourcemaps": "^1.6.0",
     "gulp-uglify": "~1.0.1",
     "gulp-useref": "^1.1.0",
     "gulp-watch": "^4.2.4",
     "gulp-webpack": "~1.1.0",
+    "gulp-yaml": "~0.2.4",
     "jade": "^1.9.2",
+    "js-yaml": "^3.3.1",
     "json-loader": "^0.5.1",
     "protractor": "^1.5.0",
-    "wiredep": "^2.2.2",
-    "gulp-yaml": "~0.2.4",
-    "gulp-gh-pages": "~0.5.2"
+    "wiredep": "^2.2.2"
   },
-  "dependencies": {
-    "gulp": "~3.8.10",
-    "js-yaml": "~3.3.1",
-    "bower": "~1.4.1"
-  }
+  "dependencies": {}
 }