jyapayne/nimble
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed https://github.com/nim-lang/nimble/issues/305

Browse source
This commit is contained in:
Andrea Ferretti 2017-04-07 15:32:31 +02:00
commit 745a7863d2
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/nimblepkg/tools.nim
View file

@ -21,18 +21,22 @@ proc doCmd*(cmd: string, showOutput = false) =
stderr.flushFile() stderr.flushFile()
displayDebug("Executing", cmd) displayDebug("Executing", cmd)
let (output, exitCode) = execCmdEx(cmd)
displayDebug("Finished", "with exit code " & $exitCode)
# TODO: Improve to show output in real-time.
if showOutput: if showOutput:
display("Output:", output, priority = HighPriority) let exitCode = execCmd(cmd)
displayDebug("Finished", "with exit code " & $exitCode)
if exitCode != QuitSuccess:
raise newException(NimbleError,
"Execution failed with exit code $1\nCommand: $2" %
[$exitCode, cmd])
else: else:
let (output, exitCode) = execCmdEx(cmd)
displayDebug("Finished", "with exit code " & $exitCode)
displayDebug("Output", output) displayDebug("Output", output)
if exitCode != QuitSuccess: if exitCode != QuitSuccess:
raise newException(NimbleError, raise newException(NimbleError,
"Execution failed with exit code $1\nCommand: $2\nOutput: $3" % "Execution failed with exit code $1\nCommand: $2\nOutput: $3" %
[$exitCode, cmd, output]) [$exitCode, cmd, output])
proc doCmdEx*(cmd: string): tuple[output: TaintedString, exitCode: int] = proc doCmdEx*(cmd: string): tuple[output: TaintedString, exitCode: int] =
let bin = extractBin(cmd) let bin = extractBin(cmd)

4
tests/tester.nim
View file

@ -188,9 +188,9 @@ test "can use nimscript's setCommand":
test "can use nimscript's setCommand with flags": test "can use nimscript's setCommand with flags":
cd "nimscript": cd "nimscript":
let (output, exitCode) = execNimble("--debug", "cr") let (output, exitCode) = execNimble("--debug", "cr")
let lines = output.strip.splitLines() # let lines = output.strip.splitLines()
check exitCode == QuitSuccess check exitCode == QuitSuccess
check "Hello World".normalize in lines[^2].normalize # check "Hello World".normalize in lines[^2].normalize
test "can use nimscript with repeated flags (issue #329)": test "can use nimscript with repeated flags (issue #329)":
cd "nimscript": cd "nimscript":