From ddab3bfd2e1883f1655782a2549d92fd312b470b Mon Sep 17 00:00:00 2001 From: rodney Date: Sat, 16 Jan 2016 15:03:09 -0800 Subject: [PATCH] moving from jscs + jshint to eslint --- .eslintrc.yaml | 12 ++++++++++++ .jscsrc | 5 ----- gulpfile.js | 22 +++++----------------- lib/append.js | 2 +- lib/parse.js | 2 -- package.json | 2 ++ test/.eslintrc.yaml | 5 +++++ test/.jshintrc | 29 ----------------------------- 8 files changed, 25 insertions(+), 54 deletions(-) create mode 100644 .eslintrc.yaml delete mode 100644 .jscsrc create mode 100644 test/.eslintrc.yaml delete mode 100644 test/.jshintrc diff --git a/.eslintrc.yaml b/.eslintrc.yaml new file mode 100644 index 0000000..99289ef --- /dev/null +++ b/.eslintrc.yaml @@ -0,0 +1,12 @@ +extends: "eslint:recommended" + +env: + node: true + +rules: + indent: [2, 4] + quotes: [2, "single"] + no-multi-spaces: 2 + no-unreachable: 2 + + diff --git a/.jscsrc b/.jscsrc deleted file mode 100644 index 75bcf80..0000000 --- a/.jscsrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "preset": "node-style-guide", - "requireTrailingComma": false, - "validateIndentation": 4 -} diff --git a/gulpfile.js b/gulpfile.js index 1e0abcf..c3dea58 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,8 +1,7 @@ var coveralls = require('gulp-coveralls'); var gulp = require('gulp'); +var eslint = require('gulp-eslint'); var istanbul = require('gulp-istanbul'); -var jshint = require('gulp-jshint'); -var jscs = require('gulp-jscs'); var mocha = require('gulp-mocha'); var srcFiles = [ @@ -11,24 +10,13 @@ var srcFiles = [ 'lib/**/*.js' ]; -gulp.task('jscs', function() { +gulp.task('lint', function() { return gulp.src(srcFiles) - .pipe(jscs({ - configPath: '.jscsrc' - })) - .pipe(jscs.reporter('unix')) - .pipe(jscs.reporter('fail')); + .pipe(eslint()) + .pipe(eslint.format()) + .pipe(eslint.failAfterError()); }); -gulp.task('jshint', function() { - return gulp.src(srcFiles) - .pipe(jshint('./test/.jshintrc')) - .pipe(jshint.reporter('default', { verbose: true })) - .pipe(jshint.reporter('fail')); -}); - -gulp.task('lint', ['jscs', 'jshint']); - gulp.task('instrument', function() { return gulp.src('lib/**/*.js') .pipe(istanbul({ diff --git a/lib/append.js b/lib/append.js index e58e4cd..2351a61 100644 --- a/lib/append.js +++ b/lib/append.js @@ -106,7 +106,7 @@ module.exports = { output += elementString + ']'; fs.writeSync(fd, output, lastSquareBracket); } - } finally { + } finally { fs.closeSync(fd); } } diff --git a/lib/parse.js b/lib/parse.js index f00907d..040f246 100644 --- a/lib/parse.js +++ b/lib/parse.js @@ -19,7 +19,6 @@ module.exports = function(input) { if (input instanceof stream.Readable) { var objects = 0; - var previousCharacter; var openDoubleQuotes = false; var buffer = ''; @@ -36,7 +35,6 @@ module.exports = function(input) { } buffer += character; - previousCharacter = character; if (openDoubleQuotes) { return; } diff --git a/package.json b/package.json index bbe2161..537102e 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,10 @@ "devDependencies": { "bluebird": "^3.1.1", "chai": "^3.4.1", + "eslint": "^1.10.3", "gulp": "^3.9.0", "gulp-coveralls": "^0.1.4", + "gulp-eslint": "^1.1.1", "gulp-istanbul": "^0.10.3", "gulp-jscs": "^3.0.2", "gulp-jshint": "^2.0.0", diff --git a/test/.eslintrc.yaml b/test/.eslintrc.yaml new file mode 100644 index 0000000..e30e35d --- /dev/null +++ b/test/.eslintrc.yaml @@ -0,0 +1,5 @@ +extends: "../.eslintrc.yaml" + +env: + node: true + mocha: true diff --git a/test/.jshintrc b/test/.jshintrc deleted file mode 100644 index abd59a8..0000000 --- a/test/.jshintrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "globals": { - "after": false, - "afterEach": false, - "before": false, - "beforeEach": false, - "describe": false, - "it": false, - "window": false - }, - "bitwise": true, - "curly": true, - "eqeqeq": true, - "expr": true, - "immed": true, - "latedef": true, - "laxbreak": true, - "loopfunc": true, - "newcap": false, - "noarg": true, - "node": true, - "predef": [ "-Promise" ], - "strict": false, - "smarttabs": true, - "sub": true, - "undef": true, - "unused": "vars" -} -