timetrap 1.4.1 → 1.5.0

data/.gitignore

@@ -1 +1,2 @@
 tags
+pkg

data/README.md

@@ -135,7 +135,7 @@ Commands
   start or end times.  Defaults to the current time although an ``--id`` flag can
   be passed with the entry's id (see display.)
 
-  usage: ``t edit [--id ID] [--start TIME] [--end TIME] [NOTES]``
+  usage: ``t edit [--id ID] [--start TIME] [--end TIME] [--append] [NOTES]``
 
 **format**
   Deprecated

data/VERSION.yml

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

data/lib/timetrap.rb

@@ -57,7 +57,6 @@ module Timetrap
     Entry.create(:sheet => Timetrap.current_sheet, :note => note, :start => time).save
   rescue => e
     CLI.say e.message
-    CLI.say e.backtrace.join("\n")
   end
 
   def switch sheet

data/lib/timetrap/cli.rb

@@ -28,10 +28,13 @@ where COMMAND is one of:
     -f, --format <format>     The output format.  Currently supports ical, csv, and
                                 text (default).
   * edit - alter an entry's note, start, or end time. Defaults to the active entry
-    usage: t edit [--id ID] [--start TIME] [--end TIME] [NOTES]
+    usage: t edit [--id ID] [--start TIME] [--end TIME] [--append] [NOTES]
     -i, --id <id:i>           Alter entry with id <id> instead of the running entry
     -s, --start <time:qs>     Change the start time to <time>
     -e, --end <time:qs>       Change the end time to <time>
+    -z, --append              Append to the current note instead of replacing it
+                                the delimiter between appended notes is
+                                configurable (see configure)
   * format - deprecated: alias for display
   * in - start the timer for the current timesheet
     usage: t in [--at TIME] [NOTES]
@@ -67,6 +70,9 @@ where COMMAND is one of:
 
     def invoke
       args['-h'] ? say(USAGE) : invoke_command_if_valid
+    rescue => e
+      say e.message
+      exit 1
     end
 
     def commands
@@ -116,7 +122,13 @@ where COMMAND is one of:
       say "can't find entry" && return unless entry
       entry.update :start => args['-s'] if args['-s'] =~ /.+/
       entry.update :end => args['-e'] if args['-e'] =~ /.+/
-      entry.update :note => unused_args if unused_args =~ /.+/
+      if unused_args =~ /.+/
+        note = unused_args
+        if args['-z']
+          note = [entry.note, note].join(Config['append_notes_delimiter'])
+        end
+        entry.update :note => note
+      end
     end
 
     def backend

data/lib/timetrap/config.rb

@@ -14,7 +14,9 @@ module Timetrap
         # Path to the sqlite db
         'database_file' => "#{ENV['HOME']}/.timetrap.db",
         # Unit of time for rounding (-r) in seconds
-        'round_in_seconds' => 900
+        'round_in_seconds' => 900,
+        # delimiter used when appending notes with `t edit --append`
+        'append_notes_delimiter' => ' '
       }
     end
 
@@ -28,10 +30,13 @@ module Timetrap
     end
 
     def configure!
-      unless File.exist?(PATH)
-        File.open(PATH, 'w') do |fh|
-          fh.puts(defaults.to_yaml)
-        end
+      configs = if File.exist?(PATH)
+        defaults.merge(YAML.load_file(PATH))
+      else
+        defaults
+      end
+      File.open(PATH, 'w') do |fh|
+        fh.puts(configs.to_yaml)
       end
     end
   end

data/lib/timetrap/models.rb

@@ -14,11 +14,11 @@ module Timetrap
     end
 
     def start= time
-      self[:start]= Chronic.parse(time.to_s) || time
+      self[:start]= process_time(time)
     end
 
     def end= time
-      self[:end]= Chronic.parse(time.to_s) || time
+      self[:end]= process_time(time)
     end
 
     def start
@@ -56,6 +56,36 @@ module Timetrap
       map{|e|e.sheet}.uniq.sort
     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/spec/timetrap_spec.rb

@@ -69,7 +69,7 @@ describe Timetrap do
           end
         end
 
-        it "should descirve config file" do
+        it "should describe config file" do
           FakeFS do
             invoke "configure"
             $stdout.string.should == "Config file is at \"#{ENV['HOME']}/.timetrap.yml\"\n"
@@ -88,6 +88,15 @@ describe Timetrap do
           Timetrap.active_entry.note.should == 'new description'
         end
 
+        it "should allow appending to the description of the active period" do
+          Timetrap::Config.stub(:[]).with('append_notes_delimiter').and_return('//')
+          Timetrap.active_entry.note.should == 'running entry'
+          invoke 'edit --append new'
+          Timetrap.active_entry.note.should == 'running entry//new'
+          invoke 'edit -z more'
+          Timetrap.active_entry.note.should == 'running entry//new//more'
+        end
+
         it "should edit the start time of the active period" do
           invoke 'edit --start "yesterday 10am"'
           Timetrap.active_entry.start.should == Chronic.parse("yesterday 10am")
@@ -329,6 +338,22 @@ END:VCALENDAR
           invoke 'in work --at "10am 2008-10-03"'
           Timetrap::Entry.order_by(:id).last.start.should == Time.parse('2008-10-03 10:00')
         end
+
+        it "should fail with a warning for misformatted cli options it can't parse" do
+          now = Time.now
+          Time.stub!(:now).and_return now
+          invoke 'in work --at="18 minutes ago"'
+          Timetrap::Entry.order_by(:id).last.should be_nil
+          $stdout.string.should =~ /\w+/
+        end
+
+        it "should fail with a time argurment of total garbage" do
+          now = Time.now
+          Time.stub!(:now).and_return now
+          invoke 'in work --at "total garbage"'
+          Timetrap::Entry.order_by(:id).last.should be_nil
+          $stdout.string.should =~ /\w+/
+        end
       end
 
       describe "kill" do

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.4.1"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2010-10-28}
+  s.date = %q{2010-10-30}
   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: 5
+  hash: 3
   prerelease: false
   segments: 
   - 1
-  - 4
-  - 1
-  version: 1.4.1
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 -07:00
+date: 2010-10-30 00:00:00 -07:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency