Make stripAnsi GC-safe.

cliutils.nim

@@ -15,7 +15,7 @@ proc getVal*(cfg: CombinedConfig, key: string): string =
   let envKey = key.replace('-', '_').toUpper
   let jsonKey = key.replace(re"(-\w)", proc (m: RegexMatch): string = ($m)[1..1].toUpper)
 
-  if cfg.docopt[argKey]: return $cfg.docopt[argKey]
+  if cfg.docopt.contains(argKey) and cfg.docopt[argKey]: return $cfg.docopt[argKey]
   elif existsEnv(envKey): return getEnv(envKey)
   elif cfg.json.hasKey(jsonKey):
     let node = cfg.json[jsonKey]
@@ -101,7 +101,7 @@ proc execWithOutput*(command: string, workingDir:string = "",
   result = (TaintedString"", TaintedString"", -1)
   var outSeq, errSeq: seq[TaintedString]
   outSeq = @[]; errSeq = @[]
-  var outputCollector = combineProcMsgHandlers(msgCB,
+  let outputCollector = combineProcMsgHandlers(msgCB,
     proc(outMsg, errMsg: TaintedString, cmd: string): void {.closure.} =
       if outMsg.len > 0: outSeq.add(outMsg)
       if errMsg.len > 0: errSeq.add(errMsg))
@@ -187,9 +187,10 @@ proc termColor*(color: TermColor, bright, bold = false): string =
 proc withColor*(str: string, color: TermColor, bright, bold = false): string =
   return termColor(color, bright, bold) & str
 
-let STRIP_ANSI_REGEX = re"\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]"
 
-proc stripAnsi*(str: string): string = return str.replace(STRIP_ANSI_REGEX, "")
+proc stripAnsi*(str: string): string =
+  let STRIP_ANSI_REGEX = re"\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]"
+  return str.replace(STRIP_ANSI_REGEX, "")
 
 proc queryParamsToCliArgs*(queryParams: Table[string, string]): seq[string] =
   result = @[]
@@ -199,8 +200,8 @@ proc queryParamsToCliArgs*(queryParams: Table[string, string]): seq[string] =
     if k.startsWith("arg"): result.add(v)
 
     else :
-      result[1].add("--" & k)
+      result.add("--" & k)
-      if v != "true": result[1].add(v) # support things like ?verbose=true -> cmd --verbose
+      if v != "true": result.add(v) # support things like ?verbose=true -> cmd --verbose
 
 proc queryParamsToCliArgs*(queryParams: StringTableRef): seq[string] =
   result = @[]

cliutils.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.6.2"
+version       = "0.6.5"
 author        = "Jonathan Bernard"
 description   = "Helper functions for writing command line interfaces."
 license       = "MIT"
@@ -8,4 +8,3 @@ license       = "MIT"
 # Dependencies
 
 requires @["nim >= 0.19.0", "docopt >= 0.6.8"]
-