From cca65b73c1755859ce51138e293d242fba648ef3 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 11 Jul 2016 22:27:05 -0700
Subject: [PATCH] Fixed forEach loops. Added Fail.NORMAL.

---
 .gitignore                                    |  3 +-
 .idea/kobalt.xml                              |  2 +-
 .idea/misc.xml                                |  4 ++
 .idea/vcs.xml                                 |  3 +
 example/kobalt/src/Build.kt                   |  4 +-
 .../kobalt/wrapper/kobalt-wrapper.properties  |  2 +-
 .../erik/kobalt/plugin/exec/ExecPlugin.kt     | 71 ++++++++++---------
 7 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index 87ff9b0..58a18f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,5 @@
 /test-output
 Thumbs.db
 ehthumbs.db
-kobaltBuild
\ No newline at end of file
+kobaltBuild
+/example/libs/
diff --git a/.idea/kobalt.xml b/.idea/kobalt.xml
index 48b08b1..34e9350 100644
--- a/.idea/kobalt.xml
+++ b/.idea/kobalt.xml
@@ -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.843" />
+        <option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.846" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 30626e1..cbe635d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -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">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..4c0d94b 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,8 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt
index 20bbbf4..a55bb57 100644
--- a/example/kobalt/src/Build.kt
+++ b/example/kobalt/src/Build.kt
@@ -37,7 +37,7 @@ val p = project {
     }
 
     exec {
-        commandLine(args = listOf("ls", "-- a"), dir = "../libs", fail = setOf(Fail.STDERR, Fail.EXIT))
-		commandLine(listOf("cmd", "/c", "echo", "Test"), os = listOf("Win"), fail = setOf(Fail.STDERR, Fail.EXIT))
+        commandLine(args = listOf("ls", "-l"), dir = "../libs", fail = setOf(Fail.NORMAL))
+        commandLine(listOf("cmd", "/c", "echo", "Test"), os = listOf("Win", "Windows"), fail = setOf(Fail.NORMAL))
     }
 }
\ No newline at end of file
diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties
index 0d4030d..0630fba 100644
--- a/example/kobalt/wrapper/kobalt-wrapper.properties
+++ b/example/kobalt/wrapper/kobalt-wrapper.properties
@@ -1 +1 @@
-kobalt.version=0.845
\ No newline at end of file
+kobalt.version=0.846
\ No newline at end of file
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 d1e81f2..7c94f19 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
@@ -48,7 +48,6 @@ class ExecPlugin : BasePlugin(), ITaskContributor {
         return emptyList()
     }
 
-
     companion object {
         const val NAME: String = "Exec"
     }
@@ -63,54 +62,63 @@ class ExecPlugin : BasePlugin(), ITaskContributor {
     private fun executeCommands(project: Project): TaskResult {
         var success = true
         val config = configs[project.name]
+        val errorMessage = StringBuilder()
 
         if (config != null) {
-            config.commandLines.forEach {
-                val dir = if (it.dir.isNullOrBlank()) project.directory else it.dir
-                val loc = File(dir)
-                if (loc.isDirectory()) {
-                    var execute = (it.os.size == 0)
+            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")
-                        it.os.forEach os@ {
-                            execute = curOs.startsWith(it, true)
-                            if (execute) return@os
+                        for (name in os) {
+                            execute = curOs.startsWith(name, true)
+                            if (execute) break
                         }
                     }
                     if (execute) {
-                        log(2, "> " + it.args.joinToString(" "))
-                        val pb = ProcessBuilder().command(it.args.toList())
-                        pb.directory(loc)
+                        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 errMsg = "Program \"" + it.args.joinToString(" ") + "\" (in directory \"$dir\"): "
+                        val cmdInfo = "Program \"" + args.joinToString(" ") + "\" (in directory \"${wrkDir.path}\"): "
 
                         if (err == false) {
-                            error(errMsg + "TIMEOUT")
-                        } else if (it.fail.isNotEmpty()) {
-                            val all = it.fail.contains(Fail.ALL)
-                            val output = it.fail.contains(Fail.OUTPUT)
-                            if ((all || it.fail.contains(Fail.EXIT)) && proc.exitValue() > 0) {
-                                error(errMsg + "EXIT ${proc.exitValue()}")
-                            } else if ((all || output || it.fail.contains(Fail.STDERR)) && stderr.isNotEmpty()) {
-                                error(errMsg + "STDERR, " + stderr[0])
-                            } else if ((all || output || it.fail.contains(Fail.STDOUT)) && stdout.isNotEmpty()) {
-                                error(errMsg + "STDOUT, " + stdout[0])
+                            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
                             }
                         }
-
-                        success = true
                     }
                 } else {
-                    error("Invalid directory: ${loc.canonicalPath}")
+                    errorMessage.append("Invalid working directory: \"${wrkDir.canonicalPath}\"")
+                    success = false
                 }
+
+                if (!success) break
             }
         }
 
-        return TaskResult(success)
+        //@TODO until cedric fixes it.
+        if (!success) error(errorMessage)
+
+        return TaskResult(success, errorMessage.toString())
     }
 
     private val configs = hashMapOf<String, ExecConfig>()
@@ -135,7 +143,7 @@ class ExecPlugin : BasePlugin(), ITaskContributor {
 }
 
 enum class Fail() {
-    ALL, STDERR, STDOUT, OUTPUT, EXIT
+    ALL, NORMAL, STDERR, STDOUT, OUTPUT, EXIT
 }
 
 data class CommandLine(var args: List<String> = emptyList(), var dir: String = "",
@@ -144,9 +152,8 @@ data class CommandLine(var args: List<String> = emptyList(), var dir: String = "
 data class ExecConfig(val project: Project) {
     val commandLines = arrayListOf<CommandLine>()
 
-    @Directive
-    public fun commandLine(args: List<String> = emptyList(), dir: String = "", os: List<String> = emptyList(),
-                           fail: Set<Fail> = emptySet()) {
+    @Directive fun commandLine(args: List<String> = emptyList(), dir: String = "", os: List<String> = emptyList(),
+                               fail: Set<Fail> = emptySet()) {
         if (args.size > 0) commandLines.add(CommandLine(args, dir, os, fail))
     }
 }