ttrack 0.1.4 → 0.2.0

data/bin/ttrack

@@ -1,25 +1,61 @@
 #!/Users/alex/.rvm/rubies/ruby-1.9.2-p290/bin/ruby -w
 require 'ttrack'
 
-tt = TTrack.new
+def usage(tt)
+  puts 'Usage: ttrack [%s]' % (tt.commands * '|')
+end
+
+databasename = "%s/%s" % [ENV['HOME'], ".timetrackerdb"]
+tt = TTrack.new databasename
 case ARGV[0]
   when 'start' then
-    tt.start ARGV[1], ARGV[2]
+    if tt.start(ARGV[1], ARGV[2])
+      puts 'Start tracking issue "%s"' % ARGV[1]
+    else
+      usage(tt)
+    end
+
   when 'stop' then
-    tt.stop
+    unless tt.stop
+      puts 'Not tracking'
+    end
+
   when 'status' then
-    tt.status ARGV[1]
+    status = tt.status(ARGV[1])
+    unless status.nil?
+      puts 'Total time tracked for task "%s": %d seconds' % [status[:task], status[:elapsed]]
+    else
+      puts "Currently not tracking"
+    end
+
   when 'init' then
+    puts 'Initlializing empty sqlite database: %s' % databasename
     tt.init
+
   when 'report' then
-    tt.report ARGV[1]
-  when 'beguin' then
-    timestamp = ARGV[3] ? "%s %s" % ARGV[2..3] : ARGV[2]
-    tt.setstart ARGV[1], timestamp
+    report = tt.report(ARGV[1])
+    unless report.nil?
+      report.each do |line|
+        puts line
+      end
+    end
+
+  when 'begin' then
+    begin
+      timestamp = ARGV[3] ? "%s %s" % ARGV[2..3] : ARGV[2]
+      tt.set_tstart! ARGV[1], timestamp
+    rescue Exception => e
+      usage(tt)
+    end
+
   when 'end' then
-    timestamp = ARGV[3] ? "%s %s" % ARGV[2..3] : ARGV[2]
-    tt.setstop ARGV[1], timestamp
-  when 'help' then
-    tt.usage
-  else tt.start ARGV[0], ARGV[1]
+    begin
+      timestamp = ARGV[3] ? "%s %s" % ARGV[2..3] : ARGV[2]
+      tt.set_tstop! ARGV[1], timestamp
+    rescue
+      usage(tt)
+    end
+
+  else
+    usage(tt)
 end

data/lib/ttrack/datastore.rb

@@ -3,8 +3,8 @@ require 'sqlite3'
 
 class TTrack::DataStore
 
-  def initialize dbname=".timetrackerdb", timezone="+02:00", version='v0.1.4', verbosity=0
-    @dbname = "%s/%s" % [ENV['HOME'], dbname]
+  def initialize dbname, timezone="+02:00", version='v0.1.4', verbosity=0
+    @dbname = dbname
     @timezone = timezone
     @version = version
     @verbosity = verbosity
@@ -63,7 +63,7 @@ class TTrack::DataStore
   public
   def getcurrent
     current = @db.execute "SELECT current FROM system"
-    current[0][0] == "" ? nil : current[0][0]
+    current[0][0] == "" ? false : current[0][0]
   end
 
   def getstatus
@@ -76,7 +76,7 @@ class TTrack::DataStore
     end
   end
 
-  def startnew issuename, notes=''
+  def startnew issuename, notes
     @db.execute "INSERT INTO timesheet ( name, notes ) VALUES ( '%s', '%s' )" %
       [issuename, notes]
     latest = @db.execute "SELECT id FROM timesheet ORDER BY id DESC LIMIT 1"
@@ -88,8 +88,9 @@ class TTrack::DataStore
     if current
       @db.execute "UPDATE timesheet set tstop = datetime('now') WHERE id = %d" % current
       @db.execute "UPDATE system SET current = '', latest = '%d'" % current
+      true
     else
-      p "Not tracking"
+      false
     end
   end
 
@@ -104,7 +105,7 @@ class TTrack::DataStore
   end
 
   def gettimesheet
-    @db.execute "SELECT id,name,tstart,tstop,notes FROM timesheet"
+    @db.execute "SELECT id,name,tstart,tstop,synced,notes FROM timesheet"
   end
 
   def gettimesbyissuename issuename
@@ -115,8 +116,8 @@ class TTrack::DataStore
     @db.execute "SELECT tstart,tstop FROM timesheet WHERE name='%s'" % issuename
   end
 
-  def getissuesidsbyname issuename
-    @db.execute "SELECT id,tstart,tstop,notes FROM timesheet WHERE name='%s'" % issuename
+  def getissuesbyname issuename
+    @db.execute "SELECT id,tstart,tstop,synced, notes FROM timesheet WHERE name='%s'" % issuename
   end
 
   def settstart id, tstart

data/lib/ttrack.rb

@@ -7,89 +7,106 @@
 class TTrack
 
   # At each call we need to declare the datastore
-  def initialize
-    @db = DataStore.new
+  def initialize datastore
+    @db = DataStore.new datastore
   end
 
-  def start issuename, notes
-    unless issuename.nil?
-      if @db.getcurrent
-        @db.stoprunning
-      end
+  # Start tracking an issue, stop the current one if running
+  # Return boolean to indicate if the action was succesfull or not
+  def start issuename, notes=''
+    unless issuename.nil? or issuename.empty?
+      @db.stoprunning if @db.getcurrent
       @db.startnew issuename, notes
+      true
     else
-      usage
+      false
     end
   end
 
+  # Stop the current running task
+  # Return false if no current running task, true otherwise
   def stop
-    @db.stoprunning
+    @db.stoprunning ? true : false
   end
 
-  def status issuename
-    unless issuename
+  # Get current running task status if no issuename given
+  # Otherwise get total duration for named task (i.e. for any matching time entry)
+  def status issuename=nil
+    if issuename.nil?
       status = @db.getstatus
       if status
         delta = Time.now - gettstart(@db.getcurrent)
-        puts "Tracking task '%s' | Run time: %d seconds (%.2f hours)" % [status[1], delta, delta / 3600]
-      else
-        puts "Not tracking"
+        {:task => status[1], :elapsed => delta}
       end
     else
       total = gettotalissueduration(issuename)
-      unless total == 0
-        puts "Total seconds for task %s: %d (%.2f hours)" % 
-          [
-            issuename,
-            total,
-            total / 3600
-          ]
-      else
-        puts "No entry for issue '%s'" % issuename
+      unless total.nil?
+        {:task => issuename, :elapsed => total}
       end
     end
   end
 
-  def report issuename
-    if issuename.nil?
+  # Get a report for the given issue name
+  # If no issue is give, get a report for everything
+  def report issuename=nil
+    result = Array.new
+
+    if issuename.nil? or issuename.empty?
       r = @db.gettimesheet
-      pstring = "%s | %s | %s | %s | %s | %d"
-      puts "id | name | tstart | tstop | notes | duration"
-    else
-      r = @db.getissuesidsbyname issuename
-      pstring = "%s | %s | %s | %s | %d"
-      puts "id | tstart | tstop | notes | duration"
-    end
-    unless r[0].nil?
-        r.each do |x|
-        x << getissueduration(x[0])
-        puts pstring % x
+      r.each do |line|
+          result << {
+          :task => line[0],
+          :name => line[1],
+          :tstart => line[2],
+          :tstop => line[3],
+          :synced => line[4],
+          :notes => line[5],
+          :elapsed => getissueduration(line[0])
+        }
       end
     else
-      usage
+      r = @db.getissuesbyname issuename
+      r.each do |line|
+          result << {
+          :task => line[0],
+          :tstart => line[1],
+          :tstop => line[2],
+          :synced => line[3],
+          :notes => line[4],
+          :elapsed => getissueduration(line[0])
+        }
+      end
     end
+    result.empty? ? nil : result
   end
 
-  def setstart issueid, timestamp
-    if validateissueid issueid
-      t = validatetimestamp timestamp
-      @db.settstart issueid, t
+  # Overwrite tstart for given issue with given timestamp
+  def set_tstart! issueid, timestamp
+    if validateissueid(issueid)
+      t = validatetimestamp(timestamp)
+      @db.settstart(issueid, t)
+      true
+    else
+      false
     end
   end
 
-  def setstop issueid, timestamp
+  # Override tstop for given issue
+  def set_tstop! issueid, timestamp
     if validateissueid issueid
       t = validatetimestamp timestamp
       @db.settstop issueid, t
     end
   end
 
+  # Cleanup the database
   def init
     @db.cleanup
   end
 
-  def usage
-    puts "Usage: ttrack [start|stop|status|init|report|begin|end] issue_name"
+  # List of available public methods
+  def commands
+    [:start, :stop, :status, :init, :report, :begin, :end]
   end
 
   private
@@ -145,7 +162,7 @@ class TTrack
         total = total + (t1 - t0)
       end
     end
-    total
+    r[0].nil? ? nil : total
   end
 
   def getissueduration issueid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ttrack
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000Z
+date: 2012-10-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70310507347300 !ruby/object:Gem::Requirement
+  requirement: &70131255576880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70310507347300
+  version_requirements: *70131255576880
 description: A simple CLI time tracker
 email: alexander.fortin@gmail.com
 executables: