timetrap 1.7.10 → 1.8.0

data/README.md

@@ -120,7 +120,7 @@ list of parsable time formats, but all of these should work.
 
 Timetrap has built-in support for 6 output formats.
 
-These are **text**, **csv**, **ical**, **json**, **factor** and **ids**
+These are **text**, **csv**, **ical**, **json**, and **ids**
 
 The default is a plain **text** format.  (You can change the default format using
 `t configure`).
@@ -171,25 +171,6 @@ 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.
@@ -238,6 +219,12 @@ Now when I invoke it:
     working on issue #123
     working on issue #234
 
+Timetrap Formatters Repository
+------------------------------
+
+A community focused repository of custom formatters is available at
+https://github.com/sam/timetrap_formatters.
+
 Commands
 --------
 **archive**

data/VERSION.yml

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

data/lib/timetrap/formatters/factor.rb

@@ -1,19 +1,12 @@
 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
+    class Factor
+      raise <<-WARN
+The factor formatter has been moved out of timetrap core in and into timetrap_formatters.
+See https://github.com/samg/timetrap_formatters for more info.
+      WARN
+      def output; end
+      def initialize(*args); end
     end
   end
 end

data/spec/timetrap_spec.rb

@@ -87,10 +87,11 @@ describe Timetrap do
         it "should write a config file" do
           FakeFS do
             FileUtils.mkdir_p(ENV['HOME'])
-            FileUtils.rm(ENV['HOME'] + '/.timetrap.yml')
-            File.exist?(ENV['HOME'] + '/.timetrap.yml').should be_false
+            config_file = ENV['HOME'] + '/.timetrap.yml'
+            FileUtils.rm(config_file) if File.exist? config_file
+            File.exist?(config_file).should be_false
             invoke "configure"
-            File.exist?(ENV['HOME'] + '/.timetrap.yml').should be_true
+            File.exist?(config_file).should be_true
           end
         end
 
@@ -323,38 +324,6 @@ 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')

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.7.10"
+  s.version = "1.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2011-12-30}
+  s.date = %q{2012-01-01}
   s.default_executable = %q{t}
   s.description = %q{Command line time tracker}
   s.email = %q{sgrock@gmail.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 55
   prerelease: 
   segments: 
   - 1
-  - 7
-  - 10
-  version: 1.7.10
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-30 00:00:00 -08:00
+date: 2012-01-01 00:00:00 -08:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency