Added CLI option for ignoring rules (fixes #231)

CSSLint · Jul 23, 2012 · d215467 · d215467
1 parent e025e5a
commit d215467
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 8 deletions.
diff --git a/src/cli/common.js b/src/cli/common.js
@@ -26,9 +26,8 @@ function cli(api){
      * @param options {Object} The CLI options.
      * @return {Object} A ruleset object.
      */
-    function gatherRules(options){
+    function gatherRules(options, ruleset){
-        var ruleset,
+        var warnings = options.rules || options.warnings,
-            warnings = options.rules || options.warnings,
             errors = options.errors;
 
         if (warnings){
@@ -44,6 +43,24 @@ function cli(api){
                 ruleset[value] = 2;
             });
         }
+
+        return ruleset;
+    }
+
+    /**
+     * Filters out rules using the ignore command line option.
+     * @param options {Object} the CLI options
+     * @return {Object} A ruleset object.
+     */
+    function filterRules(options) {
+        var ignore = options.ignore,
+            ruleset = CSSLint.getRuleset();
+
+        if (ignore) {            
+            ignore.split(",").forEach(function(value){
+                delete ruleset[value];
+            });            
+        }
 
         return ruleset;
     }
@@ -68,7 +85,8 @@ function cli(api){
      */
     function processFile(relativeFilePath, options) {
         var input = api.readFile(relativeFilePath),
-            result = CSSLint.verify(input, gatherRules(options)),
+            ruleset = filterRules(options),
+            result = CSSLint.verify(input, gatherRules(options, ruleset)),
             formatter = CSSLint.getFormatter(options.format || "text"),
             messages = result.messages || [],
             output,
@@ -113,6 +131,7 @@ function cli(api){
             "  --quiet                   Only output when errors are present.",
             "  --errors=<rule[,rule]+>   Indicate which rules to include as errors.",
             "  --warnings=<rule[,rule]+> Indicate which rules to include as warnings.",
+            "  --ignore=<rule,[,rule]+>  Indicate which rules to ignore completely.",
             "  --version                 Outputs the current version number."
         ].join("\n") + "\n");
     }

diff --git a/src/core/CSSLint.js b/src/core/CSSLint.js
@@ -45,6 +45,23 @@ var CSSLint = (function(){
             return a.id > b.id ? 1 : 0;
         });
     };
+
+    /**
+     * Returns a ruleset configuration object with all current rules.
+     * @return A ruleset object.
+     * @method getRuleset
+     */
+    api.getRuleset = function() {
+        var ruleset = {},
+            i = 0,
+            len = rules.length;
+
+        while (i < len){
+            ruleset[rules[i++].id] = 1;    //by default, everything is a warning
+        }
+
+        return ruleset;
+    };
 
     //-------------------------------------------------------------------------
     // Formatters
@@ -125,13 +142,11 @@ var CSSLint = (function(){
             parser = new parserlib.css.Parser({ starHack: true, ieFilters: true,
                                                 underscoreHack: true, strict: false });
 
+        // normalize line endings
         lines = text.replace(/\n\r?/g, "$split$").split('$split$');
 
         if (!ruleset){
-            ruleset = {};
+            ruleset = this.getRuleset();
-            while (i < len){
-                ruleset[rules[i++].id] = 1;    //by default, everything is a warning
-            }
         }
 
         reporter = new Reporter(lines, ruleset);