4 Commits
0.3.1 ... 0.3.5

2 changed files with 16 additions and 5 deletions

View File

@ -1,5 +1,7 @@
import docopt, json, osproc, posix, nre, streams, strutils, strtabs
import docopt, json, osproc, posix, nre, streams, strtabs, unicode
import os except sleep
import strutils except toUpper, toLower
type
CombinedConfig* = object
@ -13,7 +15,16 @@ proc getVal*(cfg: CombinedConfig, key, default: string): string =
if cfg.docopt[argKey]: return $cfg.docopt[argKey]
elif existsEnv(envKey): return getEnv(envKey)
elif cfg.json.hasKey(jsonKey): return cfg.json[jsonKey].getStr
elif cfg.json.hasKey(jsonKey):
let node = cfg.json[jsonKey]
case node.kind
of JString: return node.getStr
of JInt: return $node.getInt
of JFloat: return $node.getFloat
of JBool: return $node.getBool
of JNull: return ""
of JObject: return $node
of JArray: return $node
else: return default
@ -108,7 +119,7 @@ proc onStop(sig: cint) {.noconv.} =
quit(QuitSuccess)
proc daemonize*(pidfile, si, so, se: string, daemonMain: proc(): void): int =
proc daemonize*(pidfile, si, so, se: string, daemonMain: proc(): void): Pid =
if fileExists(pidfile):
raise newException(IOError, "pidfile " & pidfile & " already exists, daemon already running?")

View File

@ -1,11 +1,11 @@
# Package
version = "0.3.1"
version = "0.3.5"
author = "Jonathan Bernard"
description = "Helper functions for writing command line interfaces."
license = "MIT"
# Dependencies
requires @["nim >= 0.15.3", "docopt"]
requires @["nim >= 0.18.0", "docopt"]