timetrap 1.8.14 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e382d25aad4d86af2c0adbafca7ac08214e12bc9
-  data.tar.gz: 4ef80db091acde2505f029a7028bdfc76747e7b2
+  metadata.gz: 05ce9b29076154da0dee41fe4df8a38bffdedc7f
+  data.tar.gz: d9617fc345497096984c88798645c64779e51f18
 SHA512:
-  metadata.gz: 7cfdf04d7086a4a8ba73bb1c6b51348e01d141a2461301b9bb85f8293df6800998f7b9c8fc3b8251ee936780cc5d31155efafc0301f55f2430d00e04b9571f49
-  data.tar.gz: 0a5220b5e22404849e583e7dd3d63a359b03cd6011e90e29bf67cf45ac982f7c5d45d38db87e60305361461c4055ad62ffd91be26f47bbbe2cf905ab0ea1dd4e
+  metadata.gz: db1443b89c6cc00b5098f59aa1705c9e57796cde4d204cbafdb1423635bb09fd4f3c5ecce95470f8abd877d678a82de3d9ea99fd133f676632671db10b8aca71
+  data.tar.gz: ea3431e082d78bcea28801c288e078d595bb4c99951fcab4f106f2ee756090acc65433e8f09d3133b98e2188e67d7f7c0e76fbdf0047a1f5dedec16479b83bfa

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.5
+  - 2.2.0

data/CONTRIBUTORS

@@ -11,3 +11,5 @@
 * Toby Foster
 * Michael Moen
 * Miles Matthias
+* Devon Blandin (@dblandin)
+* Marc Addeo

data/README.md

@@ -110,7 +110,7 @@ check in 5 minutes ago using `in`'s `--at` flag.
 
 Command line flags also have short versions.
 
-    $ # equivilent to the command above
+    $ # equivalent to the command above
     $ t i -a "5 minutes ago"
 
 You can consult the Chronic gem (http://chronic.rubyforge.org/) for a full
@@ -231,13 +231,21 @@ Now when I invoke it:
     working on issue #123
     working on issue #234
 
-Timetrap Formatters Repository
-------------------------------
+#### Timetrap Formatters Repository
 
 A community focused repository of custom formatters is available at
 https://github.com/samg/timetrap_formatters.
 
-## AutoSheets
+#### Harvest Integration
+
+For timetrap users who use [Harvest][harvest] to manage timesheets,
+[Devon Blandin][dblandin] created [timetrap-harvest][timetrap-harvest], a custom
+formatter which allows you to easily submit your timetrap entries to Harvest
+timesheets.
+
+See its [README][timetrap-harvest] for more details.
+
+### AutoSheets
 
 Timetrap has a feature called auto sheets that allows you to automatically
 select which timesheet to check into.
@@ -258,7 +266,9 @@ workflow.  You're encouraged to submit these back to timetrap for inclusion in
 a future version.
 
 To create a custom auto sheet module you create a ruby class and implement one
-method on it `#sheet`.
+method on it `#sheet`.  This method should return the name of the sheet
+timetrap should use (as a string) or `nil` if a sheet shouldn't be
+automatically selected.
 
 All timetrap auto sheets live under the namespace `Timetrap::AutoSheets`
 
@@ -267,7 +277,7 @@ To ensure that timetrap can find your auto sheet put it in
 string you will set in the configuration (for example
 `~/.timetrap/auto_sheets/dotfiles.rb`.  If you want to put your auto sheet in a
 different place you can run `t configure` and edit the
-`auto sheet_search_paths` option.
+`auto_sheet_search_paths` option.
 
 As an example here's the dotfiles auto sheet
 
@@ -286,9 +296,11 @@ end
 
 Commands
 --------
+
 **archive**
   Archives the selected entries (by moving them to a sheet called ``_[SHEET]``)
   These entries can be seen by running ``t display _[SHEET]``.
+
   usage: ``t archive [--start DATE] [--end DATE] [SHEET]``
 
 **backend**
@@ -336,7 +348,7 @@ Commands
   usage: ``t in [--at TIME] [NOTES]``
 
 **kill**
-  Delete a timesheet or an entry.  Entry's are referenced using an ``--id``
+  Delete a timesheet or an entry.  Entries are referenced using an ``--id``
   flag (see display).  Sheets are referenced by name.
 
   usage: ``t kill [--id ID] [TIMESHEET]``
@@ -360,11 +372,10 @@ 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.
+  Start the timer for the current time sheet for an entry. Defaults to the
+  active entry.
 
-  usage: ``t resume [--at TIME] [NOTES]``
+  usage: ``t resume [--id ID] [--at TIME]``
 
 **sheet**
   Switch to a timesheet creating it if necessary. The default timesheet is
@@ -385,7 +396,7 @@ Commands
   usage: ``t yesterday [--ids] [--format FMT] [SHEET | all]``
 
 **week**
-  Shortcut for display with start date set to monday of this week
+  Shortcut for display with start date set to Monday of this week
 
   usage: ``t week [--ids] [--end DATE] [--format FMT] [TIMESHEET | all]``
 
@@ -396,8 +407,7 @@ Commands
   usage: ``t month [--ids] [--start MONTH] [--format FMT] [TIMESHEET | all]``
 
 
-Global Options
---------
+### Global Options
 
 **rounding**
   passing a ``--round`` or ``-r`` flag to any command will round entry start
@@ -412,10 +422,9 @@ Global Options
   confirmation (such as ``kill``) to assume an affirmative response to any
   prompt. This is useful when timetrap is used in a scripted environment.
 
-Configuration
---------
+### Configuration
 
-Configuration of TimeTrap's behavior can be done through an ERB interpolated
+Configuration of Timetrap's behavior can be done through an ERB interpolated
 YAML config file.
 
 See ``t configure`` for details.  Currently supported options are:
@@ -442,8 +451,11 @@ See ``t configure`` for details.  Currently supported options are:
 
   **auto_sheet**: Which auto sheet module to use.
 
-Autocomplete
-------------
+  **auto_sheet_search_paths**: an array of directories to search for user
+                              defined auto_sheet classes
+
+
+### Autocomplete
 
 Timetrap has some basic support for autocomplete in bash and zsh.
 There are completions for commands and for sheets.
@@ -451,7 +463,7 @@ There are completions for commands and for sheets.
 **HINT** If you don't know where timetrap is installed,
 have a look in the directories listed in `echo $GEM_PATH`.
 
-### bash
+#### bash
 
 If it isn't already, add the following to your `.bashrc`/`.bash_profile`:
 
@@ -467,7 +479,7 @@ Then add this to source the completions:
 source /path/to/timetrap-1.x.y/gem/completions/bash/timetrap-autocomplete.bash
 ```
 
-### zsh
+#### zsh
 
 If it isn't already, add the following to your `.zshrc`:
 
@@ -494,3 +506,7 @@ http://bitbucket.org/trevor/timebook/src/
 Bugs and Feature Requests
 --------
 Submit to http://github.com/samg/timetrap/issues
+
+[harvest]:          http://www.getharvest.com
+[timetrap-harvest]: https://github.com/dblandin/timetrap-harvest
+[dblandin]:         https://github.com/dblandin

data/lib/timetrap/cli.rb

@@ -84,9 +84,10 @@ 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]
+  * resume - Start the timer for the current time sheet for an entry. Defaults
+      to the active entry.
+    usage: t resume [--id ID] [--at TIME]
+    -i, --id <id:i>           Resume entry with id <id> instead of the last entry
     -a, --at <time:qs>        Use this time instead of now
 
   * sheet - Switch to a timesheet creating it if necessary. When no sheet is
@@ -269,13 +270,23 @@ COMMAND is one of:
     end
 
     def resume
-      last_entry = Timer.entries(Timer.current_sheet).last
-      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
+      entry = case
+              when args['-i']
+                entry = Entry[args['-i']]
+                warn "Resuming entry with id #{args['-i'].inspect} (#{entry.note})"
+                entry
+              when Timer.last_checkout
+                last = Timer.last_checkout
+                warn "Resuming last enrty you checked out of (#{last.note})"
+                last
+              end
+
+      unless entry
+        warn "Can't find entry"
+        return
+      end
 
-      self.unused_args = note || unused_args
+      self.unused_args = entry.note || unused_args
 
       self.in
     end

data/lib/timetrap/version.rb

@@ -1,3 +1,3 @@
 module Timetrap
-  VERSION = '1.8.14'
+  VERSION = '1.9.0'
 end

data/spec/timetrap_spec.rb

@@ -317,7 +317,8 @@ 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 local_time('2008-10-05 20:00:00')
+            now = local_time('2008-10-05 20:00:00')
+            Time.stub(:now).and_return now
             @desired_output = <<-OUTPUT
 Timesheet: SpecSheet
     Day                Start      End        Duration   Notes
@@ -843,7 +844,8 @@ END:VCALENDAR
 
         describe "with a numeric sheet name" do
           before do
-            Time.stub(:now).and_return local_time("2008-10-05 18:00:00")
+            now = local_time("2008-10-05 18:00:00")
+            Time.stub(:now).and_return now
             create_entry( :sheet => 1234, :start => local_time_cli('2008-10-03 12:00:00'),
                          :end => local_time_cli('2008-10-03 14:00:00'))
           end
@@ -866,7 +868,8 @@ END:VCALENDAR
 
         describe "with a numeric sheet name" do
           before do
-            Time.stub(:now).and_return local_time("2008-10-05 18:00:00")
+            now = local_time("2008-10-05 18:00:00")
+            Time.stub(:now).and_return now
             create_entry( :sheet => '1234', :start => local_time_cli('2008-10-03 12:00:00'),
                          :end => local_time_cli('2008-10-03 14:00:00'))
           end
@@ -890,7 +893,8 @@ END:VCALENDAR
 
         describe "with sheets defined" do
           before :each do
-            Time.stub(:now).and_return local_time("2008-10-05 18:00:00")
+            now = local_time("2008-10-05 18:00:00")
+            Time.stub(:now).and_return now
             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'),
@@ -1041,6 +1045,10 @@ END:VCALENDAR
           @time = Time.now
           Time.stub(:now).and_return @time
 
+          invoke 'in A previous task that isnt last'
+          @previous = Timetrap::Timer.active_entry
+          invoke 'out'
+
           invoke 'in Some strange task'
           @last_active = Timetrap::Timer.active_entry
           invoke 'out'
@@ -1056,6 +1064,20 @@ END:VCALENDAR
           Timetrap::Timer.active_entry.start.to_s.should == @time.to_s
         end
 
+        it "should allow to resume a specific entry" do
+          invoke "resume --id #{@previous.id}"
+
+          Timetrap::Timer.active_entry.note.should ==(@previous.note)
+          Timetrap::Timer.active_entry.start.to_s.should == @time.to_s
+        end
+
+        it "should allow to resume a specific entry with a given time" do
+          invoke "resume --id #{@previous.id} --at \"10am 2008-10-03\""
+
+          Timetrap::Timer.active_entry.note.should ==(@previous.note)
+          Timetrap::Timer.active_entry.start.should eql(Time.parse('2008-10-03 10:00'))
+        end
+
         it "should allow to resume the activity with a given time" do
           invoke 'resume --at "10am 2008-10-03"'
 
@@ -1072,17 +1094,6 @@ END:VCALENDAR
             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
 
         describe "with only archived entries" do
@@ -1352,9 +1363,9 @@ END:VCALENDAR
         it "should use round start if the global round attribute is set" do
           with_rounding_on do
             with_stubbed_config('round_in_seconds' => 900) do
-              @time = Chronic.parse("12:55am")
+              @time = Chronic.parse("12:55")
               @entry.start = @time
-              @entry.start.should == Chronic.parse("1am")
+              @entry.start.should == Chronic.parse("1")
             end
           end
         end
@@ -1362,18 +1373,18 @@ END:VCALENDAR
         it "should use round start if the global round attribute is set" do
           with_rounding_on do
             with_stubbed_config('round_in_seconds' => 900) do
-              @time = Chronic.parse("12:50am")
+              @time = Chronic.parse("12:50")
               @entry.start = @time
-              @entry.start.should == Chronic.parse("12:45am")
+              @entry.start.should == Chronic.parse("12:45")
             end
           end
         end
 
         it "should have a rounded start" do
           with_stubbed_config('round_in_seconds' => 900) do
-            @time = Chronic.parse("12:50am")
+            @time = Chronic.parse("12:50")
             @entry.start = @time
-            @entry.rounded_start.should == Chronic.parse("12:45am")
+            @entry.rounded_start.should == Chronic.parse("12:45")
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timetrap
 version: !ruby/object:Gem::Version
-  version: 1.8.14
+  version: 1.9.0
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Command line time tracker