Merge pull request #158 from bci-oss/157-add-version-switch

Add `--version` switch to bamm-cli

Author: atextor

pom.xml

@@ -108,6 +108,7 @@
       <maven-clean-plugin-version>3.1.0</maven-clean-plugin-version>
       <maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
       <maven-javadoc-plugin-version>3.3.0</maven-javadoc-plugin-version>
+      <maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
       <maven-source-plugin-version>2.2.1</maven-source-plugin-version>
       <maven-surefire-plugin-version>2.22.2</maven-surefire-plugin-version>
       <maven-surefire-report-plugin-version>2.22.2</maven-surefire-report-plugin-version>
@@ -398,6 +399,11 @@
    <build>
       <pluginManagement>
          <plugins>
+             <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-resources-plugin</artifactId>
+               <version>${maven-resources-plugin-version}</version>
+             </plugin>
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-clean-plugin</artifactId>

tools/bamm-cli/src/main/java/io/openmanufacturing/sds/AbstractCommand.java

@@ -42,7 +42,7 @@
 import io.openmanufacturing.sds.aspectmodel.urn.AspectModelUrn;
 import io.openmanufacturing.sds.aspectmodel.validation.report.ValidationReport;
 import io.openmanufacturing.sds.aspectmodel.validation.services.AspectModelValidator;
-import io.openmanufacturing.sds.exeption.CommandException;
+import io.openmanufacturing.sds.exception.CommandException;
 import io.vavr.CheckedFunction1;
 import io.vavr.control.Option;
 import io.vavr.control.Try;

tools/bamm-cli/src/main/java/io/openmanufacturing/sds/BammCli.java

@@ -12,6 +12,10 @@
  */
 package io.openmanufacturing.sds;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
 import org.fusesource.jansi.AnsiConsole;
 
 import io.openmanufacturing.sds.aspect.AspectCommand;
@@ -34,6 +38,9 @@ public class BammCli extends AbstractCommand {
 
    private final CommandLine commandLine = new CommandLine( this );
 
+   @CommandLine.Option( names = { "--version" }, description = "Show current version" )
+   private boolean version;
+
    public void run( final String... argv ) throws Exception {
       main( argv );
    }
@@ -55,8 +62,29 @@ protected String format( final String string ) {
       return commandLine.getColorScheme().ansi().string( string );
    }
 
+   private Properties loadProperties( final String filename ) {
+      final Properties properties = new Properties();
+      final InputStream propertiesResource = BammCli.class.getClassLoader().getResourceAsStream( filename );
+      try {
+         properties.load( propertiesResource );
+      } catch ( final IOException exception ) {
+         throw new RuntimeException( "Failed to load Properties: " + filename );
+      }
+      return properties;
+   }
+
    @Override
    public void run() {
+      if ( version ) {
+         final Properties applicationProperties = loadProperties( "application.properties" );
+         final Properties gitProperties = loadProperties( "git.properties" );
+         System.out.printf( "bamm-cli - %s%nVersion: %s%nBuild date: %s%nGit commit: %s%n",
+               applicationProperties.get( "application.name" ),
+               applicationProperties.get( "version" ),
+               applicationProperties.get( "build.date" ),
+               gitProperties.get( "git.commit.id" ) );
+         System.exit( 0 );
+      }
       System.out.println( commandLine.getHelp().fullSynopsis() );
       System.out.println( format( "Run @|bold " + commandLine.getCommandName() + " help|@ for help." ) );
    }

tools/bamm-cli/src/main/java/io/openmanufacturing/sds/aspect/AspectCommand.java

@@ -14,7 +14,7 @@
 package io.openmanufacturing.sds.aspect;
 
 import io.openmanufacturing.sds.AbstractCommand;
-import io.openmanufacturing.sds.exeption.SubCommandException;
+import io.openmanufacturing.sds.exception.SubCommandException;
 import picocli.CommandLine;
 
 @CommandLine.Command( name = AspectCommand.COMMAND_NAME,

tools/bamm-cli/src/main/java/io/openmanufacturing/sds/aspect/AspectToCommand.java

@@ -23,7 +23,7 @@
 import io.openmanufacturing.sds.aspect.to.AspectToOpenapiCommand;
 import io.openmanufacturing.sds.aspect.to.AspectToPngCommand;
 import io.openmanufacturing.sds.aspect.to.AspectToSvgCommand;
-import io.openmanufacturing.sds.exeption.SubCommandException;
+import io.openmanufacturing.sds.exception.SubCommandException;
 import picocli.CommandLine;
 
 @CommandLine.Command( name = AspectToCommand.COMMAND_NAME, description = "Transforms an Aspect Model into another format",

tools/bamm-cli/src/main/java/io/openmanufacturing/sds/aspect/to/AspectToAasCommand.java

@@ -18,7 +18,7 @@
 import io.openmanufacturing.sds.AbstractCommand;
 import io.openmanufacturing.sds.aspect.AspectToCommand;
 import io.openmanufacturing.sds.aspectmodel.aas.AspectModelAASGenerator;
-import io.openmanufacturing.sds.exeption.CommandException;
+import io.openmanufacturing.sds.exception.CommandException;
 import io.openmanufacturing.sds.metamodel.Aspect;
 import io.openmanufacturing.sds.metamodel.loader.AspectModelLoader;
 import picocli.CommandLine;

tools/bamm-cli/src/main/java/io/openmanufacturing/sds/aspect/to/AspectToDotCommand.java

@@ -18,7 +18,7 @@
 import io.openmanufacturing.sds.AbstractCommand;
 import io.openmanufacturing.sds.aspect.AspectToCommand;
 import io.openmanufacturing.sds.aspectmodel.generator.diagram.AspectModelDiagramGenerator;
-import io.openmanufacturing.sds.exeption.CommandException;
+import io.openmanufacturing.sds.exception.CommandException;
 import picocli.CommandLine;
 
 @CommandLine.Command( name = AspectToDotCommand.COMMAND_NAME,

tools/bamm-cli/src/main/java/io/openmanufacturing/sds/aspect/to/AspectToHtmlCommand.java

@@ -23,7 +23,7 @@
 import io.openmanufacturing.sds.AbstractCommand;
 import io.openmanufacturing.sds.aspect.AspectToCommand;
 import io.openmanufacturing.sds.aspectmodel.generator.docu.AspectModelDocumentationGenerator;
-import io.openmanufacturing.sds.exeption.CommandException;
+import io.openmanufacturing.sds.exception.CommandException;
 import picocli.CommandLine;
 
 @CommandLine.Command( name = AspectToHtmlCommand.COMMAND_NAME,

tools/bamm-cli/src/main/java/io/openmanufacturing/sds/aspect/to/AspectToJsonCommand.java

@@ -18,7 +18,7 @@
 import io.openmanufacturing.sds.AbstractCommand;
 import io.openmanufacturing.sds.aspect.AspectToCommand;
 import io.openmanufacturing.sds.aspectmodel.generator.json.AspectModelJsonPayloadGenerator;
-import io.openmanufacturing.sds.exeption.CommandException;
+import io.openmanufacturing.sds.exception.CommandException;
 import picocli.CommandLine;
 
 @CommandLine.Command( name = AspectToJsonCommand.COMMAND_NAME,

tools/bamm-cli/src/main/java/io/openmanufacturing/sds/aspect/to/AspectToJsonSchemaCommand.java

@@ -21,7 +21,7 @@
 import io.openmanufacturing.sds.AbstractCommand;
 import io.openmanufacturing.sds.aspect.AspectToCommand;
 import io.openmanufacturing.sds.aspectmodel.generator.jsonschema.AspectModelJsonSchemaGenerator;
-import io.openmanufacturing.sds.exeption.CommandException;
+import io.openmanufacturing.sds.exception.CommandException;
 import io.openmanufacturing.sds.metamodel.Aspect;
 import io.openmanufacturing.sds.metamodel.loader.AspectModelLoader;
 import picocli.CommandLine;