Extend programming model for script commands

Author: Dave Syer

spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java

@@ -52,12 +52,15 @@ public class SpringCli {
 
 	private String displayName = CLI_APP + " ";
 
+	private InitCommand init;
+
 	/**
 	 * Create a new {@link SpringCli} implementation with the default set of commands.
 	 */
 	public SpringCli() {
 		try {
-			new InitCommand(this).run();
+			this.init = new InitCommand(this);
+			this.init.run();
 		}
 		catch (Exception e) {
 			throw new IllegalStateException("Cannot init with those args", e);
@@ -66,6 +69,10 @@ public SpringCli() {
 		this.commands.add(new HintCommand());
 	}
 
+	public InitCommand getInitCommand() {
+		return this.init;
+	}
+
 	/**
 	 * Set the command available to the CLI. Primarily used to support testing. NOTE: The
 	 * 'help' command will be automatically provided in addition to this list.

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/InitCommand.java

@@ -16,11 +16,13 @@
 
 package org.springframework.boot.cli.command;
 
+import groovy.lang.Closure;
 import groovy.lang.GroovyClassLoader;
 import groovy.lang.Script;
 
 import java.io.File;
 import java.util.List;
+import java.util.Map;
 import java.util.ServiceLoader;
 
 import joptsimple.OptionSet;
@@ -87,6 +89,8 @@ protected void run(OptionSet options) throws Exception {
 						options, this, repositoryConfiguration);
 
 				this.compiler = new GroovyCompiler(configuration);
+				this.compiler
+						.addCompilationCustomizers(new ScriptCompilationCustomizer());
 				loader = this.compiler.getLoader();
 				Thread.currentThread().setContextClassLoader(loader);
 
@@ -102,7 +106,25 @@ protected void run(OptionSet options) throws Exception {
 			if (this.compiler != null && files.length > 0) {
 				Class<?>[] classes = this.compiler.compile(files);
 				for (Class<?> type : classes) {
-					if (Script.class.isAssignableFrom(type)) {
+					Command script = ScriptCommand.command(type);
+					if (script != null) {
+						this.cli.register(script);
+					}
+					else if (CommandFactory.class.isAssignableFrom(type)) {
+						for (Command command : ((CommandFactory) type.newInstance())
+								.getCommands(this.cli)) {
+							this.cli.register(command);
+						}
+					}
+					else if (Commands.class.isAssignableFrom(type)) {
+						Map<String, Closure<?>> commands = ((Commands) type.newInstance())
+								.getCommands();
+						for (String command : commands.keySet()) {
+							this.cli.register(new ScriptCommand(command, commands
+									.get(command)));
+						}
+					}
+					else if (Script.class.isAssignableFrom(type)) {
 						((Script) type.newInstance()).run();
 					}
 				}
@@ -121,7 +143,6 @@ protected void run(OptionSet options) throws Exception {
 			}
 
 		}
-
 	}
 
 	private static class InitGroovyCompilerConfigurationAdapter extends
@@ -138,4 +159,8 @@ public GroovyCompilerScope getScope() {
 		}
 	}
 
+	public static interface Commands {
+		Map<String, Closure<?>> getCommands();
+	}
+
 }