Updated lib version 2.0 and promoted CLI to 1.0

`timestamper-lib-java` introduces a breaking change in the way timeline files
are written, so this is considered a new major version change.

build.xml

@@ -4,4 +4,20 @@
     <property file="project.properties"/>
     <import file="jdb-build-1.10.xml"/>
 
+    <target name="package" depends="build">
+        <property name="package.dir" value="${build.dir}/${name}-${version}"/>
+        <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"/>
+
+    </target>
 </project>

project.properties

@@ -1,5 +1,7 @@
-#Thu, 08 Aug 2013 23:12:38 -0500
+#Fri, 11 Oct 2013 19:16:24 +0000
 lib.local=true
 name=timestamper-cli
-version=0.2
+version=1.0
-build.number=13
+build.number=1
+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,12 +23,14 @@ public class TimeStamperCLI {
     protected TimelineProperties timelineProperties
     protected Timeline timeline
 
-    public static final String VERSION = "0.1"
+    public static final String VERSION = "0.6"
 
     protected static def cli = [
-        'v': [longOpt: 'version'], 
+        'h': [longOpt: 'help'],
+        'v': [longOpt: 'version'],
         'd': [longOpt: 'working-directory', arguments: 1],
-        't': [longOpt: 'timeline-config', arguments: 1] ]
+        't': [longOpt: 'timeline-config', arguments: 1],
+        'tty': [longOpt: 'tty', arguments: 1]]
 
     public static void main(String[] args) {
 
@@ -41,17 +43,26 @@ public class TimeStamperCLI {
 
         doMain(nailgunInst, context.args, context.in, context.out, context.err) }
 
-    protected static doMain(TimeStamperCLI inst, String[] args,
+    protected static void doMain(TimeStamperCLI inst, String[] args,
     def sin, def out, def err) {
 
         //out = new PrintStream(AnsiConsole.wrapOutputStream(out))
         def opts = LightOptionParser.parseOptions(cli, args as List)
 
         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)
-            inst.showTimeline(propFile, sin, out, err) }
+            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
             File cfgFile = new File(
@@ -61,13 +72,13 @@ public class TimeStamperCLI {
                     cfgFile.canonicalPath
             else {
                 def cfg = new SmartConfig(cfgFile)
-                inst.showTimeline(new File(cfg.lastUsed), sin, out, err) } }
+                inst.showTimeline(new File(cfg.lastUsed), sin, out, err, ttyDevice) } }
-        else { inst.showTimeline(sin, out, err) } }
+        else { inst.showTimeline(sin, out, err, ttyDevice) } }
 
     public TimeStamperCLI() { }
 
     public void showTimeline(File timelinePropertiesFile,
-    def sin, def out, def err) {
+    def sin, def out, def err, String ttyDevice) {
         if (!timelinePropertiesFile.exists() ||
             !timelinePropertiesFile.isFile()) {
 
@@ -79,9 +90,9 @@ public class TimeStamperCLI {
         this.timelineProperties = new TimelineProperties(timelinePropertiesFile)
         this.timeline = timelineProperties.timeline
 
-        showTimeline(sin, out, err) }
+        showTimeline(sin, out, err, ttyDevice) }
 
-    public void showTimeline(final def sin, def out, def err) {
+    public void showTimeline(final def sin, def out, def err, String ttyDevice) {
 
         //out.println ""
         def currentMarker = timeline.getLastMarker(new Date())
@@ -103,7 +114,6 @@ public class TimeStamperCLI {
         def readNotes = {
             out.println(ansi().fg(YELLOW).
                 a("Notes (end with EOF or a blank line):").reset())
-            out.flush();
 
             String notes = ""
             String line = null
@@ -137,7 +147,7 @@ public class TimeStamperCLI {
                     case ~/n|new/:
 
                         // Read mark
-                        out.println(ansi().fg(YELLOW).a("New timestamp:").reset())
+                        out.println(ansi().fg(YELLOW).a("New timestamp mark:").reset())
                         String mark = blockingReadLine()
 
                         // Read notes
@@ -164,6 +174,26 @@ public class TimeStamperCLI {
                         timelineProperties.save()
                         break
 
+                    case ~/reload/:
+                        timeline = timelineProperties.reloadTimeline()
+                        currentMarker = timeline.getLastMarker(new Date())
+                        break
+
+                    case ~/e|ed|edit/:
+                        reader.pause()
+                        out.println(ansi().fg(YELLOW).
+                            a("Press ENTER to launch an editor for the current marker..."))
+                        out.flush()
+                        blockingReadLine()
+                        currentMarker = edit(currentMarker, ttyDevice)
+                        reader.resume()
+                        break
+
+                    case ~/d|del|delete/:
+                        timeline.removeMarker(currentMarker)
+                        currentMarker = timeline.getLastMarker(new Date())
+                        break
+
                     default:
                         String notes = readNotes()
                         currentMarker = new TimelineMarker(new Date(), line, notes)
@@ -178,11 +208,13 @@ public class TimeStamperCLI {
                     formatMarker(currentMarker) +
                     ansi().cursorDown(1).restorCursorPosition().toString())
                 out.flush();
- 
+
                 Thread.sleep(200)
             }
         }
 
+        this.timelineProperties.syncTargets.each { it.shutdown() }
+
         if (readerThread.isAlive()) {
             readerThread.interrupt();
             readerThread.join(500);
@@ -191,6 +223,51 @@ public class TimeStamperCLI {
         out.println ""
     }
 
+    protected TimelineMarker edit(TimelineMarker tm, String ttyDevice) {
+        File temp = File.createTempFile('timestamp-mark-', '.txt')
+        temp.withPrintWriter { fout ->
+            fout.println("""\
+# Edit the time, mark, and notes below. Any lines starting with '#' will be
+# ignored. When done, save the file and close the editor.""")
+            fout.println(Timeline.longFormat.format(tm.timestamp))
+            fout.println(tm.mark)
+            fout.println("""\
+# Everything from the line below to the end of the file will be considered
+# notes for this timeline mark.""")
+            fout.println(tm.notes) }
+
+        ['sh', '-c', "\$EDITOR ${temp.canonicalPath} <${ttyDevice} >${ttyDevice}"].execute().waitFor()
+
+        Thread.sleep(200)
+
+        String newTimeStr
+        String newMark
+        String newNotes = ""
+
+        temp.eachLine { line ->
+            if (line =~ /^\s*#/) return
+
+            if (!newTimeStr) newTimeStr = line
+            else if (!newMark) newMark = line
+            else newNotes += line + EOL }
+
+        Date newTime
+        try { newTime = Timeline.longFormat.parse(newTimeStr) }
+        catch(Exception e) {
+            out.println(ansi().fg(RED).a("Invalid timestamp format. The " +
+                "previous timestamp value will be retained."))
+            newTime = currentMark.timestamp }
+
+        timeline.removeMarker(tm)
+        def newMarker = new TimelineMarker(newTime, newMark, newNotes)
+        timeline.addMarker(newMarker)
+        if (timelineProperties.persistOnUpdate)
+            timelineProperties.save()
+
+        return newMarker
+
+    }
+
     protected static String formatMarker(TimelineMarker tm) {
         return ansi().fgBright(CYAN).
             a(Timeline.shortFormat.format(tm.timestamp) + " ").fg(GREEN).
@@ -215,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`.
+"""
+
 }