samg-timetrap 0.0.3 → 0.0.4

data/lib/timetrap.rb

@@ -44,7 +44,11 @@ module Timetrap
     end
 
     def alter
-      Timetrap.active_entry.update :note => args.unused.join(' ')
+      entry = args['--id'] ? Entry[args['--id']] : Timetrap.active_entry
+      say "can't find entry" && return unless entry
+      entry.update :start => args['--start'] if args['--start'] =~ /.+/
+      entry.update :end => args['--end'] if args['--end'] =~ /.+/
+      entry.update :note => unused_args if unused_args =~ /.+/
     end
 
     def backend
@@ -52,7 +56,7 @@ module Timetrap
     end
 
     def in
-      Timetrap.start args.unused.join(' '), args['--at']
+      Timetrap.start unused_args, args['--at']
     end
 
     def out
@@ -60,7 +64,7 @@ module Timetrap
     end
 
     def kill
-      sheet = args.unused.join(' ')
+      sheet = unused_args
       unless (sheets = Entry.map{|e| e.sheet }.uniq).include?(sheet)
         say "ain't no sheet #{sheet.inspect}", 'sheets:', *sheets
         return
@@ -76,10 +80,11 @@ module Timetrap
     end
 
     def display
-      sheet = sheet_name_from_string(args.unused.join(' '))
+      sheet = sheet_name_from_string(unused_args)
       sheet = (sheet =~ /.+/ ? sheet : Timetrap.current_sheet)
       say "Timesheet: #{sheet}"
-      say "           Day                Start      End        Duration   Notes"
+      id_heading = args['--ids'] ? 'Id' : '  '
+      say "       #{id_heading}  Day                Start      End        Duration   Notes"
       last_start = nil
       from_current_day = []
       (ee = Timetrap.entries(sheet)).each_with_index do |e, i|
@@ -87,7 +92,8 @@ module Timetrap
 
         from_current_day << e
         e_end = e.end || Time.now
-        say "%27s%11s -%9s%10s    %s" % [
+        say "%9s%18s%11s -%9s%10s    %s" % [
+          (args['--ids'] ? e.id : ''),
           format_date_if_new(e.start, last_start),
           format_time(e.start),
           format_time(e.end),
@@ -115,7 +121,7 @@ module Timetrap
 
     def switch
       sheet = args.unused.join(' ')
-      if not sheet then say "No sheet specified"; return end
+      if not sheet =~ /.+/ then say "No sheet specified"; return end
       say "Switching to sheet " + Timetrap.switch(sheet)
     end
 
@@ -200,6 +206,10 @@ module Timetrap
       ""
     end
 
+    def unused_args
+      args.unused.join(' ')
+    end
+
     public
     def say *something
       puts *something
@@ -219,10 +229,6 @@ module Timetrap
     Meta.find(:key => 'current_sheet').value
   end
 
-  def invoked_as_executable?
-    $0 == __FILE__
-  end
-
   def entries sheet = nil
     Entry.filter(:sheet => sheet).order_by(:start)
   end
@@ -315,6 +321,15 @@ where COMMAND is one of:
   switch - switch to a new timesheet
 
   COMMAND OPTIONS
-  -a, --at <time:qs>        Use this time instead of now
+  options for `display'
+  --ids                 Print database ids (for use with alter)
+
+  options for `in' and `out'
+  --at <time:qs>        Use this time instead of now
+
+  options for `alter'
+  --id <id:i>           Alter entry with id <id> instead of the running entry
+  --start <time:qs>     Change the start time to <time>
+  --end <time:qs>       Change the end time to <time>
   EOF
 end

data/spec/timetrap_spec.rb

@@ -29,11 +29,33 @@ describe Timetrap do
         before do
           Timetrap.start "running entry", nil
         end
+
         it "should alter the description of the active period" do
           Timetrap.active_entry.note.should == 'running entry'
           invoke 'alter new description'
           Timetrap.active_entry.note.should == 'new description'
         end
+
+        it "should alter the start time of the active period" do
+          invoke 'alter --start "yesterday 10am"'
+          Timetrap.active_entry.start.should == Chronic.parse("yesterday 10am")
+          Timetrap.active_entry.note.should == 'running entry'
+        end
+
+        it "should alter the end time of the active period" do
+          entry = Timetrap.active_entry
+          invoke 'alter --end "yesterday 10am"'
+          entry.refresh.end.should == Chronic.parse("yesterday 10am")
+          entry.refresh.note.should == 'running entry'
+        end
+
+        it "should alter a non running entry based on id" do
+          not_running = Timetrap.active_entry
+          Timetrap.stop
+          Timetrap.start "another entry", nil
+          invoke "alter --id #{not_running.id} a new description"
+          not_running.refresh.note.should == 'a new description'
+        end
       end
 
       describe "backend" do
@@ -74,6 +96,19 @@ Timesheet: SpecSheet
            ---------------------------------------------------------
            Total                                    8:00:00
           OUTPUT
+
+          @desired_output_with_ids = <<-OUTPUT
+Timesheet: SpecSheet
+       Id  Day                Start      End        Duration   Notes
+        3  Fri Oct 03, 2008   12:00:00 - 14:00:00   2:00:00    entry 1
+        2                     16:00:00 - 18:00:00   2:00:00    entry 2
+                                                    4:00:00
+        4  Sun Oct 05, 2008   16:00:00 - 18:00:00   2:00:00    entry 3
+        5                     18:00:00 -            2:00:00    entry 4
+                                                    4:00:00
+           ---------------------------------------------------------
+           Total                                    8:00:00
+          OUTPUT
         end
 
         it "should display the current timesheet" do
@@ -93,6 +128,11 @@ Timesheet: SpecSheet
           invoke 'display S'
           $stdout.string.should == @desired_output
         end
+
+        it "should display a timesheet with ids" do
+          invoke 'display S --ids'
+          $stdout.string.should == @desired_output_with_ids
+        end
       end
 
       describe "format" do
@@ -251,6 +291,12 @@ current sheet: 0:01:00 (a timesheet that is running)
           invoke 'switch sheet 2'
           Timetrap.current_sheet.should == 'sheet 2'
         end
+
+        it "should not switch to an blank timesheet" do
+          invoke 'switch sheet 1'
+          invoke 'switch'
+          Timetrap.current_sheet.should == 'sheet 1'
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: samg-timetrap
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Sam Goldstein