Merge pull request #12 from csscomb/tg/csscomb.js-2.0

Update csscomb.js to version 2.0

Author: t32k

Gruntfile.js

@@ -22,7 +22,7 @@ module.exports = function(grunt) {
         jshintrc: '.jshintrc',
       },
     },
-    
+
     // Before generating any new files, remove any previously-created files.
     clean: {
       tests: ['test/fixtures/tmp_*.css'],
@@ -37,7 +37,7 @@ module.exports = function(grunt) {
       },
       custom: {
         options: {
-          sortOrder: 'test/fixtures/sort.json'
+          config: 'test/fixtures/sort.json'
         },
         files: {
           'test/fixtures/tmp_customsort.css': ['test/fixtures/style.css'],

package.json

@@ -29,7 +29,7 @@
     "test": "grunt test"
   },
   "dependencies": {
-    "csscomb": "1.0.0"
+    "csscomb": "2.0.x"
   },
   "devDependencies": {
     "grunt-contrib-jshint": "~0.6.0",

tasks/csscomb.js

@@ -6,29 +6,49 @@
  * Licensed under the MIT license.
  */
 'use strict';
+
+var path = require('path');
+
 module.exports = function (grunt) {
 
   grunt.registerMultiTask('csscomb', 'Sorting CSS properties in specific order.', function () {
 
     var Comb = require('csscomb'),
-      defaultConfig = require('../node_modules/csscomb/.csscomb.json');
+      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 we are in HOME dir already and yet no config file, quit:
+      if (path.dirname(configPath) === HOME) return;
+
+      // If there is no config in this directory, go one level up and look for
+      // a config there:
+      configPath = path.dirname(path.dirname(configPath)) + '/.csscomb.json';
+      return getConfigPath(configPath);
+    }
 
     // Get config file from task's options:
-    var config = grunt.task.current.options().sortOrder;
+    var config = grunt.task.current.options().config || getConfigPath();
 
     // Check if config file is set and exists. If not, use default one:
     if (config && grunt.file.exists(config)) {
       grunt.log.ok('Using custom config file "' + config + '"...');
       config = grunt.file.readJSON(config);
     } else {
-      config = defaultConfig;
+      grunt.log.ok('Using default config file...');
+      config = comb.getConfig('csscomb');
     }
 
-    this.files.forEach(function (f) {
+    // Configure csscomb:
+    comb.configure(config);
 
-      // Create a new instance of csscomb and configure it:
-      var comb = new Comb();
-      comb.configure(config);
+    this.files.forEach(function (f) {
 
       f.src.filter(function (filepath) {
         // Warn on and remove invalid source files (if nonull was set).
@@ -50,4 +70,4 @@ module.exports = function (grunt) {
       });
     });
   });
-};
+};