Update eslint to 2.13.1, make eslintrc more strict (#205)

Author: LewisJEllis

.eslintrc

@@ -3,62 +3,86 @@
     "node": true,
     "mocha": true,
   },
+  "extends": "eslint:recommended",
   "rules": {
+    "array-bracket-spacing": [2, "never"],
     "block-scoped-var": 2,
-    "dot-notation": [
-      2,
-      {
-        "allowKeywords": true
-      }
-    ],
-    "eqeqeq": [
-      2,
-      "allow-null"
-    ],
+    "brace-style": [2, "1tbs"],
+    "camelcase": [1, "properties": "never"],
+    "comma-dangle": 0,
+    "comma-spacing": [2, {"before": false, "after": true}],
+    "comma-style": [2, "last"],
+    "computed-property-spacing": [2, "never"],
+    "consistent-return": 2,
+    "consistent-this": [2, "self"],
+    "curly": [2, "multi-line"],
+    "default-case": 2,
+    "dot-notation": 2,
+    "eol-last": 2,
+    "eqeqeq": [2, "allow-null"],
     "guard-for-in": 2,
+    "indent": [2, 2, {"SwitchCase": 1, "VariableDeclarator": { "var": 2, "let": 2, "const": 3}}],
+    "key-spacing": [1, {"beforeColon": false, "afterColon": true}],
+    "keyword-spacing": 2,
+    "max-len": [1, 120],
     "new-cap": 2,
+    "no-alert": 2,
     "no-caller": 2,
-    "no-cond-assign": [
-      2,
-      "except-parens"
-    ],
+    "no-catch-shadow": 1,
+    "no-console": 1,
     "no-debugger": 2,
-    "no-empty": 2,
+    "no-else-return": 2,
+    "no-empty": [2, {"allowEmptyCatch": true}],
     "no-eval": 2,
+    "no-extra-bind": 2,
     "no-extend-native": 2,
     "no-extra-parens": 2,
-    "no-irregular-whitespace": 2,
+    "no-fallthrough": 2,
+    "no-floating-decimal": 2,
+    "no-implied-eval": 2,
+    "no-inner-declarations": 2,
     "no-iterator": 2,
+    "no-lonely-if": 2,
     "no-loop-func": 2,
+    "no-mixed-spaces-and-tabs": 2,
+    "no-multiple-empty-lines": [2, {"max": 2}],
+    "no-multi-spaces": 2,
     "no-multi-str": 2,
     "no-new": 2,
+    "no-param-reassign": 1,
     "no-proto": 2,
+    "no-redeclare": 2,
+    "no-return-assign": 2,
     "no-script-url": 2,
+    "no-self-compare": 2,
     "no-sequences": 2,
     "no-shadow": 2,
+    "no-shadow-restricted-names": 2,
+    "no-spaced-func": 2,
+    "no-trailing-spaces": 2,
     "no-undef": 2,
-    "no-unused-vars": [
-      2,
-      {"args": "none"}
-    ],
+    "no-undefined": 2,
+    "no-underscore-dangle": 0,
+    "no-unused-vars": [2, {"vars": "all", "args": "none"}],
+    "no-use-before-define": [2, "nofunc"],
+    "no-useless-call": 2,
+    "no-useless-escape": 2,
+    "no-warning-comments": 0,
     "no-with": 2,
-    "quotes": [
-      2,
-      "single",
-      "avoid-escape"
-    ],
-    "semi": [
-      0,
-      "never"
-    ],
-    "strict": [
-      2,
-      "global"
-    ],
+    "object-curly-spacing": [2, "always"],
+    "quotes": [2, "single", "avoid-escape"],
+    "semi": [2, "always"],
+    "semi-spacing": [2, {"before": false, "after": true}],
+    "space-before-blocks": 2,
+    "space-before-function-paren": [2, {"anonymous": "always", "named": "never"}],
+    "space-in-parens": 2,
+    "space-infix-ops": 2,
+    "space-unary-ops": 2,
+    "spaced-comment": [2, "always"],
+    "strict": [2, "global"],
+    "valid-jsdoc": 0,
     "valid-typeof": 2,
-    "wrap-iife": [
-      2,
-      "inside"
-    ]
+    "wrap-iife": [2, "inside"],
+    "yoda": [2, "never"]
   }
 }

index.js

@@ -3,7 +3,7 @@
 module.exports = require('./lib/client');
 module.exports.utils = require('./lib/utils');
 module.exports.middleware = {
-    connect: require('./lib/middleware/connect')
+  connect: require('./lib/middleware/connect')
 };
 // friendly alias for "raven.middleware.express"
 module.exports.middleware.express = module.exports.middleware.connect;

lib/client.js

@@ -6,12 +6,12 @@ var zlib = require('zlib');
 var utils = require('./utils');
 var uuid = require('node-uuid');
 var transports = require('./transports');
-var node_util = require('util'); // node_util to avoid confusion with "utils"
+var nodeUtil = require('util'); // nodeUtil to avoid confusion with "utils"
 var events = require('events');
 
 module.exports.version = require('../package.json').version;
 
-var extend = Object.assign || function(target) {
+var extend = Object.assign || function (target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i];
     for (var key in source) {
@@ -63,9 +63,9 @@ var Client = function Client(dsn, options) {
     globalContext.extra = options.extra;
   }
 
-  this.on('error', function(e) {}); // noop
+  this.on('error', function (e) {}); // noop
 };
-node_util.inherits(Client, events.EventEmitter);
+nodeUtil.inherits(Client, events.EventEmitter);
 var proto = Client.prototype;
 
 module.exports.Client = Client;
@@ -110,25 +110,25 @@ proto.process = function process(kwargs) {
     kwargs = this.dataCallback(kwargs);
   }
 
-  // this will happen asynchronously. We don't care about it's response.
+  // this will happen asynchronously. We don't care about its response.
   this._enabled && this.send(kwargs, ident);
 
   return ident;
 };
 
 proto.send = function send(kwargs, ident) {
   var self = this;
-  
+
   var skwargs = stringify(kwargs);
 
-  zlib.deflate(skwargs, function(err, buff) {
+  zlib.deflate(skwargs, function (err, buff) {
     var message = buff.toString('base64'),
-      timestamp = new Date().getTime(),
-      headers = {
-        'X-Sentry-Auth': utils.getAuthHeader(timestamp, self.dsn.public_key, self.dsn.private_key),
-        'Content-Type': 'application/octet-stream',
-        'Content-Length': message.length
-      };
+        timestamp = new Date().getTime(),
+        headers = {
+          'X-Sentry-Auth': utils.getAuthHeader(timestamp, self.dsn.public_key, self.dsn.private_key),
+          'Content-Type': 'application/octet-stream',
+          'Content-Length': message.length
+        };
 
     self.transport.send(self, message, headers, ident);
   });
@@ -161,7 +161,7 @@ proto.captureException = function captureError(err, kwargs, cb) {
   } else {
     kwargs = kwargs || {};
   }
-  parsers.parseError(err, kwargs, function(kw) {
+  parsers.parseError(err, kwargs, function (kw) {
     var result = self.process(kw);
     cb && cb(result);
   });
@@ -230,7 +230,7 @@ module.exports.patchGlobal = function patchGlobal(client, cb) {
   !(client instanceof Client) && (client = new Client());
 
   var called = false;
-  process.on('uncaughtException', function(err) {
+  process.on('uncaughtException', function (err) {
     if (cb) { // bind event listeners only if a callback was supplied
       var onLogged = function onLogged() {
         called = false;
@@ -254,8 +254,8 @@ module.exports.patchGlobal = function patchGlobal(client, cb) {
 
     called = true;
 
-    client.captureError(err, function(result) {
-      node_util.log('uncaughtException: ' + client.getIdent(result));
+    return client.captureError(err, function (result) {
+      nodeUtil.log('uncaughtException: ' + client.getIdent(result));
     });
   });
 };

lib/middleware/connect.js

@@ -4,22 +4,22 @@ var raven = require('../client');
 var parsers = require('../parsers');
 
 // Legacy support
-var connectMiddleware = function(client) {
+var connectMiddleware = function (client) {
   return connectMiddleware.errorHandler(client);
 };
 
 // Error handler. This should be the last item listed in middleware, but
 // before any other error handlers.
-connectMiddleware.errorHandler = function(client) {
+connectMiddleware.errorHandler = function (client) {
   client = client instanceof raven.Client ? client : new raven.Client(client);
-  return function(err, req, res, next) {
+  return function (err, req, res, next) {
     var status = err.status || err.statusCode || err.status_code || 500;
 
     // skip anything not marked as an internal server error
     if (status < 500) return next(err);
 
     var kwargs = parsers.parseRequest(req);
-    client.captureError(err, kwargs, function(result) {
+    return client.captureError(err, kwargs, function (result) {
       res.sentry = client.getIdent(result);
       next(err, req, res);
     });
@@ -28,13 +28,13 @@ connectMiddleware.errorHandler = function(client) {
 
 // Ensures asynchronous exceptions are routed to the errorHandler. This
 // should be the **first** item listed in middleware.
-connectMiddleware.requestHandler = function(client) {
+connectMiddleware.requestHandler = function (client) {
   var domain = require('domain');
-  return function(req, res, next) {
+  return function (req, res, next) {
     var reqDomain = domain.create();
     reqDomain.on('error', next);
     return reqDomain.run(next);
   };
 };
 
-module.exports = connectMiddleware;
+module.exports = connectMiddleware;

lib/parsers.js

@@ -14,7 +14,7 @@ module.exports.parseText = function parseText(message, kwargs) {
 };
 
 module.exports.parseError = function parseError(err, kwargs, cb) {
-  utils.parseStack(err, function(frames) {
+  utils.parseStack(err, function (frames) {
     var name = err.name + '';
     if (typeof kwargs.message === 'undefined') {
       kwargs.message = name + ': ' + (err.message || '<no message>');
@@ -96,7 +96,7 @@ module.exports.parseRequest = function parseRequest(req, kwargs) {
   //   express: req.protocol
   //   koa: req.protocol
   //
-  var protocol = 'https' === req.protocol || true === req.secure || true === (req.socket || {}).encrypted ? 'https' : 'http';
+  var protocol = req.protocol === 'https' || req.secure || (req.socket || {}).encrypted ? 'https' : 'http';
 
   // url (including path and query string):
   //

lib/transports.js

@@ -14,7 +14,7 @@ function HTTPTransport(options) {
   this.options = options || {};
 }
 util.inherits(HTTPTransport, Transport);
-HTTPTransport.prototype.send = function(client, message, headers, ident) {
+HTTPTransport.prototype.send = function (client, message, headers, ident) {
   var options = {
     hostname: client.dsn.host,
     path: client.dsn.path + 'api/' + client.dsn.project_id + '/store/',
@@ -28,7 +28,7 @@ HTTPTransport.prototype.send = function(client, message, headers, ident) {
       options[key] = this.options[key];
     }
   }
-  var req = this.transport.request(options, function(res) {
+  var req = this.transport.request(options, function (res) {
     res.setEncoding('utf8');
     if (res.statusCode >= 200 && res.statusCode < 300) {
       client.emit('logged', ident);
@@ -44,11 +44,11 @@ HTTPTransport.prototype.send = function(client, message, headers, ident) {
       client.emit('error', e);
     }
     // force the socket to drain
-    var noop = function() {};
+    var noop = function () {};
     res.on('data', noop);
     res.on('end', noop);
   });
-  req.on('error', function(e) {
+  req.on('error', function (e) {
     client.emit('error', e);
   });
   req.end(message);