timetrap 1.8.2 → 1.8.3.beta1

data/README.md

@@ -1,4 +1,4 @@
-Timetrap
+Timetrap [![Build Status](https://secure.travis-ci.org/samg/timetrap.png)](http://travis-ci.org/samg/timetrap)
 ========
 
 Timetrap is a simple command line time tracker written in ruby. It provides an
@@ -353,14 +353,20 @@ See ``t configure`` for details.  Currently supported options are:
 
   **database_file**: The file path of the sqlite database
 
-  **append_notes_delimiter**: delimiter used when appending notes via `t edit --append`
+  **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
+  **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_formatter**: The format to use when display is invoked without a
+                         `--format` option
 
   **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.
+
 Special Thanks
 --------------
 

data/Rakefile

@@ -1,4 +1,4 @@
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rubygems/package_task'
 require 'rspec/core/rake_task'
 begin

data/VERSION.yml

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

data/lib/timetrap/cli.rb

@@ -225,6 +225,11 @@ COMMAND is one of:
     end
 
     def in
+      if Config['sheets_are_exclusive']
+        Timer.stop_other_sheets(args['-a']).each do |checked_out_of|
+          warn "Checked out of sheet #{checked_out_of.sheet.inspect}."
+        end
+      end
       Timer.start unused_args, args['-a']
       warn "Checked into sheet #{Timer.current_sheet.inspect}."
     end

data/lib/timetrap/config.rb

@@ -24,7 +24,10 @@ module Timetrap
         # formatter to use when display is invoked without a --format option
         'default_formatter' => 'text',
         # the default command to when you run `t`.  default to printing usage.
-        'default_command' => nil
+        '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
       }
     end
 

data/lib/timetrap/timer.rb

@@ -87,8 +87,19 @@ module Timetrap
       Entry.filter(:end => nil)
     end
 
-    def stop sheet, time = nil
-      if a = active_entry(sheet)
+    def stop_other_sheets(time = nil)
+      running_entries.all.select{ |e| stop(e, time) unless current_sheet == e.sheet }
+    end
+
+    def stop sheet_or_entry, time = nil
+      a = case sheet_or_entry
+      when Entry
+        sheet_or_entry
+      when String
+        active_entry(sheet_or_entry)
+      end
+
+      if a
         time ||= Time.now
         a.end = time
         a.save

data/spec/timetrap_spec.rb

@@ -12,9 +12,10 @@ def local_time_cli(str)
 end
 
 module Timetrap::StubConfig
-  def with_stubbed_config options
-    options.each do |k, v|
-      Timetrap::Config.stub(:[]).with(k).and_return v
+  def with_stubbed_config options = {}
+    defaults = Timetrap::Config.defaults.dup
+    Timetrap::Config.stub(:[]).and_return do |k|
+      defaults.merge(options)[k]
     end
     yield if block_given?
   end
@@ -22,6 +23,9 @@ end
 
 describe Timetrap do
   include Timetrap::StubConfig
+  before do
+    with_stubbed_config
+  end
   def create_entry atts = {}
     Timetrap::Entry.create({
       :sheet => 'default',
@@ -515,6 +519,53 @@ END:VCALENDAR
           Timetrap::Entry.order_by(:id).last.should be_nil
           $stderr.string.should =~ /\w+/
         end
+
+        describe "with sheets_are_exclusive config option set" do
+          before do
+            with_stubbed_config 'sheets_are_exclusive' => true
+          end
+
+          it "should check in normally if nothing else is running" do
+            Timetrap::Timer.should_not be_running #precondition
+            invoke 'in'
+            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 tell you you're already checked in" do
+              entry = Timetrap::Timer.active_entry('sheet1')
+              invoke 'in second task'
+              Timetrap::Timer.active_entry('sheet1').should == entry
+            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 'in 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 "in -a '#{now}' second task"
+              entry.reload.end.to_s.should == now.to_s
+            end
+          end
+        end
       end
 
       describe "kill" do

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timetrap"
-  s.version = "1.8.2"
+  s.version = "1.8.3.beta1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = "2012-10-27"
+  s.date = "2012-11-06"
   s.description = "Command line time tracker"
   s.email = "sgrock@gmail.com"
   s.executables = ["t"]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: timetrap
 version: !ruby/object:Gem::Version
-  version: 1.8.2
-  prerelease: 
+  version: 1.8.3.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -251,15 +251,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 799045396901513239
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24