Merge branch 'master' of http://github.com/matyb/java-koans into noninteractive

matyb · matyb · commit c675ac111605 · 2016-04-13T04:31:38.000-04:00
diff --git a/README.md b/README.md
@@ -8,13 +8,10 @@ https://github.com/matyb/java-koans/archive/master.zip
 ```cd <the directory you just unarchived>```
 * Within it you'll find:
     * *koans*: this directory contains the application and its lessons, it is all that is needed to advance through the koans themselves and **it can be distributed independently**
-    * *lib/koans-lib*: the directory for source code for the engine that executes the koans 
-    * *lib/koans-tests*: the directory for tests to check the sanity of the application
-    * *lib/file-compiler*: the dynamic compiler module that loads newly saved java files into the JVM as classes
-    * *lib/file-monitor*: the file monitoring module for notifying the app when files are saved 
-    * *lib/util*: application agnostic interfaces and utilities shared in projects
+    * *lib*: this directory contains the code the koans engine is comprised of and built with
+    * *gradle*: wrapper for build library used to build koans source, setup project files in eclipse/idea, run tests, etc. you probably don't need to touch anything in here
 * Change directory to the koans directory: ```cd koans```
-* If you are using windows enter: ```run.bat``` or ```./run.sh``` if you are using Mac or Linux.
+* If you are using windows enter: ```run.bat``` or ```./run.sh``` if you are using Mac or Linux
 
 Developing a Koan:
 ==================
diff --git a/koans/app/lib/koans.jar b/koans/app/lib/koans.jar
diff --git a/lib/src/main/java/com/sandwich/koan/runner/AppLauncher.java b/lib/src/main/java/com/sandwich/koan/runner/AppLauncher.java
@@ -29,7 +29,7 @@ public void run() {
                                 char c = (char) System.in.read();
                                 char exitChar = ApplicationSettings.getExitChar();
                                 if (Character.toUpperCase(c) == Character.toUpperCase(exitChar)) {
-                                    exit();
+                                    exit(0);
                                 }
                             } catch (IOException e) {
                                 throw new RuntimeException(e);
@@ -58,14 +58,11 @@ public void run() {
             ApplicationUtils.getPresenter().displayMessage(
                     argsBuilder.toString());
         }
-        if (!ApplicationSettings.isInteractive()) {
-            exit();
-        }
     }
 
-    private static void exit() {
+    static void exit(int status) {
         FileMonitorFactory.closeAll();
-        System.exit(0);
+        System.exit(status);
     }
 
 }
diff --git a/lib/src/main/java/com/sandwich/koan/runner/RunKoans.java b/lib/src/main/java/com/sandwich/koan/runner/RunKoans.java
@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.sandwich.koan.ApplicationSettings;
 import com.sandwich.koan.Koan;
 import com.sandwich.koan.KoanClassLoader;
 import com.sandwich.koan.KoanMethod;
@@ -43,7 +44,11 @@ public RunKoans(Path pathToEnlightenment){
 	
 	public void run(String... values) {
 		ApplicationUtils.getPresenter().clearMessages();
-		ApplicationUtils.getPresenter().displayResult(runKoans());
+		KoanSuiteResult result = runKoans();
+        ApplicationUtils.getPresenter().displayResult(result);
+        if (!ApplicationSettings.isInteractive()) {
+            AppLauncher.exit(result.getTotalNumberOfKoans() - result.getNumberPassing());
+        }
 	}
 
 	KoanSuiteResult runKoans() {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void run() {`
`29`	`29`	`char c = (char) System.in.read();`
`30`	`30`	`char exitChar = ApplicationSettings.getExitChar();`
`31`	`31`	`if (Character.toUpperCase(c) == Character.toUpperCase(exitChar)) {`
`32`		`- exit();`
	`32`	`+ exit(0);`
`33`	`33`	`}`
`34`	`34`	`} catch (IOException e) {`
`35`	`35`	`throw new RuntimeException(e);`
`@@ -58,14 +58,11 @@ public void run() {`
`58`	`58`	`ApplicationUtils.getPresenter().displayMessage(`
`59`	`59`	`argsBuilder.toString());`
`60`	`60`	`}`
`61`		`- if (!ApplicationSettings.isInteractive()) {`
`62`		`- exit();`
`63`		`- }`
`64`	`61`	`}`
`65`	`62`
`66`		`- private static void exit() {`
	`63`	`+ static void exit(int status) {`
`67`	`64`	`FileMonitorFactory.closeAll();`
`68`		`- System.exit(0);`
	`65`	`+ System.exit(status);`
`69`	`66`	`}`
`70`	`67`
`71`	`68`	`}`