Fix regression in command help options

The regression was introduced in 84abfda

Signed-off-by: David Pilar <david@czpilar.net>

Author: czpilar

spring-shell-core/src/main/java/org/springframework/shell/core/command/DefaultCommandParser.java

@@ -59,6 +59,20 @@ public ParsedInput parse(String input) {
 
 		// the first word is the (root) command name
 		String commandName = words.get(0);
+		ParsedInput.Builder parsedInputBuilder = ParsedInput.builder().commandName(commandName);
+		if (words.size() == 1) {
+			ParsedInput parsedInput = parsedInputBuilder.build();
+			log.debug("Parsed input: " + parsedInput);
+			return parsedInput;
+		}
+
+		if (words.size() == 2 && (words.get(1).equals("--help") || words.get(1).equals("-h"))) {
+			parsedInputBuilder.addOption(CommandOption.with().shortName('h').longName("help").value("true").build());
+			ParsedInput parsedInput = parsedInputBuilder.build();
+			log.debug("Parsed input: " + parsedInput);
+			return parsedInput;
+		}
+
 		List<String> remainingWords = words.subList(1, words.size());
 
 		int firstNonCommandWordIndex = 1;
@@ -76,7 +90,6 @@ public ParsedInput parse(String input) {
 				: words.subList(1, firstNonCommandWordIndex);
 
 		// add command and sub commands
-		ParsedInput.Builder parsedInputBuilder = ParsedInput.builder().commandName(commandName);
 		for (String subCommand : subCommands) {
 			parsedInputBuilder.addSubCommand(subCommand);
 		}

spring-shell-core/src/test/java/org/springframework/shell/core/command/DefaultCommandParserTests.java

@@ -21,6 +21,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.util.stream.Stream;
 
@@ -314,6 +315,24 @@ static Stream<Arguments> parseWithBooleanOptionData() {
 				Arguments.of("mycommand -o", "", 'o', Boolean.class, "true"));
 	}
 
+	@ParameterizedTest
+	@ValueSource(strings = { "mycommand --help", "mycommand -h" })
+	void testParseWithHelpOption(String input) {
+		// given
+		Command command = createCommand("mycommand", "My test command");
+		command.getOptions().add(CommandOption.with().longName("option").shortName('o').build());
+		commandRegistry.registerCommand(command);
+		// when
+		ParsedInput parsedInput = parser.parse(input);
+
+		// then
+		assertEquals("mycommand", parsedInput.commandName());
+		assertEquals(1, parsedInput.options().size());
+		assertEquals("help", parsedInput.options().get(0).longName());
+		assertEquals('h', parsedInput.options().get(0).shortName());
+		assertEquals("true", parsedInput.options().get(0).value());
+	}
+
 	private static Command createCommand(String name, String description) {
 		return new AbstractCommand(name, description) {
 			@Override