From a2bd8d09a1241f3b40475f644ab6d08edc3c0717 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Wed, 20 Mar 2024 19:47:00 -0700 Subject: [PATCH] combine tag and data into one object --- index.js | 38 ++++++------ lib/shared/completion.js | 4 +- lib/shared/log/tasks.js | 16 ++--- lib/shared/log/to-console.js | 24 ++++---- lib/shared/options/cli-options.js | 34 +++++------ lib/shared/options/make-help.js | 4 +- lib/shared/translate.js | 58 ++++++++++++------- lib/versioned/^3.7.0/index.js | 6 +- lib/versioned/^3.7.0/log/events.js | 14 ++--- lib/versioned/^4.0.0/index.js | 10 ++-- lib/versioned/^4.0.0/log/events.js | 12 ++-- lib/versioned/^4.0.0/log/sync-task.js | 2 +- messages.js | 3 +- test/config-message-function.js | 23 ++++++-- test/fixtures/.gulp.js | 4 +- .../config/theming/ARGV_ERROR/.gulp.js | 4 +- .../theming/COMPLETION_TYPE_MISSING/.gulp.js | 4 +- .../theming/COMPLETION_TYPE_UNKNOWN/.gulp.js | 4 +- .../config/theming/CWD_CHANGED/.gulp.js | 4 +- .../config/theming/DESCRIPTION/.gulp.js | 4 +- .../theming/DESCRIPTION/remove/.gulp.js | 4 +- .../config/theming/EXEC_ERROR/.gulp.js | 6 +- .../fixtures/config/theming/GULPFILE/.gulp.js | 4 +- .../config/theming/LOADER_FAILURE/.gulp.js | 8 +-- .../config/theming/LOADER_SUCCESS/.gulp.js | 6 +- .../config/theming/MISSING_GULP/.gulp.js | 6 +- .../config/theming/MISSING_GULPFILE/.gulp.js | 4 +- .../theming/MISSING_NODE_MODULES/.gulp.js | 6 +- .../config/theming/NODE_FLAGS/.gulp.js | 6 +- .../config/theming/PRELOAD_BEFORE/.gulp.js | 6 +- .../config/theming/PRELOAD_FAILURE/.gulp.js | 6 +- .../config/theming/PRELOAD_SUCCESS/.gulp.js | 6 +- .../config/theming/RESPAWNED/.gulp.js | 4 +- .../config/theming/TASK_ERROR/.gulp.js | 15 +++-- .../config/theming/TASK_FAILURE/.gulp.js | 17 ++++++ .../config/theming/TASK_FAILURE/gulpfile.js | 3 + .../config/theming/TASK_MISSING/.gulp.js | 6 +- .../config/theming/TASK_START/.gulp.js | 4 +- .../config/theming/TASK_STOP/.gulp.js | 4 +- .../config/theming/TASK_SYNC/.gulp.js | 6 +- .../theming/UNSUPPORTED_GULP_VERSION/.gulp.js | 6 +- test/fixtures/config/theming/USAGE/.gulp.js | 4 +- test/fixtures/config/theming/flags/.gulp.js | 36 ++++++------ test/fixtures/gulpfiles/.gulp.js | 4 +- 44 files changed, 246 insertions(+), 203 deletions(-) create mode 100644 test/fixtures/config/theming/TASK_FAILURE/.gulp.js create mode 100644 test/fixtures/config/theming/TASK_FAILURE/gulpfile.js diff --git a/index.js b/index.js index f842f2be..cbca8f1b 100644 --- a/index.js +++ b/index.js @@ -69,17 +69,17 @@ var opts = parser.parse(); var cleanupListeners = toConsole(log, opts, buildTranslations()); cli.on('preload:before', function(name) { - log.info(messages.PRELOAD_BEFORE, name); + log.info({ tag: messages.PRELOAD_BEFORE, name: name }); }); cli.on('preload:success', function(name) { - log.info(messages.PRELOAD_SUCCESS, name); + log.info({ tag: messages.PRELOAD_SUCCESS, name: name }); }); cli.on('preload:failure', function(name, error) { - log.warn(messages.PRELOAD_FAILURE, name); + log.warn({ tag: messages.PRELOAD_FAILURE, name: name }); if (error) { - log.warn(messages.PRELOAD_ERROR, error); + log.warn({ tag: messages.PRELOAD_ERROR, error: error }); } }); @@ -89,20 +89,20 @@ cli.on('loader:success', function(name) { // However, we don't want to show the mjs-stub loader in the logs /* istanbul ignore else */ if (path.basename(name, '.js') !== 'mjs-stub') { - log.info(messages.LOADER_SUCCESS, name); + log.info({ tag: messages.LOADER_SUCCESS, name: name }); } }); cli.on('loader:failure', function(name, error) { - log.warn(messages.LOADER_FAILURE, name); + log.warn({ tag: messages.LOADER_FAILURE, name: name }); if (error) { - log.warn(messages.LOADER_ERROR, error); + log.warn({ tag: messages.LOADER_ERROR, error: error }); } }); cli.on('respawn', function(flags, child) { - log.info(messages.NODE_FLAGS, flags); - log.info(messages.RESPAWNED, child.pid); + log.info({ tag: messages.NODE_FLAGS, flags: flags }); + log.info({ tag: messages.RESPAWNED, pid: child.pid }); }); function run() { @@ -127,7 +127,7 @@ function onFail(message, error) { var cfg = arrayFind(env.config, isDefined); var translate = buildTranslations(cfg); - var errorMsg = translate.message(messages.ARGV_ERROR, { message: message, error: error }); + var errorMsg = translate.message({ tag: messages.ARGV_ERROR, message: message, error: error }); if (errorMsg) { console.error(errorMsg); } @@ -190,25 +190,25 @@ function onExecute(env, flags, translate) { var hasYarn = fs.existsSync(path.join(env.cwd, 'yarn.lock')); if (missingNodeModules) { - log.error(messages.MISSING_NODE_MODULES, { cwd: env.cwd }); + log.error({ tag: messages.MISSING_NODE_MODULES, cwd: env.cwd }); if (hasYarn) { - log.error(messages.YARN_INSTALL) + log.error({ tag: messages.YARN_INSTALL }) } else { - log.error(messages.NPM_INSTALL) + log.error({ tag: messages.NPM_INSTALL }) } } else { - log.error(messages.MISSING_GULP, { cwd: env.cwd }); + log.error({ tag: messages.MISSING_GULP, cwd: env.cwd }); if (hasYarn) { - log.error(messages.YARN_INSTALL_GULP); + log.error({ tag: messages.YARN_INSTALL_GULP }); } else { - log.error(messages.NPM_INSTALL_GULP); + log.error({ tag: messages.NPM_INSTALL_GULP }); } } exit(1); } if (!env.configPath) { - log.error(messages.MISSING_GULPFILE); + log.error({ tag: messages.MISSING_GULPFILE }); exit(1); } @@ -216,14 +216,14 @@ function onExecute(env, flags, translate) { // we let them chdir as needed if (process.cwd() !== env.cwd) { process.chdir(env.cwd); - log.info(messages.CWD_CHANGED, { cwd: env.cwd }); + log.info({ tag: messages.CWD_CHANGED, cwd: env.cwd }); } // Find the correct CLI version to run var range = findRange(env.modulePackage.version, ranges); if (!range) { - log.error(messages.UNSUPPORTED_GULP_VERSION, env.modulePackage.version); + log.error({ tag: messages.UNSUPPORTED_GULP_VERSION, version: env.modulePackage.version }); exit(1); } diff --git a/lib/shared/completion.js b/lib/shared/completion.js index ecbbd630..4257e524 100644 --- a/lib/shared/completion.js +++ b/lib/shared/completion.js @@ -8,14 +8,14 @@ var messages = require('../../messages'); module.exports = function(name, translate) { if (typeof name !== 'string') { - throw new Error(translate.message(messages.COMPLETION_TYPE_MISSING)); + throw new Error(translate.message({ tag: messages.COMPLETION_TYPE_MISSING })); } var file = path.join(__dirname, '../../completion', name); try { console.log(fs.readFileSync(file, 'utf8')); process.exit(0); } catch (err) { - console.log(translate.message(messages.COMPLETION_TYPE_UNKNOWN, { name: name })); + console.log(translate.message({ tag: messages.COMPLETION_TYPE_UNKNOWN, name: name })); process.exit(5); } }; diff --git a/lib/shared/log/tasks.js b/lib/shared/log/tasks.js index 183feb46..733df796 100644 --- a/lib/shared/log/tasks.js +++ b/lib/shared/log/tasks.js @@ -65,7 +65,7 @@ function logTasks(tree, opts, getTask, translate) { var maxLabelWidth = addTaskToLines(task, lines, isLast, isLeaf); if (!isLeaf) { - bars += (isLast ? ' ' : translate.message(messages.BOX_DRAWINGS_LIGHT_VERTICAL)); + bars += (isLast ? ' ' : translate.message({ tag: messages.BOX_DRAWINGS_LIGHT_VERTICAL })); bars += ' ' node.nodes.forEach(function(node, idx, arr) { var isLast = idx === arr.length - 1; @@ -78,13 +78,13 @@ function logTasks(tree, opts, getTask, translate) { function addTaskToLines(task, lines, isLast, isLeaf) { var taskBars = task.bars + (isLast - ? translate.message(messages.BOX_DRAWINGS_LIGHT_UP_AND_RIGHT) - : translate.message(messages.BOX_DRAWINGS_LIGHT_VERTICAL_AND_RIGHT)) + - translate.message(messages.BOX_DRAWINGS_LIGHT_HORIZONTAL); + ? translate.message({ tag: messages.BOX_DRAWINGS_LIGHT_UP_AND_RIGHT }) + : translate.message({ tag: messages.BOX_DRAWINGS_LIGHT_VERTICAL_AND_RIGHT })) + + translate.message({ tag: messages.BOX_DRAWINGS_LIGHT_HORIZONTAL }); if (isLeaf) { - taskBars += translate.message(messages.BOX_DRAWINGS_LIGHT_HORIZONTAL); + taskBars += translate.message({ tag: messages.BOX_DRAWINGS_LIGHT_HORIZONTAL }); } else { - taskBars += translate.message(messages.BOX_DRAWINGS_LIGHT_DOWN_AND_HORIZONTAL); + taskBars += translate.message({ tag: messages.BOX_DRAWINGS_LIGHT_DOWN_AND_HORIZONTAL }); } taskBars += ' '; @@ -111,14 +111,14 @@ function logTasks(tree, opts, getTask, translate) { if (isLast) { flagBars += ' '; } else { - flagBars += translate.message(messages.BOX_DRAWINGS_LIGHT_VERTICAL); + flagBars += translate.message({ tag: messages.BOX_DRAWINGS_LIGHT_VERTICAL }); } flagBars += ' '; if (isLeaf) { flagBars += ' '; } else { - flagBars += translate.message(messages.BOX_DRAWINGS_LIGHT_VERTICAL); + flagBars += translate.message({ tag: messages.BOX_DRAWINGS_LIGHT_VERTICAL }); } flagBars += ' '; diff --git a/lib/shared/log/to-console.js b/lib/shared/log/to-console.js index e9d524f6..a3be2c48 100644 --- a/lib/shared/log/to-console.js +++ b/lib/shared/log/to-console.js @@ -43,11 +43,11 @@ function toConsole(log, opts, translate) { log.removeListener('debug', onDebug); }; - function onError(msg, data) { + function onError(msg) { // Get message and timestamp before printing anything to avoid // logging a half message if there's an error in one of them - var message = translate.message(msg, data); - var timestamp = translate.timestamp(msg, data); + var message = translate.message(msg); + var timestamp = translate.timestamp(msg); if (message) { // Ensure timestamp is not written without a message @@ -60,11 +60,11 @@ function toConsole(log, opts, translate) { // onWarn, onInfo, and onDebug are currently all the same // implementation but separated to change independently - function onWarn(msg, data) { + function onWarn(msg) { // Get message and timestamp before printing anything to avoid // logging a half message if there's an error in one of them - var message = translate.message(msg, data); - var timestamp = translate.timestamp(msg, data); + var message = translate.message(msg); + var timestamp = translate.timestamp(msg); if (message) { // Ensure timestamp is not written without a message @@ -75,11 +75,11 @@ function toConsole(log, opts, translate) { } } - function onInfo(msg, data) { + function onInfo(msg) { // Get message and timestamp before printing anything to avoid // logging a half message if there's an error in one of them - var message = translate.message(msg, data); - var timestamp = translate.timestamp(msg, data); + var message = translate.message(msg); + var timestamp = translate.timestamp(msg); if (message) { // Ensure timestamp is not written without a message @@ -90,11 +90,11 @@ function toConsole(log, opts, translate) { } } - function onDebug(msg, data) { + function onDebug(msg) { // Get message and timestamp before printing anything to avoid // logging a half message if there's an error in one of them - var message = translate.message(msg, data); - var timestamp = translate.timestamp(msg, data); + var message = translate.message(msg); + var timestamp = translate.timestamp(msg); if (message) { // Ensure timestamp is not written without a message diff --git a/lib/shared/options/cli-options.js b/lib/shared/options/cli-options.js index a1f048a3..558eaa97 100644 --- a/lib/shared/options/cli-options.js +++ b/lib/shared/options/cli-options.js @@ -7,88 +7,88 @@ var options = { help: { alias: 'h', type: 'boolean', - message: messages.FLAG_HELP, + tag: messages.FLAG_HELP, }, version: { alias: 'v', type: 'boolean', - message: messages.FLAG_VERSION, + tag: messages.FLAG_VERSION, }, preload: { type: 'string', requiresArg: true, - message: messages.FLAG_PRELOAD, + tag: messages.FLAG_PRELOAD, }, gulpfile: { alias: 'f', type: 'string', requiresArg: true, - message: messages.FLAG_GULPFILE, + tag: messages.FLAG_GULPFILE, }, cwd: { type: 'string', requiresArg: true, - message: messages.FLAG_CWD, + tag: messages.FLAG_CWD, }, tasks: { alias: 'T', type: 'boolean', - message: messages.FLAG_TASKS, + tag: messages.FLAG_TASKS, }, 'tasks-simple': { type: 'boolean', - message: messages.FLAG_TASKS_SIMPLE, + tag: messages.FLAG_TASKS_SIMPLE, }, 'tasks-json': { - message: messages.FLAG_TASKS_JSON, + tag: messages.FLAG_TASKS_JSON, }, 'tasks-depth': { alias: 'depth', type: 'number', requiresArg: true, default: undefined, // To detect if this cli option is specified. - message: messages.FLAG_TASKS_DEPTH, + tag: messages.FLAG_TASKS_DEPTH, }, 'compact-tasks': { type: 'boolean', default: undefined, // To detect if this cli option is specified. - message: messages.FLAG_COMPACT_TASKS, + tag: messages.FLAG_COMPACT_TASKS, }, 'sort-tasks': { type: 'boolean', default: undefined, // To detect if this cli option is specified. - message: messages.FLAG_SORT_TASKS, + tag: messages.FLAG_SORT_TASKS, }, color: { type: 'boolean', - message: messages.FLAG_COLOR, + tag: messages.FLAG_COLOR, }, 'no-color': { type: 'boolean', - message: messages.FLAG_NO_COLOR, + tag: messages.FLAG_NO_COLOR, }, silent: { alias: 'S', type: 'boolean', default: undefined, // To detect if this cli option is specified. - message: messages.FLAG_SILENT, + tag: messages.FLAG_SILENT, }, continue: { type: 'boolean', default: undefined, // To detect if this cli option is specified. - message: messages.FLAG_CONTINUE, + tag: messages.FLAG_CONTINUE, }, series: { type: 'boolean', default: undefined, // To detect if this cli option is specified. - message: messages.FLAG_SERIES, + tag: messages.FLAG_SERIES, }, 'log-level': { alias: 'L', // Type isn't needed because count acts as a boolean count: true, default: undefined, // To detect if this cli option is specified. - message: messages.FLAG_LOG_LEVEL, + tag: messages.FLAG_LOG_LEVEL, } }; diff --git a/lib/shared/options/make-help.js b/lib/shared/options/make-help.js index 8fec2f17..f4c111ab 100644 --- a/lib/shared/options/make-help.js +++ b/lib/shared/options/make-help.js @@ -6,14 +6,14 @@ var cliOptions = require('./cli-options'); var messages = require("../../../messages"); function makeHelp(parser, translate) { - var usage = translate.message(messages.USAGE); + var usage = translate.message({ tag: messages.USAGE }); if (usage) { parser.usage(usage); } Object.keys(cliOptions).forEach(function (flag) { var opt = cliOptions[flag]; - var description = translate.message(opt.message); + var description = translate.message({ tag: opt.tag }); if (description) { parser.describe(flag, description); } diff --git a/lib/shared/translate.js b/lib/shared/translate.js index 9d075e7f..9877ab2f 100644 --- a/lib/shared/translate.js +++ b/lib/shared/translate.js @@ -7,6 +7,7 @@ var chalk = require('chalk'); var messages = require('../../messages'); var tildify = require('./tildify'); +var formatTime = require('./log/format-hrtime'); function Timestamp() { this.now = new Date(); @@ -17,35 +18,35 @@ Timestamp.prototype[util.inspect.custom] = function (depth, opts) { return '[' + opts.stylize(timestamp, 'date') + ']'; }; -function getDefaultMessage(msg, data) { - switch (msg) { +function getDefaultMessage(data) { + switch (data.tag) { case messages.PRELOAD_BEFORE: { - return 'Preloading external module: ' + chalk.magenta(data); + return 'Preloading external module: ' + chalk.magenta(data.name); } case messages.PRELOAD_SUCCESS: { - return 'Preloaded external module: ' + chalk.magenta(data) + return 'Preloaded external module: ' + chalk.magenta(data.name) } case messages.PRELOAD_FAILURE: { - return chalk.yellow('Failed to preload external module: ') + chalk.magenta(data); + return chalk.yellow('Failed to preload external module: ') + chalk.magenta(data.name); } case messages.PRELOAD_ERROR: { - return chalk.yellow(data.toString()); + return chalk.yellow(data.error.toString()); } case messages.LOADER_SUCCESS: { - return 'Loaded external module: ' + chalk.magenta(data); + return 'Loaded external module: ' + chalk.magenta(data.name); } case messages.LOADER_FAILURE: { - return chalk.yellow('Failed to load external module: ') + chalk.magenta(data); + return chalk.yellow('Failed to load external module: ') + chalk.magenta(data.name); } case messages.LOADER_ERROR: { - return chalk.yellow(data.toString()); + return chalk.yellow(data.error.toString()); } case messages.NODE_FLAGS: { - var nodeFlags = chalk.magenta(data.join(', ')); + var nodeFlags = chalk.magenta(data.flags.join(', ')); return 'Node flags detected: ' + nodeFlags; } case messages.RESPAWNED: { - var pid = chalk.magenta(data); + var pid = chalk.magenta(data.pid); return 'Respawned to PID: ' + pid; } case messages.MISSING_GULPFILE: { @@ -55,7 +56,7 @@ function getDefaultMessage(msg, data) { return 'Working directory changed to ' + chalk.magenta(tildify(data.cwd)); } case messages.UNSUPPORTED_GULP_VERSION: { - return chalk.red('Unsupported gulp version', data) + return chalk.red('Unsupported gulp version', data.version) } case messages.DESCRIPTION: { return 'Tasks for ' + chalk.magenta(tildify(data.path)); @@ -67,10 +68,10 @@ function getDefaultMessage(msg, data) { return "Starting '" + chalk.cyan(data.task) + "'..." } case messages.TASK_STOP: { - return "Finished '" + chalk.cyan(data.task) + "' after " + chalk.magenta(data.duration); + return "Finished '" + chalk.cyan(data.task) + "' after " + chalk.magenta(formatTime(data.duration)); } - case messages.TASK_ERROR: { - return "'" + chalk.cyan(data.task) + "' " + chalk.red('errored after') + ' ' +chalk.magenta(data.duration); + case messages.TASK_FAILURE: { + return "'" + chalk.cyan(data.task) + "' " + chalk.red('errored after') + ' ' + chalk.magenta(formatTime(data.duration)); } case messages.TASK_MISSING: { if (data.similar) { @@ -82,7 +83,7 @@ function getDefaultMessage(msg, data) { } } case messages.TASK_SYNC: { - return chalk.red('The following tasks did not complete: ') + chalk.cyan(data) + "\n" + return chalk.red('The following tasks did not complete: ') + chalk.cyan(data.tasks) + "\n" + chalk.red('Did you forget to signal async completion?'); } case messages.MISSING_NODE_MODULES: { @@ -115,6 +116,9 @@ function getDefaultMessage(msg, data) { case messages.EXEC_ERROR: { return data.message; } + case messages.TASK_ERROR: { + return data.message; + } case messages.USAGE: { return '\n' + chalk.bold('Usage:') + ' gulp ' + chalk.blue('[options]') + ' tasks'; } @@ -209,7 +213,7 @@ function getDefaultMessage(msg, data) { return chalk.white('│'); } default: { - return msg; + return data; } } } @@ -222,10 +226,15 @@ function buildTranslations(cfg) { cfg = cfg || {}; return { - message: function (msg, data) { + message: function (data) { + // Don't allow an `undefined` message through + if (typeof data === 'undefined') { + data = Object.create(null); + } + var message; if (typeof cfg.message === 'function') { - message = cfg.message(msg, data); + message = cfg.message(data); } // If the user has provided a message, return it @@ -241,12 +250,17 @@ function buildTranslations(cfg) { // If the user hasn't returned a message or silenced it with `false` // get the default message. Will return the first argument if the message // is not defined in the `@gulpjs/messages` package - return getDefaultMessage(msg, data); + return getDefaultMessage(data); }, - timestamp: function () { + timestamp: function (data) { + // Don't allow an `undefined` message through + if (typeof data === 'undefined') { + data = Object.create(null); + } + var time; if (typeof cfg.timestamp === 'function') { - time = cfg.timestamp(); + time = cfg.timestamp(data); } // If the user has provided a timestamp, return it diff --git a/lib/versioned/^3.7.0/index.js b/lib/versioned/^3.7.0/index.js index c4987cf8..fbaa86f9 100644 --- a/lib/versioned/^3.7.0/index.js +++ b/lib/versioned/^3.7.0/index.js @@ -36,7 +36,7 @@ function execute(env, opts, translate) { exit(1); } - log.info(messages.GULPFILE, { path: env.configPath }); + log.info({ tag: messages.GULPFILE, path: env.configPath }); var gulpInst = require(env.modulePath); logEvents(gulpInst); @@ -52,14 +52,14 @@ function execute(env, opts, translate) { } if (opts.tasks) { tree = taskTree(gulpInst.tasks); - tree.label = translate.message(messages.DESCRIPTION, { path: env.configPath }); + tree.label = translate.message({ tag: messages.DESCRIPTION, path: env.configPath }); return logTasks(tree, opts, function(task) { return gulpInst.tasks[task].fn; }, translate); } if (opts.tasksJson) { tree = taskTree(gulpInst.tasks); - tree.label = translate.message(messages.DESCRIPTION, { path: env.configPath }); + tree.label = translate.message({ tag: messages.DESCRIPTION, path: env.configPath }); var output = JSON.stringify(copyTree(tree, opts)); diff --git a/lib/versioned/^3.7.0/log/events.js b/lib/versioned/^3.7.0/log/events.js index 3375a1e4..09f9c393 100644 --- a/lib/versioned/^3.7.0/log/events.js +++ b/lib/versioned/^3.7.0/log/events.js @@ -1,7 +1,6 @@ 'use strict'; var log = require('gulplog'); -var formatTime = require('../../../shared/log/format-hrtime'); var exit = require('../../../shared/exit'); var formatError = require('../format-error'); @@ -27,23 +26,20 @@ function logEvents(gulpInst) { gulpInst.on('task_start', function(e) { // TODO: batch these // so when 5 tasks start at once it only logs one time with all 5 - log.info(messages.TASK_START, { task: e.task }); + log.info({ tag: messages.TASK_START, task: e.task }); }); gulpInst.on('task_stop', function(e) { - var time = formatTime(e.hrDuration); - log.info(messages.TASK_STOP, { task: e.task, duration: time }); + log.info({ tag: messages.TASK_STOP, task: e.task, duration: e.hrDuration }); }); gulpInst.on('task_err', function(e) { - var msg = formatError(e); - var time = formatTime(e.hrDuration); - log.error(messages.TASK_ERROR, { task: e.task, duration: time }); - log.error(msg); + log.error({ tag: messages.TASK_FAILURE, task: e.task, duration: e.hrDuration }); + log.error({ tag: messages.TASK_ERROR, message: formatError(e) }); }); gulpInst.on('task_not_found', function(err) { - log.error(messages.TASK_MISSING, { task: err.task }); + log.error({ tag: messages.TASK_MISSING, task: err.task }); exit(1); }); } diff --git a/lib/versioned/^4.0.0/index.js b/lib/versioned/^4.0.0/index.js index d31a4f69..c2aa461d 100644 --- a/lib/versioned/^4.0.0/index.js +++ b/lib/versioned/^4.0.0/index.js @@ -55,13 +55,13 @@ function execute(env, opts, translate) { } if (opts.tasks) { tree = gulpInst.tree({ deep: true }); - tree.label = translate.message(messages.DESCRIPTION, { path: env.configPath }); + tree.label = translate.message({ tag: messages.DESCRIPTION, path: env.configPath }); return logTasks(tree, opts, getTask(gulpInst), translate); } if (opts.tasksJson) { tree = gulpInst.tree({ deep: true }); - tree.label = translate.message(messages.DESCRIPTION, { path: env.configPath }); + tree.label = translate.message({ tag: messages.DESCRIPTION, path: env.configPath }); var output = JSON.stringify(copyTree(tree, opts)); @@ -71,7 +71,7 @@ function execute(env, opts, translate) { return fs.writeFileSync(opts.tasksJson, output, 'utf-8'); } try { - log.info(messages.GULPFILE, { path: env.configPath }); + log.info({ tag: messages.GULPFILE, path: env.configPath }); var runMethod = opts.series ? 'series' : 'parallel'; gulpInst[runMethod](toRun)(function(err) { if (err) { @@ -81,9 +81,9 @@ function execute(env, opts, translate) { } catch (err) { var task = checkTaskNotFound(err); if (task) { - log.error(messages.TASK_MISSING, { task: task.target, similar: task.similar }); + log.error({ tag: messages.TASK_MISSING, task: task.target, similar: task.similar }); } else { - log.error(messages.EXEC_ERROR, { message: err.message, error: err }); + log.error({ tag: messages.EXEC_ERROR, message: err.message, error: err }); } exit(1); } diff --git a/lib/versioned/^4.0.0/log/events.js b/lib/versioned/^4.0.0/log/events.js index ba4635ef..b023683c 100644 --- a/lib/versioned/^4.0.0/log/events.js +++ b/lib/versioned/^4.0.0/log/events.js @@ -1,7 +1,6 @@ 'use strict'; var log = require('gulplog'); -var formatTime = require('../../../shared/log/format-hrtime'); var formatError = require('../format-error'); // TODO: make into `@gulpjs/messages` @@ -17,25 +16,22 @@ function logEvents(gulpInst) { // TODO: batch these // so when 5 tasks start at once it only logs one time with all 5 var level = evt.branch ? 'debug' : 'info'; - log[level](messages.TASK_START, { task: evt.name }); + log[level]({ tag: messages.TASK_START, task: evt.name }); }); gulpInst.on('stop', function(evt) { - var time = formatTime(evt.duration); /* istanbul ignore next */ var level = evt.branch ? 'debug' : 'info'; - log[level](messages.TASK_STOP, { task: evt.name, duration: time }); + log[level]({ tag: messages.TASK_STOP, task: evt.name, duration: evt.duration }); }); gulpInst.on('error', function(evt) { - var msg = formatError(evt); - var time = formatTime(evt.duration); var level = evt.branch ? 'debug' : 'error'; - log[level](messages.TASK_ERROR, { task: evt.name, duration: time }); + log[level]({ tag: messages.TASK_FAILURE, task: evt.name, duration: evt.duration }); // If we haven't logged this before, log it and add to list if (loggedErrors.indexOf(evt.error) === -1) { - log.error(msg); + log.error({ tag: messages.TASK_ERROR, message: formatError(evt) }); loggedErrors.push(evt.error); } }); diff --git a/lib/versioned/^4.0.0/log/sync-task.js b/lib/versioned/^4.0.0/log/sync-task.js index 6f788ddd..30cdc25f 100644 --- a/lib/versioned/^4.0.0/log/sync-task.js +++ b/lib/versioned/^4.0.0/log/sync-task.js @@ -20,7 +20,7 @@ function warn() { process.exitCode = 1; - log.warn(messages.TASK_SYNC, taskNames); + log.warn({ tag: messages.TASK_SYNC, tasks: taskNames }); } function start(e) { diff --git a/messages.js b/messages.js index e545b6c3..96ba5ab4 100644 --- a/messages.js +++ b/messages.js @@ -34,7 +34,7 @@ module.exports = { */ TASK_START: Symbol.for('GULP_CLI_TASK_START'), TASK_STOP: Symbol.for('GULP_CLI_TASK_STOP'), - TASK_ERROR: Symbol.for('GULP_CLI_TASK_ERROR'), + TASK_FAILURE: Symbol.for('GULP_CLI_TASK_FAILURE'), TASK_MISSING: Symbol.for('GULP_CLI_TASK_MISSING'), TASK_SYNC: Symbol.for('GULP_CLI_TASK_SYNC'), @@ -51,6 +51,7 @@ module.exports = { LOADER_ERROR: Symbol.for('GULP_CLI_LOADER_ERROR'), ARGV_ERROR: Symbol.for('GULP_CLI_ARGV_ERROR'), EXEC_ERROR: Symbol.for('GULP_CLI_EXEC_ERROR'), + TASK_ERROR: Symbol.for('GULP_CLI_TASK_ERROR'), /** * Help diff --git a/test/config-message-function.js b/test/config-message-function.js index 18e07c65..d5b9a1bd 100644 --- a/test/config-message-function.js +++ b/test/config-message-function.js @@ -13,7 +13,6 @@ var expectedDir = path.join(__dirname, 'expected/config/theming'); var eraseTime = require('./tool/erase-time'); var eraseLapse = require('./tool/erase-lapse'); -var sliceLines = require('./tool/slice-lines'); var gulp = require('./tool/gulp-cmd'); describe('config: message function', function() { @@ -383,18 +382,32 @@ describe('config: message function', function() { } }); + it('can change TASK_FAILURE with .gulp.*', function(done) { + var cwd = path.join(baseDir, 'TASK_FAILURE'); + var expectedStderr = 'TASK FAILURE: **default**\n'; + + var opts = { cwd: cwd }; + exec(gulp(), opts, cb); + + function cb(err, stdout, stderr) { + expect(err).not.toBeNull(); + expect(stdout).toEqual(''); + expect(stderr).toEqual(expectedStderr); + done(); + } + }); + it('can change TASK_ERROR with .gulp.*', function(done) { var cwd = path.join(baseDir, 'TASK_ERROR'); - var expectedStdout = "Using gulpfile!\nStarting 'default'...\n"; - var expectedStderr = 'TASK ERROR: **default**'; + var expectedStderr = '**TASK ERROR**\n'; var opts = { cwd: cwd }; exec(gulp(), opts, cb); function cb(err, stdout, stderr) { expect(err).not.toBeNull(); - expect(sliceLines(stderr, 0, 1)).toEqual(expectedStderr); - expect(eraseTime(stdout)).toEqual(expectedStdout); + expect(stdout).toEqual(''); + expect(stderr).toEqual(expectedStderr); done(); } }); diff --git a/test/fixtures/.gulp.js b/test/fixtures/.gulp.js index ad18e9c8..8b7b1924 100644 --- a/test/fixtures/.gulp.js +++ b/test/fixtures/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../messages'); module.exports = { - message: function (msg) { - if (msg === messages.DESCRIPTION) { + message: function (data) { + if (data.tag === messages.DESCRIPTION) { return "gulp-cli/test/fixtures"; } } diff --git a/test/fixtures/config/theming/ARGV_ERROR/.gulp.js b/test/fixtures/config/theming/ARGV_ERROR/.gulp.js index c25cbdc6..cd948f16 100644 --- a/test/fixtures/config/theming/ARGV_ERROR/.gulp.js +++ b/test/fixtures/config/theming/ARGV_ERROR/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.ARGV_ERROR) { + message: function (data) { + if (data.tag === messages.ARGV_ERROR) { return '**' + data.message + '**'; } } diff --git a/test/fixtures/config/theming/COMPLETION_TYPE_MISSING/.gulp.js b/test/fixtures/config/theming/COMPLETION_TYPE_MISSING/.gulp.js index fa268ca7..03edae29 100644 --- a/test/fixtures/config/theming/COMPLETION_TYPE_MISSING/.gulp.js +++ b/test/fixtures/config/theming/COMPLETION_TYPE_MISSING/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../../../messages'); module.exports = { - message: function(msg) { - if (msg === messages.COMPLETION_TYPE_MISSING) { + message: function (data) { + if (data.tag === messages.COMPLETION_TYPE_MISSING) { return 'NO COMPLETION TYPE'; } } diff --git a/test/fixtures/config/theming/COMPLETION_TYPE_UNKNOWN/.gulp.js b/test/fixtures/config/theming/COMPLETION_TYPE_UNKNOWN/.gulp.js index 2b53d569..6dd1a493 100644 --- a/test/fixtures/config/theming/COMPLETION_TYPE_UNKNOWN/.gulp.js +++ b/test/fixtures/config/theming/COMPLETION_TYPE_UNKNOWN/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../../../messages'); module.exports = { - message: function(msg, data) { - if (msg === messages.COMPLETION_TYPE_UNKNOWN) { + message: function (data) { + if (data.tag === messages.COMPLETION_TYPE_UNKNOWN) { return 'GULP COMPLETION TYPE **' + data.name + '** IS NOT FOUND'; } } diff --git a/test/fixtures/config/theming/CWD_CHANGED/.gulp.js b/test/fixtures/config/theming/CWD_CHANGED/.gulp.js index 22444169..0e4b2b0a 100644 --- a/test/fixtures/config/theming/CWD_CHANGED/.gulp.js +++ b/test/fixtures/config/theming/CWD_CHANGED/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.CWD_CHANGED) { + message: function (data) { + if (data.tag === messages.CWD_CHANGED) { return 'CHANGE CWD TO **' + data.cwd + '**'; } diff --git a/test/fixtures/config/theming/DESCRIPTION/.gulp.js b/test/fixtures/config/theming/DESCRIPTION/.gulp.js index 787bf358..0ba801d2 100644 --- a/test/fixtures/config/theming/DESCRIPTION/.gulp.js +++ b/test/fixtures/config/theming/DESCRIPTION/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.DESCRIPTION) { + message: function (data) { + if (data.tag === messages.DESCRIPTION) { return '**DESCRIPTION**'; } } diff --git a/test/fixtures/config/theming/DESCRIPTION/remove/.gulp.js b/test/fixtures/config/theming/DESCRIPTION/remove/.gulp.js index 45d7321a..5018b7be 100644 --- a/test/fixtures/config/theming/DESCRIPTION/remove/.gulp.js +++ b/test/fixtures/config/theming/DESCRIPTION/remove/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.DESCRIPTION) { + message: function (data) { + if (data.tag === messages.DESCRIPTION) { return false; } } diff --git a/test/fixtures/config/theming/EXEC_ERROR/.gulp.js b/test/fixtures/config/theming/EXEC_ERROR/.gulp.js index 4c7d1eb0..ef99982f 100644 --- a/test/fixtures/config/theming/EXEC_ERROR/.gulp.js +++ b/test/fixtures/config/theming/EXEC_ERROR/.gulp.js @@ -2,12 +2,12 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg) { - if (msg === messages.EXEC_ERROR) { + message: function (data) { + if (data.tag === messages.EXEC_ERROR) { return 'FAIL TO RUN'; } - if (msg === messages.GULPFILE) { + if (data.tag === messages.GULPFILE) { throw new Error('Crash before task execution'); } } diff --git a/test/fixtures/config/theming/GULPFILE/.gulp.js b/test/fixtures/config/theming/GULPFILE/.gulp.js index 7cf24b82..40f3a74b 100644 --- a/test/fixtures/config/theming/GULPFILE/.gulp.js +++ b/test/fixtures/config/theming/GULPFILE/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.GULPFILE) { + message: function (data) { + if (data.tag === messages.GULPFILE) { return 'USING GULPFILE **abcxyz**'; } diff --git a/test/fixtures/config/theming/LOADER_FAILURE/.gulp.js b/test/fixtures/config/theming/LOADER_FAILURE/.gulp.js index a68faf18..15d7a56d 100644 --- a/test/fixtures/config/theming/LOADER_FAILURE/.gulp.js +++ b/test/fixtures/config/theming/LOADER_FAILURE/.gulp.js @@ -2,12 +2,12 @@ var messages = require('../../../../../messages'); module.exports = { - message: function(msg, data) { - if (msg === messages.LOADER_FAILURE) { - return 'FAIL TO LOAD **' + data + '**'; + message: function (data) { + if (data.tag === messages.LOADER_FAILURE) { + return 'FAIL TO LOAD **' + data.name + '**'; } - if (msg === messages.LOADER_ERROR) { + if (data.tag === messages.LOADER_ERROR) { // Silence for test return false; } diff --git a/test/fixtures/config/theming/LOADER_SUCCESS/.gulp.js b/test/fixtures/config/theming/LOADER_SUCCESS/.gulp.js index dc00b2db..471d725b 100644 --- a/test/fixtures/config/theming/LOADER_SUCCESS/.gulp.js +++ b/test/fixtures/config/theming/LOADER_SUCCESS/.gulp.js @@ -2,9 +2,9 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.LOADER_SUCCESS) { - return 'LOADED **' + data + '**!'; + message: function (data) { + if (data.tag === messages.LOADER_SUCCESS) { + return 'LOADED **' + data.name + '**!'; } // Silence all other messages for test diff --git a/test/fixtures/config/theming/MISSING_GULP/.gulp.js b/test/fixtures/config/theming/MISSING_GULP/.gulp.js index 3388e767..a01c5ca4 100644 --- a/test/fixtures/config/theming/MISSING_GULP/.gulp.js +++ b/test/fixtures/config/theming/MISSING_GULP/.gulp.js @@ -1,11 +1,11 @@ module.exports = { - message: function(msg, data) { + message: function (data) { // Using `Symbol.for()` to avoid node_modules - if (msg === Symbol.for('GULP_CLI_MISSING_GULP')) { + if (data.tag === Symbol.for('GULP_CLI_MISSING_GULP')) { return 'GULP NOT FOUND IN **' + data.cwd + '**'; } - if (msg === Symbol.for('GULP_CLI_NPM_INSTALL_GULP')) { + if (data.tag === Symbol.for('GULP_CLI_NPM_INSTALL_GULP')) { // Silence for test return false; } diff --git a/test/fixtures/config/theming/MISSING_GULPFILE/.gulp.js b/test/fixtures/config/theming/MISSING_GULPFILE/.gulp.js index eb140ec5..9f9066e5 100644 --- a/test/fixtures/config/theming/MISSING_GULPFILE/.gulp.js +++ b/test/fixtures/config/theming/MISSING_GULPFILE/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg) { - if (msg === messages.MISSING_GULPFILE) { + message: function (data) { + if (data.tag === messages.MISSING_GULPFILE) { return 'NO GULPFILE'; } } diff --git a/test/fixtures/config/theming/MISSING_NODE_MODULES/.gulp.js b/test/fixtures/config/theming/MISSING_NODE_MODULES/.gulp.js index 07a70017..80cca25d 100644 --- a/test/fixtures/config/theming/MISSING_NODE_MODULES/.gulp.js +++ b/test/fixtures/config/theming/MISSING_NODE_MODULES/.gulp.js @@ -1,11 +1,11 @@ module.exports = { - message: function(msg, data) { + message: function (data) { // Using `Symbol.for()` to avoid node_modules - if (msg === Symbol.for('GULP_CLI_MISSING_NODE_MODULES')) { + if (data.tag === Symbol.for('GULP_CLI_MISSING_NODE_MODULES')) { return 'LOCAL MODULE NOT FOUND **' + data.cwd + '**'; } - if (msg === Symbol.for('GULP_CLI_NPM_INSTALL')) { + if (data.tag === Symbol.for('GULP_CLI_NPM_INSTALL')) { // Silence for test return false; } diff --git a/test/fixtures/config/theming/NODE_FLAGS/.gulp.js b/test/fixtures/config/theming/NODE_FLAGS/.gulp.js index e40f7c26..1f548732 100644 --- a/test/fixtures/config/theming/NODE_FLAGS/.gulp.js +++ b/test/fixtures/config/theming/NODE_FLAGS/.gulp.js @@ -2,9 +2,9 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.NODE_FLAGS) { - return 'RESPAWNED BY **' + data + '**!'; + message: function (data) { + if (data.tag === messages.NODE_FLAGS) { + return 'RESPAWNED BY **' + data.flags + '**!'; } // Silence all other messages for test diff --git a/test/fixtures/config/theming/PRELOAD_BEFORE/.gulp.js b/test/fixtures/config/theming/PRELOAD_BEFORE/.gulp.js index cd0fa559..12af60d4 100644 --- a/test/fixtures/config/theming/PRELOAD_BEFORE/.gulp.js +++ b/test/fixtures/config/theming/PRELOAD_BEFORE/.gulp.js @@ -2,9 +2,9 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.PRELOAD_BEFORE) { - return 'PRELOADING **' + data + '**!'; + message: function (data) { + if (data.tag === messages.PRELOAD_BEFORE) { + return 'PRELOADING **' + data.name + '**!'; } // Silence all other messages for test diff --git a/test/fixtures/config/theming/PRELOAD_FAILURE/.gulp.js b/test/fixtures/config/theming/PRELOAD_FAILURE/.gulp.js index cd190836..2863ad2e 100644 --- a/test/fixtures/config/theming/PRELOAD_FAILURE/.gulp.js +++ b/test/fixtures/config/theming/PRELOAD_FAILURE/.gulp.js @@ -2,9 +2,9 @@ var messages = require('../../../../../messages'); module.exports = { - message: function(msg, data) { - if (msg === messages.PRELOAD_FAILURE) { - return 'FAILED TO PRELOAD **' + data + '**'; + message: function (data) { + if (data.tag === messages.PRELOAD_FAILURE) { + return 'FAILED TO PRELOAD **' + data.name + '**'; } // Silence everything else for test diff --git a/test/fixtures/config/theming/PRELOAD_SUCCESS/.gulp.js b/test/fixtures/config/theming/PRELOAD_SUCCESS/.gulp.js index 1993da34..8b17305f 100644 --- a/test/fixtures/config/theming/PRELOAD_SUCCESS/.gulp.js +++ b/test/fixtures/config/theming/PRELOAD_SUCCESS/.gulp.js @@ -2,9 +2,9 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.PRELOAD_SUCCESS) { - return 'PRELOADED **' + data + '**!'; + message: function (data) { + if (data.tag === messages.PRELOAD_SUCCESS) { + return 'PRELOADED **' + data.name + '**!'; } // Silence all other messages for test diff --git a/test/fixtures/config/theming/RESPAWNED/.gulp.js b/test/fixtures/config/theming/RESPAWNED/.gulp.js index 704ab23e..c695811e 100644 --- a/test/fixtures/config/theming/RESPAWNED/.gulp.js +++ b/test/fixtures/config/theming/RESPAWNED/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg) { - if (msg === messages.RESPAWNED) { + message: function (data) { + if (data.tag === messages.RESPAWNED) { return 'RESPAWN!'; } diff --git a/test/fixtures/config/theming/TASK_ERROR/.gulp.js b/test/fixtures/config/theming/TASK_ERROR/.gulp.js index db0d12e0..38f76533 100644 --- a/test/fixtures/config/theming/TASK_ERROR/.gulp.js +++ b/test/fixtures/config/theming/TASK_ERROR/.gulp.js @@ -2,13 +2,16 @@ var messages = require('../../../../../messages'); module.exports = { - message: function(msg, data) { - if (msg === messages.GULPFILE) { - return 'Using gulpfile!'; + message: function (data) { + if (data.tag === messages.TASK_ERROR) { + return '**TASK ERROR**'; } - if (msg === messages.TASK_ERROR) { - return 'TASK ERROR: **' + data.task + '**'; - } + // Silence everything else for test + return false; + }, + timestamp: function () { + // Silence timestamps for test + return false; } }; diff --git a/test/fixtures/config/theming/TASK_FAILURE/.gulp.js b/test/fixtures/config/theming/TASK_FAILURE/.gulp.js new file mode 100644 index 00000000..0d1849be --- /dev/null +++ b/test/fixtures/config/theming/TASK_FAILURE/.gulp.js @@ -0,0 +1,17 @@ +// TODO: make into `@gulpjs/messages` +var messages = require('../../../../../messages'); + +module.exports = { + message: function (data) { + if (data.tag === messages.TASK_FAILURE) { + return 'TASK FAILURE: **' + data.task + '**'; + } + + // Silence everything else for test + return false; + }, + timestamp: function () { + // Silence timestamps for test + return false; + } +}; diff --git a/test/fixtures/config/theming/TASK_FAILURE/gulpfile.js b/test/fixtures/config/theming/TASK_FAILURE/gulpfile.js new file mode 100644 index 00000000..eeb90fd6 --- /dev/null +++ b/test/fixtures/config/theming/TASK_FAILURE/gulpfile.js @@ -0,0 +1,3 @@ +exports.default = function(done) { + throw new Error('FAIL!'); +} diff --git a/test/fixtures/config/theming/TASK_MISSING/.gulp.js b/test/fixtures/config/theming/TASK_MISSING/.gulp.js index b7dac4b1..90038f16 100644 --- a/test/fixtures/config/theming/TASK_MISSING/.gulp.js +++ b/test/fixtures/config/theming/TASK_MISSING/.gulp.js @@ -2,12 +2,12 @@ var messages = require('../../../../../messages'); module.exports = { - message: function(msg, data) { - if (msg === messages.GULPFILE) { + message: function (data) { + if (data.tag === messages.GULPFILE) { return 'Using gulpfile!'; } - if (msg === messages.TASK_MISSING) { + if (data.tag === messages.TASK_MISSING) { return 'TASK IS NOT FOUND: **' + data.task + '** SIMILAR ##' + data.similar.join('') + '##'; } } diff --git a/test/fixtures/config/theming/TASK_START/.gulp.js b/test/fixtures/config/theming/TASK_START/.gulp.js index 05e06b93..9e6b462d 100644 --- a/test/fixtures/config/theming/TASK_START/.gulp.js +++ b/test/fixtures/config/theming/TASK_START/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.TASK_START) { + message: function (data) { + if (data.tag === messages.TASK_START) { return 'START **' + data.task + '**'; } diff --git a/test/fixtures/config/theming/TASK_STOP/.gulp.js b/test/fixtures/config/theming/TASK_STOP/.gulp.js index a07e24f7..5d382759 100644 --- a/test/fixtures/config/theming/TASK_STOP/.gulp.js +++ b/test/fixtures/config/theming/TASK_STOP/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.TASK_STOP) { + message: function (data) { + if (data.tag === messages.TASK_STOP) { return 'STOP **' + data.task + '**'; } diff --git a/test/fixtures/config/theming/TASK_SYNC/.gulp.js b/test/fixtures/config/theming/TASK_SYNC/.gulp.js index c6d11013..217f23dd 100644 --- a/test/fixtures/config/theming/TASK_SYNC/.gulp.js +++ b/test/fixtures/config/theming/TASK_SYNC/.gulp.js @@ -2,9 +2,9 @@ var messages = require('../../../../../messages'); module.exports = { - message: function(msg, data) { - if (msg === messages.TASK_SYNC) { - return 'TASK **' + data + '** DID NOT COMPLETE'; + message: function (data) { + if (data.tag === messages.TASK_SYNC) { + return 'TASK **' + data.tasks + '** DID NOT COMPLETE'; } } }; diff --git a/test/fixtures/config/theming/UNSUPPORTED_GULP_VERSION/.gulp.js b/test/fixtures/config/theming/UNSUPPORTED_GULP_VERSION/.gulp.js index 5f41b6ad..94ec7785 100644 --- a/test/fixtures/config/theming/UNSUPPORTED_GULP_VERSION/.gulp.js +++ b/test/fixtures/config/theming/UNSUPPORTED_GULP_VERSION/.gulp.js @@ -2,9 +2,9 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.UNSUPPORTED_GULP_VERSION) { - return 'BAD GULP VERSION **' + data + '**'; + message: function (data) { + if (data.tag === messages.UNSUPPORTED_GULP_VERSION) { + return 'BAD GULP VERSION **' + data.version + '**'; } } }; diff --git a/test/fixtures/config/theming/USAGE/.gulp.js b/test/fixtures/config/theming/USAGE/.gulp.js index 9d7d9386..ce54d263 100644 --- a/test/fixtures/config/theming/USAGE/.gulp.js +++ b/test/fixtures/config/theming/USAGE/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.USAGE) { + message: function (data) { + if (data.tag === messages.USAGE) { return 'GULP USAGE'; } } diff --git a/test/fixtures/config/theming/flags/.gulp.js b/test/fixtures/config/theming/flags/.gulp.js index 0ce6f928..907a2554 100644 --- a/test/fixtures/config/theming/flags/.gulp.js +++ b/test/fixtures/config/theming/flags/.gulp.js @@ -2,72 +2,72 @@ var messages = require('../../../../../messages'); module.exports = { - message: function (msg, data) { - if (msg === messages.FLAG_HELP) { + message: function (data) { + if (data.tag === messages.FLAG_HELP) { return '**HELP**'; } - if (msg === messages.FLAG_VERSION) { + if (data.tag === messages.FLAG_VERSION) { return '**VERSION**'; } - if (msg === messages.FLAG_PRELOAD) { + if (data.tag === messages.FLAG_PRELOAD) { return '**PRELOAD**'; } - if (msg === messages.FLAG_GULPFILE) { + if (data.tag === messages.FLAG_GULPFILE) { return '**GULPFILE**'; } - if (msg === messages.FLAG_CWD) { + if (data.tag === messages.FLAG_CWD) { return '**CWD**'; } - if (msg === messages.FLAG_TASKS) { + if (data.tag === messages.FLAG_TASKS) { return '**TASKS**'; } - if (msg === messages.FLAG_TASKS_SIMPLE) { + if (data.tag === messages.FLAG_TASKS_SIMPLE) { return '**TASKS SIMPLE**'; } - if (msg === messages.FLAG_TASKS_JSON) { + if (data.tag === messages.FLAG_TASKS_JSON) { return '**TASKS JSON**'; } - if (msg === messages.FLAG_TASKS_DEPTH) { + if (data.tag === messages.FLAG_TASKS_DEPTH) { return '**TASKS DEPTH**'; } - if (msg === messages.FLAG_COMPACT_TASKS) { + if (data.tag === messages.FLAG_COMPACT_TASKS) { return '**COMPACT TASKS**'; } - if (msg === messages.FLAG_SORT_TASKS) { + if (data.tag === messages.FLAG_SORT_TASKS) { return '**SORT_TASKS**'; } - if (msg === messages.FLAG_COLOR) { + if (data.tag === messages.FLAG_COLOR) { return '**COLOR**'; } - if (msg === messages.FLAG_NO_COLOR) { + if (data.tag === messages.FLAG_NO_COLOR) { return '**NO COLOR**'; } - if (msg === messages.FLAG_SILENT) { + if (data.tag === messages.FLAG_SILENT) { return '**SILENT**'; } - if (msg === messages.FLAG_CONTINUE) { + if (data.tag === messages.FLAG_CONTINUE) { return '**CONTINUE**'; } - if (msg === messages.FLAG_SERIES) { + if (data.tag === messages.FLAG_SERIES) { return '**SERIES**'; } - if (msg === messages.FLAG_LOG_LEVEL) { + if (data.tag === messages.FLAG_LOG_LEVEL) { return '**LOG LEVEL**'; } diff --git a/test/fixtures/gulpfiles/.gulp.js b/test/fixtures/gulpfiles/.gulp.js index a4eb937f..4612d094 100644 --- a/test/fixtures/gulpfiles/.gulp.js +++ b/test/fixtures/gulpfiles/.gulp.js @@ -2,8 +2,8 @@ var messages = require('../../../messages'); module.exports = { - message: function (msg) { - if (msg === messages.DESCRIPTION) { + message: function (data) { + if (data.tag === messages.DESCRIPTION) { return "gulp-cli/test/fixtures/gulpfiles"; } }