Update v1.2.0

Author: t32k

.jshintrc

@@ -10,5 +10,5 @@
   "boss": true,
   "eqnull": true,
   "node": true,
-  "es5": true
+  "es5": false
 }

README.md

@@ -4,7 +4,7 @@
 
 ## Getting Started
 
-This plugin requires Grunt `~0.4.1`.
+This plugin requires Grunt `0.4.x`.
 
 If you haven't used [Grunt](http://gruntjs.com/) before, be sure to check out the [Getting Started](http://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](http://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you're familiar with that process, you may install this plugin with this command:
 
@@ -38,11 +38,11 @@ grunt.initConfig({
 
 ### Options
 
-#### options.sortOrder
+#### options.config
 Type: `String`
 Default value: `null`
 
-A string value that is used to specify custom-sort-order.json file path.
+A string value that is used to specify custom-csscomb.json file path.
 
 
 ### Usage Examples
@@ -65,13 +65,13 @@ grunt.initConfig({
 
 #### Custom Options
 
-You can set the `sortOrder` option if you want to use the order to which you are accustomed to.
+You can set the `config` option if you want to use the configuration which you are accustomed to.
 
 ```js
 grunt.initConfig({
   csscomb: {
     options: {
-      sortOrder: '/path/to/custom-sort-order.json'
+      config: '/path/to/config.json'
     },
     files: {
       'dest/resorted-foo.css': ['src/foo.css'],
@@ -82,10 +82,11 @@ grunt.initConfig({
 
 ## Release History
 
++ v1.2.0: Update csscomb.js to version 2.0 and change `sortOrder` to `config`.
 + v1.1.0: Improve process.
 + v1.0.0: Support [csscomb.js](http://github.com/csscomb/csscomb.js).
 + v0.5.0: Enable multiple files.
 + v0.4.0: Move to csscomb's repository.
 + v0.3.0: Fix sort option bug.
 + v0.2.0: Fix bugs.
-+ v0.1.0: Release.
++ v0.1.0: Release.

package.json

@@ -1,13 +1,14 @@
 {
   "name": "grunt-csscomb",
   "description": "The grunt plugin for sorting CSS properties in specific order.",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "homepage": "https://github.com/csscomb/grunt-csscomb",
   "author": {
     "name": "Koji Ishimoto",
     "email": "ijok.ijok@gmail.com",
-    "url": "http://en.t32k.me"
+    "url": "http://t32k.me/"
   },
+  "contributors": ['Tony Ganch'],
   "repository": {
     "type": "git",
     "url": "https://github.com/csscomb/grunt-csscomb.git"
@@ -35,10 +36,10 @@
     "grunt-contrib-jshint": "~0.6.0",
     "grunt-contrib-clean": "~0.4.0",
     "grunt-contrib-nodeunit": "~0.2.0",
-    "grunt": "~0.4.1"
+    "grunt": "0.4.x"
   },
   "peerDependencies": {
-    "grunt": "~0.4.1"
+    "grunt": "0.4.x"
   },
   "keywords": [
     "gruntplugin",

tasks/csscomb.js

@@ -14,18 +14,21 @@ module.exports = function (grunt) {
   grunt.registerMultiTask('csscomb', 'Sorting CSS properties in specific order.', function () {
 
     var Comb = require('csscomb'),
-      comb = new Comb();
+        comb = new Comb();
 
     function getConfigPath(configPath) {
       var HOME = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
 
       configPath = configPath || process.cwd() + '/.csscomb.json';
 
       // If we've finally found a config, return its path:
-      if (grunt.file.exists(configPath)) return configPath;
-
+      if (grunt.file.exists(configPath)) {
+          return configPath;
+      }
       // If we are in HOME dir already and yet no config file, quit:
-      if (path.dirname(configPath) === HOME) return;
+      if (path.dirname(configPath) === HOME) {
+          return;
+      }
 
       // If there is no config in this directory, go one level up and look for
       // a config there:
@@ -70,4 +73,4 @@ module.exports = function (grunt) {
       });
     });
   });
-};
+};