erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Better stream management in RunCommand.

Browse source
This commit is contained in:
Cedric Beust 2015-11-15 17:09:24 -08:00
parent de6fcd2c45
commit cd71653010
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/kotlin/com/beust/kobalt/misc/RunCommand.kt
View file

@ -26,7 +26,8 @@ open class RunCommand(val command: String) {
val pb = ProcessBuilder(allArgs) val pb = ProcessBuilder(allArgs)
pb.directory(directory) pb.directory(directory)
log(2, "Running command: " + allArgs.joinToString(" ") + "\n Current directory: $directory") log(2, "Running command: " + allArgs.joinToString(" ") +
"\n Current directory: ${directory.absolutePath}")
val process = pb.start() val process = pb.start()
pb.environment().let { pbEnv -> pb.environment().let { pbEnv ->
env.forEach { env.forEach {
@ -38,16 +39,22 @@ open class RunCommand(val command: String) {
if (callSucceeded) { if (callSucceeded) {
successCallback(fromStream(process.inputStream)) successCallback(fromStream(process.inputStream))
} else { } else {
errorCallback(listOf("$command failed") + fromStream(process.errorStream)) val stream = if (process.errorStream.available() > 0) process.errorStream
else if (process.inputStream.available() > 0) process.inputStream
else null
val errorString =
if (stream != null) fromStream(stream).joinToString("\n")
else "<no output>"
errorCallback(listOf("$command failed") + errorString)
} }
return if (callSucceeded) 0 else 1 return if (callSucceeded) 0 else 1
} }
private fun fromStream(ins: InputStream) : List<String> { private fun fromStream(ins: InputStream) : List<String> {
val result = arrayListOf<String>() val result = arrayListOf<String>()
val br = BufferedReader(InputStreamReader(ins)) val br = BufferedReader(InputStreamReader(ins))
var line = br.readLine() var line = br.readLine()
while (line != null) { while (line != null) {
result.add(line) result.add(line)
line = br.readLine() line = br.readLine()