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

Added ConfigActor injection.

Browse source 
Added Tarvis CI configuration.
This commit is contained in:
Erik C. Thauvin 2016-07-12 17:56:49 -07:00
parent 47beeb1510
commit 0063848981
9 changed files with 105 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.idea/codeStyleSettings.xml generated Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectCodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value />
</option>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Erik's Code Style" />
</component>
</project>

2
.idea/kobalt.xml generated
View file

@ -5,7 +5,7 @@
<KobaltProjectSettings>
<option name="autoDownloadKobalt" value="true" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.847" />
<option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.851" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

4
.idea/misc.xml generated
View file

@ -40,6 +40,10 @@
</component>
<component name="EntryPointsManager">
<entry_points version="2.0" />
<list size="2">
<item index="0" class="java.lang.String" itemvalue="com.beust.kobalt.api.annotation.Directive" />
<item index="1" class="java.lang.String" itemvalue="com.beust.kobalt.api.annotation.Task" />
</list>
</component>
<component name="MavenImportPreferences">
<option name="generalSettings">

13
.travis.yml Normal file
View file

@ -0,0 +1,13 @@
language: java
jdk:
- oraclejdk8
install: true
cache:
directories:
- $HOME/.m2
- $HOME/.kobalt
script: ./kobaltw clean assemble

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

@ -6,10 +6,10 @@ import net.thauvin.erik.kobalt.plugin.exec.*
val repos = repos("https://dl.bintray.com/ethauvin/maven/")
//val pl = plugins(file("../kobaltBuild/libs/kobalt-exec-0.5.0-beta.jar"))
val pl = plugins("net.thauvin.erik:kobalt-exec:0.5.1-beta")
val pl = plugins(file("../kobaltBuild/libs/kobalt-exec-0.5.1-beta.jar"))
//val pl = plugins("net.thauvin.erik:kobalt-exec:0.5.1-beta")
val p = project {
val example = project {
name = "example"
group = "com.example"
@ -40,7 +40,15 @@ val p = project {
}
exec {
commandLine(listOf("cmd", "/c", "echo", "Test"), os = setOf("Win"))
commandLine(listOf("cmd", "/c", "echo", "Test Example 1"), os = setOf("Win"))
commandLine(args = listOf("ls", "-l"), dir = "../libs", os = setOf("Linux", "Win"))
}
}
val example2 = project {
name = "example2"
exec {
commandLine(listOf("cmd", "/c", "echo", "Test Example 2"), os = setOf("Win"))
}
}

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

@ -1 +1 @@
kobalt.version=0.846
kobalt.version=0.851

4
kobalt/src/Build.kt
View file

@ -20,9 +20,7 @@ val p = project {
version = "0.5.1-beta"
pom = Model().apply {
name = project.name
description = "Command line execution plugin for the Kobalt build system"
version = project.version
description = "Command line execution plugin for the Kobalt build system."
url = "https://github.com/ethauvin/kobalt-exec"
licenses = listOf(License().apply {
name = "BSD 3-Clause"

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

@ -1 +1 @@
kobalt.version=0.847
kobalt.version=0.851

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

@ -31,18 +31,23 @@
*/
package net.thauvin.erik.kobalt.plugin.exec
import com.beust.kobalt.Plugins
import com.beust.kobalt.TaskResult
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 com.google.inject.Inject
import com.google.inject.Singleton
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 {
@Singleton
class ExecPlugin @Inject constructor(val configActor: ConfigActor<ExecConfig>) :
BasePlugin(), ITaskContributor, IConfigActor<ExecConfig> by configActor {
// ITaskContributor
override fun tasksFor(project: Project, context: KobaltContext): List<DynamicTask> {
return emptyList()
@ -56,63 +61,64 @@ class ExecPlugin : BasePlugin(), ITaskContributor {
@Task(name = "exec", description = "Execute a command line process.")
fun taskExec(project: Project): TaskResult {
return executeCommands(project)
var result = TaskResult()
configurationFor(project)?.let { config ->
result = executeCommands(project, config)
}
return result
}
private fun executeCommands(project: Project): TaskResult {
private fun executeCommands(project: Project, config: ExecConfig): TaskResult {
var success = true
val config = configs[project.name]
val errorMessage = StringBuilder()
if (config != null) {
for ((args, dir, os, fail) in config.commandLines) {
val wrkDir = File(if (dir.isNullOrBlank()) project.directory else dir)
if (wrkDir.isDirectory) {
var execute = (os.size == 0)
if (!execute) {
val curOs: String = System.getProperty("os.name")
for (name in os) {
execute = curOs.startsWith(name, true)
if (execute) break
}
for ((args, dir, os, fail) in config.commandLines) {
val wrkDir = File(if (dir.isNullOrBlank()) project.directory else dir)
if (wrkDir.isDirectory) {
var execute = (os.size == 0)
if (!execute) {
val curOs: String = System.getProperty("os.name")
for (name in os) {
execute = curOs.startsWith(name, true)
if (execute) break
}
if (execute) {
log(2, "> " + args.joinToString(" "))
val pb = ProcessBuilder().command(args.toList())
pb.directory(wrkDir)
val proc = pb.start()
val err = proc.waitFor(30, TimeUnit.SECONDS)
val stdout = if (proc.inputStream.available() > 0) fromStream(proc.inputStream) else emptyList()
val stderr = if (proc.errorStream.available() > 0) fromStream(proc.errorStream) else emptyList()
val cmdInfo = "Program \"" + args.joinToString(" ") + "\" (in directory \"${wrkDir.path}\"): "
if (err == false) {
errorMessage.append(cmdInfo).append("TIMEOUT")
success = false
} else if (fail.isNotEmpty()) {
val all = fail.contains(Fail.ALL)
val output = fail.contains(Fail.OUTPUT)
if ((all || fail.contains(Fail.EXIT) || fail.contains(Fail.NORMAL)) && proc.exitValue() > 0) {
errorMessage.append(cmdInfo).append("EXIT ${proc.exitValue()}")
if (stderr.isNotEmpty()) errorMessage.append(", STDERR: ").append(stderr[0])
success = false
} else if ((all || output || fail.contains(Fail.STDERR) || fail.contains(Fail.NORMAL))
&& stderr.isNotEmpty()) {
errorMessage.append(cmdInfo).append("STDERR, ").append(stderr[0])
success = false
} else if ((all || output || fail.contains(Fail.STDOUT)) && stdout.isNotEmpty()) {
errorMessage.append(cmdInfo).append("STDOUT, ").append(stdout[0])
success = false
}
}
}
} else {
errorMessage.append("Invalid working directory: \"${wrkDir.canonicalPath}\"")
success = false
}
if (execute) {
log(2, "> " + args.joinToString(" "))
val pb = ProcessBuilder().command(args.toList())
pb.directory(wrkDir)
val proc = pb.start()
val err = proc.waitFor(30, TimeUnit.SECONDS)
val stdout = if (proc.inputStream.available() > 0) fromStream(proc.inputStream) else emptyList()
val stderr = if (proc.errorStream.available() > 0) fromStream(proc.errorStream) else emptyList()
val cmdInfo = "Program \"" + args.joinToString(" ") + "\" (in directory \"${wrkDir.path}\"): "
if (!success) break
if (err == false) {
errorMessage.append(cmdInfo).append("TIMEOUT")
success = false
} else if (fail.isNotEmpty()) {
val all = fail.contains(Fail.ALL)
val output = fail.contains(Fail.OUTPUT)
if ((all || fail.contains(Fail.EXIT) || fail.contains(Fail.NORMAL)) && proc.exitValue() > 0) {
errorMessage.append(cmdInfo).append("EXIT ${proc.exitValue()}")
if (stderr.isNotEmpty()) errorMessage.append(", STDERR: ").append(stderr[0])
success = false
} else if ((all || output || fail.contains(Fail.STDERR) || fail.contains(Fail.NORMAL))
&& stderr.isNotEmpty()) {
errorMessage.append(cmdInfo).append("STDERR, ").append(stderr[0])
success = false
} else if ((all || output || fail.contains(Fail.STDOUT)) && stdout.isNotEmpty()) {
errorMessage.append(cmdInfo).append("STDOUT, ").append(stdout[0])
success = false
}
}
}
} else {
errorMessage.append("Invalid working directory: \"${wrkDir.canonicalPath}\"")
success = false
}
if (!success) break
}
//@TODO until cedric fixes it.
@ -121,11 +127,6 @@ class ExecPlugin : BasePlugin(), ITaskContributor {
return TaskResult(success, errorMessage.toString())
}
private val configs = hashMapOf<String, ExecConfig>()
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))
@ -146,13 +147,13 @@ enum class Fail() {
ALL, NORMAL, STDERR, STDOUT, OUTPUT, EXIT
}
data class CommandLine(var args: List<String> = emptyList(), var dir: String = "",
var os: Set<String> = emptySet(), var fail: Set<Fail> = setOf(Fail.NORMAL))
data class CommandLine(var args: List<String> = emptyList(), var dir: String = "", var os: Set<String> = emptySet(),
var fail: Set<Fail> = setOf(Fail.NORMAL))
data class ExecConfig(val project: Project) {
@Directive
class ExecConfig() {
val commandLines = arrayListOf<CommandLine>()
@Directive
fun commandLine(args: List<String> = emptyList(), dir: String = "", os: Set<String> = emptySet(),
fail: Set<Fail> = setOf(Fail.NORMAL)) {
if (args.size > 0) commandLines.add(CommandLine(args, dir, os, fail))
@ -160,10 +161,9 @@ data class ExecConfig(val project: Project) {
}
@Directive
fun Project.exec(init: ExecConfig.() -> Unit): ExecConfig {
with(ExecConfig(this)) {
init()
(Kobalt.findPlugin(ExecPlugin.NAME) as ExecPlugin).addExecConfig(name, this)
return this
fun Project.exec(init: ExecConfig.() -> Unit) {
ExecConfig().let { config ->
config.init()
(Plugins.findPlugin(ExecPlugin.NAME) as ExecPlugin).addConfiguration(this, config)
}
}