add version cli command

SMI · Dec 3, 2023 · 058cc24 · 058cc24
1 parent 0d3f97d
commit 058cc24
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -59,6 +59,12 @@
               </descriptorRefs>
               <finalName>ctp-anon-cli-${project.version}</finalName>
               <appendAssemblyId>false</appendAssemblyId>
+              <archive>
+                <manifest>
+                  <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                  <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                </manifest>
+              </archive>
             </configuration>
           </execution>
         </executions>

diff --git a/src/main/java/uk/ac/ed/epcc/ctp_anon_cli/Program.java b/src/main/java/uk/ac/ed/epcc/ctp_anon_cli/Program.java
@@ -19,36 +19,32 @@ public static void main(String[] args) throws ParseException {
     Options options = new Options();
 
     Option option = Option
-      .builder("a")
-      .argName("file")
-      .hasArg()
-      .longOpt("anon-script")
-      .desc("Anonymisation script")
-      .required()
+      .builder("v")
+      .longOpt("version")
+      .desc("Print version info and exit")
       .build();
     options.addOption(option);
 
-    option =
-      Option
-        .builder("s")
-        .argName("file")
-        .hasArg()
-        .longOpt("sr-anon-tool")
-        .desc("SR anonymisation tool")
-        .required()
-        .build();
-    options.addOption(option);
-
-    option =
-      Option
-        .builder("d")
-        .longOpt("daemonize")
-        .desc("Run as a daemon and wait for files to process")
-        .build();
-    options.addOption(option);
-
     CommandLineParser parser = new DefaultParser();
     CommandLine cli = null;
+
+    try {
+      cli = parser.parse(options, args, true);
+    } catch (ParseException e) {
+      HelpFormatter formatter = new HelpFormatter();
+      formatter.printHelp("ctp-anon-cli.jar", AddRequiredOptions(options));
+      System.exit(1);
+    }
+
+    if (cli.hasOption("v")) {
+      System.out.println(
+        "ctp-anon-cli: " + Program.class.getPackage().getImplementationVersion()
+      );
+      System.exit(0);
+    }
+
+    options = AddRequiredOptions(options);
+
     try {
       cli = parser.parse(options, args);
     } catch (ParseException e) {
@@ -192,6 +188,39 @@ public static void main(String[] args) throws ParseException {
     System.exit(rc);
   }
 
+  private static Options AddRequiredOptions(Options options) {
+    Option option = Option
+      .builder("d")
+      .longOpt("daemonize")
+      .desc("Run as a daemon and wait for files to process")
+      .build();
+    options.addOption(option);
+
+    option =
+      Option
+        .builder("a")
+        .argName("file")
+        .hasArg()
+        .longOpt("anon-script")
+        .desc("Anonymisation script")
+        .required()
+        .build();
+    options.addOption(option);
+
+    option =
+      Option
+        .builder("s")
+        .argName("file")
+        .hasArg()
+        .longOpt("sr-anon-tool")
+        .desc("SR anonymisation tool")
+        .required()
+        .build();
+    options.addOption(option);
+
+    return options;
+  }
+
   private static File ValidateFilePair(File inFile, File outFile)
     throws Exception {
     if (outFile.equals(inFile)) {