Fix regex in stripAnsi.

cliutils.nim

@@ -21,14 +21,19 @@ proc termColor*(color: TermColor, bright, bold = false): string =
   if bright: inc(colorVal, 60)
   return "\e[" & $colorVal & (if bold: ";1" else: "") & "m"
 
-proc withColor*(str: string, color: TermColor, bright, bold = false): string =
+
+proc withColor*(str: string, color: TermColor, bright, bold, skipReset = false): string =
+  if skipReset:
     return termColor(color, bright, bold) & str
+  else:
+    return termColor(color, bright, bold) & str & termReset
 
 
 proc stripAnsi*(str: string): string =
-  let STRIP_ANSI_REGEX = re"\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]"
+  let STRIP_ANSI_REGEX = re"\x1B\[([0-9]{1,2}(;[0-9]{0,2})?)?[m|K]"
   return str.replace(STRIP_ANSI_REGEX, "")
 
+
 proc doParseQueryParams[T](queryParams: T): seq[string] =
   result = @[]
 
@@ -40,8 +45,10 @@ proc doParseQueryParams[T](queryParams: T): seq[string] =
       result.add("--" & k)
       if v != "true": result.add(v) # support things like ?verbose=true -> cmd --verbose
 
+
 proc queryParamsToCliArgs*(queryParams: Table[string, string]): seq[string] =
   doParseQueryParams(queryParams)
 
+
 proc queryParamsToCliArgs*(queryParams: StringTableRef): seq[string] =
   doParseQueryParams(queryParams)

cliutils.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.9.0"
+version       = "0.10.1"
 author        = "Jonathan Bernard"
 description   = "Helper functions for writing command line interfaces."
 license       = "MIT"

cliutils/config.nim

@@ -6,13 +6,13 @@ type
     docopt*: Table[string, Value]
     json*: JsonNode
 
-func keyNames(key: string): tuple[arg, env, json: string] {.raises: [KeyError].} =
+proc keyNames(key: string): tuple[arg, env, json: string] {.raises: [KeyError].} =
   try:
     result = (
       "--" & key,
       key.replace('-', '_').toUpper,
       key.replace(re"(-\w)", proc (m: RegexMatch): string = ($m)[1..1].toUpper))
-  except CatchableError:
+  except Exception:
     raise newException(KeyError, "invalid config key: '" & key & "'")
 
 template walkFieldDefs*(t: NimNode, body: untyped) =
@@ -95,7 +95,7 @@ proc getJson*(
     elif cfg.json.hasKey(jsonKey): return cfg.json[jsonKey]
     else: raise newException(ValueError, "cannot find a configuration value for \"" & key & "\"")
   except Exception:
-    raise newException(ValueError, "cannot parse value as JSON:" & getCurrentExceptionMsg())
+    raise newException(ValueError, "cannot parse [" & getVal(cfg, key) & "] as JSON:" & getCurrentExceptionMsg())
 
 proc getJson*(
     cfg: CombinedConfig,

cliutils/procutil.nim

@@ -47,7 +47,7 @@ proc exec*(command: string, workingDir: string = "",
            args: openArray[string] = [], env: StringTableRef = nil,
            options: set[ProcessOption] = {poUsePath},
            msgCB: HandleProcMsgCB = nil): int
-    {.tags: [ExecIOEffect, ReadIOEffect, RootEffect], gcsafe.} =
+    {.tags: [ExecIOEffect, ReadIOEffect, RootEffect].} =
 
   var p = startProcess(command, workingDir, args, env, options)
   result = waitFor(p, msgCB, command)