Allow to require and apply rules

Author: mishanga

.csscomb.json

@@ -6,6 +6,7 @@
     "colon-space": true,
     "rule-indent": true,
     "stick-brace": "\n",
+    "strip-spaces": true,
     "sort-order": [
         [
             "position",

lib/cli.js

@@ -23,9 +23,7 @@ if (fs.existsSync(configPath)) {
     if (program.args.length > 0) {
         vow.all(program.args.map(function(path) {
             return comb.processPath(path);
-        })).then(function(results) {
-            console.log('results: ' + results);
-        }).fail(function(e) {
+        })).fail(function(e) {
             console.log('stack: ', e.stack);
             process.exit(1);
         });

lib/csscomb.js

@@ -1,7 +1,7 @@
 var cssp = require('cssp');
 var minimatch = require('minimatch');
 var vow = require('vow');
-var vowFs = require('vow-fs');
+var vfs = require('vow-fs');
 
 /**
  * Starts Code Style processing process.
@@ -12,8 +12,9 @@ var Comb = function() {
     this._rules = {
         'colon-space': {},
         'rule-indent': {},
+        'sort-order': {},
         'stick-brace': {},
-        'sort-order': {}
+        'strip-spaces': {}
     },
     this._config = {};
     this._exclude = null;
@@ -29,15 +30,51 @@ Comb.prototype = {
      */
     configure: function(config) {
         for (var rule in config) {
-            if (config.hasOwnProperty(rule) && this._rules[rule]) {
-                this._config[rule] = config[rule];
+            if (config.hasOwnProperty(rule) && config[rule] && this._rules[rule]) {
+                var beautifier;
+                try {
+                    beautifier = require('./rules/' + rule);
+                    beautifier.value = config[rule];
+                    this._config[rule] = beautifier;
+                } catch (e) {}
             }
         }
         this._exclude = (config.exclude || []).map(function(pattern) {
             return new minimatch.Minimatch(pattern);
         });
     },
 
+    /**
+     * Processes stylesheet tree node.
+     *
+     * @param {Array} tree Parsed tree
+     * @returns {Array}
+     */
+    processTree: function(tree) {
+        this.processNode(['tree', tree]);
+        return tree;
+    },
+
+    /**
+     * Processes tree node.
+     * @param {Array} node Tree node
+     */
+    processNode: function(node, level) {
+        var _this = this;
+        var config = this._config;
+        node.forEach(function(node) {
+            if (!Array.isArray(node)) return;
+            var nodeType = node.shift();
+            for (var rule in config) {
+                if (config.hasOwnProperty(rule)) {
+                    config[rule].process(nodeType, node);
+                }
+            }
+            node.unshift(nodeType);
+            _this.processNode(node, level);
+        });
+    },
+
     /**
      * Process file provided with a string.
      * @param {String} text
@@ -46,11 +83,11 @@ Comb.prototype = {
     processString: function(text, filename) {
         var tree;
         try {
-            tree = cssp.parse(text);
+            tree = this.processTree(cssp.parse(text));
         } catch (e) {
             throw new Error('Parsing error at ' + filename + ': ' + e.message);
         }
-        text = cssp.translate(cssp.transform(tree));
+        return cssp.translate(cssp.transform(tree));
     },
 
     /**
@@ -62,8 +99,8 @@ Comb.prototype = {
     processFile: function(path) {
         var _this = this;
         if (this._shouldProcess(path) && path.match(/\.css$/)) {
-            return vowFs.read(path, 'utf8').then(function(data) {
-                return _this.processString(data, path);
+            return vfs.read(path, 'utf8').then(function(data) {
+                return vfs.write(path, _this.processString(data, path), 'utf8');
             });
         }
         return null;
@@ -77,10 +114,10 @@ Comb.prototype = {
      */
     processDirectory: function(path) {
         var _this = this;
-        return vowFs.listDir(path).then(function(filenames) {
+        return vfs.listDir(path).then(function(filenames) {
             return vow.all(filenames.map(function(filename) {
                 var fullname = path + '/' + filename;
-                return vowFs.stat(fullname).then(function(stat) {
+                return vfs.stat(fullname).then(function(stat) {
                     if (_this._shouldProcess(fullname)) {
                         if (stat.isDirectory()) {
                             return _this.processDirectory(fullname);
@@ -106,9 +143,9 @@ Comb.prototype = {
     processPath: function(path) {
         path = path.replace(/\/$/, '');
         var _this = this;
-        return vowFs.exists(path).then(function(exists) {
+        return vfs.exists(path).then(function(exists) {
             if (exists) {
-                return vowFs.stat(path).then(function(stat) {
+                return vfs.stat(path).then(function(stat) {
                     if (stat.isDirectory()) {
                         return _this.processDirectory(path);
                     } else {