Merge branch 'master' of https://github.com/AtomLinter/linter-coffeelint

AtomLinter · Aug 8, 2014 · d506bbb · d506bbb
2 parents f48b53e + 679b80a
commit d506bbb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/init.coffee b/lib/init.coffee
@@ -3,6 +3,7 @@ path = require 'path'
 module.exports =
   configDefaults:
     coffeelintExecutablePath: path.join __dirname, '..', 'node_modules', 'coffeelint', 'bin'
+    coffeelintConfigPath: null
 
   activate: ->
     console.log 'activate linter-coffeelint'
diff --git a/lib/linter-coffeelint.coffee b/lib/linter-coffeelint.coffee
@@ -23,12 +23,18 @@ class LinterCoffeelint extends Linter
 
   isNodeExecutable: yes
 
+  configPath: null
+
   constructor: (editor) ->
     super(editor)
 
-    config = findFile(@cwd, ['coffeelint.json'])
-    if config
-      @cmd += " -f #{config}"
+    atom.config.observe 'linter-coffeelint.coffeelintConfigPath', =>
+      @configPath = atom.config.get 'linter-coffeelint.coffeelintConfigPath'
+
+    if configPathLocal = findFile(@cwd, ['coffeelint.json'])
+      @cmd += " -f #{configPathLocal}"
+    else if @configPath
+      @cmd += " -f #{@configPath}"
 
     atom.config.observe 'linter-coffeelint.coffeelintExecutablePath', =>
       @executablePath = atom.config.get 'linter-coffeelint.coffeelintExecutablePath'
@@ -38,5 +44,6 @@ class LinterCoffeelint extends Linter
 
   destroy: ->
     atom.config.unobserve 'linter-coffeelint.coffeelintExecutablePath'
+    atom.config.unobserve 'linter-coffeelint.coffeelintConfigPath'
 
 module.exports = LinterCoffeelint