Printing cause of compilation failure - System.exit() is not ideal but it avoids printing the Truncate Class File error that run.sh has after a compilation failure and run.sh fails to dynamically reload after that anyway

David Reed · David Reed · commit befebb1cb4ab · 2012-08-17T18:56:00.000+02:00
diff --git a/koans-lib/src/com/sandwich/util/io/CompilationFailureLogger.java b/koans-lib/src/com/sandwich/util/io/CompilationFailureLogger.java
@@ -1,18 +1,23 @@
 package com.sandwich.util.io;
 
-import java.io.File;
-import java.util.Arrays;
-
 import com.sandwich.koan.ui.SuitePresenter;
 import com.sandwich.koan.util.ApplicationUtils;
 
+import java.io.File;
+import java.util.Arrays;
+import java.util.Scanner;
+
 public class CompilationFailureLogger implements CompilationListener {
-	public void compilationFailed(File src, String[] command, Process p, Throwable x) {			
+	public void compilationFailed(File src, String[] command, Process p, Throwable x) {
 		SuitePresenter presenter = ApplicationUtils.getPresenter();
 		presenter.displayError("\n*****************************************************************");
+		presenter.displayError("COMPILE FAILED! Exit status was: " + p.exitValue());
+		presenter.displayError("\nCompile Output:");
+		presenter.displayError(StreamUtils.convertStreamToString(p.getErrorStream()));
+		presenter.displayError("Compile Command:");
 		presenter.displayError(Arrays.toString(command));
-		presenter.displayError(src.getAbsolutePath() + " does not compile. exit status was: " + p.exitValue());
 		presenter.displayError("*****************************************************************\n");
+		System.exit(1);
 	}
 	public void compilationSucceeded(File src, String[] command, Process p, Throwable x) { }
 }
diff --git a/koans-lib/src/com/sandwich/util/io/StreamUtils.java b/koans-lib/src/com/sandwich/util/io/StreamUtils.java
@@ -0,0 +1,15 @@
+package com.sandwich.util.io;
+
+import java.io.InputStream;
+
+public class StreamUtils {
+
+	public static String convertStreamToString(InputStream stream) {
+		try {
+			return new java.util.Scanner(stream).useDelimiter("\\A").next();
+		} catch (java.util.NoSuchElementException e) {
+			return "";
+		}
+	}
+
+}
diff --git a/koans/lib/koans.jar b/koans/lib/koans.jar
