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

Started to add logic to executeCommands.

Browse source
This commit is contained in:
Erik C. Thauvin 2016-07-11 11:07:13 -07:00
parent a6dfa2ba07
commit f9baae6ffa
2 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
kobalt-exec.iml
View file

@ -25,18 +25,9 @@
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="Kobalt: org.apache.ant:ant:jar:1.7.0">
<library name="Kobalt: org.testng:testng:jar:(0,]">
<CLASSES>
<root url="jar://$USER_HOME$/.kobalt/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="Kobalt: com.beust:jcommander:jar:1.48">
<CLASSES>
<root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/org/testng/testng/6.9.10/testng-6.9.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@ -52,18 +43,9 @@
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="Kobalt: org.apache.ant:ant-launcher:jar:1.7.0">
<library name="Kobalt: com.beust:jcommander:jar:1.48">
<CLASSES>
<root url="jar://$USER_HOME$/.kobalt/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="Kobalt: org.testng:testng:jar:(0,]">
<CLASSES>
<root url="jar://$USER_HOME$/.kobalt/repository/org/testng/testng/6.9.12/testng-6.9.12.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />

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

@ -62,7 +62,15 @@ class ExecPlugin : BasePlugin(), ITaskContributor {
if (config != null) {
config.commandLines.forEach {
log(2, "Executing: '" + { it.args.joinToString { " " } } + "' in '{$it.dir}'")
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 {
}
}
log(2, "Executing: '" + { it.args.joinToString { " " } } + "' in '$dir'")
success = true
}
}
@ -76,14 +84,14 @@ class ExecPlugin : BasePlugin(), ITaskContributor {
}
}
data class CommandLine(var os: String = "", var dir: String = "", var args: Array<String> = emptyArray())
data class CommandLine(var args: Array<String> = emptyArray(), var dir: String = "", var os: Array<String> = emptyArray())
data class ExecConfig(val project: Project) {
val commandLines = arrayListOf<CommandLine>()
@Directive
public fun commandLine(os: String = "", dir: String = "", args: Array<String> = emptyArray()) {
if (args.size > 0) commandLines.add(CommandLine(os, dir, args))
public fun commandLine(args: Array<String> = emptyArray(), dir: String = "", os: Array<String> = emptyArray()) {
if (args.size > 0) commandLines.add(CommandLine(args, dir, os))
}
}