Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
49342818ec | |||
95f3bc48bd | |||
64fdcb359d | |||
4ed613523b | |||
441063a393 | |||
cce4e5ec80 |
31
cliutils.nim
31
cliutils.nim
@ -1,5 +1,7 @@
|
|||||||
import docopt, json, osproc, posix, nre, streams, strutils, strtabs
|
import docopt, json, osproc, posix, nre, streams, strtabs, terminal, unicode
|
||||||
import os except sleep
|
import os except sleep
|
||||||
|
import strutils except toUpper, toLower
|
||||||
|
|
||||||
|
|
||||||
type
|
type
|
||||||
CombinedConfig* = object
|
CombinedConfig* = object
|
||||||
@ -13,7 +15,16 @@ proc getVal*(cfg: CombinedConfig, key, default: string): string =
|
|||||||
|
|
||||||
if cfg.docopt[argKey]: return $cfg.docopt[argKey]
|
if cfg.docopt[argKey]: return $cfg.docopt[argKey]
|
||||||
elif existsEnv(envKey): return getEnv(envKey)
|
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
|
else: return default
|
||||||
|
|
||||||
|
|
||||||
@ -71,7 +82,7 @@ proc exec*(command: string, workingDir: string = "",
|
|||||||
args: openArray[string] = [], env: StringTableRef = nil,
|
args: openArray[string] = [], env: StringTableRef = nil,
|
||||||
options: set[ProcessOption] = {poUsePath},
|
options: set[ProcessOption] = {poUsePath},
|
||||||
msgCB: HandleProcMsgCB = nil): int
|
msgCB: HandleProcMsgCB = nil): int
|
||||||
{.tags: [ExecIOEffect, ReadIOEffect], gcsafe.} =
|
{.tags: [ExecIOEffect, ReadIOEffect, RootEffect], gcsafe.} =
|
||||||
|
|
||||||
var p = startProcess(command, workingDir, args, env, options)
|
var p = startProcess(command, workingDir, args, env, options)
|
||||||
result = waitFor(p, msgCB, command)
|
result = waitFor(p, msgCB, command)
|
||||||
@ -108,7 +119,7 @@ proc onStop(sig: cint) {.noconv.} =
|
|||||||
|
|
||||||
quit(QuitSuccess)
|
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):
|
if fileExists(pidfile):
|
||||||
raise newException(IOError, "pidfile " & pidfile & " already exists, daemon already running?")
|
raise newException(IOError, "pidfile " & pidfile & " already exists, daemon already running?")
|
||||||
@ -160,3 +171,15 @@ proc daemonize*(pidfile, si, so, se: string, daemonMain: proc(): void): int =
|
|||||||
daemonMain()
|
daemonMain()
|
||||||
|
|
||||||
return pid1
|
return pid1
|
||||||
|
|
||||||
|
proc termFG*(color: ForegroundColor, bright, bold = false): string =
|
||||||
|
var colorVal = ord(color)
|
||||||
|
if bright: inc(colorVal, 60)
|
||||||
|
return "\e[" & $colorVal & (if bold: ";1" else: "") & "m"
|
||||||
|
|
||||||
|
proc termBG*(color: BackgroundColor, bright, bold = false): string =
|
||||||
|
var colorVal = ord(color)
|
||||||
|
if bright: inc(colorVal, 60)
|
||||||
|
return "\e[" & $colorVal & "m"
|
||||||
|
|
||||||
|
const termReset* = "\e[0;m"
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
# Package
|
# Package
|
||||||
|
|
||||||
version = "0.3.0"
|
version = "0.4.0"
|
||||||
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"
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
|
|
||||||
requires @["nim >= 0.15.3", "docopt"]
|
requires @["nim >= 0.18.0", "docopt"]
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user