Implemented new Picocli help

pesse · pesse · commit ded39d3e7e9b · 2019-06-13T16:54:39.000+02:00
diff --git a/src/main/java/org/utplsql/cli/Cli.java b/src/main/java/org/utplsql/cli/Cli.java
@@ -14,7 +14,7 @@ public class Cli {
 
     public static void main(String[] args) {
 
-        int exitCode = runWithExitCode(args);
+        int exitCode = runPicocliWithExitCode(args);
 
         System.exit(exitCode);
     }
@@ -67,15 +67,33 @@ static int runPicocliWithExitCode( String[] args ) {
 
             List<CommandLine> parsedLines = commandLine.parse(args);
 
+            boolean commandWasRun = false;
             for ( CommandLine parsedLine : parsedLines ) {
+                if (parsedLine.isUsageHelpRequested()) {
+                    parsedLine.usage(System.out);
+                    return 0;
+                }
+                else if (parsedLine.isVersionHelpRequested()) {
+                    parsedLine.printVersionHelp(System.out);
+                    return 0;
+                }
+
                 Object command = parsedLine.getCommand();
                 if ( command instanceof ICommand ) {
                     exitCode = ((ICommand)command).run();
+                    commandWasRun = true;
                     break;
                 }
             }
-        } catch (ParameterException e) {
-            e.printStackTrace();
+
+            if ( !commandWasRun ) {
+                commandLine.usage(System.out);
+            }
+        } catch (CommandLine.ParameterException e) {
+            System.err.println(e.getMessage());
+            if (!CommandLine.UnmatchedArgumentException.printSuggestions(e, System.err)) {
+                e.getCommandLine().usage(System.err);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/org/utplsql/cli/RunPicocliCommand.java b/src/main/java/org/utplsql/cli/RunPicocliCommand.java
@@ -169,6 +169,9 @@ FileMapperConfig toFileMapperConfig() {
         }
     }
 
+    @Option(names = "-h", usageHelp = true, description = "display this help and exit")
+    boolean help;
+
     private RunAction runAction;
 
     private String[] splitOrEmpty(String value) {
diff --git a/src/main/java/org/utplsql/cli/UtplsqlPicocliCommand.java b/src/main/java/org/utplsql/cli/UtplsqlPicocliCommand.java
@@ -12,4 +12,7 @@
         })
 public class UtplsqlPicocliCommand {
 
+        @CommandLine.Option(names = "-h", usageHelp = true, description = "display this help and exit")
+        boolean help;
+
 }
diff --git a/src/test/java/org/utplsql/cli/HelpCommandTest.java b/src/test/java/org/utplsql/cli/HelpCommandTest.java
@@ -31,6 +31,17 @@ void callHelp() {
         assertTrue(output.contains("Usage:"));
     }
 
+    @Test
+    void callRunHelp() {
+
+        capturer.start();
+        int result = TestHelper.runApp("run", "-h");
+        String output = capturer.stop();
+
+        assertEquals(0, result);
+        assertTrue(output.contains("Usage:"));
+    }
+
     @Test
     void callWithNoArgs() {
 

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,9 @@ FileMapperConfig toFileMapperConfig() {`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
	`172`	`+ @Option(names = "-h", usageHelp = true, description = "display this help and exit")`
	`173`	`+ boolean help;`
	`174`	`+`
`172`	`175`	`private RunAction runAction;`
`173`	`176`
`174`	`177`	`private String[] splitOrEmpty(String value) {`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,7 @@`
`12`	`12`	`})`
`13`	`13`	`public class UtplsqlPicocliCommand {`
`14`	`14`
	`15`	`+ @CommandLine.Option(names = "-h", usageHelp = true, description = "display this help and exit")`
	`16`	`+ boolean help;`
	`17`	`+`
`15`	`18`	`}`