timetrap 1.7.3 → 1.7.4

data/CONTRIBUTORS

@@ -3,3 +3,4 @@
 * Ammar Ali
 * Brian V. Hughes
 * Thorben Schröder
+* Ryan Funduk

data/README.md

@@ -118,9 +118,9 @@ list of parsable time formats, but all of these should work.
 
 #### Built-in Formatters
 
-Timetrap has built-in support for 5 output formats.
+Timetrap has built-in support for 6 output formats.
 
-These are **text**, **csv**, **ical**, **json**, and **ids**
+These are **text**, **csv**, **ical**, **json**, **factor** and **ids**
 
 The default is a plain **text** format.  (You can change the default format using
 `t configure`).
@@ -167,10 +167,29 @@ from one sheet to another sheet.  You could do something like this:
     editing entry #44
     editing entry #46
 
-A *json* formatter is also provided, because hackers love json.
+A *json* formatter is provided because hackers love json.
 
     $ t d -fjson
 
+The *factor* formatter is like the default *text* formatter, except it reads special
+notes in your entry descriptions, and multiplies the entry's duration by them.
+A note like *f:2* will multiply the entry's duration by two in the output.
+See https://github.com/samg/timetrap/issues#issue/13 for more details.
+
+    $ # note durations are multiplications of start and end times, based on notes
+    $ t d -ffactor
+    Timesheet: nopoconi
+        Day                Start      End        Duration   Notes
+        Mon Mar 07, 2011   19:56:06 - 20:18:37   0:22:31    merge factor in timetrap, f:3
+                           20:19:04 - 20:23:02   0:01:59    document factor formatter f:0.5
+
+                                                 0:22:34
+        ---------------------------------------------------------
+        Total                                    0:22:34
+
+
+
+
 #### Custom Formatters
 
 Timetrap tries to make it easy to define custom output formats.
@@ -302,6 +321,7 @@ Commands
 **sheet**
   Switch to a timesheet creating it if necessary. The default timesheet is
   called "default". When no sheet is specified list all existing sheets.
+  The special timesheet name '-' will switch to the last active sheet.
 
   usage: ``t sheet [TIMESHEET]``
 

data/VERSION.yml

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

data/lib/timetrap/cli.rb

@@ -40,7 +40,7 @@ COMMAND is one of:
     -s, --start <date:qs>     Include entries that start on this date or later
     -e, --end <date:qs>       Include entries that start on this date or earlier
     -f, --format <format>     The output format.  Valid built-in formats are
-                              ical, csv, json, ids, and text (default).
+                              ical, csv, json, ids, factor, and text (default).
                               Documentation on defining custom formats can be
                               found in the README included in this
                               distribution.
@@ -79,7 +79,8 @@ COMMAND is one of:
     -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.
+      specified list all sheets. The special sheetname '-' will switch to the
+      last active sheet.
     usage: t sheet [TIMESHEET]
 
   * week - Shortcut for display with start date set to monday of this week.
@@ -270,12 +271,21 @@ COMMAND is one of:
 
     def sheet
       sheet = unused_args
-      unless sheet =~ /.+/
+      case sheet
+      when nil, ''
         list
-      else
-        Timer.current_sheet = sheet
-        warn "Switching to sheet #{sheet.inspect}"
+        return
+      when '-'
+        if Timer.last_sheet
+          sheet = Timer.last_sheet
+        else
+          warn 'LAST_SHEET is not set'
+          return
+        end
       end
+
+      Timer.current_sheet = sheet
+      warn "Switching to sheet #{sheet.inspect}"
     end
 
     def list
@@ -314,7 +324,7 @@ COMMAND is one of:
       Timer.running_entries.each do |entry|
         current = entry[:sheet] == Timer.current_sheet
         out = current ? '*' : ' '
-        out << "#{entry[:sheet]}: #{format_duration(entry.start, entry.end_or_now)}".gsub(/  /, ' ')
+        out << "#{entry[:sheet]}: #{format_duration(entry.duration)}".gsub(/  /, ' ')
         out << " (#{entry.note})" if entry.note =~ /.+/
         puts out
       end

data/lib/timetrap/formatters/factor.rb

@@ -0,0 +1,19 @@
+module Timetrap
+  module Formatters
+    require File.join( File.dirname(__FILE__), 'text' )
+
+    class Factor < Text
+      def initialize entries
+        entries.map! do |e|
+          factor = 1
+          if e.note =~ /\bf(actor)?:([\d\.]+)\b/
+            factor = $2.to_f
+          end
+          e.duration = (e.end_or_now.to_i - e.start.to_i) * factor
+          e
+        end
+        super
+      end
+    end
+  end
+end

data/lib/timetrap/formatters/text.rb

@@ -19,13 +19,12 @@ module Timetrap
           from_current_day = []
           sheets[sheet].each_with_index do |e, i|
             from_current_day << e
-            e_end = e.end_or_now
             self.output <<  "%-4s%16s%11s -%9s%10s    %s\n" % [
               (Timetrap::CLI.args['-v'] ? e.id : ''),
               format_date_if_new(e.start, last_start),
               format_time(e.start),
               format_time(e.end),
-              format_duration(e.start, e_end),
+              format_duration(e.duration),
               e.note
             ]
 

data/lib/timetrap/helpers.rb

@@ -60,18 +60,15 @@ module Timetrap
       format_date(time) == format_date(other_time)
     end
 
-    def format_duration stime, etime
-      return '' unless stime and etime
-      secs = etime.to_i - stime.to_i
-      format_seconds secs
-    end
-
     def format_seconds secs
       "%2s:%02d:%02d" % [secs/3600, (secs%3600)/60, secs%60]
     end
+    alias :format_duration :format_seconds
 
     def format_total entries
-      secs = entries.inject(0){|m, e|e_end = e.end_or_now; m += e_end.to_i - e.start.to_i if e_end && e.start;m}
+      secs = entries.inject(0) do |m, e|
+        m += e.duration
+      end
       "%2s:%02d:%02d" % [secs/3600, (secs%3600)/60, secs%60]
     end
 

data/lib/timetrap/models.rb

@@ -29,6 +29,13 @@ module Timetrap
       round? ? rounded_end : self[:end]
     end
 
+    def duration
+      @duration ||= self.end_or_now.to_i - self.start.to_i
+    end
+    def duration=( nd )
+      @duration = nd.to_i
+    end
+
     def end_or_now
       self.end || (round? ? round(Time.now) : Time.now)
     end

data/lib/timetrap/timer.rb

@@ -43,6 +43,10 @@ module Timetrap
     end
 
     def current_sheet= sheet
+      last = Meta.find_or_create(:key => 'last_sheet')
+      last.value = current_sheet
+      last.save
+
       m = Meta.find_or_create(:key => 'current_sheet')
       m.value = sheet
       m.save
@@ -55,6 +59,11 @@ module Timetrap
       Meta.find(:key => 'current_sheet').value
     end
 
+    def last_sheet
+      m = Meta.find(:key => 'last_sheet')
+      m and m.value
+    end
+
     def entries sheet = nil
       Entry.filter(:sheet => sheet).order_by(:start)
     end

data/spec/timetrap_spec.rb

@@ -323,6 +323,38 @@ Grand Total                                 10:00:00
           end
         end
 
+        describe "factor" do
+          before do
+            Timetrap::Entry.create( :sheet => 'SpecSheet',
+              :note => 'entry f:2', :start => '2008-10-03 16:00:00', :end => '2008-10-03 18:00:00'
+            )
+            Timetrap::Entry.create( :sheet => 'SpecSheet',
+              :note => 'entry f:0.5', :start => '2008-10-04 16:00:00', :end => '2008-10-04 18:00:00'
+            )
+            Timetrap::Entry.create( :sheet => 'SpecSheet',
+              :note => 'entry', :start => '2008-10-04 19:00:00'
+            )
+            Time.stub!(:now).and_return local_time('2008-10-04 20:00:00')
+            @desired_output = <<-OUTPUT
+Timesheet: SpecSheet
+    Day                Start      End        Duration   Notes
+    Fri Oct 03, 2008   16:00:00 - 18:00:00   4:00:00    entry f:2
+                                             4:00:00
+    Sat Oct 04, 2008   16:00:00 - 18:00:00   1:00:00    entry f:0.5
+                       19:00:00 -            1:00:00    entry
+                                             2:00:00
+    ---------------------------------------------------------
+    Total                                    6:00:00
+            OUTPUT
+          end
+
+          it "should correctly handle factors in notes" do
+            Timetrap::Timer.current_sheet = 'SpecSheet'
+            invoke 'display --format factor'
+            $stdout.string.should == @desired_output
+          end
+        end
+
         describe "default" do
           before do
             create_entry(:start => '2008-10-03 12:00:00', :end => '2008-10-03 14:00:00')
@@ -733,6 +765,34 @@ END:VCALENDAR
           invoke 'sheet'
           $stdout.string.should == " Timesheet  Running     Today       Total Time\n*sheet 1     0:00:00     0:00:00     0:00:00\n"
         end
+
+        describe "using - to switch to the last sheet" do
+          it "should warn if there isn't a sheet set" do
+            lambda do
+              invoke 'sheet -'
+            end.should_not change(Timetrap::Timer, :current_sheet)
+            $stderr.string.should include 'LAST_SHEET is not set'
+          end
+
+          it "should switch to the last active sheet" do
+            invoke 'sheet second'
+            lambda do
+              invoke 'sheet -'
+            end.should change(Timetrap::Timer, :current_sheet).
+              from('second').to('default')
+          end
+
+          it "should toggle back and forth" do
+            invoke 'sheet first'
+            invoke 'sheet second'
+            5.times do
+              invoke 's -'
+              Timetrap::Timer.current_sheet.should == 'first'
+              invoke 's -'
+              Timetrap::Timer.current_sheet.should == 'second'
+            end
+          end
+        end
       end
     end
   end

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.7.3"
+  s.version = "1.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2011-02-06}
+  s.date = %q{2011-03-07}
   s.default_executable = %q{t}
   s.description = %q{Command line time tracker}
   s.email = %q{sgrock@gmail.com}
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "lib/timetrap/config.rb",
      "lib/timetrap/formatters.rb",
      "lib/timetrap/formatters/csv.rb",
+     "lib/timetrap/formatters/factor.rb",
      "lib/timetrap/formatters/ical.rb",
      "lib/timetrap/formatters/ids.rb",
      "lib/timetrap/formatters/json.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 7
-  - 3
-  version: 1.7.3
+  - 4
+  version: 1.7.4
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 -08:00
+date: 2011-03-07 00:00:00 -08:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ files:
 - lib/timetrap/config.rb
 - lib/timetrap/formatters.rb
 - lib/timetrap/formatters/csv.rb
+- lib/timetrap/formatters/factor.rb
 - lib/timetrap/formatters/ical.rb
 - lib/timetrap/formatters/ids.rb
 - lib/timetrap/formatters/json.rb