Support extends

.all-contributorsrc

@@ -29,6 +29,15 @@
       "contributions": [
         "test"
       ]
+    },
+    {
+      "login": "ta2edchimp",
+      "name": "Andreas Windt",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/262436?v=3",
+      "html_url": "https://twitter.com/ta2edchimp",
+      "contributions": [
+        "code", "test"
+      ]
     }
   ]
 }

bin.js

@@ -5,29 +5,47 @@
 // Prints rules recognized by ESLint that don't appear in the given config
 // preset. It helps with upgrading the preset when new ESLint gets released.
 var path = require('path')
+var eslint = require('eslint')
 var isAbsolute = require('path-is-absolute')
 var findNewRules = require('./index')
 
-var currentRules = Object.keys(getConfig().rules)
+var currentRules = getRules()
 var newRules = findNewRules(currentRules)
 
 if (newRules.length) {
   console.log('New rules to add to the config: ' + newRules.join(', ') + '.') // eslint-disable-line no-console
   process.exit(1)
 }
 
-function getConfig() {
+function getConfigFile() {
   var specifiedFile = process.argv[2]
   if (specifiedFile) {
     // this is being called like: eslint-find-new-rules eslint-config-mgol
     if (isAbsolute(specifiedFile)) {
-      return require(specifiedFile)
+      return specifiedFile
     } else {
-      return require(path.join(process.cwd(), specifiedFile))
+      return path.join(process.cwd(), specifiedFile)
     }
   } else {
     // this is not being called with an arg. Use the package.json `main`
-    return require(process.cwd())
+    return path.join(process.cwd(), 'package.json')
   }
 }
 
+function getConfig(file) {
+  var cliEngine = new eslint.CLIEngine({
+    // ignore any config applicable depending on the location on the filesystem
+    useEslintrc: false,
+    // point to the particular config
+    configFile: file,
+  })
+  var config = cliEngine.getConfigForFile(file)
+  return config
+}
+
+function getRules() {
+  var configFile = getConfigFile()
+  var config = getConfig(configFile)
+  var rules = Object.keys(config.rules)
+  return rules
+}

test/bin.js

@@ -6,8 +6,10 @@ let rules = []
 const processCwd = process.cwd
 const processExit = process.exit
 const consoleLog = console.log // eslint-disable-line no-console
-const specifiedFile = './fixtures/.eslintrc'
+const noSpecifiedFile = './fixtures/no-path'
+const specifiedFile = './fixtures/.eslintrc.js'
 const mainFile = path.join(process.cwd(), specifiedFile)
+const extendingFile = './fixtures/extending-config.json'
 const indexStub = {
   './index': () => rules,
 }
@@ -38,7 +40,7 @@ test('no new rule and relative path', () => {
 })
 
 test('no new rule and no path', () => {
-  process.cwd = () => mainFile
+  process.cwd = () => noSpecifiedFile
   proxyquire('../bin', indexStub)
 })
 
@@ -56,6 +58,12 @@ test('new rule and relative path', () => {
 
 test('new rule and no path', () => {
   rules = ['foo', 'bar', 'baz']
-  process.cwd = () => mainFile
+  process.cwd = () => noSpecifiedFile
+  proxyquire('../bin', indexStub)
+})
+
+test('new rule (extending)', () => {
+  rules = ['comma-dangle', 'no-console', 'no-alert']
+  process.argv[2] = extendingFile
   proxyquire('../bin', indexStub)
 })

test/fixtures/.eslintrc → test/fixtures/.eslintrc.js

@@ -1,5 +1,5 @@
 module.exports = {
   rules: {
-    foo: true,
+    "no-console": [2],
   }
 }

test/fixtures/base-config.yml

@@ -0,0 +1,5 @@
+rules:
+  no-console:
+    - 2
+  no-alert:
+    - 2

test/fixtures/extending-config.json

@@ -0,0 +1,6 @@
+{
+  "extends": "./base-config.yml",
+  "rules": {
+    "comma-dangle": [2, "never"]
+  }
+}

test/fixtures/no-path/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "fake-project",
+  "version": "0.0.0",
+  "description": "Simulating a project's package.json.",
+  "private": true,
+  "eslintConfig": {
+    "rules": {
+      "no-console": [2]
+    }
+  }
+}