style: please the linter

Xiphe · Jun 16, 2016 · 15e7565 · 15e7565
1 parent c96038d
commit 15e7565
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 23 deletions.
diff --git a/lib/MultiTypeValue.js b/lib/MultiTypeValue.js
@@ -47,7 +47,7 @@ class MultiTypeValue {
       return;
     } else if (type(this.originalValue) === toType) {
       this.value = this.originalValue;
-    } else if(this[convertMethod]) {
+    } else if (this[convertMethod]) {
       this.value = this[convertMethod](this.originalValue);
     }
   }
@@ -64,7 +64,7 @@ MultiTypeValue.prototype.falsyStrings = [
   'null',
   'false',
   'NaN',
-  'undefined'
+  'undefined',
 ];
 
 MultiTypeValue.prototype.arrayDelmiter = ',';

diff --git a/lib/Uberconfig.js b/lib/Uberconfig.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-underscore-dangle */
 'use strict';
 
 const type = require('useful-type');
@@ -10,7 +11,7 @@ const DEFAULTS = {
   envPrefix: 'UBERCONFIG_',
   envConverter: getFromEnv.converter,
   cliPrefix: 'uc-',
-  cliConverter: getFromCliArg.converter
+  cliConverter: getFromCliArg.converter,
 };
 
 class Uberconfig {
@@ -22,17 +23,15 @@ class Uberconfig {
   request(requests, conflictResolver) {
     const response = {};
 
-    for (const key in requests) {
-      if (requests.hasOwnProperty(key)) {
-        const request = requests[key];
+    Object.keys(requests).forEach(key => {
+      const request = requests[key];
 
-        response[request.as || key] = this.get(
-          key,
-          request.default,
-          request.conflictResolver || conflictResolver
-        );
-      }
-    }
+      response[request.as || key] = this.get(
+        key,
+        request.default,
+        request.conflictResolver || conflictResolver
+      );
+    });
 
     return dot.object(response);
   }
@@ -43,9 +42,9 @@ class Uberconfig {
 
     return getValue(
       [
-        () => {return getFromCliArg(key, this._opt);},
-        () => {return getFromEnv(key, this._opt);},
-        () => {return dot.pick(key, this.config);}
+        () => getFromCliArg(key, this._opt),
+        () => getFromEnv(key, this._opt),
+        () => dot.pick(key, this.config),
       ].reduce((aValue, getter) => {
         if (aValue === null) {
           return getter();
@@ -55,7 +54,7 @@ class Uberconfig {
       }, null),
       getDefault(
         this._defaultsMap,
-        {defaultValue, conflictResolver},
+        { defaultValue, conflictResolver },
         key
       ),
       key

diff --git a/lib/getDefault.js b/lib/getDefault.js
@@ -27,14 +27,14 @@ function resolveConflict(defaultsMap, newDefault, key) {
       `to equal ${JSON.stringify(otherDefaultValues[0])}`);
   }
 
-  return getDefaultValue(
+  return getDefaultValue( // eslint-disable-line no-use-before-define
     defaultsMap,
     {
       defaultValue: newDefault.conflictResolver(
         newDefault,
         defaultsMap[key],
         key
-      ).defaultValue
+      ).defaultValue,
     },
     key
   );
@@ -55,7 +55,7 @@ function getDefaultValue(defaultsMap, newDefault, key) {
       return resolveConflict(defaultsMap, newDefault, key);
     }
   } else {
-    defaultsMap[key] = [];
+    defaultsMap[key] = []; // eslint-disable-line no-param-reassign
   }
 
   defaultsMap[key].push(newDefault);

diff --git a/lib/getFromCliArg.js b/lib/getFromCliArg.js
@@ -1,4 +1,3 @@
-/* eslint no-process-env: [0] */
 'use strict';
 
 const MultiTypeValue = require('./MultiTypeValue');

diff --git a/lib/getFromEnv.js b/lib/getFromEnv.js
@@ -1,4 +1,3 @@
-/* eslint no-process-env: [0] */
 'use strict';
 
 const MultiTypeValue = require('./MultiTypeValue');

diff --git a/lib/getValue.js b/lib/getValue.js
@@ -4,7 +4,7 @@ const type = require('useful-type');
 const MultiTypeValue = require('./MultiTypeValue');
 
 module.exports = function getValue(aValue, defaultValue, key) {
-  var value = aValue;
+  let value = aValue;
 
   if (type(value) === 'undefined') {
     return defaultValue;