timetrap 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 271617ba22c6a444786172a06c319c130e520e3e
-  data.tar.gz: 58a80a95272541cf095d4727e580a1feda1b49f4
+  metadata.gz: 932d2f57b36aa208733e8f99532073b97c224c2e
+  data.tar.gz: c7664fc5641cbcb202d9d368a97ec48e46fa20de
 SHA512:
-  metadata.gz: 75ac29be79462ac44122fedbe8255b48091d749cd08eed5ef672327c7d1a8e949f40ffdb584d3a203e2a3a42ea4ff0ef2ba81ca13c25477555e5d0d96556d409
-  data.tar.gz: d85f15fd101a3a3a321b2d6283c744ac1f7fdc919ee292a8366ad71543841fb70253c2274b8bbd691fae9ef6ac260386e51adf23c1b22fd344b6e287ed989dfb
+  metadata.gz: e7e215bbf435d29824abae93dd2d33bdab1e98ea8fba91400a3f34e3d9b6a04f12749fa426b7e12d3db863edf648a527077d364aa074798d2e9ef2863a970fab
+  data.tar.gz: 8ca27f988fa422d5044964cae9dff471acd34e4d8f6fd0dbdfd5ef40c6dee1160ffb3fee2d563497a3213724bd9b1eb61d3a181707a0d66ff344747ad157f779

data/lib/timetrap/cli.rb

@@ -292,12 +292,19 @@ COMMAND is one of:
       entry = case
               when args['-i']
                 entry = Entry[args['-i']]
+                unless entry
+                  warn "No such entry (id #{args['-i'].inspect})!"
+                  return
+                end
                 warn "Resuming entry with id #{args['-i'].inspect} (#{entry.note})"
                 entry
-              when Timer.last_checkout
-                last = Timer.last_checkout
-                warn "Resuming last entry you checked out of (#{last.note})"
-                last
+              else
+                last_entry = Timer.entries(Timer.current_sheet).order(:id).last
+                last_entry ||= Timer.entries("_#{Timer.current_sheet}").order(:id).last
+                warn "No entry yet on this sheet yet. Started a new entry." unless last_entry
+                note = (last_entry ? last_entry.note : nil)
+                warn "Resuming #{note.inspect} from entry ##{last_entry.id}" if note
+                last_entry
               end
 
       unless entry

data/lib/timetrap/version.rb

@@ -1,3 +1,3 @@
 module Timetrap
-  VERSION = '1.11.0'
+  VERSION = '1.12.0'
 end

data/spec/timetrap_spec.rb

@@ -1241,7 +1241,18 @@ END:VCALENDAR
           @last_active.should_not be_nil
         end
 
-        it "should allow to resume the last active sheet" do
+        it "should allow to resume the last active entry" do
+          invoke 'resume'
+
+          Timetrap::Timer.active_entry.note.should ==(@last_active.note)
+          Timetrap::Timer.active_entry.start.to_s.should == @time.to_s
+        end
+
+        it "should allow to resume the last entry from the current sheet" do
+          invoke 'sheet another another'
+          invoke 'in foo11998845'
+          invoke 'out'
+          invoke 'sheet -'
           invoke 'resume'
 
           Timetrap::Timer.active_entry.note.should ==(@last_active.note)
@@ -1322,6 +1333,10 @@ END:VCALENDAR
 
           describe "with a running entry on another sheet" do
             before do
+              invoke 'sheet sheet2'
+              invoke 'in second task'
+              invoke 'out'
+
               invoke 'sheet sheet1'
               invoke 'in first task'
               invoke 'sheet sheet2'
@@ -1329,7 +1344,7 @@ END:VCALENDAR
 
             it "should check out of the running entry" do
               Timetrap::Timer.active_entry('sheet1').should be_a(Timetrap::Entry)
-              invoke 'resume second task'
+              invoke 'resume'
               Timetrap::Timer.active_entry('sheet1').should be nil
             end
 
@@ -1337,7 +1352,7 @@ END:VCALENDAR
               now = Time.at(Time.now - 5 * 60) # 5 minutes ago
               entry = Timetrap::Timer.active_entry('sheet1')
               entry.should be_a(Timetrap::Entry)
-              invoke "resume -a '#{now}' second task"
+              invoke "resume -a '#{now}'"
               entry.reload.end.to_s.should == now.to_s
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timetrap
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler