dev, fix: cleanup lib/util a bit; fix bug on init for the repl

stringparser · stringparser · commit 06e322732104 · 2016-09-18T22:24:26.000+02:00
diff --git a/lib/cli.js b/lib/cli.js
@@ -95,7 +95,7 @@ exports = module.exports = function (gulp) {
     }
 
     if (gulp.repl) {
-      gulp.repl.emit('line', argv.join(' '));
+      gulp.repl.emit('line', argv.length ? argv.join(' ') : 'default');
     } else {
       gulp.start.apply(gulp, [argv].concat(args));
     }
diff --git a/lib/util.js b/lib/util.js
@@ -4,15 +4,9 @@ var path = require('path');
 
 var util = exports = module.exports = {};
 
-var xargs = process.argv.slice(2).join(' ');
-var isSilent = /(^|[\s])(--silent|--tasks-simple)/.test(xargs);
-var execFile = path.extname(process.argv[1])
-  ? process.argv[1]
-  : process.argv[1] + '.js';
-
 // dependencies
-//
 util.type = require('utils-type');
+util.clone = require('lodash.clone');
 util.archy = require('archy');
 util.merge = require('lodash.merge');
 util.gutil = require('gulp-util');
@@ -21,56 +15,44 @@ util.tildify = require('tildify');
 util.dateFormat = require('dateformat');
 util.prettyTime = require('pretty-hrtime');
 
+// refs
+var xargs = process.argv.slice(2).join(' ');
+var isSilent = /(^|[\s])(--silent|--tasks-simple)/.test(xargs);
+var execFile = path.extname(process.argv[1])
+  ? process.argv[1]
+  : process.argv[1] + '.js';
+
 // assorted
-//
 util.docs = {
   task: 'http://git.io/vVYKS'
 };
 
+// logging helpers
 util.silent = function () {};
-
 util.logger = function (/* arguments */) {
   process.stdout.write(util.format.date());
   console.log.apply(console, arguments);
 };
 
-if (isSilent) {
-  util.log = util.gutil.log = util.silent;
-} else {
-  util.log = util.gutil.log = util.logger;
-}
+// assign the initial logger according to cli args
+util.log = util.gutil.log = isSilent ? util.silent : util.logger;
 
 util.format = {
   time: function (hrtime) {
-    return util.chalk.magenta(hrtime
-      ? util.prettyTime(process.hrtime(hrtime))
-      : util.prettyTime(process.hrtime())
-    );
-  },
-  link: function (link) {
-    return util.chalk.underline(
-      util.chalk.green(link)
-    );
+    var time = util.prettyTime(process.hrtime(hrtime || []));
+    return util.chalk.magenta(time);
   },
-  path: function (filename) {
-    return util.chalk.magenta(
-      util.tildify(filename)
-    );
+  path: function (pahtname) {
+    return util.chalk.magenta(util.tildify(pahtname));
   },
   task: function (task) {
-    if (!task.mode) {
-      return util.chalk.cyan(task && task.label || task);
+    if (task && task.label) {
+      return task.label.split(',').map(function (name) {
+        return util.chalk.cyan(name);
+      }).join(',');
+    } else {
+      return task;
     }
-
-    return (
-      (task.name ? util.chalk.cyan(task.name) + ' => ' : '') +
-       task.mode + '(' +
-        task.label.split(/\,/).map(function (name) {
-          return util.chalk.cyan(name)
-        }).join(',') +
-      ')'
-    );
-
   },
   date: function (date) {
     var value = util.dateFormat(date || new Date(), 'HH:MM:ss');
@@ -87,5 +69,5 @@ util.isFromCLI = function (gulp) {
 
 util.getGulpFile = function () {
   var match = new Error().stack.match(/\/([^:()]+)/g);
-  return match && match[4] || '';
+  return match && match[3] || '';
 };

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ exports = module.exports = function (gulp) {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`if (gulp.repl) {`
`98`		`- gulp.repl.emit('line', argv.join(' '));`
	`98`	`+ gulp.repl.emit('line', argv.length ? argv.join(' ') : 'default');`
`99`	`99`	`} else {`
`100`	`100`	`gulp.start.apply(gulp, [argv].concat(args));`
`101`	`101`	`}`