Add automatic command grouping

Fixes #163

Introduce Command and Command.Help

spring-shell-standard/src/test/java/org/springframework/shell/standard/StandardMethodTargetRegistrarTest.java

@@ -16,8 +16,7 @@
 
 package org.springframework.shell.standard;
 
-import org.hamcrest.Matchers;
-import org.junit.Assert;
+import org.assertj.core.api.Assertions;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -26,6 +25,9 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.shell.Availability;
 import org.springframework.shell.ConfigurableCommandRegistry;
 import org.springframework.shell.MethodTarget;
+import org.springframework.shell.standard.test1.GroupOneCommands;
+import org.springframework.shell.standard.test2.GroupTwoCommands;
+import org.springframework.shell.standard.test2.GroupThreeCommands;
 import org.springframework.util.ReflectionUtils;
 
 import static org.hamcrest.Matchers.hasEntry;
@@ -33,6 +35,8 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
+import java.util.Map;
+
 /**
  * Unit tests for {@link StandardMethodTargetRegistrar}.
  *
@@ -242,4 +246,20 @@ public class StandardMethodTargetRegistrarTest {
         }
     }
 
-}
+    @Test
+    public void testGrouping() {
+        ApplicationContext context = new AnnotationConfigApplicationContext(GroupOneCommands.class,
+                GroupTwoCommands.class, GroupThreeCommands.class);
+        registrar.setApplicationContext(context);
+        registrar.register(registry);
+
+        Map<String, MethodTarget> commands = registry.listCommands();
+        Assertions.assertThat(commands.get("explicit1").getGroup()).isEqualTo("Explicit Group Method Level 1");
+        Assertions.assertThat(commands.get("explicit2").getGroup()).isEqualTo("Explicit Group Method Level 2");
+        Assertions.assertThat(commands.get("explicit3").getGroup()).isEqualTo("Explicit Group Method Level 3");
+        Assertions.assertThat(commands.get("implicit1").getGroup()).isEqualTo("Implicit Group Package Level 1");
+        Assertions.assertThat(commands.get("implicit2").getGroup()).isEqualTo("Group Two Commands");
+        Assertions.assertThat(commands.get("implicit3").getGroup()).isEqualTo("Explicit Group 3 Class Level");
+    }
+
+}

spring-shell-standard/src/test/java/org/springframework/shell/standard/test1/GroupOneCommands.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2017 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.
+ */
+
+package org.springframework.shell.standard.test1;
+
+import org.springframework.shell.standard.ShellComponent;
+import org.springframework.shell.standard.ShellMethod;
+
+@ShellComponent
+public class GroupOneCommands {
+
+	@ShellMethod(value = "Do Something.", group = "Explicit Group Method Level 1")
+	public void explicit1() {
+
+	}
+
+	@ShellMethod(value = "Do Something Else")
+	public void implicit1() {
+
+	}
+
+}

spring-shell-standard/src/test/java/org/springframework/shell/standard/test1/package-info.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2017 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.
+ */
+
+@ShellCommandGroup("Implicit Group Package Level 1")
+package org.springframework.shell.standard.test1;
+
+import org.springframework.shell.standard.ShellCommandGroup;

spring-shell-standard/src/test/java/org/springframework/shell/standard/test2/GroupThreeCommands.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017 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.
+ */
+
+package org.springframework.shell.standard.test2;
+
+import org.springframework.shell.standard.ShellCommandGroup;
+import org.springframework.shell.standard.ShellComponent;
+import org.springframework.shell.standard.ShellMethod;
+
+@ShellComponent
+@ShellCommandGroup("Explicit Group 3 Class Level")
+public class GroupThreeCommands {
+
+	@ShellMethod(value = "Do Something.", group = "Explicit Group Method Level 3")
+	public void explicit3() {
+
+	}
+
+	@ShellMethod(value = "Do Something Else")
+	public void implicit3() {
+
+	}
+
+}

spring-shell-standard/src/test/java/org/springframework/shell/standard/test2/GroupTwoCommands.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2017 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.
+ */
+
+package org.springframework.shell.standard.test2;
+
+import org.springframework.shell.standard.ShellComponent;
+import org.springframework.shell.standard.ShellMethod;
+
+@ShellComponent
+public class GroupTwoCommands {
+
+	@ShellMethod(value = "Do Something.", group = "Explicit Group Method Level 2")
+	public void explicit2() {
+
+	}
+
+	@ShellMethod(value = "Do Something Else")
+	public void implicit2() {
+
+	}
+
+}