Merge pull request #228 from KenGorab/command-flags-dont-depend-on-position

Command flags no longer depend on position

Author: Diullei

src/expose/Expose.ts

@@ -119,7 +119,10 @@ class Expose {
 				opts.default[option.name] = option.default;
 			}
 			// we parse our own types
-			if (option.type !== 'number') {
+			if (option.type === 'flag') {
+				opts.boolean.push(option.name);
+			}
+			else if (option.type !== 'number') {
 				opts.string.push(option.name);
 			}
 		});
@@ -217,7 +220,7 @@ class Expose {
 		// command options (option that takes priority, like --version etc)
 		for (i = 0, ii = options.length; i < ii; i++) {
 			opt = options[i];
-			if (opt.command && ctx.hasOpt(opt.name, true)) {
+			if (opt.command && ctx.hasOpt(opt.name, true) && ctx.getOpt(opt.name)) {
 				return this.executeCommand(opt.command, ctx);
 			}
 		}

test/nspec/cases/install-save-jquery/command.txt

@@ -0,0 +1,2 @@
+install jquery -c f7cfda
+install --save jquery -c f7cfda

test/nspec/cases/install-save-jquery/expected/out.txt

@@ -0,0 +1,23 @@
+
+ - jquery / jquery : f7cfda : 2015-04-20 17:59
+      
+   f7cfda | 2015-04-20 17:59 | Robert Dennis @ rdennis   
+    | Add optional jQueryAlias to $(callback) and $().ready(callback).   
+
+>> running install..
+
+>> written 1 file:
+
+    - jquery/jquery.d.ts
+
+
+ - jquery / jquery : f7cfda : 2015-04-20 17:59
+      
+   f7cfda | 2015-04-20 17:59 | Robert Dennis @ rdennis   
+    | Add optional jQueryAlias to $(callback) and $().ready(callback).   
+
+>> running install..
+
+>> written 1 file:
+
+    - jquery/jquery.d.ts

test/nspec/cases/install-save-jquery/expected/tsd.json

@@ -0,0 +1,12 @@
+{
+  "version": "v4",
+  "repo": "borisyankov/DefinitelyTyped",
+  "ref": "master",
+  "path": "typings",
+  "bundle": "typings/tsd.d.ts",
+  "installed": {
+    "jquery/jquery.d.ts": {
+      "commit": "f7cfda9f1a6d4de9953f23db03fd5095ac216d41"
+    }
+  }
+}

test/nspec/cases/install-save-jquery/expected/typings/jquery/jquery.d.ts

@@ -0,0 +1 @@
+/// <reference path="jquery/jquery.d.ts" />

test/nspec/cases/install-save-jquery/expected/typings/tsd.d.ts

@@ -0,0 +1,2 @@
+query d3 --info
+query --info d3

test/nspec/cases/query-d3-info/command.txt

@@ -0,0 +1,13 @@
+
+ - d3 / d3    
+   >> d3JS                 : d3js.org
+    @ Alex Ford            : github.com/gustavderdrache
+    @ Boris Yankov         : github.com/borisyankov
+    < d3 (external module) 
+
+
+ - d3 / d3    
+   >> d3JS                 : d3js.org
+    @ Alex Ford            : github.com/gustavderdrache
+    @ Boris Yankov         : github.com/borisyankov
+    < d3 (external module) 

test/nspec/cases/query-d3-info/expected/out.txt

@@ -0,0 +1,2 @@
+query jquery --history -c f7cfda
+query --history jquery -c f7cfda

test/nspec/cases/query-jquery-history/command.txt

@@ -0,0 +1,11 @@
+
+ - jquery / jquery : f7cfda : 2015-04-20 17:59
+      
+   f7cfda | 2015-04-20 17:59 | Robert Dennis @ rdennis   
+    | Add optional jQueryAlias to $(callback) and $().ready(callback).   
+
+
+ - jquery / jquery : f7cfda : 2015-04-20 17:59
+      
+   f7cfda | 2015-04-20 17:59 | Robert Dennis @ rdennis   
+    | Add optional jQueryAlias to $(callback) and $().ready(callback).