Add ESLint curly rule and tweak indent rule for switch case

.eslintrc.yml

@@ -10,10 +10,11 @@ root: true
 
 rules:
   comma-dangle: off
+  curly: warn
   eol-last: error
   eqeqeq: error
   handle-callback-err: error
-  indent: [error, 2]
+  indent: [error, 2, {SwitchCase: 1}]
   no-console: off
   no-multi-spaces: error
   no-unused-vars: [error, {vars: all, args: none}]

index.js

@@ -21,25 +21,34 @@ var clim = require("clim");
 var QUIET = false;
 var hasSite = false;
 
-function padright(s, l) {
-  if (s.length >= l) return s;
-  return s + Array(l).fill(" ").join("").slice(s.length);
+function padright(s, len) {
+  if (s.length >= len) {
+    return s;
+  }
+  return s + Array(len).fill(" ").join("").slice(s.length);
 }
 
 clim.logWrite = function(level, prefixes, msg) {
-  if (QUIET) return;
+  if (QUIET) {
+    return;
+  }
 
   var pfx = "";
-  if (prefixes.length > 0) pfx = prefixes.join(" ");
+  if (prefixes.length > 0) {
+    pfx = prefixes.join(" ");
+  }
 
-  level = (f[level.toLowerCase()] || function(p) {return p;})(level);
+  level = (f[level.toLowerCase()] || function(p) {
+    return p;
+  })(level);
   var line = util.format("%s [%s] %s", pfx, level, msg);
+
   switch (level) {
-  case "ERROR":
-    process.stderr.write(line + "\n");
-    break;
-  default:
-    process.stdout.write(line + "\n");
+    case "ERROR":
+      process.stderr.write(line + "\n");
+      break;
+    default:
+      process.stdout.write(line + "\n");
   }
 };
 
@@ -47,12 +56,12 @@ var logger = clim(chalk.grey("observatory"));
 
 var f = {
   error: chalk.red,
-  link:  chalk.underline.blue,
-  info:  chalk.blue,
-  log:   chalk.blue,
-  warn:  chalk.red,
-  bold:  chalk.bold,
-  code:  chalk.grey,
+  link: chalk.underline.blue,
+  info: chalk.blue,
+  log: chalk.blue,
+  warn: chalk.red,
+  bold: chalk.bold,
+  code: chalk.grey,
   header: chalk.bold.blue
 };
 
@@ -62,13 +71,17 @@ function collect(val, O) {
 }
 
 function helpAnywhere(rawArgs) {
-  return rawArgs.filter(function(x) { return /-h|--help/.exec(x);}).length;
+  return rawArgs.filter(function(x) {
+    return /-h|--help/.exec(x);
+  }).length;
 }
 
 var FORMATS = {
   "json": {
     "description": "json of the report",
-    "action": function(scores) { console.log(JSON.stringify(scores, null, 2));}
+    "action": function(scores) {
+      console.log(JSON.stringify(scores, null, 2));
+    }
   },
   "report": {
     "description": "plain-text tabular format",
@@ -87,8 +100,9 @@ var FORMATS = {
 
 function validateFormatChoice(given) {
   given = given.toLowerCase();
-  if (given in FORMATS) return given;
-  else {
+  if (given in FORMATS) {
+    return given;
+  } else {
     logger.error("not a valid format choice: %s.  Allowed: ",
       f.error(given),
       f.code(Object.keys(FORMATS).join("|")));
@@ -97,7 +111,9 @@ function validateFormatChoice(given) {
 }
 
 function longestInList(L) {
-  return Math.max.apply(null, L.map(function(x) {return x.length;}));
+  return Math.max.apply(null, L.map(function(x) {
+    return x.length;
+  }));
 }
 
 /* functions for retrieving reports */
@@ -144,7 +160,9 @@ class Scanner {
           return scan;
         } else {
           logger.warn(sprintf("retrying in 1 second (attempt %s/%s)", that.attempts, that.allowed));
-          return delay(1000).then(function() {return that.promiseScan(site, options);});
+          return delay(1000).then(function() {
+            return that.promiseScan(site, options);
+          });
         }
       }
     );
@@ -154,7 +172,7 @@ class Scanner {
 /** related to grades */
 var grades = ["F"];
 "DCBA".split("").forEach(function(g) {
-  ["-","","+"].forEach(function(mark) {
+  ["-", "", "+"].forEach(function(mark) {
     grades.push(g + mark);
   });
 });
@@ -192,8 +210,7 @@ function promiseReport(scan, options) {
     simple: true
   }).then(function(reportData) {
     formatAnswer(reportData, url, scan, options);
-  }
-  );
+  });
 }
 
 function formatAnswersCsv(scores, url, scan, options) {
@@ -359,8 +376,11 @@ function preprocess(args) {
       dashed = true;
       return;
     }
-    if (dashed) passedOn.push(a);
-    else out.push(a);
+    if (dashed) {
+      passedOn.push(a);
+    } else {
+      out.push(a);
+    }
   });
   return out;
 }
@@ -408,7 +428,9 @@ program
     // everything here has a site
     hasSite = true;
 
-    if (helpAnywhere(options.rawArgs)) program.help();
+    if (helpAnywhere(options.rawArgs)) {
+      program.help();
+    }
 
     options.site = site; // stuff it in.
 
@@ -425,14 +447,15 @@ program
       process.exit(1);
     }
 
-    var S = new Scanner(site, options);
-    S.promiseScan(site, options).then(
-    function(reportId) {promiseReport(reportId, options);}).
-    catch(function(err) {
-      logger.error(err);
-      process.exit(1);
-    });
-
+    var scanner = new Scanner(site, options);
+    scanner.promiseScan(site, options)
+      .then(function(reportId) {
+        promiseReport(reportId, options);
+      })
+      .catch(function(err) {
+        logger.error(err);
+        process.exit(1);
+      });
   });
 
 function newHelp() {

package.json

@@ -25,6 +25,9 @@
     "npm-run-all": "^3.1.0",
     "nsp": "^2.6.1"
   },
+  "engines": {
+    "node" : ">=6"
+  },
   "homepage": "https://github.com/mozilla/observatory-cli#readme",
   "keywords": [
     "https",