Add version command

Author: jericks

build.sh

@@ -4,6 +4,7 @@ $GRAALVM_HOME/bin/native-image --verbose \
   -H:ReflectionConfigurationFiles=src/config/config_geom.json \
   -H:ReflectionConfigurationFiles=src/config/config_args4j.json \
   -H:IncludeResources=META-INF/services/*.* \
+  -H:IncludeResources=application.properties \
   -H:IncludeResourceBundles=org.kohsuke.args4j.Messages \
   -H:IncludeResourceBundles=org.kohsuke.args4j.spi.Messages \
   -H:+JNI \

pom.xml

@@ -35,6 +35,12 @@
         </dependency>
     </dependencies>
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

src/config/config_geom.json

@@ -17,6 +17,24 @@
     "allPublicFields": true,
     "allDeclaredFields": true
   },
+  {
+    "name": "org.geometrycommands.VersionCommand",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allPublicFields": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "org.geometrycommands.VersionCommand$VersionOptions",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allPublicFields": true,
+    "allDeclaredFields": true
+  },
   {
     "name": "org.geometrycommands.ListCommand",
     "allDeclaredConstructors": true,

src/main/java/org/geometrycommands/VersionCommand.java

@@ -0,0 +1,63 @@
+package org.geometrycommands;
+
+import org.geometrycommands.VersionCommand.VersionOptions;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.Properties;
+
+public class VersionCommand implements Command<VersionOptions> {
+
+
+    /**
+     * Get the Command's name
+     *
+     * @return The Command's name
+     */
+    @Override
+    public String getName() {
+        return "version";
+    }
+
+    /**
+     * Get the description of what the Command does
+     *
+     * @return The description of what the Command does
+     */
+    @Override
+    public String getDescription() {
+        return "Get the version";
+    }
+
+    /**
+     * Get a new Options
+     *
+     * @return A new Options
+     */
+    @Override
+    public VersionOptions getOptions() {
+        return new VersionOptions();
+    }
+
+    /**
+     * Execute this Command with the given Options
+     *
+     * @param options The Options
+     * @param reader  The java.io.Reader
+     * @param writer  The java.io.Writer
+     * @throws Exception if an error occurs
+     */
+    @Override
+    public void execute(VersionOptions options, Reader reader, Writer writer) throws Exception {
+        try(InputStream inputStream = VersionCommand.class.getClassLoader().getResourceAsStream("application.properties")) {
+            Properties properties = new Properties();
+            properties.load(inputStream);
+            writer.write(properties.getProperty("version"));
+        }
+    }
+
+    public static class VersionOptions extends Options {
+    }
+
+}

src/main/resources/META-INF/services/org.geometrycommands.Command

@@ -95,4 +95,5 @@ org.geometrycommands.ToWkbCommand
 org.geometrycommands.TranslateCommand
 org.geometrycommands.UnionCommand
 org.geometrycommands.VoronoiDiagramCommand
-org.geometrycommands.WithinCommand
+org.geometrycommands.WithinCommand
+org.geometrycommands.VersionCommand

src/main/resources/application.properties

@@ -0,0 +1 @@
+version=${project.version}

src/man/geom-version.1

@@ -0,0 +1,12 @@
+.TH "geom-version" "1" "4 May 2012" "version 0.1"
+.SH NAME
+geom version
+.SH DESCRIPTION
+Get the version
+.SH USAGE
+geom version
+.SH OPTIONS
+--help : Print help message
+.PP
+--web-help : Open help in a web browser
+.PP

src/shell/geom_bash_comp

@@ -5,7 +5,7 @@ _geom()
     local line=${COMP_LINE}
     COMPREPLY=()
     if [[ "$line" == *"geom " ]]; then
-        COMPREPLY=($(compgen -W 'angle arc arcpoly area asciiart boundary buffer centroid closelinestring combine contains convexHull coordinates count countpoints coveredby covers crosses delaunay densify difference dimension disjoint distance distanceline draw drawbase64 dump ellipse endpoint envelope equals fromwkb get grid hausdorffdistance interiorpoint interpolatepoint intersection intersects isccw isclosed isempty isrectangle isring issimple isvalid iswithindistance kochsnowflake linedissolve linemerge list locatepoint mincircle minclearance mindiameter minrect narrow nearestpoints node normalize octagonalenvelope overlaps placepoint pointatangle polygonize project random randomwalk rectangle reduceprecision reflect relate reverse rotate scale shear sierpinskicarpet similarity simplify sinestar slice snap split spoke squircle startpoint subline supercircle symdifference text touches towkb translate type union voronoi within' -- $cur))
+        COMPREPLY=($(compgen -W 'angle arc arcpoly area asciiart boundary buffer centroid closelinestring combine contains convexHull coordinates count countpoints coveredby covers crosses delaunay densify difference dimension disjoint distance distanceline draw drawbase64 dump ellipse endpoint envelope equals fromwkb get grid hausdorffdistance interiorpoint interpolatepoint intersection intersects isccw isclosed isempty isrectangle isring issimple isvalid iswithindistance kochsnowflake linedissolve linemerge list locatepoint mincircle minclearance mindiameter minrect narrow nearestpoints node normalize octagonalenvelope overlaps placepoint pointatangle polygonize project random randomwalk rectangle reduceprecision reflect relate reverse rotate scale shear sierpinskicarpet similarity simplify sinestar slice snap split spoke squircle startpoint subline supercircle symdifference text touches towkb translate type union version voronoi within' -- $cur))
     elif [[ "$line" == *"geom angle "* ]]; then
         COMPREPLY=($(compgen -W '--help --web-help -g --geometry -o --otherGeometry -t --type' -- $cur))
     elif [[ "$line" == *"geom arc "* ]]; then
@@ -198,6 +198,8 @@ _geom()
         COMPREPLY=($(compgen -W '--help --web-help -g --geometry' -- $cur))
     elif [[ "$line" == *"geom union "* ]]; then
         COMPREPLY=($(compgen -W '--help --web-help -g --geometry -o --otherGeometry' -- $cur))
+    elif [[ "$line" == *"geom version "* ]]; then
+        COMPREPLY=($(compgen -W '--help --web-help' -- $cur))
     elif [[ "$line" == *"geom voronoi "* ]]; then
         COMPREPLY=($(compgen -W '--help --web-help -g --geometry' -- $cur))
     elif [[ "$line" == *"geom within "* ]]; then
@@ -492,6 +494,9 @@ _geom()
         if [[ "union" == "$nm"* ]]; then
             COMPREPLY=("${COMPREPLY[@]}" $(compgen -W 'union'))
         fi
+        if [[ "version" == "$nm"* ]]; then
+            COMPREPLY=("${COMPREPLY[@]}" $(compgen -W 'version'))
+        fi
         if [[ "voronoi" == "$nm"* ]]; then
             COMPREPLY=("${COMPREPLY[@]}" $(compgen -W 'voronoi'))
         fi

src/test/java/org/geometrycommands/VersionCommandTest.java

@@ -0,0 +1,43 @@
+package org.geometrycommands;
+
+import org.junit.Test;
+
+import java.io.*;
+import java.util.Properties;
+
+import org.geometrycommands.VersionCommand.VersionOptions;
+
+import static org.junit.Assert.assertEquals;
+
+public class VersionCommandTest extends BaseTest {
+
+    @Test
+    public void execute() throws Exception {
+        VersionOptions options = new VersionOptions();
+        Reader reader = new StringReader("");
+        StringWriter writer = new StringWriter();
+
+        VersionCommand command = new VersionCommand();
+        command.execute(options, reader, writer);
+        assertEquals(getExpectedVersion(), writer.getBuffer().toString());
+    }
+
+    @Test
+    public void run() throws Exception {
+        String result = runApp(new String[]{
+            "Version"
+        }, null);
+        assertEquals(getExpectedVersion(), result);
+    }
+
+    private String getExpectedVersion() throws IOException {
+        String expectedVersion = null;
+        try(InputStream inputStream = VersionCommand.class.getClassLoader().getResourceAsStream("application.properties")) {
+            Properties properties = new Properties();
+            properties.load(inputStream);
+            expectedVersion = properties.getProperty("version");
+        }
+        return expectedVersion;
+    }
+
+}