Merge pull request #320 from mcfly-io/feat-lint

gulp_tasks/tasks/lint.js

@@ -1,118 +1,13 @@
 'use strict';
-
 var gulp = require('gulp');
-var map = require('map-stream');
-var chalk = require('chalk');
-var _ = require('lodash');
-var jshint = require('gulp-jshint');
-//var jscs = require('gulp-jscs');
 var eslint = require('gulp-eslint');
-var gutil = require('gulp-util');
-var plumber = require('gulp-plumber');
 var constants = require('../common/constants')();
 
-gulp.task('jshint', false, function() {
-    var hasError = false;
-    var hasShown = false;
-    var successReporter = map(function(file, cb) {
-        if (!file.jshint.success) {
-            hasError = true;
-        }
-        cb(null, file);
-    });
-
-    gulp.src(constants.lint)
-        .pipe(jshint({
-            lookup: true
-        }))
-        .pipe(successReporter)
-        .pipe(jshint.reporter('jshint-stylish'))
-        .pipe(jshint.reporter('fail'))
-        .on('error', function() {
-            gutil.log(chalk.red('Jshint failed'));
-            throw new Error('jshint failed');
-        })
-        .pipe(map(function() {
-            if (!hasError && !hasShown) {
-                hasShown = true;
-                gutil.log(chalk.green('All Jshint files passed'));
-
-            }
-
-        }));
-});
-
 gulp.task('eslint', false, function() {
-    var hasError = false;
-    var hasShown = false;
     gulp.src(constants.lint)
         .pipe(eslint())
         .pipe(eslint.format())
-        .on('data', function(file) {
-
-            if (file.eslint.messages && file.eslint.messages.length && _.any(file.eslint.messages, function(item) {
-                    return item.severity === 2;
-                })) {
-                hasError = true;
-            }
-        })
-        .on('end', function() {
-            if (!hasError && !hasShown) {
-                hasShown = true;
-                gutil.log(chalk.green('All EsLint files passed'));
-
-            } else {
-                gutil.log(chalk.red('EsLint failed'));
-
-                throw new Error('eslint failed');
-            }
-
-        });
-
+        .pipe(eslint.failAfterError());
 });
 
-gulp.task('static', false, function() {
-
-    var status = {
-        hasShown: false,
-        hasError: false,
-        errs: []
-    };
-    return gulp.src(constants.lint)
-        .pipe(plumber({
-            errorHandler: function(err) {
-                if (err.plugin === 'gulp-jscs') {
-                    gutil.log(err.toString());
-                }
-                status.hasError = true;
-                status.errs.push(err);
-                if (!status.hasShown) {
-                    status.hasShown = true;
-
-                    this.emit('end');
-                }
-            }
-        }))
-        .pipe(jshint({
-            lookup: true
-        }))
-        .pipe(jshint.reporter('jshint-stylish'))
-        //.pipe(jscs())
-        .pipe(eslint())
-        .pipe(eslint.format())
-        .pipe(jshint.reporter('fail'))
-        .pipe(eslint.failOnError())
-        .on('end', function() {
-            if (status.hasError) {
-                gutil.log(chalk.red('lint failed'));
-                throw new Error('lint_error');
-
-            } else {
-                gutil.log(chalk.green('All lint files passed'));
-
-            }
-        });
-
-});
-//gulp.task('lint', ['jshint', 'jscs', 'eslint']);
-gulp.task('lint', 'Lint all javascript files.', ['static']);
+gulp.task('lint', 'Lint all javascript files.', ['eslint']);

package.json

@@ -50,7 +50,7 @@
     "bluebird": "3.3.4",
     "chalk": "1.1.1",
     "del": "2.2.0",
-    "generator-sublime": ">=2.0.8",
+    "generator-sublime": ">=2.0.9",
     "glob-to-regexp": "0.1.0",
     "gulp": "3.9.1",
     "gulp-inject": "3.0.0",
@@ -80,16 +80,12 @@
     "gulp-help": "1.6.1",
     "gulp-if": "2.0.0",
     "gulp-istanbul": "0.10.3",
-    "gulp-jshint": "2.0.0",
     "gulp-mocha": "2.2.0",
     "gulp-order": "1.1.1",
     "gulp-plumber": "1.1.0",
     "gulp-tap": "0.1.3",
     "gulp-util": "3.0.7",
     "inquirer": "0.12.0",
-    "jshint": "^2.9.1",
-    "jshint-stylish": "2.1.0",
-    "map-stream": "0.0.6",
     "mocha": "2.4.5",
     "mocha-lcov-reporter": "1.2.0",
     "mockery": "1.4.1",