tempo-cli 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 020b9afac83811fcaf37f57bf03ba5553677134f
-  data.tar.gz: 90c5735ba9f705f1a8428a7c99cdcb0dcb74cf3f
+  metadata.gz: 6f1e31cb5d21c90343bf98498d67ece6b53532fe
+  data.tar.gz: 22380af6098cebe55438b9878a5324f4024d414b
 SHA512:
-  metadata.gz: f1acba9a88b45b4e2f4ba85a301da99e4b880c4681b46fcb0bf2c552f074c865bc66abeab6919c6687f839d4c00157522abff3fa531b466255a86152f781fcca
-  data.tar.gz: e5820580c779d3b956ac57ad7c9d799da3951c1cd9b58682aaecd024cdc0208a708f4b758515fce905a5f55176f537adea024e05658b0f45c336fc7512a14824
+  metadata.gz: 4cd63f381d1b7267e0951a2aa3f709fffadc25db098c7581e929254c28fe36ca334c849243b79d22e407ea41c582f642d44ad4784617b01373ba5fb535e77507
+  data.tar.gz: 64038cd234cecf689e3f48c20719de6d1c9843c87952570bb73ffb74c70eaea4a4548ba2532e813ff087d5ad5bbe1722e3f919dbb17ca8decfe2ea584b3b6dad

data/Gemfile.lock

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

data/README.md

@@ -68,13 +68,14 @@ Time record ids are on a per-day basis, and begin again with an id of 1 on the n
 
 ##### command options
 
-    --add                  - Add a Project
-    --delete=title         - Delete a Project
-    --exact                - Exact Match
-    --id                   - List by or perform command by project Id
-    --list                 - List Projects
-    --tag=tagword          - Tag a Project
-    --untag=tagword        - Untag a Project
+    --add           - Add a Project
+    --child         - Add a Project as a child of the current Project
+    --delete=title  - Delete a Project (default: none)
+    --exact         - Exact Match
+    --id            - List by or perform command by project id
+    --list          - List Projects
+    --tag=tagword   - Tag a Project (default: none)
+    --untag=tagword - Untag a Project (default: none)
 
 
 Manage the Projects that timed tasks are assigned to. By default, lists the current project, or with --list tag, lists all projects. The active project will be marked by an asterisk.
@@ -148,15 +149,15 @@ New projects are added as root projects by default. Use arrange to arrange exist
     tempo [global options] start [command options] description
 
 ##### command options
-    --at=time
-    --end=time
-    --restart
+    --at=time  - start the entry at a given time (default: none)
+    --end=time - end the entry at a given time (default: none)
+    --resume   - start an entry using the last description and project
 
     Starts a new time entry, and closes out any running time entries.
 
     You can also add a description of the time entry.
 
-    To start a time entry at a time other than the current, pass it in as an argument to the --at flag. This will accept a number of human readable formats, multiple word time formats should be enclosed in quotes
+    To start a time entry at a time other than the current, pass it in as an argument to the --at flag. This will accept a number of human readable formats, multiple-word time formats should be enclosed in quotes
 
 ##### examples:
 
@@ -198,7 +199,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)
+    --running           - Change the last time entry back to actively running (ignores all other options)
     --start=time        - Update the Start Time
 
 update the project, start time, or end time for a time entry.

data/bin/tempo

@@ -112,6 +112,9 @@ command [:project, :p] do |c|
   c.arg_name 'tagword'
   c.flag [:u, :untag]
 
+  c.desc 'Add a Project as a child of the current Project'
+  c.switch [:c, :child], negatable: false
+
   c.action do |global_options, options, args|
 
     controller = Tempo::Controllers::Projects
@@ -457,10 +460,6 @@ command [:update, :u] do |c|
 end
 
 pre do |global,command,options,args|
-  # Return true to proceed; false to abort and not call the
-  # chosen command
-  # Use skips_pre before a command to skip this block
-  # on that command only
 
   # add reporting of all arguments
   if global[:v]
@@ -480,25 +479,22 @@ pre do |global,command,options,args|
   # TODO: send formats in through global options, and then:
   # Tempo::Views::Reporter.add_formats
 
+  # Return true to proceed; false to abort
   true
 end
 
 post do |global,command,options,args|
-  # Post logic here
-  # Use skips_post before a command to skip this
-  # block on that command only
 
   Tempo::Views::Reporter.report
 
 end
 
 on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
 
-  # remove before distribution:
-  puts exception.backtrace
+  # run DEBUG=true tempo ... to see verbose exceptions
+  puts exception.backtrace if ENV['DEBUG'] == "true"
 
+  # return false to skip default error handling
   true
 end
 

data/features/end.feature

@@ -51,12 +51,13 @@ Feature: End Command ends the current time record
 @pending
   Scenario: Ending a time record with tags
     Given an existing project file
+
 @pending
-  Scenario: Ending a time record on a previous day
+  Scenario: Ending a time record on a previous day creates a record on each day
     Given an existing project file
     When I run `tempo start --at "1-1-2014 7:00"`
     And I run `tempo end --at "1-3-2014 10:00"`
-    Then the stdout should contain "time record ended"
+    Then the stderr should contain "time record ended"
     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/project.feature

@@ -102,6 +102,13 @@ Feature: Project Command manages a list of projects
     Then the stdout should contain "added project:\nhang gliding\n"
     And the project file should contain ":title: hang gliding"
 
+  Scenario: Adding a project as a child of the current
+    Given an existing project file
+    When I successfully run `tempo project --child hang gliding`
+    Then the stdout should contain "added project:\nhang gliding\n"
+    And the project file should contain "- 7" at line 7
+    And the project file should contain ":parent: 1" at line 52
+
   Scenario: Attempting to add an existing project
     Given an existing project file
     When I run `tempo project "basement mushrooms"`

data/features/start.feature

@@ -70,6 +70,41 @@ 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: Adding a future days time record should warn about complications
+    Given an existing project file
+    When I run `tempo start --at "1-1-2033 10:00"`
+    Then the stdout should contain "WARNING"
+    And the time record 20330101 should contain ":start_time: 2033-01-01 10:00" at line 4
+
+  Scenario: Adding a record to a previous day works
+    Given an existing project file
+    When I run `tempo start --at "7/2/14 10:00" existing entry`
+    And I run `tempo start --at "7/1/14 10:00" -e "7/1/2014 11:00" previous entry 1`
+    And I run `tempo start --at "7/1/14 11:00" previous entry 2`
+    Then the time record 20140701 should contain "previous entry 1" at line 3
+    And the time record 20140701 should contain "11:00" at line 5
+    And the time record 20140701 should contain "previous entry 2" at line 11
+    And the time record 20140701 should contain "23:59" at line 13
+
+  Scenario: Adding a record to a previous day works
+    Given an existing project file
+    When I run `tempo start --at "7/2/14 10:00" existing entry`
+    And I run `tempo start --at "7/1/14 10:00" previous entry 1`
+    And I run `tempo start --at "7/1/14 11:00" previous entry 2`
+    Then the stderr should contain "error: time <11:00> conflicts with existing record"
+    And the time record 20140701 should contain "previous entry 1" at line 3
+    And the time record 20140701 should contain "23:59" at line 5
+
+  Scenario: Adding a record to a future day works
+    Given an existing project file
+    When I run `tempo start --at "7/2/33 10:00" existing entry`
+    And I run `tempo start --at "7/1/33 10:00" -e "7/1/2033 11:00" previous entry 1`
+    And I run `tempo start --at "7/1/33 11:00" previous entry 2`
+    Then the time record 20330701 should contain "previous entry 1" at line 3
+    And the time record 20330701 should contain "11:00" at line 5
+    And the time record 20330701 should contain "previous entry 2" at line 11
+    And the time record 20330701 should contain "23:59" at line 13
+
   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`

data/lib/tempo/controllers/projects_controller.rb

@@ -53,6 +53,10 @@ module Tempo
 
             if @projects.index.length == 1
               @projects.current = project
+
+            # arrange the project as the child of the current project
+            elsif options[:child]
+              @projects.current << project
             end
 
             @projects.save_to_file options

data/lib/tempo/controllers/start_controller.rb

@@ -13,24 +13,29 @@ module Tempo
           return Views.project_assistance if Model::Project.index.empty?
 
           if not options[:at]
-            time_in = Time.new()
+            start_time = Time.new()
           else
-            time_in = Time.parse options[:at]
+            start_time = Time.parse options[:at]
           end
 
-          return Views.no_match_error( "valid timeframe", options[:at], false ) if time_in.nil?
+          return Views.no_match_error( "valid timeframe", options[:at], false ) if start_time.nil?
 
-          opts = { start_time: time_in }
+          if start_time > Time.new()
+            Views.warning("WARNING: logging time in the future may cause trouble maintaining running records")
+          end
+
+          opts = { start_time: start_time }
           opts[:description] = reassemble_the args
 
           if options[:end]
-            time_out = Time.parse options[:end]
-            return Views.no_match_error( "valid timeframe", options[:end], false ) if time_out.nil?
-            opts[:end_time] = time_out
+            end_time = Time.parse options[:end]
+            return Views.no_match_error( "valid timeframe", options[:end], false ) if end_time.nil?
+            opts[:end_time] = end_time
           end
 
-          @time_records.load_last_day options
+          load_records(start_time, options)
 
+          # Restart the last time record
           if options[:resume]
             last_record = @time_records.last_record
 
@@ -44,6 +49,7 @@ module Tempo
 
             record = @time_records.new(opts)
 
+          # Add a new time record
           else
             record = @time_records.new(opts)
           end
@@ -51,10 +57,27 @@ module Tempo
           @time_records.save_to_file options
 
           Views.start_time_record_view record
+        end
+
+        private
+
+        # Load all records necessary to start a new record
+        def load_records(start_time, options)
 
+          last_day = @time_records.last_day(options)
+
+          # No records exits yet
+          return if !last_day
+
+          if start_time.same_day?(last_day) || start_time > last_day
+            @time_records.load_last_day options
+          else
+            @time_records.load_days_records(start_time, last_day, options)
+          end
         end
 
       end #class << self
+
     end
   end
 end

data/lib/tempo/models/log.rb

@@ -59,7 +59,8 @@ module Tempo
         end
 
         # returns the loaded record with the latest start time
-        # Only loads records if options[:load] is true
+        # Only loads records if options[:load] is true,
+        # otherwise assumes records are already loaded
         def last_record(options={})
           load_last_day(options) if options[:load]
           sort_by_start_time.last
@@ -99,17 +100,25 @@ module Tempo
           (days + 1).times { |i| load_day_record(time_1.add_days(i), options)}
         end
 
-        # load the records for the most recently recorded day
-        #
-        def load_last_day(options={})
+        # Return a Time object for the last record's date
+        def last_day(options={})
           reg = /(\d+)\.yaml/
-          recs = records(options)
+          recs = records options
           if recs.last
             d_id = reg.match(recs.last)[1]
             time = day_id_to_time d_id if d_id
-            load_day_record time, options
             return time
           end
+          return nil
+        end
+
+        # load the records for the most recently recorded day
+        #
+        def load_last_day(options={})
+          time = last_day options
+          return nil unless time
+          load_day_record time, options
+          return time
         end
 
         # delete the file for a single day
@@ -157,7 +166,7 @@ module Tempo
           days_index[dsym].delete instance
           @ids[dsym].delete id
         end
-      end
+      end # class << self
 
       def initialize(options={})
         @start_time = options.fetch(:start_time, Time.now)

data/lib/tempo/models/time_record.rb

@@ -1,5 +1,5 @@
 # Time Record is an extension of the Log Model,
-# it adds and end time, and verifies that no records overlap
+# it adds an 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.

data/lib/tempo/version.rb

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

data/lib/tempo/views/base.rb

@@ -52,6 +52,10 @@ module Tempo
         ViewRecords::Message.new message, category: :info
       end
 
+      def warning(message)
+        ViewRecords::Message.new message, category: :warning
+      end
+
       def error(message)
         ViewRecords::Message.new message, category: :error
       end

data/lib/tempo/views/formatters/screen.rb

@@ -18,7 +18,7 @@ module Tempo
             case m.category
             when :error
               raise m.message
-            when :info, :debug
+            when :info, :warning, :debug
               puts m.message
             end
             m.message

data/lib/time_utilities.rb

@@ -32,4 +32,9 @@ class Time
     raise ArgumentError if ! date.kind_of? Time
     Time.new(date.year, date.month, date.day, self.hour, self.min, self.sec)
   end
+
+  def same_day?(date)
+    raise ArgumentError if ! date.kind_of? Time
+    Time.new(date.year, date.month, date.day) == Time.new(self.year, self.month, self.day)
+  end
 end

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

@@ -92,6 +92,14 @@ describe Tempo do
       Tempo::Model::MessageLog.index[0].message.must_equal "day 1 pet the sheep"
     end
 
+    it "knows the date of the last record" do
+      log_record_factory
+      last_day = Tempo::Model::MessageLog.last_day
+      match_day = Time.new(2014, 1, 2)
+      Tempo::Model::MessageLog.ids( match_day ).must_equal [] # should not load any records
+      last_day.must_equal match_day
+    end
+
     it "loads records for most recent and return day" do
       log_record_factory
       last_day = Tempo::Model::MessageLog.load_last_day
@@ -101,7 +109,7 @@ describe Tempo do
       Tempo::Model::MessageLog.ids( time_1 ).must_equal []
       Tempo::Model::MessageLog.ids( time_2 ).must_equal [1,2,3]
       Tempo::Model::MessageLog.index[0].message.must_equal "day 2 pet the sheep"
-      last_day.must_equal Time.new(2014, 1, 2)
+      last_day.must_equal time_2
     end
 
     it "loads the records for a time frame" do

data/test/lib/time_utilities_test.rb

@@ -0,0 +1,26 @@
+require "test_helper"
+
+describe Time do
+
+  it "returns nil on invalid information" do
+    Time.parse("t").must_equal nil
+  end
+
+  it "rounds to the nearest whole minute" do
+    Time.new(2015,6,18,11,33,25).round.must_equal Time.new(2015,6,18,11,33)
+    Time.new(2015,6,18,11,33,45).round.must_equal Time.new(2015,6,18,11,34)
+  end
+
+  it "adds days to time" do
+    Time.new(2015,6,18,11,33,45).add_days(5).must_equal Time.new(2015,6,23,11,33,45)
+  end
+
+  it "moves time to a different day" do
+    Time.new(2015,6,18,11,33,45).on_date(Time.new(2015,6,23)).must_equal Time.new(2015,6,23,11,33,45)
+  end
+
+  it "verifies two times occur on the same day" do
+    Time.new(2015,6,18,11,33,45).same_day?(Time.new(2015,6,18,16,22,30)).must_equal true
+    Time.new(2015,6,18,11,33,45).same_day?(Time.new(2015,6,17,16,22,30)).must_equal false
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tempo-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jonathan Gabel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -189,6 +189,7 @@ files:
 - test/lib/tempo/views/view_records/log_test.rb
 - test/lib/tempo/views/view_records/project_test.rb
 - test/lib/tempo/views/view_records/time_record_test.rb
+- test/lib/time_utilities_test.rb
 - test/support/factories.rb
 - test/support/helpers.rb
 - test/test_helper.rb