Extend programming model for script commands

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

@@ -0,0 +1,19 @@
+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/command.groovy

@@ -16,6 +16,8 @@
 
 package org.test.command
 
+import java.util.Collection;
+
 class TestCommand implements Command {
 
 	String name = "foo"
@@ -25,9 +27,12 @@ class TestCommand implements Command {
 	String help = "No options"
 
 	String usageHelp = "Not very useful"
+	
+	Collection<String> optionsHelp = ["No options"]
+	
+	boolean optionCommand = false
 
 	void run(String... args) {
-		org.springframework.boot.cli.command.ScriptCommandTests.executed = true
 		println "Hello ${args[0]}"
 	}
 

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

@@ -16,13 +16,13 @@
 
 package org.test.command
 
-import joptsimple.OptionSet
-
 @Grab("org.eclipse.jgit:org.eclipse.jgit:2.3.1.201302201838-r")
 import org.eclipse.jgit.api.Git
 
 
 class TestCommand extends OptionHandler {
+	
+	String name = "foo"
 
 	void options() {
 		option "foo", "Foo set"
@@ -30,7 +30,7 @@ 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()
+		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,9 +14,8 @@
  * limitations under the License.
  */
 
-def run = { msg ->
-	org.springframework.boot.cli.command.ScriptCommandTests.executed = true
-	println "Hello ${msg}"
-}
+command("foo") { args ->
 
-run
+	org.springframework.boot.cli.command.ScriptCommandTests.executed = true
+	println "Hello ${options.nonOptionArguments()}: ${options.has('foo')} ${options.valueOf('bar')}"
+}

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

@@ -1,23 +0,0 @@
-/*
- * 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.
- */
-
-options {
-	option "foo", "Foo set"
-	option "bar", "Bar has an argument of type int" withOptionalArg() ofType Integer
-}
-
-org.springframework.boot.cli.command.ScriptCommandTests.executed = true
-println "Hello ${options.nonOptionArguments()}: ${options.has('foo')} ${options.valueOf('bar')}"

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

@@ -1 +1 @@
-println "Hello World"
+println "Hello Init"

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

@@ -14,14 +14,26 @@
  * limitations under the License.
  */
 
-class TestCommand implements Runnable {
-	def msg
-	TestCommand(String msg) {
-		this.msg = msg
-	}
-	void run() {
-		org.springframework.boot.cli.command.ScriptCommandTests.executed = true
-		println "Hello ${msg}"
+package org.test.command
+
+import java.util.Collection;
+
+class TestCommand 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]}"
 	}
+
 }
-new TestCommand(args[0])

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

@@ -14,9 +14,24 @@
  * limitations under the License.
  */
 
-void options() {
-	option "foo", "Foo set"
-}
+package org.test.command
 
-org.springframework.boot.cli.command.ScriptCommandTests.executed = true
-println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}"
+@Grab("org.eclipse.jgit:org.eclipse.jgit:2.3.1.201302201838-r")
+import org.eclipse.jgit.api.Git
+
+
+class TestCommand extends OptionHandler {
+	
+	String name = "foo"
+
+	void options() {
+		option "foo", "Foo set"
+	}
+
+	void run(OptionSet options) {
+		// Demonstrate use of Grape.grab to load dependencies before running
+		println "Clean: " + Git.open(".." as File).status().call().isClean()
+		println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}"
+	}
+
+}

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

@@ -14,4 +14,8 @@
  * limitations under the License.
  */
 
-println "Hello ${args[0]}"
+command("foo") { args ->
+
+	println "Hello Command"
+
+}