lint updates for eslint 4 (#22)

haraka · Jun 17, 2017 · f373846 · f373846
1 parent db90144
commit f373846
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 48 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -4,6 +4,5 @@
   ],
   "extends": ["eslint:recommended", "plugin:haraka/recommended"],
   "rules": {
-    "no-console": 0
   }
 }
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,8 @@
+
+# 1.0.13 - 2017-06-16
+
+- lint updates for eslint 4
+
 # 1.0.12 - 2017-05-21
 
 - unref() the setInterval so that Haraka can gracefully exit

diff --git a/configfile.js b/configfile.js
@@ -268,24 +268,24 @@ cfreader.read_dir = function (name, opts, done) {
     var type = opts.type || 'binary';
 
     isDirectory(name)
-    .then((result) => {
-        return fsReadDir(name);
-    })
-    .then((result2) => {
-        var reader = require('./readers/' + type);
-        var promises = [];
-        result2.forEach(function (file) {
-            promises.push(reader.loadPromise(path.resolve(name, file)))
-        });
-        return Promise.all(promises);
-    })
-    .then((fileList) => {
+        .then((result) => {
+            return fsReadDir(name);
+        })
+        .then((result2) => {
+            var reader = require('./readers/' + type);
+            var promises = [];
+            result2.forEach(function (file) {
+                promises.push(reader.loadPromise(path.resolve(name, file)))
+            });
+            return Promise.all(promises);
+        })
+        .then((fileList) => {
         // console.log(fileList);
-        done(null, fileList);
-    })
-    .catch((error) => {
-        done(error);
-    })
+            done(null, fileList);
+        })
+        .catch((error) => {
+            done(error);
+        })
 
     if (opts.watchCb) fsWatchDir(name);
 };

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "name": "haraka-config",
   "license": "MIT",
   "description": "Haraka's config file loader",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "homepage": "http://haraka.github.io",
   "repository": {
     "type": "git",

diff --git a/test/readers/flat.js b/test/readers/flat.js
@@ -22,14 +22,14 @@ exports.load = {
     'loads the test flat file, as list': function (test) {
         test.expect(1);
         var result = this.flat.load(
-                'test/config/test.flat', 'list', null, regex);
+            'test/config/test.flat', 'list', null, regex);
         test.deepEqual(result, [ 'line1', 'line2', 'line3', 'line5' ]);
         test.done();
     },
     'loads the test flat file, unspecified type': function (test) {
         test.expect(1);
         var result = this.flat.load(
-                'test/config/test.flat', null, null, regex);
+            'test/config/test.flat', null, null, regex);
         test.deepEqual(result, 'line1');
         test.done();
     },

diff --git a/test/readers/ini.js b/test/readers/ini.js
@@ -103,53 +103,53 @@ exports.empty = {
     'non-exist.ini boolean' : function (test) {
         test.expect(1);
         test.deepEqual(
-                this.ini.empty({ booleans: ['reject']}),
-                { main: { reject: false } }
-                );
+            this.ini.empty({ booleans: ['reject']}),
+            { main: { reject: false } }
+        );
         test.done();
     },
     'non-exist.ini boolean true default' : function (test) {
         test.expect(3);
         test.deepEqual(
-                this.ini.empty({ booleans: ['+reject']}),
-                { main: { reject: true } }
-                );
+            this.ini.empty({ booleans: ['+reject']}),
+            { main: { reject: true } }
+        );
         test.deepEqual(
-                this.ini.empty({ booleans: ['+main.reject']}),
-                { main: { reject: true } }
-                );
+            this.ini.empty({ booleans: ['+main.reject']}),
+            { main: { reject: true } }
+        );
         test.deepEqual(
-                this.ini.empty({ booleans: ['main.+reject']}),
-                { main: { reject: true } }
-                );
+            this.ini.empty({ booleans: ['main.+reject']}),
+            { main: { reject: true } }
+        );
         test.done();
     },
     'non-exist.ini boolean false default' : function (test) {
         test.expect(3);
         test.deepEqual(
-                this.ini.empty({ booleans: ['-reject']}),
-                { main: { reject: false } }
-                );
+            this.ini.empty({ booleans: ['-reject']}),
+            { main: { reject: false } }
+        );
         test.deepEqual(
-                this.ini.empty({ booleans: ['-main.reject']}),
-                { main: { reject: false } }
-                );
+            this.ini.empty({ booleans: ['-main.reject']}),
+            { main: { reject: false } }
+        );
         test.deepEqual(
-                this.ini.empty({ booleans: ['main.-reject']}),
-                { main: { reject: false } }
-                );
+            this.ini.empty({ booleans: ['main.-reject']}),
+            { main: { reject: false } }
+        );
         test.done();
     },
     'non-exist.ini boolean false default, section' : function (test) {
         test.expect(2);
         test.deepEqual(
-                this.ini.empty({ booleans: ['-reject.boolf']}),
-                { main: { }, reject: {boolf: false} }
-                );
+            this.ini.empty({ booleans: ['-reject.boolf']}),
+            { main: { }, reject: {boolf: false} }
+        );
         test.deepEqual(
-                this.ini.empty({ booleans: ['+reject.boolt']}),
-                { main: { }, reject: {boolt: true} }
-                );
+            this.ini.empty({ booleans: ['+reject.boolt']}),
+            { main: { }, reject: {boolt: true} }
+        );
         test.done();
     },
 };