From f9baae6ffa42407d83ba48a8f3faa9aa9c8bd381 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 11 Jul 2016 11:07:13 -0700
Subject: [PATCH] Started to add logic to executeCommands.

---
 kobalt-exec.iml                               | 26 +++----------------
 .../erik/kobalt/plugin/exec/ExecPlugin.kt     | 16 +++++++++---
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/kobalt-exec.iml b/kobalt-exec.iml
index 2041920..3773968 100644
--- a/kobalt-exec.iml
+++ b/kobalt-exec.iml
@@ -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 />
diff --git a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt
index f6e4a2b..1f8292e 100644
--- a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt
+++ b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt
@@ -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))
     }
 }