Merge pull request #47 from noahcooper/master

Update dependencies

Author: noahcooper

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "8.0.0"
 before_script:
   - npm install grunt-cli

package.json

@@ -37,22 +37,22 @@
   ],
   "main": "Gruntfile.js",
   "engines": {
-    "node": ">= 0.10.0"
+    "node": ">= 6.0.0"
   },
   "scripts": {
     "test": "grunt test"
   },
   "dependencies": {
-    "csscomb": "~3.1.0"
+    "csscomb": "~4.2.0"
   },
   "devDependencies": {
-    "grunt": "^0.4.5",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-jshint": "^0.11.2",
-    "grunt-contrib-nodeunit": "^0.4.1"
+    "grunt": "^1.0.3",
+    "grunt-contrib-clean": "^2.0.0",
+    "grunt-contrib-jshint": "^2.0.0",
+    "grunt-contrib-nodeunit": "^2.0.0"
   },
   "peerDependencies": {
-    "grunt": ">=0.4.0"
+    "grunt": ">=1.0.0"
   },
   "keywords": [
     "gruntplugin",

tasks/csscomb.js

@@ -74,14 +74,14 @@ module.exports = function (grunt) {
 
                 // Get CSS from a source file:
                 var css = grunt.file.read(src);
-                var combed;
 
                 // Comb it:
                 grunt.log.ok('Sorting file "' + src + '"...');
                 var syntax = src.split('.').pop();
                 try {
-                    combed = comb.processString(css, { syntax: syntax });
-                    grunt.file.write(f.dest, combed);
+                    comb.processString(css, { syntax: syntax }).then(function(combed) {
+                        grunt.file.write(f.dest, combed);
+                    });
                 } catch(e) {
                     grunt.log.error(e);
                 }

test/csscomb_test.js

@@ -8,7 +8,7 @@ exports.csscomb = {
 
         var actual = grunt.file.read('test/fixtures/tmp_resort.css');
         var expected = grunt.file.read('test/expected/resort.css');
-        test.equal(actual, expected, 'sholud be sorted.');
+        test.equal(actual, expected, 'should be sorted.');
 
         test.done();
     },
@@ -17,7 +17,7 @@ exports.csscomb = {
 
         var actual = grunt.file.read('test/fixtures/tmp_customsort.css');
         var expected = grunt.file.read('test/expected/customsort.css');
-        test.equal(actual, expected, 'sholud be custom sorted.');
+        test.equal(actual, expected, 'should be custom sorted.');
 
         test.done();
     },
@@ -26,11 +26,11 @@ exports.csscomb = {
 
         var actual = grunt.file.read('test/fixtures/tmp_multi1.css');
         var expected = grunt.file.read('test/expected/multi1.css');
-        test.equal(actual, expected, 'sholud be sorted.');
+        test.equal(actual, expected, 'should be sorted.');
 
         var actual2 = grunt.file.read('test/fixtures/tmp_multi2.css');
         var expected2 = grunt.file.read('test/expected/multi2.css');
-        test.equal(actual2, expected2, 'sholud be sorted.');
+        test.equal(actual2, expected2, 'should be sorted.');
 
         test.done();
     },
@@ -39,11 +39,11 @@ exports.csscomb = {
 
         var actual = grunt.file.read('test/fixtures/dest/multi1.resorted.css');
         var expected = grunt.file.read('test/expected/multi1.css');
-        test.equal(actual, expected, 'sholud be sorted.');
+        test.equal(actual, expected, 'should be sorted.');
 
         var actual2 = grunt.file.read('test/fixtures/dest/multi2.resorted.css');
         var expected2 = grunt.file.read('test/expected/multi2.css');
-        test.equal(actual2, expected2, 'sholud be sorted.');
+        test.equal(actual2, expected2, 'should be sorted.');
 
         test.done();
     }