Allow exiting shell with 'exit'.

cmd_shell.nim

@@ -1,20 +1,25 @@
-import cliutils, linenoise, os, osproc, sequtils, strutils
+import cliutils, cstrutils, docopt, linenoise, os, osproc, sequtils, strutils
+
+import "./version.nim"
 
 proc writeOutput(msg, errMsg: TaintedString, cmd: string): void =
-  if msg != nil: stdout.writeLine(msg)
+  if not msg.isEmptyOrWhitespace: stdout.writeLine(msg)
-  if errMsg != nil: stderr.writeLine(errMsg)
+  if not errMsg.isEmptyOrWhitespace: stderr.writeLine(errMsg)
 
 when isMainModule:
 
-  if paramCount() == 0:
+  let usage = """
-    stderr.writeLine "cmd_shell: no arguments"
+Usage:
-    quit(QuitFailure)
+  cmd_shell [--prepend-args] <cmd> [-- <args>...]
+"""
+  # Parse arguments
+  let args = docopt(usage, version = CMD_SHELL_VERSION)
 
-  let cmdPrompt = paramStr(1)
+  let cmdPrompt = $args["<cmd>"]
   let cmd = '"' & cmdPrompt & '"'
 
-  let args =
+  let argsForCmd =
-    if paramCount() > 1: commandLineParams()[1..^1].mapIt("'" & $it & "'").join(" ")
+    if args["<args>"]: @(args["<args>"]).mapIt("'" & $it & "'").join(" ")
     else: ""
 
   discard historySetMaxLen(
@@ -23,8 +28,10 @@ when isMainModule:
 
   var line = readLine(cmdPrompt & "> ")
 
-  while line != nil:
+  while line != nil and cmpIgnoreCase(line, "exit") != 0:
-    discard exec(cmd & " " & args & $line, "", [], nil, {poUsePath, poEvalCommand}, writeOutput)
+    if args["--prepend-args"]:
+      discard exec(cmd & " " & argsForCmd & " " & $line, "", [], nil, {poUsePath, poEvalCommand}, writeOutput)
+    else:
+      discard exec(cmd & " " & $line & " " & argsForCmd, "", [], nil, {poUsePath, poEvalCommand}, writeOutput)
     historyAdd(line)
     line = readLine(cmdPrompt & "> ")
-

cmd_shell.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.1.0"
+version       = "1.2.0"
 author        = "Jonathan Bernard"
 description   = "Wrapper around CLI commands (passing input as arguments)."
 license       = "MIT"
@@ -8,4 +8,12 @@ bin           = @["cmd_shell"]
 
 # Dependencies
 
-requires @["nim >= 0.16.1", "cliutils"]
+requires @[
+  "nim >= 0.16.1",
+  "cliutils",
+
+  "https://git.jdb-labs.com/jdb/update-nim-package-version"
+]
+
+task updateVersion, "Update the version of this package.":
+  exec "update_nim_package_version cmd_shell 'version.nim'"

version.nim

@@ -0,0 +1 @@
+const CMD_SHELL_VERSION* = "1.2.0"