diff --git a/build.xml b/build.xml index 4879997..84bf454 100644 --- a/build.xml +++ b/build.xml @@ -9,8 +9,12 @@ + + + + diff --git a/project.properties b/project.properties index 13d27c7..ef75485 100644 --- a/project.properties +++ b/project.properties @@ -1,5 +1,7 @@ -#Fri, 13 Sep 2013 08:55:20 -0500 +#Fri, 13 Sep 2013 09:05:06 -0500 lib.local=true name=timestamper-cli -version=0.5 -build.number=0 +version=0.6 +build.number=4 +main.class=com.jdblabs.timestamper.cli.TimeStamperCLI +executable.jar=true diff --git a/resources/bin/ts b/resources/bin/ts new file mode 100755 index 0000000..ba9797a --- /dev/null +++ b/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" diff --git a/resources/config/logback.groovy b/resources/config/logback.groovy new file mode 100644 index 0000000..e69de29 diff --git a/src/main/com/jdblabs/timestamper/cli/TimeStamperCLI.groovy b/src/main/com/jdblabs/timestamper/cli/TimeStamperCLI.groovy index 53c8283..bb57ee0 100644 --- a/src/main/com/jdblabs/timestamper/cli/TimeStamperCLI.groovy +++ b/src/main/com/jdblabs/timestamper/cli/TimeStamperCLI.groovy @@ -23,7 +23,7 @@ public class TimeStamperCLI { protected TimelineProperties timelineProperties protected Timeline timeline - public static final String VERSION = "0.5" + public static final String VERSION = "0.6" protected static def cli = [ 'h': [longOpt: 'help'], @@ -52,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 @@ -288,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 +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`. +""" + }