erik/kobalt-exec
erik/kobalt-exec
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #4 from ethauvin/cbeust-fix

Browse source 
First rough ProcessBuilder implementation.
This commit is contained in:
Erik C. Thauvin 2016-07-11 17:57:11 -07:00 • committed by GitHub
commit ecbe481de6
5 changed files with 72 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.idea/kobalt.xml generated
View file

@ -16,7 +16,7 @@
<KobaltProjectSettings>
<option name="autoDownloadKobalt" value="true" />
<option name="externalProjectPath" value="$PROJECT_DIR$/example" />
<option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.843" />
<option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.845" />
<option name="useAutoImport" value="true" />
</KobaltProjectSettings>
</option>

3
example/kobalt/src/Build.kt
View file

@ -37,6 +37,7 @@ val p = project {
}
exec {
commandLine(args = arrayOf("ls"))
commandLine(args = arrayOf("ls", "-- a"), dir = "../libs", fail = arrayOf(Fail.EXIT))
commandLine(arrayOf("cmd", "/c", "echo", "Test"), os = arrayOf("Win"), fail = arrayOf(Fail.STDERR))
}
}

2
example/kobalt/wrapper/kobalt-wrapper.properties
View file

@ -1 +1 @@
kobalt.version=0.843
kobalt.version=0.845

2
kobalt/wrapper/kobalt-wrapper.properties
View file

@ -1 +1 @@
kobalt.version=0.843
kobalt.version=0.845

75
src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt
View file

@ -36,6 +36,11 @@ import com.beust.kobalt.api.*
import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.misc.log
import java.io.BufferedReader
import java.io.File
import java.io.InputStream
import java.io.InputStreamReader
import java.util.concurrent.TimeUnit
class ExecPlugin : BasePlugin(), ITaskContributor {
// ITaskContributor
@ -62,15 +67,44 @@ class ExecPlugin : BasePlugin(), ITaskContributor {
if (config != null) {
config.commandLines.forEach {
val dir = if (it.dir.isNullOrBlank()) project.directory else it.dir
var execute = (it.os.size == 0)
if (!execute) {
val curOs: String = System.getProperty("os.name")
it.os.forEach {
val loc = File(dir)
if (loc.isDirectory()) {
var execute = (it.os.size == 0)
if (!execute) {
val curOs: String = System.getProperty("os.name")
it.os.forEach os@ {
execute = curOs.startsWith(it, true)
if (execute) return@os
}
}
if (execute) {
log(2, "> " + it.args.joinToString(" "))
val pb = ProcessBuilder().command(it.args.toList())
pb.directory(loc)
val proc = pb.start()
val err = proc.waitFor(30, TimeUnit.SECONDS)
val stdin = if (proc.inputStream.available() > 0) fromStream(proc.inputStream) else listOf()
val stderr = if (proc.errorStream.available() > 0) fromStream(proc.errorStream) else listOf()
if (err == false) {
error("Cannot run program \"" + it.args.joinToString(" ")
+ "\" (in directory \"$dir\"): TIMEOUT")
} else if (it.fail.contains(Fail.EXIT) && proc.exitValue() > 0) {
error("Program \"" + it.args.joinToString(" ")
+ "\" (in directory \"$dir\"): EXIT ${proc.exitValue()}")
} else if (it.fail.contains(Fail.STDERR) && stderr.isNotEmpty()) {
error("Program \"" + it.args.joinToString(" ") + "\" (in directory \"$dir\"): STDERR, "
+ stderr[0] + "...")
} else if (it.fail.contains(Fail.STDIN) && stdin.isNotEmpty()) {
error("Program \"" + it.args.joinToString(" ") + "\" (in directory \"$dir\"): STDIN, "
+ stdin[0] + "...")
}
success = true
}
} else {
error("Invalid directory: ${loc.canonicalPath}")
}
log(2, "Executing: '" + it.args.joinToString(" ") + "' in '$dir'")
success = true
}
}
@ -81,16 +115,37 @@ class ExecPlugin : BasePlugin(), ITaskContributor {
fun addExecConfig(projectName: String, config: ExecConfig) {
configs.put(projectName, config)
}
private fun fromStream(ins: InputStream): List<String> {
val result = arrayListOf<String>()
val br = BufferedReader(InputStreamReader(ins))
var line = br.readLine()
while (line != null) {
result.add(line)
log(2, line)
line = br.readLine()
}
log(2, "")
return result
}
}
data class CommandLine(var args: Array<String> = emptyArray(), var dir: String = "", var os: Array<String> = emptyArray())
enum class Fail() {
STDERR, STDIN, EXIT
}
data class CommandLine(var args: Array<String> = emptyArray(), var dir: String = "",
var os: Array<String> = emptyArray(), var fail: Array<Fail> = emptyArray())
data class ExecConfig(val project: Project) {
val commandLines = arrayListOf<CommandLine>()
@Directive
public fun commandLine(args: Array<String> = emptyArray(), dir: String = "", os: Array<String> = emptyArray()) {
if (args.size > 0) commandLines.add(CommandLine(args, dir, os))
public fun commandLine(args: Array<String> = emptyArray(), dir: String = "", os: Array<String> = emptyArray(),
fail: Array<Fail> = emptyArray()) {
if (args.size > 0) commandLines.add(CommandLine(args, dir, os, fail))
}
}