Merge pull request #347 from tonylukasavage/issue-346

Issue #346, fix collisions when option and first arg have same name

index.js

@@ -287,8 +287,8 @@ Command.prototype.action = function(fn) {
 
     fn.apply(self, args);
   };
-  this.parent.on(this._name, listener);
-  if (this._alias) this.parent.on(this._alias, listener);
+  this.parent.on('action_' + this._name, listener);
+  if (this._alias) this.parent.on('action_' + this._alias, listener);
   return this;
 };
 
@@ -564,8 +564,8 @@ Command.prototype.parseArgs = function(args, unknown) {
 
   if (args.length) {
     name = args[0];
-    if (this.listeners(name).length) {
-      this.emit(args.shift(), args, unknown);
+    if (this.listeners('action_' + name).length) {
+      this.emit('action_' + args.shift(), args, unknown);
     } else {
       this.emit('*', args);
     }

test/test.options.same-name-arg.js

@@ -0,0 +1,14 @@
+/**
+ * Module dependencies.
+ */
+
+var program = require('../')
+  , should = require('should');
+
+program
+  .version('0.0.1')
+  .option('--string <n>', 'pass a string')
+
+program.parse('node test string --string myString'.split(' '));
+program.string.should.equal('myString');
+program.args.should.containEql('string');