tempo-cli 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea6cc8f7f2251d38ac0f1302e37a0f2cf93fa3d4
-  data.tar.gz: 2e8cce29f69bbc7468034c872084ff4e0952e5e2
+  metadata.gz: 020b9afac83811fcaf37f57bf03ba5553677134f
+  data.tar.gz: 90c5735ba9f705f1a8428a7c99cdcb0dcb74cf3f
 SHA512:
-  metadata.gz: 516fe4c8216081c83a2ce43436cce83827aecccba3823956e236ed7f1bc0e86f67cde7c63537dab655ae60e4dc7610a1e5649858474bb118926ded4aed3ee5e6
-  data.tar.gz: 8c0b3784dfd824eb13343662c061eaf6f4f7ec308458a2f706127ee5388d00d1b20983e5cc0df0e13ce0c170204b70720cefc8164135d948caf8bd85ffedfffe
+  metadata.gz: f1acba9a88b45b4e2f4ba85a301da99e4b880c4681b46fcb0bf2c552f074c865bc66abeab6919c6687f839d4c00157522abff3fa531b466255a86152f781fcca
+  data.tar.gz: e5820580c779d3b956ac57ad7c9d799da3951c1cd9b58682aaecd024cdc0208a708f4b758515fce905a5f55176f537adea024e05658b0f45c336fc7512a14824

data/Gemfile.lock

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

data/README.md

@@ -150,6 +150,7 @@ New projects are added as root projects by default. Use arrange to arrange exist
 ##### command options
     --at=time
     --end=time
+    --restart
 
     Starts a new time entry, and closes out any running time entries.
 
@@ -197,6 +198,7 @@ New projects are added as root projects by default. Use arrange to arrange exist
     --id=number         - Select by Id
     --on=date           - Select On Date
     --project           - Update to the active project
+    --running           - Set the last project back to running (reopen the end-time)
     --start=time        - Update the Start Time
 
 update the project, start time, or end time for a time entry.

data/Rakefile

@@ -4,6 +4,7 @@ require 'rubygems/package_task'
 require 'rdoc/task'
 require 'cucumber'
 require 'cucumber/rake/task'
+require "fileutils"
 
 Rake::RDocTask.new do |rd|
   rd.rdoc_files.include("lib/**/*.rb","bin/**/*")
@@ -62,4 +63,4 @@ task :clean => [:tests_setup, :tests_teardown]
 
 task :default => [:tests_setup, :run_tests, :features, :tests_teardown]
 
-task 'features:focus' => [:tests_setup, :run_tests, 'cucumber:focus', :tests_teardown]
+task 'features:focus' => [:tests_setup, :run_tests, 'cucumber:focus']

data/bin/tempo

@@ -261,6 +261,10 @@ To start a time entry at a time other than the current, pass it in as an argumen
 to the --at flag.  This will accept a number of human readable formats, multiple
 word time formats should be enclosed in quotes.
 
+Use the --resume flag to start a new time entry with the last used project and description.
+
+To reopen the last time entry (change the end time back to 'running') see `tempo update --running`
+
 examples:
 
 # start a new time record at the current time with no description
@@ -275,6 +279,9 @@ $ tempo start learning how to do the Hustle --at 'yesterday at 8:00 in the eveni
 arg_name 'description'
 command [:start, :s] do |c|
 
+  c.desc 'start an entry using the last description and project'
+  c.switch [:r, :resume], negatable: false
+
   c.desc 'end the entry at a given time'
   c.arg_name 'time'
   c.flag [:e, :end]
@@ -432,6 +439,9 @@ command [:update, :u] do |c|
   c.arg_name 'time'
   c.flag [:s, :start]
 
+  c.desc 'Change the last time entry back to actively running (ignores all other options)'
+  c.switch [:r, :running], negatable: false
+
   c.desc 'Update the End Time'
   c.arg_name 'time'
   c.flag [:e, :end]
@@ -487,7 +497,7 @@ on_error do |exception|
   # return false to skip default error handling
 
   # remove before distribution:
-  # puts exception.backtrace
+  puts exception.backtrace
 
   true
 end

data/features/end.feature

@@ -40,6 +40,7 @@ Feature: End Command ends the current time record
     And I run `tempo end --at "1-5-2014 15:00"`
     Then the stdout should contain "time record ended"
     And the output should match /7:00 - 15:00/
+
 @pending
   Scenario: Attempting to end after the beginning time
     Given an existing project file
@@ -59,7 +60,3 @@ Feature: End Command ends the current time record
     And the time record 20140101 should contain ":end_time: 2014-01-01 23:59" at line 5
     And the time record 20140102 should contain ":end_time: 2014-01-01 23:59" at line 5
     And the time record 20140103 should contain ":end_time: 2014-01-01 10:00" at line 5
-
-
-
-

data/features/start.feature

@@ -70,6 +70,29 @@ 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 10:00" at line 5
 
+  Scenario: Resuming the last time record
+    Given an existing project file
+    When I run `tempo start --at "1-1-2014 10:00" tweezing the cactus`
+    And I run `tempo end --at "1-1-2014 12:00"`
+    And I successfully run `tempo start --resume --at "1-1-2014 13:00"`
+    Then the stdout should contain "time record started"
+    And the time record 20140101 should contain ":description: tweezing the cactus" at line 11
+
+  Scenario: Resuming the last time record with a different project checked out ignores current project
+    Given an existing project file
+    When I run `tempo start --at "1-1-2014 10:00" tweezing the cactus`
+    And I run `tempo end --at "1-1-2014 12:00"`
+    And I run `tempo checkout basement mushrooms`
+    And I successfully run `tempo start --resume --at "1-1-2014 13:00"`
+    Then the stdout should contain "time record started"
+    And the time record 20140101 should contain ":project_title: horticulture" at line 10
+
+  Scenario: Attempting to resume the last project when one is running
+    Given an existing project file
+    When I run `tempo start --at "1-1-2014 10:00"`
+    And I run `tempo start --resume`
+    Then the stderr should contain "error: cannot resume last time record when it is still running"
+
   Scenario: Adding an earlier day time record should immediately close out
     Given an existing project file
     When I run `tempo start --at "1-5-2014 7:00"`

data/features/update.feature

@@ -48,6 +48,14 @@ Feature: Update Command manages edits to the time records
     Then the stdout should contain "time record updated:\n13:32 - 16:35  [3:03] nano aquarium: trimming the coral"
     And the time record 20140101 should contain ":end_time: 2014-01-01 16:35:00" at line 37
 
+  Scenario: Restarting the last time record
+    Given an existing project file
+    When I run `tempo start --at "1-5-2015 7:00"`
+    And I run `tempo end --at "1-5-2015 15:00"`
+    And I run `tempo update --running`
+    Then the stdout should contain "time record updated"
+    And the time record 20150105 should contain ":end_time: :running" at line 5
+
   Scenario: Updating to the project for the last time record
     Given an existing project file
     And an existing time record file
@@ -73,3 +81,22 @@ Feature: Update Command manages edits to the time records
     Then the stdout should contain "time record updated:\n07:00 - 08:35  [1:35] horticulture: raking leaves"
     And the time record 20131201 should contain ":end_time: 2013-12-01 08:35:00" at line 5
 
+  Scenario: Updating the start time on an earlier day passing only time no date
+    Given an existing project file
+    And an existing time record file
+    When I run `tempo start --at "12/1/2013 7:00" --end "12/1/2013 8:00" raking leaves`
+    And I run `tempo start --at "12/1/2013 9:00" --end "12/1/2013 10:00" counting rosebuds`
+    When I successfully run `tempo update --on "12/1/2013" --id 1 --start "7:35"`
+    Then the stdout should contain "time record updated:\n07:35 - 08:00  [0:25] horticulture: raking leaves"
+    And the time record 20131201 should contain ":start_time: 2013-12-01 07:35:00" at line 4
+
+  Scenario: Updating the end time on an earlier day passing only time no date
+    Given an existing project file
+    And an existing time record file
+    When I run `tempo start --at "12/1/2013 7:00" --end "12/1/2013 8:00" raking leaves`
+    And I run `tempo start --at "12/1/2013 9:00" --end "12/1/2013 10:00" counting rosebuds`
+    When I successfully run `tempo update --on "12/1/2013" --id 1 --end "8:35"`
+    Then the stdout should contain "time record updated:\n07:00 - 08:35  [1:35] horticulture: raking leaves"
+    And the time record 20131201 should contain ":end_time: 2013-12-01 08:35:00" at line 5
+
+

data/lib/tempo/controllers/start_controller.rb

@@ -30,7 +30,24 @@ module Tempo
           end
 
           @time_records.load_last_day options
-          record = @time_records.new(opts)
+
+          if options[:resume]
+            last_record = @time_records.last_record
+
+            return Views.error("cannot resume last time record when it is still running") if last_record.running?
+
+            opts[:description] = last_record.description
+
+            # we use the last used project, but don't save it as current
+            # in case a different project has been checked out.
+            @projects.current = @projects.find_by_id(last_record.project)
+
+            record = @time_records.new(opts)
+
+          else
+            record = @time_records.new(opts)
+          end
+
           @time_records.save_to_file options
 
           Views.start_time_record_view record

data/lib/tempo/controllers/update_controller.rb

@@ -8,12 +8,27 @@ module Tempo
 
       class << self
 
+        def running(options, args)
+          @time_records.load_last_day options
+
+          if @time_records.last_record.running?
+            Views.message "Last time record is currently running"
+          else
+            @time_records.last_record.running!
+            @time_records.save_to_file options
+            Views.update_time_record_view @time_records.last_record
+          end
+        end
+
         def parse(options, args)
 
           reassemble_the args
 
           return Views.project_assistance if Model::Project.index.empty?
 
+          # Reopen last record and ignore all other values if passed --running switch
+          return running(options, args) if options[:running]
+
           # Load last day, or specific day if options includes an on-date
           if options[:on]
             day = Time.parse options[:on]
@@ -52,9 +67,13 @@ module Tempo
               start_time = Time.parse options[:start]
               return Views.no_match_error( "valid timeframe", options[:at], false ) if start_time.nil?
 
-              # TODO: add "today " to start time and try again if not valid
               if record.valid_start_time? start_time
                 record.start_time = start_time
+
+              # try to update the time on the day, to handle updating with time params only
+              elsif record.valid_start_time? start_time.on_date(record.start_time)
+                record.start_time = start_time.on_date(record.start_time)
+
               else
                 return Views::ViewRecords::Message.new "cannot change start time to #{start_time.strftime('%H:%M')}", category: :error
               end
@@ -68,6 +87,11 @@ module Tempo
               # TODO: add "today " to end time and try again if not valid
               if record.valid_end_time? end_time
                 record.end_time = end_time
+
+              # try to update the time on the day, to handle updating with time params only
+              elsif record.valid_end_time? end_time.on_date(record.end_time)
+                record.end_time = end_time.on_date(record.end_time)
+
               else
                 return Views::ViewRecords::Message.new "cannot change end time to #{end_time.strftime('%H:%M')}", category: :error
               end

data/lib/tempo/models/log.rb

@@ -58,6 +58,13 @@ module Tempo
           FileRecord::FileUtility.new(self, options).log_records
         end
 
+        # returns the loaded record with the latest start time
+        # Only loads records if options[:load] is true
+        def last_record(options={})
+          load_last_day(options) if options[:load]
+          sort_by_start_time.last
+        end
+
         # send alternate directory through options
         def save_to_file(options={})
           FileRecord::Record.save_log(self, options)

data/lib/tempo/models/time_record.rb

@@ -65,6 +65,7 @@ module Tempo
 
       # end time cannot be set to :running, only to a
       # valid Time object
+      # Use running! to restart a time record
       #
       def end_time=time
         raise ArgumentError if !time.kind_of? Time
@@ -154,6 +155,11 @@ module Tempo
         @end_time == :running
       end
 
+      def running!
+        raise "only the most recent record can be reopened" unless self == self.class.last_record
+        @end_time = :running
+      end
+
       def freeze_dry
         record = super
         record[:project_title] = project_title
@@ -181,7 +187,7 @@ module Tempo
 
       private
 
-      #close current at the end time, or on the last minute
+      # close current at the end time, or on the last minute
       # of the day if end time is another day
       #
       def self.close_current(end_time)

data/lib/tempo/version.rb

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

data/lib/tempo/views/base.rb

@@ -48,6 +48,14 @@ module Tempo
         end
       end
 
+      def message(message)
+        ViewRecords::Message.new message, category: :info
+      end
+
+      def error(message)
+        ViewRecords::Message.new message, category: :error
+      end
+
       def no_match_error(items, request, plural=true)
         match = plural ? "match" : "matches"
         ViewRecords::Message.new "no #{items} #{match} the request: #{request}", category: :error

data/lib/time_utilities.rb

@@ -27,4 +27,9 @@ class Time
   def add_days(days)
     t = self + days * 86400 # 24 * 60 * 60
   end
+
+  def on_date(date)
+    raise ArgumentError if ! date.kind_of? Time
+    Time.new(date.year, date.month, date.day, self.hour, self.min, self.sec)
+  end
 end

data/test/lib/tempo/exceptions_test.rb

@@ -11,21 +11,21 @@ describe Tempo::TimeConflictError do
 
   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"
+    @exception.to_s.must_equal "time <08:15 - 08:45> conflicts with existing record: 07:15 - 09:15 on Jan 02, 2014"
   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"
+    @exception.to_s.must_equal "time <08:15> conflicts with existing record: 07:15 - 09:15 on Jan 02, 2014"
   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"
+    @exception.to_s.must_equal "time conflicts with existing record: 07:15 - 09:15 on Jan 02, 2014"
   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"
+    @exception.to_s.must_equal "time <08:15> conflicts with existing record: 07:15 - running on Jan 02, 2014"
   end
-end
+end

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

@@ -17,7 +17,6 @@ describe Tempo do
     it "inherits the freeze-dry method" do
       log_factory
       frozen = @log_4.freeze_dry
-      binding.pry if @log_4.id != 1
       frozen.must_equal({ :start_time=>Time.new(2014, 01, 02, 07, 15),
                           :id=>1, :message=>"day 2 pet the sheep"})
     end
@@ -182,5 +181,10 @@ describe Tempo do
       Tempo::Model::MessageLog.days_index[:"20140101"].length.must_equal 2
       Tempo::Model::MessageLog.days_index[:"20140102"].length.must_equal 3
     end
+
+    it "can return the last record" do
+      log_factory
+      Tempo::Model::MessageLog.last_record.must_equal @log_6
+    end
   end
 end

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

@@ -73,6 +73,19 @@ describe Tempo do
       @record_6.running?.must_equal true
     end
 
+    it "has a running! method for last record only" do
+      time_record_factory
+       @record_6.end_time = Time.new(2014, 1, 2, 19, 00 )
+       @record_6.running!
+      Tempo::Model::TimeRecord.current.must_equal @record_6
+    end
+
+    it "running! method succeeds on last record only" do
+      time_record_factory
+      proc { @record_1.running!}.must_raise RuntimeError
+    end
+
+
     it "has a next record method" do
       time_record_factory
       @record_1.next_record.must_equal @record_2
@@ -155,7 +168,7 @@ describe Tempo do
 
     it "errors when end time is before start time" do
       Tempo::Model::TimeRecord.clear_all
-      proc { Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 12 ), end_time: Time.new(2014, 1, 1, 10 ) }) }.must_raise ArgumentError
+      proc { Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 12 ), end_time: Time.new(2014, 1, 1, 10 ) }) }.must_raise Tempo::EndTimeError
     end
 
     it "accepts and end time equal to start time" do
@@ -173,7 +186,7 @@ describe Tempo do
 
     it "errors when end time is on a different day" do
       Tempo::Model::TimeRecord.clear_all
-      proc { Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 10 ), end_time: Time.new(2014, 1, 2, 12 ) }) }.must_raise ArgumentError
+      proc { Tempo::Model::TimeRecord.new({ start_time: Time.new(2014, 1, 1, 10 ), end_time: Time.new(2014, 1, 2, 12 ) }) }.must_raise Tempo::DifferentDaysError
     end
 
     it "errors when end time in existing record" do
@@ -212,7 +225,7 @@ describe Tempo do
       @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
+      proc { @record.start_time = Time.new(2014, 1, 1, 11 )}.must_raise Tempo::EndTimeError
 
       @record.start_time = Time.new(2014, 1, 1, 9 )
       @record.start_time.must_equal Time.new(2014, 1, 1, 9 )
@@ -225,7 +238,7 @@ describe Tempo do
                                               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
+      proc { @record.end_time = Time.new(2014, 1, 1, 7 )}.must_raise Tempo::EndTimeError
       @record.end_time = Time.new(2014, 1, 1, 11 )
       @record.end_time.must_equal Time.new(2014, 1, 1, 11 )
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tempo-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jonathan Gabel