timetrap 1.8.3.beta1 → 1.8.3.beta2

data/README.md

@@ -364,8 +364,7 @@ See ``t configure`` for details.  Currently supported options are:
 
   **default_command**: The default command to invoke when you call `t`
 
-  **sheets_are_exclusive**: Only allow one running entry at a time. Defaults to
-                            false which allows one running entry per sheet.
+  **auto_checkout**: Automatically check out of running entries when you check in
 
 Special Thanks
 --------------

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 8
 :patch: 3
-:build: beta1
+:build: beta2

data/lib/timetrap/cli.rb

@@ -32,7 +32,13 @@ COMMAND is one of:
       database_file:          The file path of the sqlite database
       append_notes_delimiter: delimiter used when appending notes via
                               t edit --append
+      formatter_search_paths: an array of directories to search for user
+                              defined fomatter classes
+      default_formatter:      The format to use when display is invoked without a
+                              `--format` option
       default_command:        The default command to run when calling t.
+      auto_checkout:          Automatically check out of running entries when
+                              you check in
 
   * display - Display the current timesheet or a specific. Pass `all' as SHEET
       to display all unarchived sheets or `full' to display archived and
@@ -225,8 +231,8 @@ COMMAND is one of:
     end
 
     def in
-      if Config['sheets_are_exclusive']
-        Timer.stop_other_sheets(args['-a']).each do |checked_out_of|
+      if Config['auto_checkout']
+        Timer.stop_all(args['-a']).each do |checked_out_of|
           warn "Checked out of sheet #{checked_out_of.sheet.inspect}."
         end
       end

data/lib/timetrap/config.rb

@@ -26,8 +26,8 @@ module Timetrap
         # the default command to when you run `t`.  default to printing usage.
         'default_command' => nil,
         # only allow one running entry at a time.
-        # when set to false it is possible to have one running entry per sheet.
-        'sheets_are_exclusive' => false
+        # automatically check out of any running tasks when checking in.
+        'auto_checkout' => false
       }
     end
 

data/lib/timetrap/timer.rb

@@ -87,8 +87,8 @@ module Timetrap
       Entry.filter(:end => nil)
     end
 
-    def stop_other_sheets(time = nil)
-      running_entries.all.select{ |e| stop(e, time) unless current_sheet == e.sheet }
+    def stop_all(time = nil)
+      running_entries.map{ |e| stop(e, time) }
     end
 
     def stop sheet_or_entry, time = nil
@@ -104,6 +104,7 @@ module Timetrap
         a.end = time
         a.save
       end
+      a
     end
 
     def start note, time = nil

data/spec/timetrap_spec.rb

@@ -520,9 +520,9 @@ END:VCALENDAR
           $stderr.string.should =~ /\w+/
         end
 
-        describe "with sheets_are_exclusive config option set" do
+        describe "with auto_checkout config option set" do
           before do
-            with_stubbed_config 'sheets_are_exclusive' => true
+            with_stubbed_config 'auto_checkout' => true
           end
 
           it "should check in normally if nothing else is running" do
@@ -537,10 +537,15 @@ END:VCALENDAR
               invoke 'in first task'
             end
 
-            it "should tell you you're already checked in" do
+            it "should check out and back in" do
               entry = Timetrap::Timer.active_entry('sheet1')
               invoke 'in second task'
-              Timetrap::Timer.active_entry('sheet1').should == entry
+              Timetrap::Timer.active_entry('sheet1').note.should == 'second task'
+            end
+
+            it "should tell me what it's doing" do
+              invoke 'in second task'
+              $stderr.string.should include "Checked out"
             end
           end
 
@@ -823,6 +828,53 @@ END:VCALENDAR
             Timetrap::Timer.active_entry.note.should ==("New Note")
           end
         end
+
+        describe "with auto_checkout config option set" do
+          before do
+            with_stubbed_config 'auto_checkout' => true
+          end
+
+          it "should check in normally if nothing else is running" do
+            Timetrap::Timer.should_not be_running #precondition
+            invoke 'resume'
+            Timetrap::Timer.should be_running
+          end
+
+          describe "with a running entry on current sheet" do
+            before do
+              invoke 'sheet sheet1'
+              invoke 'in first task'
+            end
+
+            it "should check out and back in" do
+              entry = Timetrap::Timer.active_entry('sheet1')
+              invoke 'resume second task'
+              Timetrap::Timer.active_entry('sheet1').id.should_not == entry.id
+            end
+          end
+
+          describe "with a running entry on another sheet" do
+            before do
+              invoke 'sheet sheet1'
+              invoke 'in first task'
+              invoke 'sheet sheet2'
+            end
+
+            it "should check out of the running entry" do
+              Timetrap::Timer.active_entry('sheet1').should be_a(Timetrap::Entry)
+              invoke 'resume second task'
+              Timetrap::Timer.active_entry('sheet1').should be nil
+            end
+
+            it "should check out of the running entry at another time" do
+              now = Time.at(Time.now - 5 * 60) # 5 minutes ago
+              entry = Timetrap::Timer.active_entry('sheet1')
+              entry.should be_a(Timetrap::Entry)
+              invoke "resume -a '#{now}' second task"
+              entry.reload.end.to_s.should == now.to_s
+            end
+          end
+        end
       end
 
       describe "sheet" do

data/timetrap.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "timetrap"
-  s.version = "1.8.3.beta1"
+  s.version = "1.8.3.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timetrap
 version: !ruby/object:Gem::Version
-  version: 1.8.3.beta1
+  version: 1.8.3.beta2
   prerelease: 6
 platform: ruby
 authors: