Version 1.6: Added help section, bugfix, updated build process.

* Build now includes config and bin resources.
* Build new builds an executable jar.
* Added help section.
* Bugfix for working directory.

build.xml

@@ -9,8 +9,12 @@
         <mkdir dir="${package.dir}/lib"/>
         <copy file="${build.dir}/${name}-${version}.${build.number}.jar"
               tofile="${package.dir}/${name}-${version}.jar"/>
+        <copy todir="${package.dir}">
+            <fileset dir="${resources.dir}/bin"/>
+        </copy>
         <copy todir="${package.dir}/lib">
             <fileset dir="${build.dir}/lib/runtime/jar"/>
+            <fileset dir="${resources.dir}/config"/>
         </copy>
         <zip basedir="${build.dir}" includes="${name}-${version}/"
              destfile="${build.dir}/${name}-${version}.zip"/>

project.properties

@@ -1,5 +1,7 @@
-#Sat, 10 Aug 2013 01:38:31 -0500
+#Fri, 13 Sep 2013 09:05:06 -0500
 lib.local=true
 name=timestamper-cli
-version=0.4
-build.number=13
+version=0.6
+build.number=4
+main.class=com.jdblabs.timestamper.cli.TimeStamperCLI
+executable.jar=true

resources/bin/ts

@@ -0,0 +1,4 @@
+curdir="`pwd`"
+cd ~/programs/timestamper-cli-0.4
+java -cp "lib:lib/*:./*" com.jdblabs.timestamper.cli.TimeStamperCLI -d "$curdir" "$@" 
+cd "$curdir"

src/main/com/jdblabs/timestamper/cli/TimeStamperCLI.groovy

@@ -23,9 +23,10 @@ public class TimeStamperCLI {
     protected TimelineProperties timelineProperties
     protected Timeline timeline
 
-    public static final String VERSION = "0.4"
+    public static final String VERSION = "0.6"
 
     protected static def cli = [
+        'h': [longOpt: 'help'],
         'v': [longOpt: 'version'],
         'd': [longOpt: 'working-directory', arguments: 1],
         't': [longOpt: 'timeline-config', arguments: 1],
@@ -51,12 +52,16 @@ public class TimeStamperCLI {
         File workingDir = new File(opts.d ?: '.')
         String ttyDevice = opts.tty ?: '/dev/tty'
 
+        if (opts.h) println USAGE
+
         if (opts.v) {
             println "TimeStamperCLI v${VERSION}"
+            println "By JDB Labs (https://www.jdb-labs.com)"
             return }
 
         if (opts.t) {
-            File propFile = new File(workingDir, opts.t)
+            File propFile = new File(opts.t)
+            if (!propFile.isAbsolute()) propFile = new File(workingDir, opts.t)
             inst.showTimeline(propFile, sin, out, err, ttyDevice) }
         else if (inst.timeline == null) {
             // Look for .timestamperrc user config file
@@ -208,6 +213,8 @@ public class TimeStamperCLI {
             }
         }
 
+        this.timelineProperties.syncTargets.each { it.shutdown() }
+
         if (readerThread.isAlive()) {
             readerThread.interrupt();
             readerThread.join(500);
@@ -285,4 +292,29 @@ public class TimeStamperCLI {
 
         return sb.toString() }
 
+    public static final String USAGE = """\
+TimeStamperCLI v${VERSION}
+By JDB Labs (https://www.jdb-labs.com)
+
+Usage: 
+    ts <OPTIONS>
+where OPTIONS is one or more of:
+
+-h, --help                  Print this usage information.
+
+-v, --version               Print version information.
+
+-d, --working-directory     Set the application's working direcotry (defaults to
+                            the current directory of the executing process).
+
+-t, --timeline-config       Set the timeline configuration file to use to access
+                            the timeline. By default, the value of the
+                            `lastUsed` property in the \$HOME/.timestamperrc
+                            file is used to find the timeline configuration file
+                            to use.
+
+--tty                       Manually set the name of the TTY device to use. This
+                            defaults to `/dev/tty`.
+"""
+
 }