From ffe658376b56910e95578b6979df8b3fa2307683 Mon Sep 17 00:00:00 2001 From: alexlamsl Date: Tue, 15 Mar 2016 21:25:00 +0800 Subject: [PATCH] add eslint to grunt test --- .eslintrc.json | 17 +++++++++++++++++ Gruntfile.js | 19 +++++++++++++++++++ backtest.js | 3 +-- package.json | 1 + tests/.eslintrc.json | 5 +++++ 5 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 .eslintrc.json create mode 100644 tests/.eslintrc.json diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..ab54300 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,17 @@ +{ + "env": { + "browser": true, + "node": true + }, + "extends": "eslint:recommended", + "rules": { + "brace-style": [ + "error", + "stroustrup", + { + "allowSingleLine": true + } + ], + "no-console": "off" + } +} \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 176588c..b367780 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -13,6 +13,24 @@ module.exports = function(grunt) { ' * Licensed under the <%= pkg.license %> license\n' + ' */\n', + eslint: { + grunt: { + src: 'Gruntfile.js' + }, + src: { + src: ['cli.js', 'src/**/*.js'] + }, + tests: { + src: ['tests/*.js', 'test.js'] + }, + web: { + src: 'assets/master.js' + }, + other: { + src: ['backtest.js', 'benchmark.js'] + } + }, + jshint: { options: { jshintrc: '.jshintrc' @@ -121,6 +139,7 @@ module.exports = function(grunt) { grunt.registerTask('test', [ 'dist', + 'eslint', 'jshint', 'jscs', 'exec:test' diff --git a/backtest.js b/backtest.js index 50c055e..3042086 100644 --- a/backtest.js +++ b/backtest.js @@ -121,7 +121,7 @@ if (process.argv.length > 2) { return hash; }); var nThreads = os.cpus().length; - var running = 0, ready = true; + var running = 0; var progress = new Progress('[:bar] :etas', { width: 50, total: commits.length * 2 @@ -141,7 +141,6 @@ if (process.argv.length > 2) { task.on('message', function(data) { if (data === 'ready') { progress.tick(1); - ready = true; fork(); } else { diff --git a/package.json b/package.json index ae0865d..39c0530 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,7 @@ "grunt-contrib-jshint": "1.0.x", "grunt-contrib-qunit": "1.0.x", "grunt-contrib-uglify": "1.0.x", + "grunt-eslint": "18.0.x", "grunt-exec": "0.4.x", "grunt-jscs": "2.8.x", "load-grunt-tasks": "3.4.x", diff --git a/tests/.eslintrc.json b/tests/.eslintrc.json new file mode 100644 index 0000000..76a6b64 --- /dev/null +++ b/tests/.eslintrc.json @@ -0,0 +1,5 @@ +{ + "env": { + "qunit": true + } +} \ No newline at end of file -- 2.34.1