Merge pull request #27 from xgecko/master

Adding command specific options

example/bin/examplecomp

@@ -20,6 +20,10 @@ complete({
     lemon: {},
     mango: {}
   },
+  commandOptions: {
+    apple: [ '--cinnamon'],
+    orange: [ '--extra-pulp', '--no-pulp' ]
+  },
   options: {
     '--version': {},
     '--help': {}

lib/complete.js

@@ -12,6 +12,7 @@ var bashrc = getRc();
 var argv = require('optimist').argv;
 
 var commands;
+var commandOptions;
 var program;
 var opt;
 var words = [];
@@ -22,6 +23,7 @@ function complete(options) {
 
   options = options || {};
   commands = options.commands || exports.commands || {};
+  commandOptions = options.commandOptions || exports.commandOptions || {};
   opt = options.options || exports.options;
   program = options.program || exports.program;
 
@@ -46,7 +48,7 @@ function complete(options) {
     // further. This gets caught by the uncaughtException listener
     // and stops anymore synchronous code from being executed.
     // Yes, it is hacky.
-    throw 'stop';
+    throw '';
   }
 }
 
@@ -59,6 +61,7 @@ function completeWords() {
   var i = 1;
   var word;
   var out;
+  var cmdOpt = opt;
 
   // Reduce
   for (; i < l; i++) {
@@ -71,6 +74,10 @@ function completeWords() {
     } else {
       if (command[word] && hop.call(command, word)) {
         command = command[word];
+
+        if ( commandOptions[ word ]  && hop.call( commandOptions, word ) ) {
+            cmdOpt = commandOptions[ word ];
+        }
       } else {
         break;
       }
@@ -103,6 +110,12 @@ function completeWords() {
 
     // Resolve position-independent options.
     // Possibly add dynamic behavior here.
+    out = match(cur, cmdOpt);
+    if (out) {
+      echo(out);
+      return;
+    }
+
     out = match(cur, opt);
     if (out) {
       echo(out);
@@ -334,7 +347,7 @@ complete.init = function() {
 
     // If there are still any callbacks on the event loop,
     // we need to kill the current stack immediately.
-    throw 'stop';
+    throw '';
   }
 
   return this;