Replace JSHint with ESLint and JSCS

.eslintignore

@@ -0,0 +1,3 @@
+node_modules/
+coverage/
+tmp/

.eslintrc

@@ -0,0 +1,45 @@
+{
+  "extends": "eslint:recommended",
+  "root": true,
+  "rules": {
+    "curly": [2, "multi-line"],
+    "no-console": 0,
+    "no-path-concat": 2,
+    "handle-callback-err": 2,
+    "no-use-before-define": [2, "nofunc"],
+    "no-shadow-restricted-names": 2,
+    "block-scoped-var": 2,
+    "dot-notation": 2,
+    "eqeqeq": [2, "allow-null"],
+    "no-else-return": 1,
+    "no-extend-native": 2,
+    "no-extra-bind": 2,
+    "no-implied-eval": 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-redeclare": 2,
+    "no-return-assign": 2,
+    "no-throw-literal": 2,
+    "no-unused-expressions": [2, {
+      "allowShortCircuit": true,
+      "allowTernary": true
+    }],
+    "no-useless-call": 2,
+    "no-useless-concat": 2,
+    "no-with": 2,
+    "radix": 2,
+    "no-self-compare": 2,
+    "no-unused-vars": [2, {
+      "vars": "all",
+      "args": "none"
+    }],
+    "strict": [2, "global"]
+  },
+  "env": {
+    "node": true
+  }
+}

.jscsrc

@@ -0,0 +1,85 @@
+{
+  "excludeFiles": ["node_modules/**", "coverage/**", "tmp/**"],
+  "validateIndentation": 2,
+  "validateLineBreaks": "LF",
+  "validateQuoteMarks": "'",
+  "requireSemicolons": true,
+  "disallowEmptyBlocks": true,
+  "disallowKeywordsOnNewLine": ["else"],
+  "disallowKeywords": ["with"],
+  "disallowMixedSpacesAndTabs": true,
+  "disallowMultipleLineBreaks": true,
+  "disallowMultipleLineStrings": true,
+  "disallowMultipleVarDecl": "exceptUndefined",
+  "disallowNewlineBeforeBlockStatements": true,
+  "disallowOperatorBeforeLineBreak": ["."],
+  "disallowSpaceBeforeBinaryOperators": [","],
+  "disallowSpaceAfterObjectKeys": true,
+  "disallowSpaceAfterPrefixUnaryOperators": true,
+  "disallowSpaceBeforeComma": true,
+  "disallowSpaceBeforePostfixUnaryOperators": true,
+  "disallowSpaceBeforeSemicolon": true,
+  "disallowSpacesInCallExpression": true,
+  "disallowSpacesInFunctionDeclaration": {
+    "beforeOpeningRoundBrace": true
+  },
+  "disallowSpacesInFunctionExpression": {
+    "beforeOpeningRoundBrace": true
+  },
+  "disallowSpacesInsideParentheses": true,
+  "disallowSpacesInsideParenthesizedExpression": {
+    "allExcept": [ "{", "}" ]
+  },
+  "disallowTrailingComma": true,
+  "disallowTrailingWhitespace": true,
+  "disallowYodaConditions": true,
+  "requireBlocksOnNewline": true,
+  "requireCapitalizedConstructors": true,
+  "requireCommaBeforeLineBreak": true,
+  "requireCurlyBraces": [
+    "for",
+    "while",
+    "do",
+    "try",
+    "catch"
+  ],
+  "requireDotNotation": true,
+  "requireLineBreakAfterVariableAssignment": true,
+  "requireLineFeedAtFileEnd": true,
+  "requirePaddingNewLinesAfterBlocks": true,
+  "requirePaddingNewLinesAfterUseStrict": true,
+  "requireParenthesesAroundIIFE": true,
+  "requireSpaceAfterBinaryOperators": true,
+  "requireSpaceAfterKeywords": [
+    "do",
+    "for",
+    "if",
+    "else",
+    "switch",
+    "case",
+    "try",
+    "catch",
+    "void",
+    "while",
+    "with",
+    "return",
+    "typeof"
+  ],
+  "requireSpaceBeforeBinaryOperators": true,
+  "requireSpaceBeforeBlockStatements": true,
+  "requireSpaceBetweenArguments": true,
+  "requireSpacesInFunction": {
+    "beforeOpeningCurlyBrace": true
+  },
+  "requireSpacesInConditionalExpression": true,
+  "requireSpacesInForStatement": true,
+  "requireSpacesInFunctionDeclaration": {
+    "beforeOpeningCurlyBrace": true
+  },
+  "requireSpacesInFunctionExpression": {
+    "beforeOpeningCurlyBrace": true
+  },
+  "validateNewlineAfterArrayElements": true,
+  "validateParameterSeparator": ", ",
+  "disallowMultipleSpaces": true
+}

.travis.yml

@@ -10,10 +10,14 @@ cache:
 node_js:
   - "0.10"
   - "0.12"
-  - iojs
+  - "4"
+  - "5"
 
 script:
-  - npm test
+  - npm run eslint
+  - npm run jscs
+  - npm run test-cov
 
 after_script:
+  - npm install coveralls
   - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

lib/database.js

@@ -21,7 +21,7 @@ var extend = util.extend;
  * @constructor
  * @module warehouse
  */
-function Database(options){
+function Database(options) {
   /**
    * Database options.
    *
@@ -30,8 +30,9 @@ function Database(options){
    */
   this.options = extend({
     version: 0,
-    onUpgrade: function(){},
-    onDowngrade: function(){}
+    onUpgrade: function() {},
+
+    onDowngrade: function() {}
   }, options);
 
   /**
@@ -51,7 +52,7 @@ function Database(options){
    * @constructor
    * @private
    */
-  var _Model = this.Model = function(name, schema){
+  var _Model = this.Model = function(name, schema) {
     Model.call(this, name, schema);
   };
 
@@ -67,8 +68,8 @@ function Database(options){
  * @param {Schema|Object} [schema]
  * @return {Model}
  */
-Database.prototype.model = function(name, schema){
-  if (this._models[name]){
+Database.prototype.model = function(name, schema) {
+  if (this._models[name]) {
     return this._models[name];
   }
 
@@ -83,20 +84,20 @@ Database.prototype.model = function(name, schema){
  * @param {Function} [callback]
  * @return {Promise}
  */
-Database.prototype.load = function(callback){
+Database.prototype.load = function(callback) {
   var path = this.options.path;
   var self = this;
 
   if (!path) throw new WarehouseError('options.path is required');
 
-  return new Promise(function(resolve, reject){
+  return new Promise(function(resolve, reject) {
     var src = fs.createReadStream(path, {encoding: 'utf8'});
     var oldVersion = 0;
 
-    var stream = JSONStream.parse([true, true], function(value, keys){
+    var stream = JSONStream.parse([true, true], function(value, keys) {
       switch (keys.shift()){
         case 'meta':
-          if (keys.shift() === 'version'){
+          if (keys.shift() === 'version') {
             oldVersion = value;
           }
 
@@ -111,15 +112,15 @@ Database.prototype.load = function(callback){
     src
       .pipe(stream)
       .on('error', reject)
-      .on('end', function(){
+      .on('end', function() {
         resolve(oldVersion);
       });
-  }).then(function(oldVersion){
+  }).then(function(oldVersion) {
     var newVersion = self.options.version;
 
-    if (newVersion > oldVersion){
+    if (newVersion > oldVersion) {
       return self.options.onUpgrade(oldVersion, newVersion);
-    } else if (newVersion < oldVersion){
+    } else if (newVersion < oldVersion) {
       return self.options.onDowngrade(oldVersion, newVersion);
     }
   }).nodeify(callback);
@@ -132,13 +133,13 @@ Database.prototype.load = function(callback){
  * @param {Function} callback
  * @return {Promise}
  */
-Database.prototype.save = function(callback){
+Database.prototype.save = function(callback) {
   var path = this.options.path;
   var self = this;
 
   if (!path) throw new WarehouseError('options.path is required');
 
-  return new Promise(function(resolve, reject){
+  return new Promise(function(resolve, reject) {
     var stream = fs.createWriteStream(path);
 
     // Start
@@ -151,13 +152,13 @@ Database.prototype.save = function(callback){
     }) + ',');
 
     // Export models
-    var models = self._models,
-      keys = Object.keys(models),
-      model, key;
+    var models = self._models;
+    var keys = Object.keys(models);
+    var model, key;
 
     stream.write('"models":{');
 
-    for (var i = 0, len = keys.length; i < len; i++){
+    for (var i = 0, len = keys.length; i < len; i++) {
       key = keys[i];
       model = models[key];
 
@@ -201,4 +202,4 @@ Database.SchemaType = Database.prototype.SchemaType = SchemaType;
  */
 Database.version = pkg.version;
 
-module.exports = Database;
+module.exports = Database;