From 077a501da368c56beff12d64ab150d4954716440 Mon Sep 17 00:00:00 2001 From: Esteban Ordano Date: Wed, 26 Nov 2014 13:19:15 -0300 Subject: [PATCH] fixes gulpfile cover and browser-test --- gulpfile.js | 26 ++++++-------------------- package.json | 7 ------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index c66ee7f..646588d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -13,20 +13,20 @@ var gulp = require('gulp'); var browserify = require('gulp-browserify'); var closureCompiler = require('gulp-closure-compiler'); -var istanbul = require('gulp-istanbul'); var jsdoc = require('gulp-jsdoc'); var jshint = require('gulp-jshint'); var mocha = require('gulp-mocha'); var rename = require('gulp-rename'); var runSequence = require('run-sequence'); var shell = require('gulp-shell'); -var tap = require('gulp-tap'); + var files = ['lib/**/*.js']; var tests = ['test/**/*.js']; var alljs = files.concat(tests); var jsdocReadme = 'doc/README.md'; + function ignoreError() { /* jshint ignore:start */ // using `this` in this context is weird this.emit('end'); @@ -55,21 +55,7 @@ gulp.task('watch:lint', function() { return gulp.watch(alljs, ['lint']); }); -gulp.task('coverage', function() { - return gulp.src(files) - .pipe(istanbul()) - .pipe(tap(function(f) { - // Make sure all files are loaded to get accurate coverage data - require(f.path); - })) - .on('end', function() { - gulp.src(tests) - .pipe(istanbul.writeReports('coverage')) - .pipe(new mocha({reporter: 'spec'})) - .on('end', function() {}) - .on('error', ignoreError) - }); -}); +gulp.task('coverage', shell.task(['istanbul cover _mocha -- --recursive'])); gulp.task('jsdoc', function() { return gulp.src(files.concat([jsdocReadme])) @@ -95,9 +81,9 @@ gulp.task('browser', function() { .pipe(gulp.dest('browser')); }); -gulp.task('browser-test', function() { - return shell('find test/ -type f -name "*.js" | xargs browserify -o browser/tests.js'); -}); +gulp.task('browser-test', shell.task([ + 'find test/ -type f -name "*.js" | xargs browserify -o ./browser/tests.js' +])); gulp.task('minify', function() { return gulp.src('dist/bitcore.js') diff --git a/package.json b/package.json index 63e22b8..6254f19 100644 --- a/package.json +++ b/package.json @@ -81,21 +81,14 @@ "browserify": "~6.3.3", "chai": "~1.10.0", "closure-compiler-jar": "git://github.com/eordano/closure-compiler-jar.git", - "grunt": "^0.4.5", - "grunt-contrib-watch": "^0.6.1", - "grunt-markdown": "^0.6.1", - "grunt-shell": "^1.1.1", "gulp": "^3.8.10", "gulp-browserify": "^0.5.0", "gulp-closure-compiler": "^0.2.9", - "gulp-insert": "^0.4.0", - "gulp-istanbul": "^0.4.0", "gulp-jsdoc": "^0.1.4", "gulp-jshint": "^1.9.0", "gulp-mocha": "^2.0.0", "gulp-rename": "^1.2.0", "gulp-shell": "^0.2.10", - "gulp-tap": "^0.1.3", "lodash": "^2.4.1", "mocha": "~2.0.1", "run-sequence": "^1.0.2"