jdb/nim-cli-utils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jdb:0.6.1
Branches Tags
jdb:main
jdb:0.9.1 jdb:0.9.0 jdb:0.8.1 jdb:0.8.0 jdb:0.7.1 jdb:0.7.0 jdb:0.6.5 jdb:0.6.4 jdb:0.6.3 jdb:0.6.2 jdb:0.6.1 jdb:0.6.0 jdb:0.5.1 jdb:0.5.0 jdb:0.4.1 jdb:0.4.0 jdb:0.3.5 jdb:0.3.4 jdb:0.3.3 jdb:0.3.2 jdb:0.3.1 jdb:0.3.0 jdb:0.2.1 jdb:0.2.0 jdb:0.1.0
...
compare: jdb:0.6.4
Branches Tags
jdb:main
jdb:0.9.1 jdb:0.9.0 jdb:0.8.1 jdb:0.8.0 jdb:0.7.1 jdb:0.7.0 jdb:0.6.5 jdb:0.6.4 jdb:0.6.3 jdb:0.6.2 jdb:0.6.1 jdb:0.6.0 jdb:0.5.1 jdb:0.5.0 jdb:0.4.1 jdb:0.4.0 jdb:0.3.5 jdb:0.3.4 jdb:0.3.3 jdb:0.3.2 jdb:0.3.1 jdb:0.3.0 jdb:0.2.1 jdb:0.2.0 jdb:0.1.0

5 Commits
0.6.1 ... 0.6.4

Author SHA1 Message Date
Jonathan Bernard
438ea5f7b3 Bugfix for queryParamsToCliArgs. 2020-03-23 08:19:40 -05:00
Jonathan Bernard
e9351fbd9d Fix bug in CombinedConfig: need to allow for config values not defined in the possible CLI args. 2019-02-18 16:06:10 -06:00
Jonathan Bernard
8036af6bc8 Add CombinedConfig.getVal that raises an exception if the config key is not found. 2019-02-18 15:38:30 -06:00
Jonathan Bernard
b9a69809eb Merge in fix lost from 0.5.1 2019-02-18 15:34:09 -06:00
Jonathan Bernard
969af93425 Bugfix for new HTTP<->CLI functionality. 2018-10-03 03:42:10 -05:00
2 changed files with 11 additions and 8 deletions
Expand all files Collapse all files

17
cliutils.nim
View File

@ -10,12 +10,12 @@ type
TermColor = ForegroundColor or BackgroundColor TermColor = ForegroundColor or BackgroundColor
proc getVal*(cfg: CombinedConfig, key, default: string): string = proc getVal*(cfg: CombinedConfig, key: string): string =
let argKey = "--" & key let argKey = "--" & key
let envKey = key.replace('-', '_').toUpper let envKey = key.replace('-', '_').toUpper
let jsonKey = key.replace(re"(-\w)", proc (m: RegexMatch): string = ($m)[1..1].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 existsEnv(envKey): return getEnv(envKey)
elif cfg.json.hasKey(jsonKey): elif cfg.json.hasKey(jsonKey):
let node = cfg.json[jsonKey] let node = cfg.json[jsonKey]
@ -27,8 +27,11 @@ proc getVal*(cfg: CombinedConfig, key, default: string): string =
of JNull: return "" of JNull: return ""
of JObject: return $node of JObject: return $node
of JArray: return $node of JArray: return $node
else: return default else: raise newException(ValueError, "cannot find a configuration value for \"" & key & "\"")
proc getVal*(cfg: CombinedConfig, key, default: string): string =
try: return getVal(cfg, key)
except: return default
proc loadEnv*(): StringTableRef = proc loadEnv*(): StringTableRef =
result = newStringTable() result = newStringTable()
@ -196,8 +199,8 @@ proc queryParamsToCliArgs*(queryParams: Table[string, string]): seq[string] =
if k.startsWith("arg"): result.add(v) if k.startsWith("arg"): result.add(v)
else : 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] = proc queryParamsToCliArgs*(queryParams: StringTableRef): seq[string] =
result = @[] result = @[]
@ -207,5 +210,5 @@ proc queryParamsToCliArgs*(queryParams: StringTableRef): seq[string] =
if k.startsWith("arg"): result.add(v) if k.startsWith("arg"): result.add(v)
else : 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

2
cliutils.nimble
View File

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