Merge pull request #342 from andreaferretti/fix329

Fixed https://github.com/nim-lang/nimble/issues/339

src/nimblepkg/options.nim

@@ -235,11 +235,12 @@ proc parseArgument*(key: string, result: var Options) =
   else:
     discard
 
-proc parseFlag*(flag, val: string, result: var Options) =
+proc parseFlag*(flag, val: string, result: var Options, kind = cmdLongOption) =
   var wasFlagHandled = true
+  let f = flag.normalize()
 
   # Global flags.
-  case flag.normalize()
+  case f
   of "help", "h": writeHelp()
   of "version", "v": writeVersion()
   of "accept", "y": result.forcePrompts = forcePromptYes
@@ -248,28 +249,28 @@ proc parseFlag*(flag, val: string, result: var Options) =
   of "verbose": result.verbosity = LowPriority
   of "debug": result.verbosity = DebugPriority
   # Action-specific flags.
-  of "installed", "i":
-    if result.action.typ in [actionSearch, actionList]:
-      result.queryInstalled = true
-    else:
-      wasFlagHandled = false
-  of "depsonly", "d":
-    if result.action.typ == actionInstall:
-      result.depsOnly = true
-    else:
-      wasFlagHandled = false
-  of "ver":
-    if result.action.typ in [actionSearch, actionList]:
-      result.queryVersions = true
-    else:
-      wasFlagHandled = false
   else:
     case result.action.typ
-    of actionCompile, actionDoc:
+    of actionSearch, actionList:
-      if val == "":
+      case f
-        result.action.compileOptions.add("--" & flag)
+      of "installed", "i":
+        result.queryInstalled = true
+      of "ver":
+        result.queryVersions = true
       else:
-        result.action.compileOptions.add("--" & flag & ":" & val)
+        wasFlagHandled = false
+    of actionInstall:
+      case f
+      of "depsonly", "d":
+        result.depsOnly = true
+      else:
+        wasFlagHandled = false
+    of actionCompile, actionDoc:
+      let prefix = if kind == cmdShortOption: "-" else: "--"
+      if val == "":
+        result.action.compileOptions.add(prefix & flag)
+      else:
+        result.action.compileOptions.add(prefix & flag & ":" & val)
     of actionCustom:
       result.action.flags[flag] = val
     else:
@@ -310,7 +311,7 @@ proc parseCmdLine*(): Options =
       else:
         parseArgument(key, result)
     of cmdLongOption, cmdShortOption:
-      parseFlag(key, val, result)
+      parseFlag(key, val, result, kind)
     of cmdEnd: assert(false) # cannot happen
 
   # Set verbosity level.

tests/tester.nim

@@ -52,6 +52,10 @@ test "can distinguish package reading in nimbleDir vs. other dirs (#304)":
   cd "issue304" / "package-test":
     check execNimble("tasks").exitCode == QuitSuccess
 
+test "can accept short flags (#329)":
+  cd "nimscript":
+    check execNimble("c", "-d:release", "nimscript.nim").exitCode == QuitSuccess
+
 test "can build with #head and versioned package (#289)":
   cd "issue289":
     check execNimble(["install", "-y"]).exitCode == QuitSuccess