Merge branch 'next_release'

Author: stringparser

index.js

@@ -11,7 +11,7 @@ exports.instances = [];
 var repl = require('readline').createInterface({
   input: process.stdin,
   output: process.stdout,
-  completer: function(line){
+  completer: function onCompletion(line){
     return util.completer(line, exports.instances);
   }
 });
@@ -46,21 +46,20 @@ repl.on('line', function onLine(input){
       plural ? 's' : '',
       plural ? 'are' : 'is'
     );
-    return repl.prompt();
+  } else {
+    queue.found.forEach(function(found){
+      var result = found.inst.runner.apply(found.inst.gulp, found.tasks);
+      if(typeof result === 'function'){
+        result(); // gulp#4.0
+      }
+    });
   }
-
-  queue.found.forEach(function(found){
-    var result = found.inst.runner.apply(found.inst.gulp, found.tasks);
-    if(typeof result === 'function'){
-      result(); // gulp#4.0
-    }
-  });
 });
 
 /**
  * exit on SIGINT with a timestamp
 **/
-repl.on('SIGINT', function(){
+repl.on('SIGINT', function onSIGINT(){
   process.stdout.write('\n');
   console.log(new Date());
   process.exit(0);
@@ -69,16 +68,8 @@ repl.on('SIGINT', function(){
 /**
  * add the given gulp instance to the instances array
 **/
-function gulpRepl(gulp){
-  if(!gulp || typeof gulp.task !== 'function'){
-    try {
-      gulp = require('gulp');
-    } catch (err){
-      console.log('gulp is not installed locally');
-      console.log('try `npm install gulp`');
-      process.exit(1);
-    }
-  }
+function gulpRepl(_gulp_){
+  var gulp = util.getGulp(_gulp_);
 
   var inInstances = Boolean(
     exports.instances.filter(function(instance){
@@ -87,34 +78,11 @@ function gulpRepl(gulp){
   );
   if(inInstances){ return repl; }
 
-  var tasks = {
-    obj: (
-      (gulp._registry && gulp._registry._tasks) || // gulp#4
-      (gulp.tasks && gulp.tasks.store) || // gulp-runtime
-      gulp.tasks // gulp#3
-    )
-  };
-
-  if(typeof (gulp.tasks && gulp.tasks.get) === 'function'){
-    tasks.get = function(name, line){
-      return gulp.tasks.get(line);
-    };
-  } else {
-    tasks.get = function(name, line){
-      return tasks.obj[name] && {
-        match: name,
-        notFound: line.slice(name.length)
-      };
-    };
-  }
-
   exports.instances.push({
     gulp: gulp,
-    tasks: tasks,
-    runner: gulp.parallel || gulp.start
+    tasks: util.getTasks(gulp),
+    runner: gulp.start
   });
 
-  util.waitToPrompt(gulp, repl);
-
   return repl;
 }

lib/util.js

@@ -2,22 +2,57 @@
 
 exports = module.exports = {};
 
+exports.uniq = require('lodash.uniq');
+
+exports.getGulp = function(gulp){
+  if(!gulp || typeof gulp.task !== 'function'){
+    try {
+      gulp = require('gulp');
+    } catch (err){
+      console.log('gulp is not installed locally');
+      console.log('try `npm install gulp`');
+      process.exit(1);
+    }
+  }
+  return gulp;
+};
+
+exports.getTasks = function(gulp){
+  var tasks = {
+    obj: (
+      (gulp._registry && gulp._registry._tasks) || // gulp#4
+      (gulp.tasks && gulp.tasks.store) || // gulp-runtime
+      gulp.tasks // gulp#3
+    )
+  };
+
+  if(typeof (gulp.tasks && gulp.tasks.get) === 'function'){
+    tasks.get = function(name, line){
+      return gulp.tasks.get(line);
+    };
+  } else {
+    tasks.get = function(name){
+      return tasks.obj[name] && {match: name};
+    };
+  }
+
+  return tasks;
+};
+
 exports.getQueue = function(line, tasks){
   var queue = {found: [], notFound: []};
 
   while(line.length){
     var name = /(\S+)/.exec(line).pop();
-    var task = tasks.get(name, line) || {
-      notFound: line.slice(name.length)
-    };
+    var task = tasks.get(name, line);
 
-    if(task.match){
+    if(task && task.match){
       queue.found.push(task.match);
+      line = line.slice(task.match.length).trim();
     } else {
       queue.notFound.push(name);
+      line = line.slice(name.length).trim();
     }
-
-    line = task.notFound.trim();
   }
 
   return queue;
@@ -34,58 +69,20 @@ exports.completer = function(line, instances){
 
   instances.forEach(function (instance){
     var matches = exports.getQueue(line, instance.tasks);
-    completion.push.apply(completion, matches.found.length
-        ? matches.found
-        : Object.keys(instance.tasks.obj)
-    );
+    if(!matches.found.length){
+      Object.keys(instance.tasks.obj).forEach(function(name){
+        matches.found.push.apply(matches.found,
+          (name.match(/\(([^(]+)\)/) || [name]).pop().split('|')
+        );
+      });
+    }
+    completion.push.apply(completion, matches.found);
   });
 
-  var hits = completion.filter(function(elem){
+  var hits = exports.uniq(completion).filter(function(elem){
     return !elem.indexOf(line);
   });
 
   // TODO: add async path completion (nodejs.org/api/readline.html)
   return [hits.length ? hits : completion, line];
 };
-
-exports.waitToPrompt = function(gulp, repl){
-  var events = [
-    'start', 'task_start',
-    'err', 'stop', 'error', 'task_err', 'task_stop', 'task_not_found'
-  ];
-
-  if(typeof gulp.on === 'function'){
-    events.forEach(function(eventName){
-      var replEventName = 'task:' + (/start/.test(eventName) ?
-        'start' : 'ended'
-      );
-      gulp.on(eventName, function(ev){
-        repl.emit(replEventName, ev);
-      });
-    });
-  }
-
-  var queue = [];
-
-  repl.on('task:start', function start(ev){
-    var taskName = ev && (ev.task || ev.name);
-    if(!taskName){ return; }
-    if(/watch/i.test(taskName)){
-      repl.emit('task:ended', ev);
-    } else {
-      queue.push(taskName);
-    }
-  });
-
-  repl.on('task:ended', function ended(ev){
-    var taskName = ev && (ev.task || ev.name);
-    var index = queue.indexOf(taskName);
-    if(index > -1){ queue.splice(index, 1); }
-    if(queue.length){ return; }
-    setTimeout(function(){
-      if(!queue.length){
-        repl.prompt();
-      }
-    }, 10);
-  });
-};

package.json

@@ -21,5 +21,8 @@
   "scripts": {
     "lint": "jshint lib index.js --exclude ./node_modules",
     "test": "npm run-script lint && mocha test"
+  },
+  "dependencies": {
+    "lodash.uniq": "^4.2.1"
   }
 }