Merge pull request #1019 from NodeRedis/eslint

Replace jshint with eslint and fix everything according to the new rules

Author: BridgeAR

.jshintignore renamed to .eslintignore

@@ -1,4 +1,4 @@
 node_modules/**
 coverage/**
 **.md
-**.log
+**.log

.eslintrc

@@ -0,0 +1,108 @@
+env:
+  node: true
+  es6: false
+
+rules:
+  # Possible Errors
+  # http://eslint.org/docs/rules/#possible-errors
+  comma-dangle: [2, "only-multiline"]
+  no-constant-condition: 2
+  no-control-regex: 2
+  no-debugger: 2
+  no-dupe-args: 2
+  no-dupe-keys: 2
+  no-duplicate-case: 2
+  no-empty: 2
+  no-empty-character-class: 2
+  no-ex-assign: 2
+  no-extra-boolean-cast : 2
+  no-extra-parens: [2, "functions"]
+  no-extra-semi: 2
+  no-func-assign: 2
+  no-invalid-regexp: 2
+  no-irregular-whitespace: 2
+  no-negated-in-lhs: 2
+  no-obj-calls: 2
+  no-regex-spaces: 2
+  no-sparse-arrays: 2
+  no-inner-declarations: 2
+  no-unexpected-multiline: 2
+  no-unreachable: 2
+  use-isnan: 2
+  valid-typeof: 2
+
+  # Best Practices
+  # http://eslint.org/docs/rules/#best-practices
+  array-callback-return: 2
+  block-scoped-var: 2
+  dot-notation: 2
+  eqeqeq: 2
+  no-else-return: 2
+  no-extend-native: 2
+  no-floating-decimal: 2
+  no-extra-bind: 2
+  no-fallthrough: 2
+  no-labels: 2
+  no-lone-blocks: 2
+  no-loop-func: 2
+  no-multi-spaces: 2
+  no-multi-str: 2
+  no-native-reassign: 2
+  no-new-wrappers: 2
+  no-octal: 2
+  no-proto: 2
+  no-redeclare: 2
+  no-return-assign: 2
+  no-self-assign: 2
+  no-self-compare: 2
+  no-sequences: 2
+  no-throw-literal: 2
+  no-useless-call: 2
+  no-useless-concat: 2
+  no-useless-escape: 2
+  no-void: 2
+  no-unmodified-loop-condition: 2
+  yoda: 2
+
+  # Strict Mode
+  # http://eslint.org/docs/rules/#strict-mode
+  strict: [2, "global"]
+
+  # Variables
+  # http://eslint.org/docs/rules/#variables
+  no-delete-var: 2
+  no-shadow-restricted-names: 2
+  no-undef: 2
+  no-unused-vars: [2, {"args": "none"}]
+
+  # http://eslint.org/docs/rules/#nodejs-and-commonjs
+  no-mixed-requires: 2
+  no-new-require: 2
+  no-path-concat: 2
+
+  # Stylistic Issues
+  # http://eslint.org/docs/rules/#stylistic-issues
+  comma-spacing: 2
+  eol-last: 2
+  indent: [2, 4, {SwitchCase: 2}]
+  keyword-spacing: 2
+  max-len: [2, 200, 2]
+  new-parens: 2
+  no-mixed-spaces-and-tabs: 2
+  no-multiple-empty-lines: [2, {max: 2}]
+  no-trailing-spaces: 2
+  quotes: [2, "single", "avoid-escape"]
+  semi: 2
+  space-before-blocks: [2, "always"]
+  space-before-function-paren: [2, "always"]
+  space-in-parens: [2, "never"]
+  space-infix-ops: 2
+  space-unary-ops: 2
+
+globals:
+  it: true
+  describe: true
+  before: true
+  after: true
+  beforeEach: true
+  afterEach: true

.jshintrc

@@ -23,11 +23,11 @@ var total_ops = new metrics.Histogram.createUniformHistogram();
 
 console.log('Comparing before,', file1, '(', before_lines.length, 'lines)', 'to after,', file2, '(', after_lines.length, 'lines)');
 
-function is_whitespace(s) {
+function is_whitespace (s) {
     return !!s.trim();
 }
 
-function pad(input, len, chr, right) {
+function pad (input, len, chr, right) {
     var str = input.toString();
     chr = chr || ' ';
 
@@ -44,20 +44,20 @@ function pad(input, len, chr, right) {
 }
 
 // green if greater than 0, red otherwise
-function humanize_diff(num, unit, toFixed) {
+function humanize_diff (num, unit, toFixed) {
     unit = unit || '';
     if (num > 0) {
         return ' +' + pad(num.toFixed(toFixed || 0) + unit, 7);
     }
     return ' -' + pad(Math.abs(num).toFixed(toFixed || 0) + unit, 7);
 }
 
-function command_name(words) {
+function command_name (words) {
     var line = words.join(' ');
     return line.substr(0, line.indexOf(','));
 }
 
-before_lines.forEach(function(b, i) {
+before_lines.forEach(function (b, i) {
     var a = after_lines[i];
     if (!a || !b || !b.trim() || !a.trim()) {
         // console.log('#ignored#', '>'+a+'<', '>'+b+'<');
@@ -66,10 +66,10 @@ before_lines.forEach(function(b, i) {
     var b_words = b.split(' ').filter(is_whitespace);
     var a_words = a.split(' ').filter(is_whitespace);
 
-    var ops = [b_words, a_words].map(function(words) {
+    var ops = [b_words, a_words].map(function (words) {
         // console.log(words);
         return words.slice(-2, -1) | 0;
-    }).filter(function(num) {
+    }).filter(function (num) {
         var isNaN = !num && num !== 0;
         return !isNaN;
     });

benchmarks/diff_multi_bench_output.js

@@ -13,7 +13,7 @@ var tests = [];
 // bluebird.promisifyAll(redis.Multi.prototype);
 
 function returnArg (name, def) {
-    var matches = process.argv.filter(function(entry) {
+    var matches = process.argv.filter(function (entry) {
         return entry.indexOf(name + '=') === 0;
     });
     if (matches.length) {
@@ -30,7 +30,7 @@ var client_options = {
 };
 var small_str, large_str, small_buf, large_buf, very_large_str, very_large_buf;
 
-function lpad(input, len, chr) {
+function lpad (input, len, chr) {
     var str = input.toString();
     chr = chr || ' ';
     while (str.length < len) {
@@ -44,7 +44,7 @@ metrics.Histogram.prototype.print_line = function () {
     return lpad((obj.min / 1e6).toFixed(2), 6) + '/' + lpad((obj.max / 1e6).toFixed(2), 6) + '/' + lpad((obj.mean / 1e6).toFixed(2), 6);
 };
 
-function Test(args) {
+function Test (args) {
     this.args = args;
     this.callback = null;
     this.clients = [];
@@ -101,7 +101,7 @@ Test.prototype.new_client = function (id) {
     });
 
     // If no redis server is running, start one
-    new_client.on('error', function(err) {
+    new_client.on('error', function (err) {
         if (err.code === 'CONNECTION_BROKEN') {
             throw err;
         }
@@ -268,15 +268,15 @@ tests.push(new Test({descr: 'GET 4MiB str', command: 'get', args: ['foo_rand0000
 tests.push(new Test({descr: 'GET 4MiB buf', command: 'get', args: ['foo_rand000000000002'], pipeline: 1, client_opts: { return_buffers: true} }));
 tests.push(new Test({descr: 'GET 4MiB buf', command: 'get', args: ['foo_rand000000000002'], batch: 20, client_opts: { return_buffers: true} }));
 
-function next() {
+function next () {
     var test = tests.shift();
     if (test) {
         test.run(function () {
             next();
         });
     } else if (rp) {
         // Stop the redis process if started by the benchmark
-        rp.stop(function() {
+        rp.stop(function () {
             rp = undefined;
             next();
         });

benchmarks/multi_bench.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var redis  = require('redis'),
-    client = redis.createClient();
-
+var redis = require('redis');
 // The client stashes the password and will reauthenticate on every connect.
-client.auth('somepass');
+redis.createClient({
+    password: 'somepass'
+});

examples/auth.js

@@ -1,10 +1,11 @@
 'use strict';
 
-var redis = require('../index'),
-    client = redis.createClient(),
-    remaining_ops = 100000, paused = false;
+var redis = require('../index');
+var client = redis.createClient();
+var remaining_ops = 100000;
+var paused = false;
 
-function op() {
+function op () {
     if (remaining_ops <= 0) {
         console.error('Finished.');
         process.exit(0);

examples/backpressure_drain.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var redis = require('../index'),
-    client = redis.createClient();
+var redis = require('../index');
+var client = redis.createClient();
 
 client.eval('return 100.5', 0, function (err, res) {
     console.dir(err);

examples/eval.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var redis = require('redis'),
-    client = redis.createClient();
+var redis = require('redis');
+var client = redis.createClient();
 
 // Extend the RedisClient prototype to add a custom method
 // This one converts the results from 'INFO' into a JavaScript Object

examples/extend.js

@@ -2,13 +2,13 @@
 
 // Read a file from disk, store it in Redis, then read it back from Redis.
 
-var redis = require('redis'),
-    client = redis.createClient({
-        return_buffers: true
-    }),
-    fs = require('fs'),
-    assert = require('assert'),
-    filename = 'grumpyCat.jpg';
+var redis = require('redis');
+var client = redis.createClient({
+    return_buffers: true
+});
+var fs = require('fs');
+var assert = require('assert');
+var filename = 'grumpyCat.jpg';
 
 // Get the file I use for testing like this:
 //    curl http://media4.popsugar-assets.com/files/2014/08/08/878/n/1922507/caef16ec354ca23b_thumb_temp_cover_file32304521407524949.xxxlarge/i/Funny-Cat-GIFs.jpg -o grumpyCat.jpg