Merge pull request #5 from AtomLinter/further-tests

Got even more tests working

Author: savetheclocktower

.eslintrc

@@ -15,7 +15,7 @@
     }
   },
   "plugins": [
-    "eslint-plugin-import"
+    "import"
   ],
   "extends": [
     "eslint:recommended"

lib/config.js

@@ -4,6 +4,10 @@ import get from 'lodash.get';
 
 import console from './console';
 
+function configChanged (config, prevConfig) {
+  return JSON.stringify(config) !== JSON.stringify(prevConfig);
+}
+
 // Returns config values, but prioritizes anything defined in `.linter-eslint`
 // as a per-project override for this linter's settings.
 const Config = {
@@ -14,18 +18,19 @@ const Config = {
 
   initialize () {
     if (this.initialized) { return; }
+    this._currentConfig = null;
     this.rescan();
     this.initialized = true;
-    console.log('Config initialized. nodeBin:', this.get('nodeBin'));
   },
 
+  // Search again for the presence of a .linter-eslint in the project root.
   rescan () {
     if (this.subscriptions) {
       this.subscriptions.dispose();
     }
     this.subscriptions = new CompositeDisposable();
     this.overrides = {};
-    this._currentConfig = null;
+    this.configFile = null;
 
     for (let dir of atom.project.getDirectories()) {
       let candidate = dir.getFile('.linter-eslint');
@@ -36,6 +41,10 @@ const Config = {
     }
 
     if (this.configFile) {
+      // Changes to config file contents are caught by this subscription. File
+      // deletion, file creation, or file renaming that involves
+      // `.linter-eslint` is caught by the main module. We might decide to make
+      // Config in charge of both in the future.
       this.subscriptions.add(
         this.configFile.onDidChange(this.update.bind(this))
       );
@@ -49,6 +58,7 @@ const Config = {
     );
   },
 
+  // Re-read from .linter-eslint when it updates.
   update () {
     if (!this.configFile) {
       this.overrides = {};
@@ -78,8 +88,11 @@ const Config = {
 
   triggerConfigChange () {
     let newConfig = this.get();
-    for (let handler of this.handlers) {
-      handler(newConfig, this._currentConfig || {});
+    if (!configChanged(newConfig, this._currentConfig)) { return; }
+    if (this._currentConfig) {
+      for (let handler of this.handlers) {
+        handler(newConfig, this._currentConfig || {});
+      }
     }
     this._currentConfig = newConfig;
   },
@@ -94,6 +107,7 @@ const Config = {
 
   dispose () {
     this.subscriptions.dispose();
+    this.initialized = false;
   }
 };
 

lib/console.js

@@ -2,7 +2,7 @@
 
 const CONSOLE = {};
 
-const isEnabled = atom.inDevMode();
+const isEnabled = atom.inDevMode() && !process.env.SILENCE_LOG;
 
 function makeConsoleMethod (name) {
   return (...args) => {

lib/helpers.js

@@ -33,8 +33,8 @@ export function generateUserMessage (textEditor, options) {
 
 function configThatMayInvalidateWorkerCache (config) {
   let {
-    advanced: { disableEslintIgnore },
-    autofix: { rulesToDisableWhileFixing }
+    advanced: { disableEslintIgnore } = {},
+    autofix: { rulesToDisableWhileFixing } = {}
   } = config;
 
   return {

lib/job-manager.js

@@ -42,8 +42,8 @@ class JobManager {
   }
 
   createWorker () {
-    console.log('JobManager creating worker at:', nodeBin, this.workerPath);
     let nodeBin = Config.get('nodeBin');
+    console.debug('JobManager creating worker at:', nodeBin, this.workerPath);
     this.killWorker();
 
     // We should not try to start the worker without testing the value we have
@@ -101,7 +101,7 @@ class JobManager {
 
   receiveMessage (data) {
     if (data.log) {
-      console.log('WORKER LOG:', data.log);
+      console.debug('WORKER LOG:', data.log);
       return;
     }
     let key = data.key;
@@ -138,7 +138,7 @@ class JobManager {
   async send (bundle) {
     let key = generateKey();
     bundle.key = key;
-    console.log('JobManager#send:', bundle);
+    console.debug('JobManager#send:', bundle);
     try {
       this.ensureWorker();
     } catch (err) {