tempo-cli 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e0e749497d74a2c5e925fd047c19040e672ec24
-  data.tar.gz: a4923005458055bcf4439e939a8f278d65459296
+  metadata.gz: ea6cc8f7f2251d38ac0f1302e37a0f2cf93fa3d4
+  data.tar.gz: 2e8cce29f69bbc7468034c872084ff4e0952e5e2
 SHA512:
-  metadata.gz: 2524f53d37306e60ced9e55015ac57c1e962540113170b190abb7937a7a2eb16dd0ef7d5825d9ac574895649df0b0f49d3fe146e64a75c9800c51dc42a30aaa3
-  data.tar.gz: 66e4108bba0f37681e7a1f4e701f5e3a7de62705770351f9e5954e998351a73f85328e4e20bdf06ba392905b45c60f4b638051a9fe5aa0c417629f1509016b78
+  metadata.gz: 516fe4c8216081c83a2ce43436cce83827aecccba3823956e236ed7f1bc0e86f67cde7c63537dab655ae60e4dc7610a1e5649858474bb118926ded4aed3ee5e6
+  data.tar.gz: 8c0b3784dfd824eb13343662c061eaf6f4f7ec308458a2f706127ee5388d00d1b20983e5cc0df0e13ce0c170204b70720cefc8164135d948caf8bd85ffedfffe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tempo-cli (0.2.1)
+    tempo-cli (0.2.2)
       chronic (~> 0.10)
       gli (~> 2.10)
 

data/lib/tempo/exceptions.rb

@@ -7,7 +7,9 @@ module Tempo
   # 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
+  # Expected parameters are Time objects, but nil or strings will be handled as well.
+  #
+  # If start time is a Time object, the date will be added to the message.
   #
   # examples:
   #
@@ -17,10 +19,11 @@ module Tempo
   # (<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"
   #
+  # (<2015-09-23 11:50:00 -0400>,...) "... on Sept 23, 2015"
+
   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
@@ -29,7 +32,38 @@ module Tempo
       @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}"
+      @on_day = (start_time.kind_of? Time) ? " on #{start_time.strftime('%b %d, %Y')}" : ""
+      @message = "time #{@target}conflicts with existing record#{@existing}#{@on_day}"
+    end
+
+    def to_s
+      @message
+    end
+  end
+
+  # Raise when the end time is less than the start time
+  # start_time and end_time should be Time objects
+  class EndTimeError < ArgumentError
+
+    def initialize(start_time, end_time)
+      @start_time = (start_time.kind_of? Time) ? start_time.strftime('%H:%M') : start_time.to_s
+      @end_time = (end_time.kind_of? Time) ? end_time.strftime('%H:%M') : end_time.to_s
+      @on_day = (start_time.kind_of? Time) ? "on #{start_time.strftime('%b %d, %Y')}" : ""
+
+      @message = "End time #{@end_time} must be greater than start time #{@start_time} #{@on_day}"
+    end
+
+    def to_s
+      @message
+    end
+  end
+
+  class DifferentDaysError < ArgumentError
+
+    def initialize(start_time, end_time)
+      @start_time = (start_time.kind_of? Time) ? start_time.strftime('%H:%M on %b %d, %Y') : start_time.to_s
+      @end_time = (end_time.kind_of? Time) ? end_time.strftime('%H:%M on %b %d, %Y') : end_time.to_s
+      @message = "End time must be on the same day as start time: #{start_time} : #{end_time}"
     end
 
     def to_s

data/lib/tempo/models/time_record.rb

@@ -285,11 +285,12 @@ module Tempo
         # TODO: a better check for :running conditions
         return true if end_time == :running
 
-        raise ArgumentError, "End time must be greater than start time" if end_time < start_time
+        raise Tempo::EndTimeError.new(start_time, end_time) if end_time < start_time
 
         dsym = self.class.date_symbol end_time
         start_dsym = self.class.date_symbol start_time
-        raise ArgumentError, "End time must be on the same day as start time: #{start_time} : #{end_time}" if dsym != start_dsym
+
+        raise Tempo::DifferentDaysError.new(start_time, end_time) if dsym != start_dsym
 
         # this is necessary if this is the first record
         # for the day and self is not yet added to index

data/lib/tempo/version.rb

@@ -1,3 +1,3 @@
 module Tempo
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tempo-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jonathan Gabel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake