Merge pull request #715 from mapbox/eslint

Add basic eslint configuration

.eslintrc.js

+module.exports = {
+    "extends": "eslint:recommended",
+    "env": {
+        "node": true
+    },
+    "rules": {
+        "indent": ["error", 4],
+        "linebreak-style": ["error", "unix"],
+        "semi": ["error", "always"],
+        "no-cond-assign": ["error", "always"]
+    }
+}

.travis.yml

@@ -121,5 +121,6 @@ before_script:
 
 script:
 - if [[ "${NODE_VERSION}" ]]; then ./scripts/build_against_node.sh; fi;
+- if [[ "${NODE_VERSION}" -eq "4" ]]; then ./node_modules/.bin/eslint lib; fi;
 # disabled for now: need to port to sudo:false
 #- if [[ "${NODE_WEBKIT}" ]]; then ./scripts/build_against_node_webkit.sh; fi;

lib/sqlite3.js

@@ -19,7 +19,7 @@ function normalizeMethod (fn) {
         }
         var statement = new Statement(this, sql, errBack);
         return fn.call(this, statement, args);
-    }
+    };
 }
 
 function inherits(target, source) {
@@ -34,17 +34,18 @@ sqlite3.cached = {
             return new Database(file, a, b);
         }
 
+        var db;
         file = path.resolve(file);
+        function cb() { callback.call(db, null); }
 
         if (!sqlite3.cached.objects[file]) {
-            var db =sqlite3.cached.objects[file] = new Database(file, a, b);
+            db = sqlite3.cached.objects[file] = new Database(file, a, b);
         }
         else {
             // Make sure the callback is called.
-            var db = sqlite3.cached.objects[file];
+            db = sqlite3.cached.objects[file];
             var callback = (typeof a === 'number') ? b : a;
             if (typeof callback === 'function') {
-                function cb() { callback.call(db, null); }
                 if (db.open) process.nextTick(cb);
                 else db.once('open', cb);
             }
@@ -114,7 +115,7 @@ Statement.prototype.map = function() {
             } else {
                 var value = keys[1];
                 // Value is a plain value
-                for (var i = 0; i < rows.length; i++) {
+                for (i = 0; i < rows.length; i++) {
                     result[rows[i][key]] = rows[i][value];
                 }
             }

lib/trace.js

 // Inspired by https://github.com/tlrobinson/long-stack-traces
-var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 
 function extendTrace(object, property, pos) {

package.json

@@ -8,10 +8,10 @@
     "url": "https://mapbox.com/"
   },
   "binary": {
-        "module_name" : "node_sqlite3",
-        "module_path" : "./lib/binding/{node_abi}-{platform}-{arch}",
-        "host"        : "https://mapbox-node-binary.s3.amazonaws.com",
-        "remote_path" : "./{name}/v{version}/{toolset}/",
+    "module_name": "node_sqlite3",
+    "module_path": "./lib/binding/{node_abi}-{platform}-{arch}",
+    "host": "https://mapbox-node-binary.s3.amazonaws.com",
+    "remote_path": "./{name}/v{version}/{toolset}/",
     "package_name": "{node_abi}-{platform}-{arch}.tar.gz"
   },
   "contributors": [
@@ -44,11 +44,12 @@
       "node-pre-gyp"		
   ],
   "devDependencies": {
-        "mocha": "3.x",
-        "aws-sdk": "2.x"
+    "aws-sdk": "2.x",
+    "eslint": "3.5.0",
+    "mocha": "3.x"
   },
   "scripts": {
-        "prepublish":"npm ls",
+    "prepublish": "npm ls",
     "install": "node-pre-gyp install --fallback-to-build",
     "pretest": "node test/support/createdb.js",
     "test": "mocha -R spec --timeout 480000"