Merge pull request #259 from ripple/use-eslint

Use eslint, remove jshint

Gulpfile.js

@@ -8,7 +8,7 @@ var concat = require('gulp-concat');
 var uglify = require('gulp-uglify');
 var rename = require('gulp-rename');
 var webpack = require('webpack');
-var jshint = require('gulp-jshint');
+var eslint = require('gulp-eslint');
 var map = require('map-stream');
 var bump = require('gulp-bump');
 var react = require('gulp-react');
@@ -161,33 +161,9 @@ gulp.task('bower-version', function() {
 gulp.task('bower', ['bower-build', 'bower-build-min', 'bower-build-debug', 'bower-version']);
 
 gulp.task('lint', function() {
-  gulp.src('src/js/ripple/*.js')
-  .pipe(jshint('./jshintrc'))
-  .pipe(map(function(file, callback) {
-    if (file.jshint.success) {
-      return callback(null, file);
-    }
-
-    console.log('\n>' + file.path.substring(file.base.length) + '\n');
-
-    file.jshint.results.forEach(function(err) {
-      if (err && err.error) {
-        var col1 = err.error.line + ':' + err.error.character;
-        var col2 = err.error.reason;
-        var col3 = '(' + err.error.code + ')';
-
-        while (col1.length < 8) {
-          col1 = ' ' + col1;
-        }
-
-        col1 += ' |';
-
-        console.log([ col1, col2, col3 ].join(' '));
-      }
-    });
-
-    callback(null, file);
-  }));
+  return gulp.src('src/js/ripple/*.js')
+  .pipe(eslint({ reset: true, configFile: './eslint.json' }))
+  .pipe(eslint.format());
 });
 
 gulp.task('watch', function() {
@@ -197,20 +173,20 @@ gulp.task('watch', function() {
 // To use this, each javascript file must have /* @flow */ on the first line
 gulp.task('typecheck', function() {
   return gulp.src('src/js/ripple/*.js')
-    .pipe(flow({      // note: do not set the 'all' option, it is broken
-        weak: true,   // remove this after all errors are addressed
-        killFlow: true
-    }));
+  .pipe(flow({      // note: do not set the 'all' option, it is broken
+    weak: true,   // remove this after all errors are addressed
+    killFlow: true
+  }));
 });
 
 gulp.task('strip', function() {
   return gulp.src('src/js/ripple/*.js')
-    .pipe(watch('src/js/ripple/*.js'))
-    .pipe(cleanDest('out'))   // delete outdated output file before stripping
-    .pipe(plumber())        // prevent an error in one file from ending build
-    .pipe(react({ stripTypes: true }).on('error', logPluginError))
-    .pipe(filelog())
-    .pipe(gulp.dest('out'));
+  .pipe(watch('src/js/ripple/*.js'))
+  .pipe(cleanDest('out'))   // delete outdated output file before stripping
+  .pipe(plumber())        // prevent an error in one file from ending build
+  .pipe(react({ stripTypes: true }).on('error', logPluginError))
+  .pipe(filelog())
+  .pipe(gulp.dest('out'));
 });
 
 gulp.task('version-bump', function() {

eslint.json

@@ -0,0 +1,73 @@
+{
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "rules": {
+    "no-use-before-define": 1,
+    "no-undef": 1,
+    "no-unused-expressions": 1,
+    "no-unused-vars": 1,
+    "no-extend-native": 1,
+    "no-native-reassign": 1,
+    "no-trailing-spaces": 1,
+    "no-empty": 1,
+    "no-inner-declarations": 1,
+    "no-irregular-whitespace": 1,
+    "no-negated-in-lhs": 1,
+    "no-obj-calls": 1,
+    "no-reserved-keys": 1,
+    "no-sparse-arrays": 1,
+    "no-unreachable": 1,
+    "use-isnan": 1,
+    "valid-jsdoc": 1,
+    "valid-typeof": 1,
+    "block-scoped-var": 1,
+    "dot-notation": 1,
+    "semi": 1,
+    "curly": 1,
+    "eqeqeq": 1,
+    "no-else-return": 1,
+    "new-cap": 1,
+    "new-parens": 1,
+    "no-comma-dangle": 1,
+    "no-empty-label": 1,
+    "no-eval": 1,
+    "no-extra-bind": 1,
+    "no-fallthrough": 1,
+    "no-lone-blocks": 1,
+    "no-loop-func": 1,
+    "no-multi-spaces": 1,
+    "no-return-assign": 1,
+    "no-sequences": 1,
+    "no-with": 1,
+    "radix": 1,
+    "yoda": [ 1, "never" ],
+    "no-catch-shadow": 1,
+    "no-shadow-restricted-names": 1,
+    "no-delete-var": 1,
+    "no-undefined": 1,
+    "handle-callback-err": 1,
+    "brace-style": [ 1, "1tbs", { "allowSingleLine": false } ],
+    "comma-spacing": [ 1, { "before": false, "after": true } ],
+    "comma-style": [ 1, "last" ],
+    "consistent-this": [ 1, "self" ],
+    "func-style": [ 1, "declaration" ],
+    "key-spacing": [ 1, { "beforeColon": false, "afterColon": true } ],
+    "max-nested-callbacks": [ 1, 2 ],
+    "no-lonely-if": 1,
+    "no-mixed-spaces-and-tabs": 1,
+    "no-multiple-empty-lines": 1,
+    "no-space-before-semi": 1,
+    "no-spaced-func": 1,
+    "space-after-keywords": [ 1, "always" ],
+    "space-in-brackets": [ 1, "always" ],
+    "space-infix-ops": 1,
+    "space-return-throw-case": 1,
+    "spaced-line-comment": 1,
+    "max-params": [ 1, 4 ],
+    "max-depth": [1, 3 ],
+    "max-len": [ 1, 80 ],
+    "quotes": [ 1, "single" ]
+  }
+}

jshintrc

@@ -1,20 +0,0 @@
-{
-  "browser": true,
-  "jquery": true,
-  "node": true,
-
-  "eqeqeq": true,
-  "eqnull": true,
-  "latedef": true,
-  "newcap": true,
-  "quotmark": "single",
-  "undef": true,
-  "unused": true,
-  "curly": true,
-  "freeze": true,
-  "nonbsp": true,
-  "maxparams": 4,
-  "maxdepth": 3,
-
-  "laxbreak": true
-}

package.json

@@ -30,13 +30,13 @@
     "gulp-concat": "~2.2.0",
     "gulp-filelog": "^0.4.1",
     "gulp-flowtype": "^0.4.1",
-    "gulp-jshint": "~1.5.5",
     "gulp-plumber": "^0.6.6",
     "gulp-react": "^2.0.0",
     "gulp-rename": "~1.2.0",
     "gulp-uglify": "~0.3.0",
     "gulp-util": "^3.0.2",
     "gulp-watch": "^3.0.0",
+    "gulp-eslint": "^0.2.0",
     "istanbul": "~0.2.10",
     "map-stream": "~0.1.0",
     "mocha": "~1.14.0",
@@ -48,7 +48,8 @@
     "build": "node_modules/.bin/gulp",
     "pretest": "node_modules/.bin/gulp concat-sjcl",
     "test": "./node_modules/.bin/istanbul test -x build/sjcl.js -x src/js/jsbn/* ./node_modules/mocha/bin/_mocha -- --reporter tap test/*-test.js",
-    "coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls"
+    "coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls",
+    "lint": "./node_modules/.bin/gulp lint"
   },
   "repository": {
     "type": "git",