timetrap 1.8.10 → 1.8.11

data/lib/timetrap/cli.rb

@@ -259,6 +259,7 @@ COMMAND is one of:
 
     def resume
       last_entry = Timer.entries(Timer.current_sheet).last
+      last_entry ||= Timer.entries("_#{Timer.current_sheet}").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

data/lib/timetrap/version.rb

@@ -1,3 +1,3 @@
 module Timetrap
-  VERSION = '1.8.10'
+  VERSION = '1.8.11'
 end

data/spec/timetrap_spec.rb

@@ -951,6 +951,22 @@ END:VCALENDAR
           end
         end
 
+        describe "with only archived entries" do
+          before(:each) do
+            $stdin.string = "yes\n"
+            invoke "archive"
+            Timetrap::Timer.entries(Timetrap::Timer.current_sheet).should be_empty
+            Timetrap::Timer.active_entry.should be_nil
+          end
+
+          it "retrieves the note of the most recent archived entry" do
+            invoke "resume"
+            Timetrap::Timer.active_entry.should_not be_nil
+            Timetrap::Timer.active_entry.note.should == @last_active.note
+            Timetrap::Timer.active_entry.start.to_s.should == @time.to_s
+          end
+        end
+
         describe "with auto_checkout config option set" do
           before do
             with_stubbed_config 'auto_checkout' => true

data/timetrap.gemspec

@@ -22,9 +22,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", '~> 2.13'
   spec.add_development_dependency "fakefs"
-  spec.add_development_dependency "icalendar"
+  # More recent versions of icalendar drop support for Ruby 1.8.7
+  spec.add_development_dependency "icalendar", "~> 1.3.0"
   spec.add_development_dependency "json"
   spec.add_dependency "sequel", "~> 4.0.0"
   spec.add_dependency "sqlite3", "~> 1.3.3"
-  spec.add_dependency "chronic", "~> 0.9.1"
+
+  spec.add_dependency "chronic", "~> 0.10.2"
 end

metadata

@@ -1,150 +1,169 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: timetrap
-version: !ruby/object:Gem::Version
-  version: 1.8.10
+version: !ruby/object:Gem::Version 
+  hash: 33
+  prerelease: 
+  segments: 
+  - 1
+  - 8
+  - 11
+  version: 1.8.11
 platform: ruby
-authors:
+authors: 
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-12-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 13
+        version: "2.13"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: fakefs
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: icalendar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: icalendar
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 4
+        - 0
+        - 0
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
   type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: chronic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.1
   type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: chronic
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 10
+        - 2
+        version: 0.10.2
+  type: :runtime
+  version_requirements: *id009
 description: Command line time tracker
-email:
+email: 
 - sgrock@gmail.org
-executables:
+executables: 
 - dev_t
 - t
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -177,28 +196,37 @@ files:
 - spec/timetrap_spec.rb
 - timetrap.gemspec
 homepage: https://github.com/samg/timetrap
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.15
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Command line time tracker
-test_files:
+test_files: 
 - spec/timetrap_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 79ab53a429f5f42025e0f262c00d985ff01e5ceb
-  data.tar.gz: 1312375ff25e715b71f78bca87ec4380a5e97867
-SHA512:
-  metadata.gz: 3e9f9c54e829c5ec5d9a6ce3d753a2c4bac35eab4227fc2c242b3df084690b9649f7ad72bfc0ddce5f078ddc6c096298e0e23c28b0978d6eb54ff84cfbee4993
-  data.tar.gz: 99e92a3d25285833f9dc4ede7291ed3361c767d66b58db960438b945eb12fc0640fb1ac180c9fd7ad517d36ff0cdddace1b207746953977ee4e5cb11e8f6e695