eslint 0.22.0 → 0.24.1

package/lib/ignored-paths.js

@@ -1,137 +1,137 @@
-/**
- * @fileoverview Responsible for loading ignore config files and managing ignore patterns
- * @author Jonathan Rajavuori
- */
-"use strict";
-
-//------------------------------------------------------------------------------
-// Requirements
-//------------------------------------------------------------------------------
-
-var fs = require("fs"),
-    debug = require("debug"),
-    minimatch = require("minimatch"),
-    FileFinder = require("./file-finder");
-
-debug = debug("eslint:ignored-paths");
-
-
-//------------------------------------------------------------------------------
-// Constants
-//------------------------------------------------------------------------------
-
-var ESLINT_IGNORE_FILENAME = ".eslintignore";
-
-
-//------------------------------------------------------------------------------
-// Helpers
-//------------------------------------------------------------------------------
-
-/**
- * Load and parse ignore patterns from the file at the given path
- * @param {string} filepath Path to the ignore file.
- * @returns {string[]} An array of ignore patterns or an empty array if no ignore file.
- */
-function loadIgnoreFile(filepath) {
-    var ignorePatterns = [];
-
-    function nonEmpty(line) {
-        return line.trim() !== "" && line[0] !== "#";
-    }
-
-    if (filepath) {
-        try {
-            ignorePatterns = fs.readFileSync(filepath, "utf8").split(/\r?\n/).filter(nonEmpty);
-        } catch (e) {
-            e.message = "Cannot read ignore file: " + filepath + "\nError: " + e.message;
-            throw e;
-        }
-    }
-
-    return ["node_modules/**"].concat(ignorePatterns);
-}
-
-var ignoreFileFinder;
-
-/**
- * Find an ignore file in the current directory or a parent directory.
- * @returns {string} Path of ignore file or an empty string.
- */
-function findIgnoreFile() {
-    if (!ignoreFileFinder) {
-        ignoreFileFinder = new FileFinder(ESLINT_IGNORE_FILENAME);
-    }
-
-    return ignoreFileFinder.findInDirectoryOrParents();
-}
-
-
-//------------------------------------------------------------------------------
-// Public Interface
-//------------------------------------------------------------------------------
-
-/**
- * IgnoredPaths
- * @constructor
- * @class IgnoredPaths
- * @param {Array} patterns to be matched against file paths
- */
-function IgnoredPaths(patterns) {
-    this.patterns = patterns;
-}
-
-/**
- * IgnoredPaths initializer
- * @param {Object} options object containing 'ignore' and 'ignorePath' properties
- * @returns {IgnoredPaths} object, with patterns loaded from the ignore file
- */
-IgnoredPaths.load = function (options) {
-    var patterns;
-
-    options = options || {};
-
-    if (options.ignore) {
-        patterns = loadIgnoreFile(options.ignorePath || findIgnoreFile());
-    } else {
-        patterns = [];
-    }
-
-    if (options.ignorePattern) {
-        patterns.push(options.ignorePattern);
-    }
-
-    return new IgnoredPaths(patterns);
-};
-
-/**
- * Determine whether a file path is included in the configured ignore patterns
- * @param {string} filepath Path to check
- * @returns {boolean} true if the file path matches one or more patterns, false otherwise
- */
-IgnoredPaths.prototype.contains = function (filepath) {
-    if (this.patterns === null) {
-        throw new Error("No ignore patterns loaded, call 'load' first");
-    }
-
-    filepath = filepath.replace("\\", "/");
-    filepath = filepath.replace(/^\.\//, "");
-    return this.patterns.reduce(function(ignored, pattern) {
-        var negated = pattern[0] === "!",
-            matches;
-
-        if (negated) {
-            pattern = pattern.slice(1);
-        }
-
-        // Remove leading "current folder" prefix
-        if (pattern.indexOf("./") === 0) {
-            pattern = pattern.slice(2);
-        }
-
-        matches = minimatch(filepath, pattern) || minimatch(filepath, pattern + "/**");
-
-        return matches ? !negated : ignored;
-    }, false);
-};
-
-module.exports = IgnoredPaths;
+/**
+ * @fileoverview Responsible for loading ignore config files and managing ignore patterns
+ * @author Jonathan Rajavuori
+ */
+"use strict";
+
+//------------------------------------------------------------------------------
+// Requirements
+//------------------------------------------------------------------------------
+
+var fs = require("fs"),
+    debug = require("debug"),
+    minimatch = require("minimatch"),
+    FileFinder = require("./file-finder");
+
+debug = debug("eslint:ignored-paths");
+
+
+//------------------------------------------------------------------------------
+// Constants
+//------------------------------------------------------------------------------
+
+var ESLINT_IGNORE_FILENAME = ".eslintignore";
+
+
+//------------------------------------------------------------------------------
+// Helpers
+//------------------------------------------------------------------------------
+
+/**
+ * Load and parse ignore patterns from the file at the given path
+ * @param {string} filepath Path to the ignore file.
+ * @returns {string[]} An array of ignore patterns or an empty array if no ignore file.
+ */
+function loadIgnoreFile(filepath) {
+    var ignorePatterns = [];
+
+    function nonEmpty(line) {
+        return line.trim() !== "" && line[0] !== "#";
+    }
+
+    if (filepath) {
+        try {
+            ignorePatterns = fs.readFileSync(filepath, "utf8").split(/\r?\n/).filter(nonEmpty);
+        } catch (e) {
+            e.message = "Cannot read ignore file: " + filepath + "\nError: " + e.message;
+            throw e;
+        }
+    }
+
+    return ["node_modules/**"].concat(ignorePatterns);
+}
+
+var ignoreFileFinder;
+
+/**
+ * Find an ignore file in the current directory or a parent directory.
+ * @returns {string} Path of ignore file or an empty string.
+ */
+function findIgnoreFile() {
+    if (!ignoreFileFinder) {
+        ignoreFileFinder = new FileFinder(ESLINT_IGNORE_FILENAME);
+    }
+
+    return ignoreFileFinder.findInDirectoryOrParents();
+}
+
+
+//------------------------------------------------------------------------------
+// Public Interface
+//------------------------------------------------------------------------------
+
+/**
+ * IgnoredPaths
+ * @constructor
+ * @class IgnoredPaths
+ * @param {Array} patterns to be matched against file paths
+ */
+function IgnoredPaths(patterns) {
+    this.patterns = patterns;
+}
+
+/**
+ * IgnoredPaths initializer
+ * @param {Object} options object containing 'ignore' and 'ignorePath' properties
+ * @returns {IgnoredPaths} object, with patterns loaded from the ignore file
+ */
+IgnoredPaths.load = function (options) {
+    var patterns;
+
+    options = options || {};
+
+    if (options.ignore) {
+        patterns = loadIgnoreFile(options.ignorePath || findIgnoreFile());
+    } else {
+        patterns = [];
+    }
+
+    if (options.ignorePattern) {
+        patterns.push(options.ignorePattern);
+    }
+
+    return new IgnoredPaths(patterns);
+};
+
+/**
+ * Determine whether a file path is included in the configured ignore patterns
+ * @param {string} filepath Path to check
+ * @returns {boolean} true if the file path matches one or more patterns, false otherwise
+ */
+IgnoredPaths.prototype.contains = function (filepath) {
+    if (this.patterns === null) {
+        throw new Error("No ignore patterns loaded, call 'load' first");
+    }
+
+    filepath = filepath.replace("\\", "/");
+    filepath = filepath.replace(/^\.\//, "");
+    return this.patterns.reduce(function(ignored, pattern) {
+        var negated = pattern[0] === "!",
+            matches;
+
+        if (negated) {
+            pattern = pattern.slice(1);
+        }
+
+        // Remove leading "current folder" prefix
+        if (pattern.indexOf("./") === 0) {
+            pattern = pattern.slice(2);
+        }
+
+        matches = minimatch(filepath, pattern) || minimatch(filepath, pattern + "/**");
+
+        return matches ? !negated : ignored;
+    }, false);
+};
+
+module.exports = IgnoredPaths;

package/lib/load-rules.js

@@ -1,39 +1,39 @@
-/**
- * @fileoverview Module for loading rules from files and directories.
- * @author Michael Ficarra
- */
-
-"use strict";
-
-//------------------------------------------------------------------------------
-// Requirements
-//------------------------------------------------------------------------------
-
-var fs = require("fs"),
-    path = require("path");
-
-//------------------------------------------------------------------------------
-// Public Interface
-//------------------------------------------------------------------------------
-
-/**
- * Load all rule modules from specified directory.
- * @param {String} [rulesDir] Path to rules directory, may be relative. Defaults to `lib/rules`.
- * @returns {Object} Loaded rule modules by rule ids (file names).
- */
-module.exports = function(rulesDir) {
-    if (!rulesDir) {
-        rulesDir = path.join(__dirname, "rules");
-    } else {
-        rulesDir = path.resolve(process.cwd(), rulesDir);
-    }
-
-    var rules = Object.create(null);
-    fs.readdirSync(rulesDir).forEach(function(file) {
-        if (path.extname(file) !== ".js") {
-            return;
-        }
-        rules[file.slice(0, -3)] = require(path.join(rulesDir, file));
-    });
-    return rules;
-};
+/**
+ * @fileoverview Module for loading rules from files and directories.
+ * @author Michael Ficarra
+ */
+
+"use strict";
+
+//------------------------------------------------------------------------------
+// Requirements
+//------------------------------------------------------------------------------
+
+var fs = require("fs"),
+    path = require("path");
+
+//------------------------------------------------------------------------------
+// Public Interface
+//------------------------------------------------------------------------------
+
+/**
+ * Load all rule modules from specified directory.
+ * @param {String} [rulesDir] Path to rules directory, may be relative. Defaults to `lib/rules`.
+ * @returns {Object} Loaded rule modules by rule ids (file names).
+ */
+module.exports = function(rulesDir) {
+    if (!rulesDir) {
+        rulesDir = path.join(__dirname, "rules");
+    } else {
+        rulesDir = path.resolve(process.cwd(), rulesDir);
+    }
+
+    var rules = Object.create(null);
+    fs.readdirSync(rulesDir).forEach(function(file) {
+        if (path.extname(file) !== ".js") {
+            return;
+        }
+        rules[file.slice(0, -3)] = require(path.join(rulesDir, file));
+    });
+    return rules;
+};

package/lib/options.js

@@ -1,126 +1,132 @@
-/**
- * @fileoverview Options configuration for optionator.
- * @author George Zahariev
- */
-"use strict";
-
-//------------------------------------------------------------------------------
-// Requirements
-//------------------------------------------------------------------------------
-
-var optionator = require("optionator");
-
-//------------------------------------------------------------------------------
-// Initialization and Public Interface
-//------------------------------------------------------------------------------
-
-// exports "parse(args)", "generateHelp()", and "generateHelpForOption(optionName)"
-module.exports = optionator({
-    prepend: "eslint [options] file.js [file.js] [dir]",
-    concatRepeatedArrays: true,
-    mergeRepeatedObjects: true,
-    options: [{
-        heading: "Options"
-    }, {
-        option: "help",
-        alias: "h",
-        type: "Boolean",
-        description: "Show help"
-    }, {
-        option: "config",
-        alias: "c",
-        type: "path::String",
-        description: "Use configuration from this file"
-    }, {
-        option: "rulesdir",
-        type: "[path::String]",
-        description: "Use additional rules from this directory"
-    }, {
-        option: "format",
-        alias: "f",
-        type: "String",
-        default: "stylish",
-        description: "Use a specific output format"
-    }, {
-        option: "version",
-        alias: "v",
-        type: "Boolean",
-        description: "Outputs the version number"
-    }, {
-        option: "reset",
-        type: "Boolean",
-        default: "false",
-        description: "Set all default rules to off"
-    }, {
-        option: "eslintrc",
-        type: "Boolean",
-        default: "true",
-        description: "Disable use of configuration from .eslintrc"
-    }, {
-        option: "env",
-        type: "[String]",
-        description: "Specify environments"
-    }, {
-        option: "ext",
-        type: "[String]",
-        default: ".js",
-        description: "Specify JavaScript file extensions"
-    }, {
-        option: "plugin",
-        type: "[String]",
-        description: "Specify plugins"
-    }, {
-        option: "global",
-        type: "[String]",
-        description: "Define global variables"
-    }, {
-        option: "rule",
-        type: "Object",
-        description: "Specify rules"
-    },
-    {
-        option: "ignore-path",
-        type: "path::String",
-        description: "Specify path of ignore file"
-    },
-    {
-        option: "ignore",
-        type: "Boolean",
-        default: "true",
-        description: "Disable use of .eslintignore"
-    },
-    {
-        option: "ignore-pattern",
-        type: "String",
-        description: "Pattern of files to ignore (in addition to those in .eslintignore)"
-    },
-    {
-        option: "color",
-        type: "Boolean",
-        default: "true",
-        description: "Disable color in piped output"
-    },
-    {
-        option: "output-file",
-        alias: "o",
-        type: "path::String",
-        description: "Specify file to write report to"
-    },
-    {
-        option: "quiet",
-        type: "Boolean",
-        default: "false",
-        description: "Report errors only"
-    },
-    {
-        option: "stdin",
-        type: "Boolean",
-        default: "false",
-        description: "Lint code provided on <STDIN>"
-    },
-    {
-        option: "stdin-filename",
-        type: "String",
-        description: "Specify filename to process STDIN as"
-    }]
-});
+/**
+ * @fileoverview Options configuration for optionator.
+ * @author George Zahariev
+ */
+"use strict";
+
+//------------------------------------------------------------------------------
+// Requirements
+//------------------------------------------------------------------------------
+
+var optionator = require("optionator");
+
+//------------------------------------------------------------------------------
+// Initialization and Public Interface
+//------------------------------------------------------------------------------
+
+// exports "parse(args)", "generateHelp()", and "generateHelpForOption(optionName)"
+module.exports = optionator({
+    prepend: "eslint [options] file.js [file.js] [dir]",
+    concatRepeatedArrays: true,
+    mergeRepeatedObjects: true,
+    options: [{
+        heading: "Options"
+    }, {
+        option: "help",
+        alias: "h",
+        type: "Boolean",
+        description: "Show help"
+    }, {
+        option: "config",
+        alias: "c",
+        type: "path::String",
+        description: "Use configuration from this file"
+    }, {
+        option: "rulesdir",
+        type: "[path::String]",
+        description: "Use additional rules from this directory"
+    }, {
+        option: "format",
+        alias: "f",
+        type: "String",
+        default: "stylish",
+        description: "Use a specific output format"
+    }, {
+        option: "version",
+        alias: "v",
+        type: "Boolean",
+        description: "Outputs the version number"
+    }, {
+        option: "reset",
+        type: "Boolean",
+        default: "false",
+        description: "Set all default rules to off"
+    }, {
+        option: "eslintrc",
+        type: "Boolean",
+        default: "true",
+        description: "Disable use of configuration from .eslintrc"
+    }, {
+        option: "env",
+        type: "[String]",
+        description: "Specify environments"
+    }, {
+        option: "ext",
+        type: "[String]",
+        default: ".js",
+        description: "Specify JavaScript file extensions"
+    }, {
+        option: "plugin",
+        type: "[String]",
+        description: "Specify plugins"
+    }, {
+        option: "global",
+        type: "[String]",
+        description: "Define global variables"
+    }, {
+        option: "rule",
+        type: "Object",
+        description: "Specify rules"
+    },
+    {
+        option: "ignore-path",
+        type: "path::String",
+        description: "Specify path of ignore file"
+    },
+    {
+        option: "ignore",
+        type: "Boolean",
+        default: "true",
+        description: "Disable use of .eslintignore"
+    },
+    {
+        option: "ignore-pattern",
+        type: "String",
+        description: "Pattern of files to ignore (in addition to those in .eslintignore)"
+    },
+    {
+        option: "color",
+        type: "Boolean",
+        default: "true",
+        description: "Disable color in piped output"
+    },
+    {
+        option: "output-file",
+        alias: "o",
+        type: "path::String",
+        description: "Specify file to write report to"
+    },
+    {
+        option: "quiet",
+        type: "Boolean",
+        default: "false",
+        description: "Report errors only"
+    },
+    {
+        option: "stdin",
+        type: "Boolean",
+        default: "false",
+        description: "Lint code provided on <STDIN>"
+    },
+    {
+        option: "stdin-filename",
+        type: "String",
+        description: "Specify filename to process STDIN as"
+    },
+    {
+        option: "init",
+        type: "Boolean",
+        default: "false",
+        description: "Run config initialization wizard"
+    }]
+});