tempo-cli 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tempo-cli (0.1.2)
+    tempo-cli (0.1.3)
       chronic (~> 0.10.2)
       gli (= 2.6.1)
 

data/features/start.feature

@@ -36,6 +36,7 @@ Feature: Start Command starts a new time record
     When I run `tempo start --end "1 hour from now"`
     Then the stdout should contain "time record started"
     And the output should match /\d{2}:\d{2} - \d{2}:\d{2}/
+
 @pending
   Scenario: Adding a time record with tags
     Given an existing project file
@@ -45,7 +46,7 @@ Feature: Start Command starts a new time record
     When I run `tempo start --at "1-1-2014 7:00"`
     And I run `tempo end --at "1-1-2014 10:00"`
     And I run `tempo start --at "1-1-2014 8:00"`
-    Then the stderr should contain "error: Time conflict with existing record"
+    Then the stderr should contain "error: time <08:00> conflicts with existing record: 07:00 - 10:00"
 
   Scenario: Adding a time record and closing out the last one
     Given an existing project file
@@ -60,21 +61,15 @@ Feature: Start Command starts a new time record
     And I run `tempo start --at "1-3-2014 10:00"`
     Then the stdout should contain "time record started"
     And the time record 20140101 should contain ":end_time: 2014-01-01 23:59" at line 5
-@pending
-  Scenario: Adding an evening time record should compensate for local time
-    # need to mock entering time in the evening, 21:26:46 -0400
-    # make sure --at "5:00" is recorded for the local day, not GMC
 
-# Adding a time record at the beginning of the day seems to close out at the last time record
-# check on and fix this bug.
- @pending
+
   Scenario: Adding an earlier time record should immediately close out
     Given an existing project file
-    When I run `tempo start --at "1-1-2014 9:00"`
+    When I run `tempo start --at "1-1-2014 10:00"`
     And I run `tempo start --at "1-1-2014 17:00"`
     And I run `tempo start --at "1-1-2014 6:00"`
     Then the stdout should contain "time record started"
-    And the time record 20140101 should contain ":end_time: 2014-01-01 9:00" at line 5
+    And the time record 20140101 should contain ":end_time: 2014-01-01 10:00" at line 5
 
   Scenario: Adding an earlier day time record should immediately close out
     Given an existing project file
@@ -83,5 +78,9 @@ Feature: Start Command starts a new time record
     Then the stdout should contain "time record started"
     And the time record 20140101 should contain ":end_time: 2014-01-01 23:59" at line 5
 
+@pending
+  Scenario: Adding an evening time record should compensate for local time
+    # need to mock entering time in the evening, 21:26:46 -0400
+    # make sure --at "5:00" is recorded for the local day, not GMC
 
 

data/lib/tempo/exceptions.rb

@@ -0,0 +1,39 @@
+module Tempo
+
+  # Reporter raises and error when view records of unknown format
+  class InvalidViewRecordError < Exception
+  end
+
+  # This error is raised when an existing time period conflicts with a time or time period
+  # All parameters are optional, and will be build into the error string if supplied
+  #
+  # Expected parameters are Time objects, but nil or strings will be handled as well
+  #
+  # examples:
+  #
+  # ()                => "time conflicts with existing record"
+  # (<8:00>, <10:00>) => "time conflicts with existing record: 8:00 - 10:00"
+  # (<8:00>, <10:00>, <9:00>) => "time <9:00> conflicts with existing record: 8:00 - 10:00"
+  # (<8:00>, <10:00>, <9:00>, <9:30>) => "time <9:00 - 9:30> conflicts with existing record: 8:00 - 10:00"
+  # (<8:00>, :running) => "time conflicts with existing record: 8:00 - running"
+  #
+  class TimeConflictError < ArgumentError
+
+    def initialize( start_time=nil, end_time=nil, target_start_time=nil, target_end_time=nil )
+
+      @end_time = (end_time.kind_of? Time) ? end_time.strftime('%H:%M') : end_time.to_s
+      @end_time = " - #{@end_time}" if !@end_time.empty?
+      @existing = (start_time.kind_of? Time) ? ": #{start_time.strftime('%H:%M')}#{@end_time}" : start_time.to_s
+
+      @target_end_time = (target_end_time.kind_of? Time) ? "#{target_end_time.strftime('%H:%M')}" : target_end_time.to_s
+      @target_end_time = " - #{@target_end_time}" if !@target_end_time.empty?
+      @target = (target_start_time.kind_of? Time) ? "<#{target_start_time.strftime('%H:%M')}#{@target_end_time}> " : ""
+
+      @message = "time #{@target}conflicts with existing record#{@existing}"
+    end
+
+    def to_s
+      @message
+    end
+  end
+end

data/lib/tempo/models/log.rb

@@ -11,6 +11,7 @@ module Tempo
         # for example Jan 1, 2013 would be  :"130101"
         # id counter is managed through the private methods
         # increase_id_counter and next_id below
+        #
         def id_counter time
           dsym = date_symbol time
           @id_counter = {} unless @id_counter.kind_of? Hash
@@ -26,6 +27,7 @@ module Tempo
         # all instances are saved in the index inherited from base.
         # Additionally, the days index organizes all instances into
         # arrays by day.  This is used for saving to file.
+        #
         def days_index
           @days_index = {} unless @days_index.kind_of? Hash
           @days_index
@@ -56,6 +58,7 @@ module Tempo
         end
 
         # load all the records for a single day
+        #
         def load_day_record time
           dsym = date_symbol time
           if not days_index.has_key? dsym
@@ -65,6 +68,7 @@ module Tempo
         end
 
         # load the records for each day from time 1 to time 2
+        #
         def load_days_records time_1, time_2
 
           return if time_1.nil? || time_2.nil?
@@ -76,6 +80,7 @@ module Tempo
         end
 
         # load the records for the most recently recorded day
+        #
         def load_last_day
           reg = /(\d+)\.yaml/
           if records.last

data/lib/tempo/models/time_record.rb

@@ -1,17 +1,27 @@
+# Time Record is an extension of the Log Model,
+# it adds and end time, and verifies that no records overlap
+# in their time periods. Additionally, one, and only on record
+# can be running at any given time, and it can only be the most
+# recent record.
+
 module Tempo
   module Model
+
     class TimeRecord < Tempo::Model::Log
       attr_accessor :project, :description
       attr_reader :start_time, :end_time, :tags
 
       class << self
 
+        # Only one record can be running at any given time. This record
+        # is the class current, and has and end time of :running
+        #
         def current
           return @current if @current && @current.end_time == :running
           @current = nil
         end
 
-        def current=( instance )
+        def current=instance
           if instance.class == self
             @current = instance
           else
@@ -20,7 +30,7 @@ module Tempo
         end
       end
 
-      def initialize(options={})
+      def initialize options={}
 
         # declare these first for model organization when sent to YAML
         @project_title = nil
@@ -28,10 +38,11 @@ module Tempo
         @start_time = nil
 
         # verify both start time and end time before sending to super
+        # super handles start_time, not end time
         options[:start_time] ||= Time.now
-        verify_start_time options[:start_time]
         @end_time = options.fetch :end_time, :running
-        verify_end_time options[:start_time], @end_time
+        verify_times options[:start_time], @end_time
+
         super options
 
         project = options.fetch :project, Tempo::Model::Project.current
@@ -40,67 +51,92 @@ module Tempo
         @tags = []
         tag options.fetch(:tags, [])
 
-        # close out the running time record
-        if running?
-          if not self.class.current
-            self.class.current = self
-          else
-
-            current = self.class.current
-
-            # more recent entries exist, need to close out immediately
-            if current.start_time > @start_time
-              if current.start_time.day > @start_time.day
-                out = self.class.end_of_day @start_time
-                @end_time = out
-                # TODO add a new record onto the next day
-              else
-                @end_time = current.start_time
-              end
-
-            # close out the last current record
-            else
-              self.class.close_current @start_time
-              self.class.current = self
-            end
-          end
+        leave_only_one_running
+      end
 
-        # close out any earlier running timerecords
+      def start_time= time
+        raise ArgumentError if !time.kind_of? Time
+        if @end_time != :running
+          @start_time = time if verify_times time, @end_time
         else
-          if self.class.current
-             if self.class.current.start_time < @start_time
-               self.class.close_current @start_time
-             end
-          end
+          @start_time = time if verify_start_time time
         end
       end
 
-      def start_time= time
-        @start_time = time if verify_start_time time
+      # end time cannot be set to :running, only to a
+      # valid Time object
+      #
+      def end_time= time
+        raise ArgumentError if !time.kind_of? Time
+        @end_time = time if verify_times self.start_time, time
       end
 
-      def end_time= time
-        @end_time = time if verify_end_time self.start_time, time
+      # method for updating both times at once, necessary if it would
+      # cause a conflict to do them individually
+      #
+      def update_times start_time, end_time
+        raise ArgumentError if !start_time.kind_of? Time
+        raise ArgumentError if !end_time.kind_of? Time
+        verify_times start_time, end_time
+        @start_time = start_time
+        @end_time = end_time
+        leave_only_one_running
       end
 
+      # Public method to access verify start time,
+      # determine if an error will be raised
+      #
       def valid_start_time? time
+        return false if !time.kind_of? Time
         begin
-          verify_start_time time
+          if @end_time != :running
+            verify_times time, @end_time
+          else
+            verify_start_time time
+          end
         rescue ArgumentError => e
           return false
         end
         true
       end
 
+      # Public method to access verify end time,
+      # determine if an error will be raised
+      #
       def valid_end_time? time
+        return false if !time.kind_of? Time
         begin
-          verify_end_time self.start_time, time
+          verify_times self.start_time, time
         rescue ArgumentError => e
           return false
         end
         true
       end
 
+      # Returns the next record in time from the current record
+      # Remember, only records loaded from files will be available
+      # to compare against, so it is important to use the following
+      # methods defined in Log first to assure accuracy:
+      #   * load_day_record
+      #   * load_days_records
+      #   * load_last_day
+      #
+      # uses start_time if end time is :running
+      #
+      def next_record
+        next_one = nil
+        end_time = ( @end_time.kind_of? Time ) ? @end_time : @start_time
+        self.class.index.each do |record|
+          next if record == self
+          if next_one == nil && record.start_time >= end_time
+            next_one = record
+          elsif record.start_time >= end_time && record.start_time < next_one.start_time
+            next_one = record
+          end
+        end
+        next_one
+      end
+
       def project_title
         Project.find_by_id( @project ).title if @project
       end
@@ -124,7 +160,7 @@ module Tempo
         record
       end
 
-      def tag( tags )
+      def tag tags
         return unless tags and tags.kind_of? Array
         tags.each do |tag|
           tag.split.each {|t| @tags << t if ! @tags.include? t }
@@ -132,7 +168,7 @@ module Tempo
         @tags.sort!
       end
 
-      def untag( tags )
+      def untag tags
         return unless tags and tags.kind_of? Array
         tags.each do |tag|
           tag.split.each {|t| @tags.delete t }
@@ -157,6 +193,64 @@ module Tempo
         end
       end
 
+      # If the current project end_time is :running, we
+      # need to update the class running record to the most
+      # recent record that is running. We also need to close out
+      # all other records at the start time of the next record,
+      # or the end of the day if it is the last record on that day.
+      #
+      # If the current project has an end_time, then we
+      # close any previous running record.
+      #
+      def leave_only_one_running
+
+        if running?
+
+          nxt_rcrd = next_record
+
+          # Nothing running, no newer records, make this one current
+          if self.class.current.nil? && nxt_rcrd.nil?
+            self.class.current = self
+
+          # This is the newest record, close out the running record
+          elsif self.class.current && nxt_rcrd.nil?
+            self.class.close_current @start_time
+            self.class.current = self
+
+          # newer records exits, close out on the next record start
+          # date, or end of day if next record is on another day.
+          #
+          # ? Do we care about the current record ?
+          else
+            #current = self.class.current
+
+            # # more recent running entries exist, close this record
+            # if current.start_time > @start_time
+            #   if current.start_time.day > @start_time.day
+            #     out = self.class.end_of_day @start_time
+            #     @end_time = out
+            #   else
+            #     @end_time = current.start_time
+            #   end
+
+
+            if nxt_rcrd.start_time.day == @start_time.day
+              @end_time = nxt_rcrd.start_time
+            else
+              @end_time = self.class.end_of_day @start_time
+            end
+          end
+
+        # Not running, but we still need to close out any earlier running timerecords
+        else
+          if self.class.current
+             if self.class.current.start_time < @start_time
+               self.class.close_current @start_time
+             end
+          end
+        end
+      end
+
       # check a time against all loaded instances, verify that it doesn't
       # fall in the middle of any closed time records
       #
@@ -172,13 +266,21 @@ module Tempo
           next if record.end_time == :running
           next if record == self
           if time < record.end_time
-            raise ArgumentError, "Time conflict with existing record" if time_in_record? time, record
+            raise Tempo::TimeConflictError.new( record.start_time, record.end_time, time ) if time_in_record? time, record
           end
         end
         true
       end
 
-      def verify_end_time start_time, end_time
+      # We never have an end time without a start time
+      # so this is also the equivalent of a verify_end_time method
+      # This method returns true for any valid start time, and an
+      # end time of :running. This condition, (currently only possible from init)
+      # requires a second check to close out all but the most recent time entry.
+      #
+      def verify_times start_time, end_time
+
+        verify_start_time start_time
 
         # TODO: a better check for :running conditions
         return true if end_time == :running
@@ -195,15 +297,16 @@ module Tempo
 
         self.class.days_index[dsym].each do |record|
           next if record == self
-          raise ArgumentError, "Time conflict with existing record:" if time_span_intersects_record? start_time, end_time, record
+          raise Tempo::TimeConflictError.new( record.start_time, record.end_time, start_time, end_time ) if time_span_intersects_record? start_time, end_time, record
         end
         true
       end
 
       # this is used for both start time and end times,
-      # so it will return true if the time is :running
-      # or if it is exactly the record start or end time
-      # these conditions need to be checked separately
+      # so it will return false if the time is :running
+      #
+      # It will return true if it is exactly the record start or end time
+      #
       def time_in_record? time, record
         return false if record.end_time == :running
         time >= record.start_time && time <= record.end_time
@@ -214,6 +317,7 @@ module Tempo
       # It does not invalidate a time span earlier than the record with a :running end time,
       # this condition must be accounted for separately.
       # It assumes a valid start and end time.
+      #
       def time_span_intersects_record? start_time, end_time, record
         if record.end_time == :running
           return true if start_time <= record.start_time && end_time > record.start_time
@@ -227,6 +331,7 @@ module Tempo
       end
 
       # returns the last minute of the day
+      #
       def self.end_of_day time
         Time.new(time.year, time.month, time.day, 23, 59)
       end

data/lib/tempo/version.rb

@@ -1,3 +1,3 @@
 module Tempo
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/tempo/views/view_records/base.rb

@@ -19,9 +19,6 @@
 module Tempo
   module Views
 
-    class InvalidViewRecordError < Exception
-    end
-
     module ViewRecords
 
       # The most simple view records, with a message string

data/lib/tempo.rb

@@ -4,6 +4,7 @@
 require 'time_utilities.rb'
 
 require 'tempo/version.rb'
+require 'tempo/exceptions.rb'
 
 require 'tempo/models/base.rb'
 require 'tempo/models/composite.rb'

data/tempo-cli.gemspec

@@ -9,8 +9,6 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.summary = 'A command line time tracker for recording by day and by project'
   s.description = 'tempo-cli is a command line time tracking application.  Record time spent on projects in YAML files, and manage them from the command line.'
-# Add your other files here if you make them
-# Add lib files to lib.tempo.rb
   s.files = `git ls-files`.split("\n")
   s.require_paths << 'lib'
   s.has_rdoc = true

data/test/lib/tempo/exceptions_test.rb

@@ -0,0 +1,31 @@
+require "test_helper"
+
+describe Tempo::TimeConflictError do
+
+  before(:each) do
+    @start_time = Time.new(2014, 1, 2, 7, 15)
+    @end_time = Time.new(2104, 1, 2, 9, 15)
+    @target_start_time = Time.new(2104, 1, 2, 8, 15)
+    @target_end_time = Time.new(2104, 1, 2, 8, 45)
+  end
+
+  it "can create a message with a target duration" do
+    @exception = Tempo::TimeConflictError.new @start_time, @end_time, @target_start_time, @target_end_time
+    @exception.to_s.must_equal "time <08:15 - 08:45> conflicts with existing record: 07:15 - 09:15"
+  end
+
+  it "can create a message with a target time" do
+    @exception = Tempo::TimeConflictError.new @start_time, @end_time, @target_start_time
+    @exception.to_s.must_equal "time <08:15> conflicts with existing record: 07:15 - 09:15"
+  end
+
+  it "can create a message without a target time" do
+    @exception = Tempo::TimeConflictError.new @start_time, @end_time
+    @exception.to_s.must_equal "time conflicts with existing record: 07:15 - 09:15"
+  end
+
+  it "can handle running time entries" do
+    @exception = Tempo::TimeConflictError.new @start_time, :running, @target_start_time
+    @exception.to_s.must_equal "time <08:15> conflicts with existing record: 07:15 - running"
+  end
+end

data/test/lib/tempo/models/log_test.rb

@@ -78,7 +78,7 @@ describe Tempo do
       Tempo::Model::MessageLog.index[0].message.must_equal "day 1 pet the sheep"
     end
 
-    it "loads the records for a the most recent day and return day" do
+    it "loads records for most recent and return day" do
       log_record_factory
       last_day = Tempo::Model::MessageLog.load_last_day
 

data/test/lib/tempo/models/time_record_test.rb

@@ -1,4 +1,5 @@
 require "test_helper"
+require "pry"
 
 describe Tempo do
 
@@ -66,12 +67,22 @@ describe Tempo do
       Tempo::Model::TimeRecord.current.must_equal nil
     end
 
-    it "has a running? method" do
+    it "has a running boolean method" do
       time_record_factory
       @record_1.running?.must_equal false
       @record_6.running?.must_equal true
     end
 
+    it "has a next record method" do
+      time_record_factory
+      @record_1.next_record.must_equal @record_2
+      @record_2.next_record.must_equal @record_3
+      @record_3.next_record.must_equal @record_4
+      @record_4.next_record.must_equal @record_5
+      @record_5.next_record.must_equal @record_6
+      @record_6.next_record.must_equal nil
+    end
+
     it "has a duration method returning seconds" do
       time_record_factory
       @record_1.duration.must_equal 1800
@@ -92,16 +103,38 @@ describe Tempo do
       @record_3.end_time.must_equal Time.new(2014,1,1,23,59)
     end
 
-    it "closes out new projects if not the most recent" do
+    it "closes out new projects at if not the most recent" do
+    # Verify project closes out at the start time of the next time record,
+    # which is not necessarily the running record
       project_factory
       Tempo::Model::TimeRecord.clear_all
-      @record_2 = Tempo::Model::TimeRecord.new({ project: @project_2, description: "day 1 drinking coffee, check on the mushrooms", start_time: Time.new(2014, 1, 1, 7, 30 ) })
-      @record_1 = Tempo::Model::TimeRecord.new({ project: @project_1, description: "day 1 pet the sheep", start_time: Time.new(2014, 1, 1, 7 ) })
+      @record_1 = Tempo::Model::TimeRecord.new({project: @project_2,
+                                                description: "day 1 drinking coffee, check on the mushrooms",
+                                                start_time: Time.new(2014, 1, 1, 9, 30 ) })
+      @record_2 = Tempo::Model::TimeRecord.new({project: @project_2,
+                                                description: "day 1 pet the sheep",
+                                                start_time: Time.new(2014, 1, 1, 10, 30 ) })
+      @record_3 = Tempo::Model::TimeRecord.new({project: @project_1,
+                                                description: "make the coffee, check the weather",
+                                                start_time: Time.new(2014, 1, 1, 7 ) })
       Tempo::Model::TimeRecord.current.must_equal @record_2
-      @record_1.end_time.must_equal @record_2.start_time
+      @record_3.end_time.must_equal @record_1.start_time
+    end
+
+    it "on init closes out new projects on the same day" do
+      project_factory
+      Tempo::Model::TimeRecord.clear_all
+      @record_1 = Tempo::Model::TimeRecord.new({project: @project_2,
+                                                description: "day 1 drinking coffee, check on the mushrooms",
+                                                start_time: Time.new(2014, 1, 2, 10, 30 ) })
+      @record_2 = Tempo::Model::TimeRecord.new({project: @project_2,
+                                                description: "day 1 pet the sheep",
+                                                start_time: Time.new(2014, 1, 1, 10, 30 ) })
+      Tempo::Model::TimeRecord.current.must_equal @record_1
+      @record_2.end_time.must_equal Time.new(2014, 1, 1, 23, 59 )
     end
 
-    it "closes out all projects when init with an end time" do
+    it "closes earlier running when init with an end time" do
       project_factory
       Tempo::Model::TimeRecord.clear_all
       @record_1 = Tempo::Model::TimeRecord.new({ project: @project_2, description: "day 1 drinking coffee, check on the mushrooms", start_time: Time.new(2014, 1, 1, 7, 30 ) })
@@ -112,12 +145,12 @@ describe Tempo do
 
     it "errors when start time inside existing record" do
       time_record_factory
-      proc { Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 12 ) }) }.must_raise ArgumentError
+      proc { Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 12 ) }) }.must_raise Tempo::TimeConflictError
     end
 
     it "errors when start time same as existing record" do
       time_record_factory
-      proc { Tempo::Model::TimeRecord.new({ start_time: @record_1.start_time }) }.must_raise ArgumentError
+      proc { Tempo::Model::TimeRecord.new({ start_time: @record_1.start_time }) }.must_raise Tempo::TimeConflictError
     end
 
     it "errors when end time is before start time" do
@@ -146,19 +179,19 @@ describe Tempo do
     it "errors when end time in existing record" do
       Tempo::Model::TimeRecord.clear_all
       r1 = Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 10 ), end_time: Time.new(2014, 1, 1, 12 ) })
-      proc { Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 8 ), end_time: Time.new(2014, 1, 1, 11 ) }) }.must_raise ArgumentError
+      proc { Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 8 ), end_time: Time.new(2014, 1, 1, 11 ) }) }.must_raise Tempo::TimeConflictError
     end
 
     it "errors when record spans an existing record" do
       Tempo::Model::TimeRecord.clear_all
       r1 = Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 10 ), end_time: Time.new(2014, 1, 1, 11 ) })
-      proc { Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 8 ), end_time: Time.new(2014, 1, 1, 12 ) }) }.must_raise ArgumentError
+      proc { Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 8 ), end_time: Time.new(2014, 1, 1, 12 ) }) }.must_raise Tempo::TimeConflictError
     end
 
     it "errors when record spans a running record" do
       Tempo::Model::TimeRecord.clear_all
       r1 = Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 10 ) })
-      proc { Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 8 ), end_time: Time.new(2014, 1, 1, 12 ) }) }.must_raise ArgumentError
+      proc { Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 8 ), end_time: Time.new(2014, 1, 1, 12 ) }) }.must_raise Tempo::TimeConflictError
     end
 
     it "has a valid start time check for existing record" do
@@ -173,6 +206,51 @@ describe Tempo do
       @record_2.valid_end_time?(@record_3.end_time).must_equal false
     end
 
+    it "can validate and update a start time" do
+      project_factory
+      Tempo::Model::TimeRecord.clear_all
+      @record = Tempo::Model::TimeRecord.new({project: @project_1,
+                                              start_time: Time.new(2014, 1, 1, 8 ),
+                                              end_time: Time.new(2014, 1, 1, 10 ) })
+      proc { @record.start_time = Time.new(2014, 1, 1, 11 )}.must_raise ArgumentError
+
+      @record.start_time = Time.new(2014, 1, 1, 9 )
+      @record.start_time.must_equal Time.new(2014, 1, 1, 9 )
+    end
+
+    it "can validate and update an end time" do
+      project_factory
+      Tempo::Model::TimeRecord.clear_all
+      @record = Tempo::Model::TimeRecord.new({project: @project_1,
+                                              start_time: Time.new(2014, 1, 1, 8 ),
+                                              end_time: Time.new(2014, 1, 1, 10 ) })
+
+      proc { @record.end_time = Time.new(2014, 1, 1, 7 )}.must_raise ArgumentError
+      @record.end_time = Time.new(2014, 1, 1, 11 )
+      @record.end_time.must_equal Time.new(2014, 1, 1, 11 )
+    end
+
+    it "can update a start and end time" do
+      project_factory
+      Tempo::Model::TimeRecord.clear_all
+      @record = Tempo::Model::TimeRecord.new({project: @project_3,
+                                              start_time: Time.new(2014, 1, 1, 8 ),
+                                              end_time: Time.new(2014, 1, 1, 10 ) })
+
+      @record.update_times(Time.new(2014, 1, 1, 8 ), Time.new(2014, 1, 1, 10 ))
+    end
+
+    it "closes earlier running when start time is updated" do
+      project_factory
+      Tempo::Model::TimeRecord.clear_all
+      @record_1 = Tempo::Model::TimeRecord.new({ project: @project_2, description: "record 1", start_time: Time.new(2014, 1, 1, 10 ) })
+      @record_2 = Tempo::Model::TimeRecord.new({ project: @project_1, description: "record 2", start_time: Time.new(2014, 1, 1, 7 ), end_time: Time.new(2014, 1, 1, 8 ) })
+      Tempo::Model::TimeRecord.current.must_equal @record_1
+
+      @record_2.update_times(Time.new(2014, 1, 1, 11 ), Time.new(2014, 1, 1, 12 ))
+      Tempo::Model::TimeRecord.current.must_equal nil
+    end
+
     it "comes with freeze dry for free" do
       Tempo::Model::TimeRecord.clear_all
       time_record_factory

data/test/lib/tempo/views/reporter_test.rb

@@ -19,7 +19,7 @@ describe Tempo do
 
       it "raises and error when view records of unknown format" do
         record = "an invalid record object"
-        proc { Tempo::Views::Reporter.add_view_record record }.must_raise Tempo::Views::InvalidViewRecordError
+        proc { Tempo::Views::Reporter.add_view_record record }.must_raise Tempo::InvalidViewRecordError
       end
 
       it "sends the reports to the screen formatter on report" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tempo-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -161,6 +161,7 @@ files:
 - lib/tempo/controllers/report_controller.rb
 - lib/tempo/controllers/start_controller.rb
 - lib/tempo/controllers/update_controller.rb
+- lib/tempo/exceptions.rb
 - lib/tempo/models/base.rb
 - lib/tempo/models/composite.rb
 - lib/tempo/models/log.rb
@@ -186,6 +187,7 @@ files:
 - test/lib/file_record/record_test.rb
 - test/lib/tempo/controllers/base_controller_test.rb
 - test/lib/tempo/controllers/project_controller_test.rb
+- test/lib/tempo/exceptions_test.rb
 - test/lib/tempo/models/base_test.rb
 - test/lib/tempo/models/composite_test.rb
 - test/lib/tempo/models/log_test.rb