timetrap 1.8.3 → 1.8.4

data/README.md

@@ -57,13 +57,19 @@ If you make a mistake use the `edit` command.
 
     $ # edit the running entry's note
     $ t edit writing readme
-    editing entry #42
+    Editing running entry
 
 You check out with the `out` command.
 
     $ t out
     Checked out of sheet "coding"
 
+Running `edit` when you're checked out will edit the last sheet you checked out
+of.
+
+    $ t edit --append "oh and that"
+    Editing last entry you checked out of
+
 You can edit entries that aren't running using `edit`'s `--id` or `-i` flag.
 `t display --ids`  (or `t display -v`) will tell you the ids.
 
@@ -78,7 +84,7 @@ You can edit entries that aren't running using `edit`'s `--id` or `-i` flag.
 
     $ # -i43 to edit entry 43
     $ t e -i43 --end "2010-11-28 13:45"
-    editing entry #43
+    Editing entry with id 43
 
     $ t d
     Timesheet: coding
@@ -264,8 +270,8 @@ Commands
 
 **edit**
   Inserts a note associated with the an entry in the timesheet, or edits the
-  start or end times.  Defaults to the current time although an ``--id`` flag can
-  be passed with the entry's id (see display.)
+  start or end times.  Defaults to the current entry, or previously running
+  entry. An ``--id`` flag can be passed with the entry's id (see display.)
 
   usage: ``t edit [--id ID] [--start TIME] [--end TIME] [--append] [NOTES]``
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 8
-:patch: 3
+:patch: 4

data/lib/timetrap/cli.rb

@@ -53,7 +53,8 @@ COMMAND is one of:
                               found in the README included in this
                               distribution.
 
-  * edit - Alter an entry's note, start, or end time. Defaults to the active entry.
+  * edit - Alter an entry's note, start, or end time. Defaults to the active
+    entry. Defaults to the last entry to be checked out of if no entry is active.
     usage: t edit [--id ID] [--start TIME] [--end TIME] [--append] [NOTES]
     -i, --id <id:i>           Alter entry with id <id> instead of the running entry
     -s, --start <time:qs>     Change the start time to <time>
@@ -198,13 +199,24 @@ COMMAND is one of:
     end
 
     def edit
-      entry = args['-i'] ? Entry[args['-i']] : Timer.active_entry
+      entry = case
+              when args['-i']
+                warn "Editing entry with id #{args['-i'].inspect}"
+                Entry[args['-i']]
+              when Timer.active_entry
+                warn "Editing running entry"
+                Timer.active_entry
+              when Timer.last_checkout
+                warn  "Editing last entry you checked out of"
+                Timer.last_checkout
+              end
+
       unless entry
-        warn "can't find entry"
+        warn "Can't find entry"
         return
-      else
-        warn "editing entry ##{entry.id.inspect}"
       end
+      warn ""
+
       entry.update :start => args['-s'] if args['-s'] =~ /.+/
       entry.update :end => args['-e'] if args['-e'] =~ /.+/
 
@@ -224,6 +236,8 @@ COMMAND is one of:
         end
         entry.update :note => note
       end
+
+      puts format_entries(entry)
     end
 
     def backend
@@ -289,7 +303,7 @@ COMMAND is one of:
       if entries == []
         warn "No entries were selected to display."
       else
-        puts load_formatter(args['-f'] || Config['default_formatter']).new(entries).output
+        puts format_entries(entries)
       end
     end
 
@@ -385,5 +399,9 @@ COMMAND is one of:
       $stdin.gets =~ /\Aye?s?\Z/i
     end
 
+    def format_entries(entries)
+      load_formatter(args['-f'] || Config['default_formatter']).new(Array(entries)).output
+    end
+
   end
 end

data/lib/timetrap/timer.rb

@@ -83,6 +83,12 @@ module Timetrap
       Entry.find(:sheet => (sheet || Timer.current_sheet), :end => nil)
     end
 
+    # the last entry to be checked out of
+    def last_checkout
+      meta = Meta.find(:key => 'last_checkout_id')
+      Entry[meta.value] if meta
+    end
+
     def running_entries
       Entry.filter(:end => nil)
     end
@@ -103,6 +109,9 @@ module Timetrap
         time ||= Time.now
         a.end = time
         a.save
+        meta = Meta.find(:key => 'last_checkout_id') || Meta.create(:key => 'last_checkout_id')
+        meta.value = a.id
+        meta.save
       end
       a
     end

data/spec/timetrap_spec.rb

@@ -188,9 +188,35 @@ describe Timetrap do
           not_running = Timetrap::Timer.active_entry
           Timetrap::Timer.stop(Timetrap::Timer.current_sheet)
           Timetrap::Timer.start "another entry", nil
+
+          # create a few more entries to ensure we're not falling back on "last
+          # checked out of" feature.
+          Timetrap::Timer.stop(Timetrap::Timer.current_sheet)
+          Timetrap::Timer.start "another entry", nil
+
+          Timetrap::Timer.stop(Timetrap::Timer.current_sheet)
+          Timetrap::Timer.start "another entry", nil
+
           invoke "edit --id #{not_running.id} a new description"
           not_running.refresh.note.should == 'a new description'
         end
+
+        it "should edit the entry last checked out of if none is running" do
+          not_running = Timetrap::Timer.active_entry
+          Timetrap::Timer.stop(Timetrap::Timer.current_sheet)
+          invoke "edit -z 'a new description'"
+          not_running.refresh.note.should include 'a new description'
+        end
+
+        it "should edit the entry last checked out of if none is running even if the sheet is changed" do
+          not_running = Timetrap::Timer.active_entry
+          Timetrap::Timer.stop(Timetrap::Timer.current_sheet)
+          invoke "edit -z 'a new description'"
+          invoke "sheet another second sheet"
+          not_running.refresh.note.should include 'a new description'
+          not_running.refresh.sheet.should == 'default'
+          Timetrap::Timer.current_sheet.should == 'another second sheet'
+        end
       end
 
       describe "backend" do
@@ -989,6 +1015,13 @@ END:VCALENDAR
       time.to_i.should == e.refresh.end.to_i
     end
 
+    it "should track the last entry that was checked out of" do
+      Timetrap::Timer.start 'some work'
+      e = Timetrap::Timer.active_entry
+      Timetrap::Timer.stop Timetrap::Timer.current_sheet
+      Timetrap::Timer.last_checkout.id.should == e.id
+    end
+
   end
 
   describe Timetrap::Helpers do

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timetrap"
-  s.version = "1.8.3"
+  s.version = "1.8.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = "2012-11-07"
+  s.date = "2012-11-17"
   s.description = "Command line time tracker"
   s.email = "sgrock@gmail.com"
   s.executables = ["t"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timetrap
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel