Add --classpath to CLI

spring-cli/samples/ui.groovy

@@ -8,4 +8,26 @@ class Example {
 		return "home";
 	}
 
+}
+
+@Configuration
+@Log
+class MvcConfiguration extends WebMvcConfigurerAdapter {
+
+  @Override
+  void addInterceptors(def registry) { 
+    log.info("Registering temporary file interceptor")
+    registry.addInterceptor(temporaryFileInterceptor())
+  }
+
+  @Bean
+  HandlerInterceptor temporaryFileInterceptor() {
+    log.info("Creating temporary file interceptor")
+    new HandlerInterceptorAdapter() {
+      @Override
+      postHandle(def request, def response, def handler, ModelAndView mav) { 
+        log.info("Model: " + model)
+      }
+    }
+  }
 }

spring-cli/src/main/java/org/springframework/cli/command/RunCommand.java

@@ -71,6 +71,8 @@ private static class RunOptionHandler extends OptionHandler {
 
 		private OptionSpec<Void> localOption;
 
+		private OptionSpec<String> classpathOption;
+
 		private SpringApplicationRunner runner;
 
 		@Override
@@ -86,6 +88,8 @@ protected void options() {
 					"Do not attempt to guess dependencies");
 			this.verboseOption = option(asList("verbose", "v"), "Verbose logging");
 			this.quietOption = option(asList("quiet", "q"), "Quiet logging");
+			this.classpathOption = option(asList("classpath", "cp"),
+					"Additional classpath entries").withRequiredArg();
 		}
 
 		@Override
@@ -177,6 +181,14 @@ public Level getLogLevel() {
 				return Level.INFO;
 			}
 
+			@Override
+			public String getClasspath() {
+				if (this.options.has(RunOptionHandler.this.classpathOption)) {
+					return this.options.valueOf(RunOptionHandler.this.classpathOption);
+				}
+				return "";
+			}
+
 		}
 	}
 

spring-cli/src/main/java/org/springframework/cli/command/ScriptCommand.java

@@ -240,6 +240,11 @@ public boolean isGuessDependencies() {
 			return true;
 		}
 
+		@Override
+		public String getClasspath() {
+			return "";
+		}
+
 	}
 
 }

spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompiler.java

@@ -72,6 +72,9 @@ public GroovyCompiler(final GroovyCompilerConfiguration configuration) {
 		CompilerConfiguration compilerConfiguration = new CompilerConfiguration();
 		this.loader = new ExtendedGroovyClassLoader(getClass().getClassLoader(),
 				compilerConfiguration);
+		if (configuration.getClasspath().length() > 0) {
+			this.loader.addClasspath(configuration.getClasspath());
+		}
 		// FIXME: allow the extra resolvers to be switched on (off by default)
 		addExtraResolvers();
 		compilerConfiguration

spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompilerConfiguration.java

@@ -33,4 +33,9 @@ public interface GroovyCompilerConfiguration {
 	 */
 	boolean isGuessDependencies();
 
+	/**
+	 * @return a path for local resources (colon separated)
+	 */
+	String getClasspath();
+
 }

spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java

@@ -28,7 +28,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.cli.command.RunCommand;
 
@@ -142,14 +141,11 @@ public void webSample() throws Exception {
 	}
 
 	@Test
-	@Ignore
 	public void uiSample() throws Exception {
 
 		// FIXME Failing on OSX
 
-		// To run this one from the command line you need to add target/test-classes to
-		// CLASSPATH
-		start("samples/ui.groovy");
+		start("samples/ui.groovy", "--classpath=.:src/test/resources");
 		String result = FileUtil.readEntirely(new URL("http://localhost:8080")
 				.openStream());
 		assertTrue("Wrong output: " + result, result.contains("Hello World"));