timetrap 1.7.8 → 1.7.9

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 7
-:patch: 8
+:patch: 9

data/lib/timetrap/timer.rb

@@ -14,7 +14,7 @@ module Timetrap
         time
       when String
         chronic = begin
-          Chronic.parse(time, :now => now)
+          time_closest_to_now_with_chronic(time, now)
         rescue => e
           warn "#{e.class} in Chronic gem parsing time.  Falling back to Time.parse"
         end
@@ -29,6 +29,13 @@ module Timetrap
       end
     end
 
+    def time_closest_to_now_with_chronic(time, now)
+      [
+        Chronic.parse(time, :context => :past, :now => now),
+        Chronic.parse(time, :context => :future, :now => now)
+      ].sort_by{|a| (a.to_i - now.to_i).abs }.first
+    end
+
     # Time.parse is optimistic and will parse things like '=18' into midnight
     # on 18th of this month.
     # It will also turn 'total garbage' into Time.now

data/spec/timetrap_spec.rb

@@ -1014,7 +1014,7 @@ END:VCALENDAR
         end
       end
 
-      describe "setting the end time" do
+      describe "with times specfied like 12:12:12" do
         it "should assume a <24 hour duration" do
           @entry.start= Time.at(Time.now - 3600) # 1.hour.ago
           @entry.end = Time.at(Time.now - 300).strftime("%H:%M:%S") # ambiguous 5.minutes.ago
@@ -1023,6 +1023,15 @@ END:VCALENDAR
           # within this test.
           (3299..3301).should === @entry.duration
         end
+
+        it "should assume a start time near the current time" do
+          time = Time.at(Time.now - 300)
+          @entry.start= time.strftime("%H:%M:%S") # ambiguous 5.minutes.ago
+
+          # should be about 55 minutes duration.  Allow for second rollover
+          # within this test.
+          @entry.start.to_i.should == time.to_i
+        end
       end
     end
 

data/timetrap.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.7.8"
+  s.version = "1.7.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 7
-  - 8
-  version: 1.7.8
+  - 9
+  version: 1.7.9
 platform: ruby
 authors: 
 - Sam Goldstein