First proper draft of DSL for Groovy Commands

Users can declare or Command, OptionHandler classes in an init script
or they can use a DSL, e.g.

command("foo") { args -> println "Do stuff with ${args} array" }

or

command("foo") {
  options { option "bar", "Help text for bar option" ithOptionArg() ofType Integer }
  run { options -> println "Do stuff with ${options.valueOf('bar')}" }
}

spring-boot-cli/src/test/resources/command.groovy

@@ -1,19 +0,0 @@
-class MyCommand implements Command {
-
-	String name = "foo"
-
-	String description = "My script command"
-
-	String help = "No options"
-
-	String usageHelp = "Not very useful"
-	
-	Collection<String> optionsHelp = ["No options"]
-	
-	boolean optionCommand = false
-
-	void run(String... args) {
-		println "Hello ${args[0]}"
-	}
-
-}

spring-boot-cli/src/test/resources/commands/closure.groovy

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2012-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+command("foo") { args ->
+	println "Hello Foo"
+}

spring-boot-cli/src/test/resources/commands/command.groovy

@@ -16,8 +16,6 @@
 
 package org.test.command
 
-import java.util.Collection;
-
 class TestCommand implements Command {
 
 	String name = "foo"

spring-boot-cli/src/test/resources/commands/handler.groovy

@@ -31,7 +31,6 @@ class TestCommand extends OptionHandler {
 	void run(OptionSet options) {
 		// Demonstrate use of Grape.grab to load dependencies before running
 		println "Clean: " + Git.open(".." as File).status().call().isClean()
-		org.springframework.boot.cli.command.ScriptCommandTests.executed = true
 		println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}"
 	}
 

spring-boot-cli/src/test/resources/commands/options.groovy

@@ -14,8 +14,19 @@
  * limitations under the License.
  */
 
-command("foo") { args ->
+ def foo() {
+	 "Foo"
+ }
+
+command("foo") {
+
+	options {
+		option "foo", "A foo of type String"
+		option "bar", "Bar has a value" withOptionalArg() ofType Integer
+	}
+
+	run { options ->
+		println "Hello ${foo()}: bar=${options.valueOf('bar')}"
+	}
 
-	org.springframework.boot.cli.command.ScriptCommandTests.executed = true
-	println "Hello ${options.nonOptionArguments()}: ${options.has('foo')} ${options.valueOf('bar')}"
 }

spring-boot-cli/src/test/resources/scripts/closure.groovy

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2012-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+def foo() {
+	"Foo"
+}
+ 
+command("foo") { options ->
+	def foo = foo()
+	println "Hello ${foo} ${options.nonOptionArguments()}: ${options.has('foo')} ${options.valueOf('bar')}"
+}

spring-boot-cli/src/test/resources/scripts/commands.groovy

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2012-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+command("foo") { args ->
+
+	println "Hello Command"
+
+}

spring-boot-cli/src/test/resources/scripts/options.groovy

@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-command("foo") { args ->
-
-	println "Hello Command"
-
+command("foo") {
+	options {
+		option "foo", "Some foo description" withOptionalArg()
+		option "bar", "Some bar" withOptionalArg()
+	}
+	run { options -> println "Hello ${options.nonOptionArguments()}: ${options.has('foo')} ${options.valueOf('bar')}" }
 }