timetrap 1.7.0 → 1.7.1

data/.gitignore

@@ -1,3 +1,5 @@
 tags
 pkg
 *.swp
+Gemfile.lock
+.bundle

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--profile

data/CONTRIBUTORS

@@ -2,3 +2,4 @@
 * Ian Smith-Heisters
 * Ammar Ali
 * Brian V. Hughes
+* Thorben Schröder

data/Gemfile

@@ -0,0 +1,13 @@
+source 'http://rubygems.org'
+
+gem 'sequel', ">= 3.9.0"
+gem 'sqlite3-ruby', ">= 1.2.5"
+gem 'chronic', "~> 0.3.0"
+gem 'getopt-declare', ">= 1.28"
+gem 'json', "~>1.4.6"
+gem 'icalendar', "~>1.1.5"
+
+group :test do
+  gem "rspec", "~>2"
+  gem 'fakefs'
+end

data/README.md

@@ -65,7 +65,7 @@ You check out with the `out` command.
     Checked out of sheet "coding"
 
 You can edit entries that aren't running using `edit`'s `--id` or `-i` flag.
-`t display --verbose` will tell you the ids.
+`t display --ids`  (or `t display -v`) will tell you the ids.
 
     $ # note id column in output
     $ t d -v
@@ -292,6 +292,13 @@ Commands
 
   usage: ``t out [--at TIME] [TIMESHEET]``
 
+**resume**
+  Start the timer for the current timesheet with the same notes as the last entry.
+  If there is no last entry the new one has blank notes ore uses the optional
+  NOTES parameter.
+
+  usage: ``t resume [--at TIME] [NOTES]``
+
 **sheet**
   Switch to a timesheet creating it if necessary. The default timesheet is
   called "default". When no sheet is specified list all existing sheets.

data/Rakefile

@@ -1,12 +1,14 @@
-require 'spec/rake/spectask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
+require 'rspec/core/rake_task'
 
+desc 'Default: run specs.'
 task :default => :spec
 
-desc "Run all specs in spec directory"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  # Put spec opts in a file named .rspec in root
 end
 
 Rake::RDocTask.new do |rd|

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 7
-:patch: 0
+:patch: 1

data/lib/timetrap.rb

@@ -1,4 +1,5 @@
-require 'rubygems'
+require "rubygems"
+
 require 'chronic'
 require 'sequel'
 require 'yaml'

data/lib/timetrap/cli.rb

@@ -73,6 +73,11 @@ COMMAND is one of:
     usage: t out [--at TIME] [TIMESHEET]
     -a, --at <time:qs>        Use this time instead of now
 
+  * resume - Start the timer for the current time sheet with the same note as
+      the last entry on the sheet. If there is no entry it takes the passed note.
+    usage: t resume [--at TIME] [NOTES]
+    -a, --at <time:qs>        Use this time instead of now
+
   * sheet - Switch to a timesheet creating it if necessary. When no sheet is
       specified list all sheets.
     usage: t sheet [TIMESHEET]
@@ -210,6 +215,17 @@ COMMAND is one of:
       warn "Checked into sheet #{Timer.current_sheet.inspect}."
     end
 
+    def resume
+      last_entry = Timer.entries(Timer.current_sheet).last
+      warn "No entry yet on this sheet yet. Started a new entry." unless last_entry
+      note = (last_entry ? last_entry.note : nil)
+      warn "Resuming #{note.inspect} from entry ##{last_entry.id}" if note
+
+      self.unused_args = note || unused_args
+
+      self.in
+    end
+
     def out
       sheet = sheet_name_from_string(unused_args)
       if Timer.stop sheet, args['-a']
@@ -315,6 +331,10 @@ COMMAND is one of:
       args.unused.join(' ')
     end
 
+    def unused_args=(str)
+      args.unused = str.split
+    end
+
     def ask_user question
       return true if args['-y']
       $stderr.print question

data/lib/timetrap/helpers.rb

@@ -36,8 +36,8 @@ module Timetrap
       else
         Timetrap::Entry.filter('sheet = ?', Timer.current_sheet)
       end
-      ee = ee.filter('start >= ?', Date.parse(Chronic.parse(args['-s']).to_s)) if args['-s']
-      ee = ee.filter('start <= ?', Date.parse(Chronic.parse(args['-e']).to_s) + 1) if args['-e']
+      ee = ee.filter('start >= ?', Date.parse(Timer.process_time(args['-s']).to_s)) if args['-s']
+      ee = ee.filter('start <= ?', Date.parse(Timer.process_time(args['-e']).to_s) + 1) if args['-e']
       ee
     end
 

data/lib/timetrap/models.rb

@@ -14,11 +14,11 @@ module Timetrap
     end
 
     def start= time
-      self[:start]= process_time(time)
+      self[:start]= Timer.process_time(time)
     end
 
     def end= time
-      self[:end]= process_time(time)
+      self[:end]= Timer.process_time(time)
     end
 
     def start
@@ -57,35 +57,6 @@ module Timetrap
     end
 
     private
-    def process_time(time)
-      case time
-      when Time
-        time
-      when String
-        if parsed = Chronic.parse(time)
-          parsed
-        elsif safe_for_time_parse?(time) and parsed = Time.parse(time)
-          parsed
-        else
-          raise ArgumentError, "Could not parse #{time.inspect}, entry not updated"
-        end
-      end
-    end
-
-    # Time.parse is optimistic and will parse things like '=18' into midnight
-    # on 18th of this month.
-    # It will also turn 'total garbage' into Time.now
-    # Here we do some sanity checks on the string to protect it from common
-    # cli formatting issues, and allow reasonable warning to be passed back to
-    # the user.
-    def safe_for_time_parse?(string)
-      # misformatted cli option
-      !string.include?('=') and
-      # a date time string needs a number in it
-      string =~ /\d/
-    end
-
-
     # do a quick pseudo migration.  This should only get executed on the first run
     set_schema do
       primary_key :id

data/lib/timetrap/timer.rb

@@ -8,6 +8,40 @@ module Timetrap
 
     extend self
 
+    def process_time(time)
+      case time
+      when Time
+        time
+      when String
+        chronic = begin
+          Chronic.parse(time)
+        rescue => e
+          warn "#{e.class} in Chronic gem parsing time.  Falling back to Time.parse"
+        end
+
+        if parsed = chronic
+          parsed
+        elsif safe_for_time_parse?(time) and parsed = Time.parse(time)
+          parsed
+        else
+          raise ArgumentError, "Could not parse #{time.inspect}, entry not updated"
+        end
+      end
+    end
+
+    # Time.parse is optimistic and will parse things like '=18' into midnight
+    # on 18th of this month.
+    # It will also turn 'total garbage' into Time.now
+    # Here we do some sanity checks on the string to protect it from common
+    # cli formatting issues, and allow reasonable warning to be passed back to
+    # the user.
+    def safe_for_time_parse?(string)
+      # misformatted cli option
+      !string.include?('=') and
+      # a date time string needs a number in it
+      string =~ /\d/
+    end
+
     def current_sheet= sheet
       m = Meta.find_or_create(:key => 'current_sheet')
       m.value = sheet

data/spec/timetrap_spec.rb

@@ -1,8 +1,16 @@
 TEST_MODE = true
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'timetrap'))
-require 'spec'
+require 'rspec'
 require 'fakefs/safe'
 
+def local_time(str)
+  Timetrap::Timer.process_time(str)
+end
+
+def local_time_cli(str)
+  local_time(str).strftime('%Y-%m-%d %H:%M:%S')
+end
+
 module Timetrap::StubConfig
   def with_stubbed_config options
     options.each do |k, v|
@@ -197,7 +205,7 @@ The "format" command is deprecated in favor of "display". Sorry for the inconven
               :note => 'entry 4', :start => '2008-10-05 18:00:00'
             )
 
-            Time.stub!(:now).and_return Time.at(1223254800 + (60*60*2))
+            Time.stub!(:now).and_return local_time('2008-10-05 20:00:00')
             @desired_output = <<-OUTPUT
 Timesheet: SpecSheet
     Day                Start      End        Duration   Notes
@@ -310,7 +318,6 @@ Grand Total                                 10:00:00
               RUBY
             end
             invoke 'd -fbaz'
-            $stderr.string.should == ''
             $stdout.string.should == "yeah I did it\n"
             FileUtils.rm_r dir
           end
@@ -381,28 +388,29 @@ start,end,note,sheet
 
         describe 'json' do
           before do
-            create_entry(:start => '2008-10-03 12:00:00', :end => '2008-10-03 14:00:00')
-            create_entry(:start => '2008-10-05 12:00:00', :end => '2008-10-05 14:00:00')
+            create_entry(:start => local_time_cli('2008-10-03 12:00:00'), :end => local_time_cli('2008-10-03 14:00:00'))
+            create_entry(:start => local_time_cli('2008-10-05 12:00:00'), :end => local_time_cli('2008-10-05 14:00:00'))
           end
 
           it "should export to json not including running items" do
             invoke 'in'
             invoke 'display -f json'
             JSON.parse($stdout.string).should == JSON.parse(<<-EOF)
-[{\"sheet\":\"default\",\"end\":\"Fri Oct 03 14:00:00 -0700 2008\",\"start\":\"Fri Oct 03 12:00:00 -0700 2008\",\"note\":\"note\",\"id\":1},{\"sheet\":\"default\",\"end\":\"Sun Oct 05 14:00:00 -0700 2008\",\"start\":\"Sun Oct 05 12:00:00 -0700 2008\",\"note\":\"note\",\"id\":2}]
+[{\"sheet\":\"default\",\"end\":\"#{local_time('2008-10-03 14:00:00')}\",\"start\":\"#{local_time('2008-10-03 12:00:00')}\",\"note\":\"note\",\"id\":1},{\"sheet\":\"default\",\"end\":\"#{local_time('2008-10-05 14:00:00')}\",\"start\":\"#{local_time('2008-10-05 12:00:00')}\",\"note\":\"note\",\"id\":2}]
             EOF
           end
         end
 
         describe 'ical' do
           before do
-            create_entry(:start => '2008-10-03 12:00:00', :end => '2008-10-03 14:00:00')
-            create_entry(:start => '2008-10-05 12:00:00', :end => '2008-10-05 14:00:00')
+            create_entry(:start => local_time_cli('2008-10-03 12:00:00'), :end => local_time_cli('2008-10-03 14:00:00'))
+            create_entry(:start => local_time_cli('2008-10-05 12:00:00'), :end => local_time_cli('2008-10-05 14:00:00'))
           end
 
           it "should not export running items" do
             invoke 'in'
             invoke 'display --format ical'
+
             $stdout.string.scan(/BEGIN:VEVENT/).should have(2).item
           end
 
@@ -533,17 +541,17 @@ END:VCALENDAR
 
         describe "with sheets defined" do
           before do
-            Time.stub!(:now).and_return Time.parse("Oct 5 18:00:00 -0700 2008")
-            create_entry( :sheet => 'A Longly Named Sheet 2', :start => '2008-10-03 12:00:00',
-                         :end => '2008-10-03 14:00:00')
-            create_entry( :sheet => 'A Longly Named Sheet 2', :start => '2008-10-03 12:00:00',
-                         :end => '2008-10-03 14:00:00')
-            create_entry( :sheet => 'A Longly Named Sheet 2', :start => '2008-10-05 12:00:00',
-                         :end => '2008-10-05 14:00:00')
-            create_entry( :sheet => 'A Longly Named Sheet 2', :start => '2008-10-05 14:00:00',
+            Time.stub!(:now).and_return local_time("2008-10-05 18:00:00")
+            create_entry( :sheet => 'A Longly Named Sheet 2', :start => local_time_cli('2008-10-03 12:00:00'),
+                         :end => local_time_cli('2008-10-03 14:00:00'))
+            create_entry( :sheet => 'A Longly Named Sheet 2', :start => local_time_cli('2008-10-03 12:00:00'),
+                         :end => local_time_cli('2008-10-03 14:00:00'))
+            create_entry( :sheet => 'A Longly Named Sheet 2', :start => local_time_cli('2008-10-05 12:00:00'),
+                         :end => local_time_cli('2008-10-05 14:00:00'))
+            create_entry( :sheet => 'A Longly Named Sheet 2', :start => local_time_cli('2008-10-05 14:00:00'),
                          :end => nil)
-            create_entry( :sheet => 'Sheet 1', :start => '2008-10-03 16:00:00',
-                         :end => '2008-10-03 18:00:00')
+            create_entry( :sheet => 'Sheet 1', :start => local_time_cli('2008-10-03 16:00:00'),
+                         :end => local_time_cli('2008-10-03 18:00:00'))
             Timetrap::Timer.current_sheet = 'A Longly Named Sheet 2'
           end
           it "should list available timesheets" do
@@ -656,6 +664,56 @@ END:VCALENDAR
         end
       end
 
+      describe "resume" do
+        before :each do
+          @time = Time.now
+          Time.stub!(:now).and_return @time
+
+          invoke 'in Some strange task'
+          @last_active = Timetrap::Timer.active_entry
+          invoke 'out'
+
+          Timetrap::Timer.active_entry.should be_nil
+          @last_active.should_not be_nil
+        end
+
+        it "should allow to resume the last active sheet" do
+          invoke 'resume'
+
+          Timetrap::Timer.active_entry.note.should ==(@last_active.note)
+          Timetrap::Timer.active_entry.start.to_s.should == @time.to_s
+        end
+
+        it "should allow to resume the activity with a given time" do
+          invoke 'resume --at "10am 2008-10-03"'
+
+          Timetrap::Timer.active_entry.start.should eql(Time.parse('2008-10-03 10:00'))
+        end
+
+        describe "no existing entries" do
+          before(:each) do
+            Timetrap::Timer.entries(Timetrap::Timer.current_sheet).each do |e|
+              e.destroy
+            end
+
+            Timetrap::Timer.entries(Timetrap::Timer.current_sheet).should be_empty
+            Timetrap::Timer.active_entry.should be_nil
+          end
+
+          it "starts a new entry if no entry exists" do
+            invoke "resume"
+            Timetrap::Timer.active_entry.should_not be_nil
+            Timetrap::Timer.active_entry.note.should ==("")
+          end
+
+          it "allows to pass a note that is used for the new entry" do
+            invoke "resume New Note"
+            Timetrap::Timer.active_entry.should_not be_nil
+            Timetrap::Timer.active_entry.note.should ==("New Note")
+          end
+        end
+      end
+
       describe "sheet" do
         it "should switch to a new timesheet" do
           invoke 'sheet sheet 1'

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.7.0"
+  s.version = "1.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2010-12-08}
+  s.date = %q{2010-12-18}
   s.default_executable = %q{t}
   s.description = %q{Command line time tracker}
   s.email = %q{sgrock@gmail.com}
@@ -20,7 +20,9 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     ".rspec",
      "CONTRIBUTORS",
+     "Gemfile",
      "LICENSE.txt",
      "README.md",
      "Rakefile",
@@ -39,7 +41,6 @@ Gem::Specification.new do |s|
      "lib/timetrap/helpers.rb",
      "lib/timetrap/models.rb",
      "lib/timetrap/timer.rb",
-     "spec/spec.opts",
      "spec/timetrap_spec.rb",
      "timetrap.gemspec"
   ]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
   - 7
-  - 0
-  version: 1.7.0
+  - 1
+  version: 1.7.1
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -08:00
+date: 2010-12-18 00:00:00 -08:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,7 +92,9 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- .rspec
 - CONTRIBUTORS
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -111,7 +113,6 @@ files:
 - lib/timetrap/helpers.rb
 - lib/timetrap/models.rb
 - lib/timetrap/timer.rb
-- spec/spec.opts
 - spec/timetrap_spec.rb
 - timetrap.gemspec
 has_rdoc: true

data/spec/spec.opts

@@ -1,2 +0,0 @@
---color
---format profile