From c7f199a59ecfe40f1ddb5cff53898edd96d14a67 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 4 Mar 2016 12:01:11 -0800 Subject: [PATCH] [Build] Also lint specs ...with additional tolerance declared for Jasmine variables. --- gulpfile.js | 14 ++++++++++---- package.json | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 1fab6d5b18..2caf983d46 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -35,7 +35,9 @@ var gulp = require('gulp'), fs = require('fs'), git = require('git-rev-sync'), moment = require('moment'), + merge = require('merge-stream'), project = require('./package.json'), + _ = require('lodash'), paths = { main: 'main.js', dist: 'dist', @@ -122,10 +124,14 @@ gulp.task('stylesheets', function () { gulp.task('lint', function () { var nonspecs = paths.specs.map(function (glob) { - return "!" + glob; - }); - return gulp.src(paths.scripts.concat(nonspecs)) - .pipe(jshint(options.jshint)) + return "!" + glob; + }), + scriptLint = gulp.src(paths.scripts.concat(nonspecs)) + .pipe(jshint(options.jshint)), + specLint = gulp.src(paths.specs) + .pipe(jshint(_.extend({ jasmine: true }, options.jshint))); + + return merge(scriptLint, specLint) .pipe(jshint.reporter('default')) .pipe(jshint.reporter('fail')); }); diff --git a/package.json b/package.json index c0afb1c9ce..19f45ac089 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "lodash": "^3.10.1", "markdown-toc": "^0.11.7", "marked": "^0.3.5", + "merge-stream": "^1.0.0", "mkdirp": "^0.5.1", "moment": "^2.11.1", "node-bourbon": "^4.2.3",