timetrap 1.7.7 → 1.7.8

data/VERSION.yml

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

data/lib/timetrap/helpers.rb

@@ -63,7 +63,11 @@ module Timetrap
     end
 
     def format_seconds secs
-      "%2s:%02d:%02d" % [secs/3600, (secs%3600)/60, secs%60]
+      negative = secs < 0
+      secs = secs.abs
+      formatted = "%2s:%02d:%02d" % [secs/3600, (secs%3600)/60, secs%60]
+      formatted = "-#{formatted}" if negative
+      formatted
     end
     alias :format_duration :format_seconds
 

data/lib/timetrap/models.rb

@@ -18,7 +18,7 @@ module Timetrap
     end
 
     def end= time
-      self[:end]= Timer.process_time(time)
+      self[:end]= Timer.process_time(time, self[:start])
     end
 
     def start

data/lib/timetrap/timer.rb

@@ -8,13 +8,13 @@ module Timetrap
 
     extend self
 
-    def process_time(time)
+    def process_time(time, now = Time.now)
       case time
       when Time
         time
       when String
         chronic = begin
-          Chronic.parse(time)
+          Chronic.parse(time, :now => now)
         rescue => e
           warn "#{e.class} in Chronic gem parsing time.  Falling back to Time.parse"
         end

data/spec/timetrap_spec.rb

@@ -898,6 +898,20 @@ END:VCALENDAR
 
   end
 
+  describe Timetrap::Helpers do
+    before do
+      @helper = Object.new
+      @helper.extend Timetrap::Helpers
+    end
+    it "should correctly format positive durations" do
+      @helper.format_duration(1234).should == " 0:20:34"
+    end
+
+    it "should correctly format negative durations" do
+      @helper.format_duration(-1234).should == "- 0:20:34"
+    end
+  end
+
 
   describe Timetrap::Entry do
 
@@ -999,6 +1013,17 @@ END:VCALENDAR
           @entry.end.should == Chronic.parse("tomorrow 1pm")
         end
       end
+
+      describe "setting the end time" 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
+
+          # should be about 55 minutes duration.  Allow for second rollover
+          # within this test.
+          (3299..3301).should === @entry.duration
+        end
+      end
     end
 
   end

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.7.7"
+  s.version = "1.7.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2011-11-27}
+  s.date = %q{2011-12-29}
   s.default_executable = %q{t}
   s.description = %q{Command line time tracker}
   s.email = %q{sgrock@gmail.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 7
-  - 7
-  version: 1.7.7
+  - 8
+  version: 1.7.8
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-27 00:00:00 -08:00
+date: 2011-12-29 00:00:00 -08:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency