Adds Commons CLI and JUnit to the classpath and includes a couple tests! Fixes #2

Author: Cervator

Test.groovy

@@ -0,0 +1,18 @@
+class Test extends GroovyTestCase {
+
+    Test() {
+        println "I live!"
+    }
+
+    void testIvy() {
+        def report = new org.apache.ivy.Ivy()
+        def ivyHome = report.getIvyHomeURL()
+        assertTrue(ivyHome.contains("apache.org"))
+    }
+
+    void testCLI() {
+        def cli = new CliBuilder(usage: 'Usage')
+        def expected = 'Usage'
+        assertToString(cli.usage, expected)
+    }
+}

build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'java'
 
-version = '1.0.1'
+version = '1.0.2'
 
 dependencies {
     compile files('gradle/wrapper/gradle-wrapper.jar')

gradle/wrapper/groovy-wrapper.jar

@@ -24,9 +24,16 @@
 public class GroovyBootstrapMainStarter extends BootstrapMainStarter {
     @Override
     public void start(String[] args, File gradleHome) throws Exception {
-        File groovyJar = findGroovyJar(gradleHome);
-        File ivyJar = findIvyJar(gradleHome);
-        URLClassLoader contextClassLoader = new URLClassLoader(new URL[]{groovyJar.toURI().toURL(),ivyJar.toURI().toURL()}, ClassLoader.getSystemClassLoader().getParent());
+        File groovyJar = findJar("groovy-all", gradleHome, "lib");
+        File ivyJar = findJar("ivy", gradleHome, "lib/plugins");
+        File cliJar = findJar("commons-cli", gradleHome, "lib/plugins");
+        File junitJar = findJar("junit", gradleHome, "lib/plugins");
+        URLClassLoader contextClassLoader = new URLClassLoader(new URL[]{
+                groovyJar.toURI().toURL()
+                ,ivyJar.toURI().toURL()
+                ,cliJar.toURI().toURL()
+                ,junitJar.toURI().toURL()
+                }, ClassLoader.getSystemClassLoader().getParent());
         Thread.currentThread().setContextClassLoader(contextClassLoader);
         Class<?> mainClass = contextClassLoader.loadClass("groovy.ui.GroovyMain");
         Method mainMethod = mainClass.getMethod("main", String[].class);
@@ -36,21 +43,12 @@ public void start(String[] args, File gradleHome) throws Exception {
         }
     }
 
-    private File findGroovyJar(File gradleHome) {
-        for (File file : new File(gradleHome, "lib").listFiles()) {
-            if (file.getName().matches("groovy-all-.*\\.jar")) {
+    private File findJar(String fragment, File gradleHome, String subdir) {
+        for (File file : new File(gradleHome, subdir).listFiles()) {
+            if (file.getName().matches(fragment + "-.*\\.jar")) {
                 return file;
             }
         }
-        throw new RuntimeException(String.format("Could not locate the Groovy JAR in Gradle distribution '%s'.", gradleHome));
-    }
-
-    private File findIvyJar(File gradleHome) {
-        for (File file : new File(gradleHome, "lib/plugins").listFiles()) {
-            if (file.getName().matches("ivy-.*\\.jar")) {
-                return file;
-            }
-        }
-        throw new RuntimeException(String.format("Could not locate the Ivy JAR in Gradle distribution '%s'.", gradleHome));
+        throw new RuntimeException(String.format("Could not locate the JAR for " + fragment + " in Gradle distribution '%s'.", gradleHome));
     }
 }