From f9834f73a8fe97d843bf6b160ac72563aa900c0b Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Fri, 18 Dec 2015 15:07:26 -0700 Subject: [PATCH 1/3] track errors we log and only log them once --- lib/versioned/^4.0.0/log/events.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/versioned/^4.0.0/log/events.js b/lib/versioned/^4.0.0/log/events.js index 7a1b5fc8..83e4c373 100644 --- a/lib/versioned/^4.0.0/log/events.js +++ b/lib/versioned/^4.0.0/log/events.js @@ -8,6 +8,8 @@ var formatError = require('../formatError'); // Wire up logging events function logEvents(gulpInst) { + var loggedErrors = []; + gulpInst.on('start', function(e) { // TODO: batch these // so when 5 tasks start at once it only logs one time with all 5 @@ -30,7 +32,12 @@ function logEvents(gulpInst) { chalk.red('errored after'), chalk.magenta(time) ); - log.error(msg); + + // If we haven't logged this before, log it and add to list + if (loggedErrors.indexOf(e.error) === -1) { + log.error(msg); + loggedErrors.push(e.error); + } }); } From 6f23077406c5f21d0457647ca4f636d817549f0c Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Fri, 18 Dec 2015 15:08:13 -0700 Subject: [PATCH 2/3] rename `e` event to avoid confusing with `e` for error --- lib/versioned/^4.0.0/log/events.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/versioned/^4.0.0/log/events.js b/lib/versioned/^4.0.0/log/events.js index 83e4c373..6ee8c380 100644 --- a/lib/versioned/^4.0.0/log/events.js +++ b/lib/versioned/^4.0.0/log/events.js @@ -10,33 +10,33 @@ function logEvents(gulpInst) { var loggedErrors = []; - gulpInst.on('start', function(e) { + gulpInst.on('start', function(evt) { // TODO: batch these // so when 5 tasks start at once it only logs one time with all 5 - log.info('Starting', '\'' + chalk.cyan(e.name) + '\'...'); + log.info('Starting', '\'' + chalk.cyan(evt.name) + '\'...'); }); - gulpInst.on('stop', function(e) { - var time = prettyTime(e.duration); + gulpInst.on('stop', function(evt) { + var time = prettyTime(evt.duration); log.info( - 'Finished', '\'' + chalk.cyan(e.name) + '\'', + 'Finished', '\'' + chalk.cyan(evt.name) + '\'', 'after', chalk.magenta(time) ); }); - gulpInst.on('error', function(e) { - var msg = formatError(e); - var time = prettyTime(e.duration); + gulpInst.on('error', function(evt) { + var msg = formatError(evt); + var time = prettyTime(evt.duration); log.error( - '\'' + chalk.cyan(e.name) + '\'', + '\'' + chalk.cyan(evt.name) + '\'', chalk.red('errored after'), chalk.magenta(time) ); // If we haven't logged this before, log it and add to list - if (loggedErrors.indexOf(e.error) === -1) { + if (loggedErrors.indexOf(evt.error) === -1) { log.error(msg); - loggedErrors.push(e.error); + loggedErrors.push(evt.error); } }); } From af740292dc4bfdc362ff672bf9622043afa2a2e0 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Fri, 18 Dec 2015 15:13:57 -0700 Subject: [PATCH 3/3] fix jscs linting --- lib/versioned/^4.0.0-alpha.1/index.js | 3 +-- lib/versioned/^4.0.0-alpha.2/index.js | 3 +-- lib/versioned/^4.0.0/index.js | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/versioned/^4.0.0-alpha.1/index.js b/lib/versioned/^4.0.0-alpha.1/index.js index 5660783b..4feb4163 100644 --- a/lib/versioned/^4.0.0-alpha.1/index.js +++ b/lib/versioned/^4.0.0-alpha.1/index.js @@ -51,9 +51,8 @@ function execute(opts, env) { var output = JSON.stringify(gulpInst.tree({ deep: true })); if (typeof opts.tasksJson === 'boolean' && opts.tasksJson) { return console.log(output); - } else { - return fs.writeFileSync(opts.tasksJson, output, 'utf-8'); } + return fs.writeFileSync(opts.tasksJson, output, 'utf-8'); } try { log.info('Using gulpfile', chalk.magenta(tildify(env.configPath))); diff --git a/lib/versioned/^4.0.0-alpha.2/index.js b/lib/versioned/^4.0.0-alpha.2/index.js index be0f6eea..c59f1bdf 100644 --- a/lib/versioned/^4.0.0-alpha.2/index.js +++ b/lib/versioned/^4.0.0-alpha.2/index.js @@ -57,9 +57,8 @@ function execute(opts, env) { if (typeof opts.tasksJson === 'boolean' && opts.tasksJson) { return console.log(output); - } else { - return fs.writeFileSync(opts.tasksJson, output, 'utf-8'); } + return fs.writeFileSync(opts.tasksJson, output, 'utf-8'); } try { log.info('Using gulpfile', chalk.magenta(tildify(env.configPath))); diff --git a/lib/versioned/^4.0.0/index.js b/lib/versioned/^4.0.0/index.js index 635665ec..782ecc42 100644 --- a/lib/versioned/^4.0.0/index.js +++ b/lib/versioned/^4.0.0/index.js @@ -57,9 +57,8 @@ function execute(opts, env) { if (typeof opts.tasksJson === 'boolean' && opts.tasksJson) { return console.log(output); - } else { - return fs.writeFileSync(opts.tasksJson, output, 'utf-8'); } + return fs.writeFileSync(opts.tasksJson, output, 'utf-8'); } try { log.info('Using gulpfile', chalk.magenta(tildify(env.configPath)));