samg-timetrap 1.0.1 → 1.0.3

data/README.md

@@ -57,7 +57,7 @@ ago"`` creates a new period in the current timesheet, and annotates it with the
 description "document timetrap". The optional ``--at`` flag can be passed to start
 the entry at a time other than the present.  The ``--at`` flag is able to parse
 natural language times (via Chronic: http://chronic.rubyforge.org/) and will
-understand 'friday 13:00', 'mon 2:35', '4pm', etc. (also true of the ``alter``
+understand 'friday 13:00', 'mon 2:35', '4pm', etc. (also true of the ``edit``
 command's ``--start`` and ``--end`` flags.)  Note that this command would be in
 error if the ``writing`` timesheet was already active.  Finally, ``t out``
 records the current time as the end time for the most recent period in the
@@ -74,7 +74,7 @@ To display the current timesheet, invoke the ``t display`` command::
                            22:37:38 - 23:38:43   1:01:05    work on kill
                                                  2:18:52
         Tue Apr 14, 2009   00:41:16 - 01:40:19   0:59:03    gem packaging
-                           10:20:00 - 10:48:10   0:28:10    enhance alter
+                           10:20:00 - 10:48:10   0:28:10    enhance edit
                                                  1:27:13
         ---------------------------------------------------------
         Total                                    3:46:05
@@ -87,13 +87,9 @@ last row, the total time tracked in the timesheet is shown.
 
 Commands
 --------
-
-**alter**
-  Inserts a note associated with the an entry in the timesheet, or alters the
-  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 alter [--id ID] [--start TIME] [--end TIME] [NOTES]``
+**archives**
+  Archives the selected entries (by moving them to a sheet called _<SHEET>)
+  usage: ``t archive [--start DATE] [--end DATE] [SHEET]``
 
 **backend**
   Run an interactive database session on the timetrap database. Requires the
@@ -105,7 +101,7 @@ Commands
   Display a given timesheet. If no timesheet is specified, show the current
   timesheet. If ``all`` is passed as SHEET display all timesheets. Accepts
   an optional ``--ids`` flag which will include the entries' ids in the output.
-  This is useful when editing an non running entry with ``alter``.
+  This is useful when editing an non running entry with ``edit``.
 
   Display is designed to support a variety of export formats that can be
   specified by passing the ``--format`` flag.  This currently defaults to
@@ -113,13 +109,20 @@ Commands
 
   usage: ``t display [--ids] [--start DATE] [--end DATE] [--format FMT] [SHEET | all]``
 
+**edit**
+  Inserts a note associated with the an entry in the timesheet, or edits the
+  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]``
+
 **format**
   Alias for display
 
 **in**
   Start the timer for the current timesheet. Must be called before out.  Notes
   may be specified for this period. This is exactly equivalent to
-  ``t in; t alter NOTES``. Accepts an optional --at flag.
+  ``t in; t edit NOTES``. Accepts an optional --at flag.
 
   usage: ``t in [--at TIME] [NOTES]``
 

data/VERSION.yml

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

data/lib/timetrap/cli.rb

@@ -11,21 +11,26 @@ Timetrap - Simple Time Tracking
 Usage: #{File.basename $0} COMMAND [OPTIONS] [ARGS...]
 
 where COMMAND is one of:
-  * alter - alter an entry's note, start, or end time. Defaults to the active entry
-    usage: t alter [--id ID] [--start TIME] [--end TIME] [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>
+  * archive - move entries to a hidden sheet (by default named '_<SHEET>') so
+      they're out of the way.
+    usage: t archive [--start DATE] [--end DATE] [SHEET]
+    -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
   * backend - open an sqlite shell to the database
     usage: t backend
   * display - display the current timesheet or a specific. Pass `all' as
       SHEET to display all sheets.
     usage: t display [--ids] [--start DATE] [--end DATE] [--format FMT] [SHEET | all]
-    -v, --ids                 Print database ids (for use with alter)
+    -v, --ids                 Print database ids (for use with edit)
     -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.  Currently supports ical 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]
+    -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>
   * format - alias for display
   * in - start the timer for the current timesheet
     usage: t in [--at TIME] [NOTES]
@@ -75,7 +80,20 @@ where COMMAND is one of:
       else; say "Ambigous command: #{command}"; end
     end
 
-    def alter
+    def archive
+      ee = selected_entries
+      out = "Archive #{ee.count} entries? "
+      print out
+      if $stdin.gets =~ /\Aye?s?\Z/i
+        ee.all.each do |e|
+          e.update :sheet => "_#{e.sheet}"
+        end
+      else
+        say "archive aborted!"
+      end
+    end
+
+    def edit
       entry = args['-i'] ? Entry[args['-i']] : Timetrap.active_entry
       say "can't find entry" && return unless entry
       entry.update :start => args['-s'] if args['-s'] =~ /.+/
@@ -132,16 +150,7 @@ where COMMAND is one of:
         say "Invalid format specified `#{args['-f']}'"
         return
       end
-      ee = if (sheet = sheet_name_from_string(unused_args)) == 'all'
-        Timetrap::Entry
-      elsif sheet =~ /.+/
-        Timetrap::Entry.filter(:sheet => sheet)
-      else
-        Timetrap::Entry.filter(:sheet => Timetrap.current_sheet)
-      end
-      ee = ee.filter(:start >= Date.parse(args['-s'])) if args['-s']
-      ee = ee.filter(:start <= Date.parse(args['-e']) + 1) if args['-e']
-      say Timetrap.format(fmt_klass, ee.order(:start).all)
+      say Timetrap.format(fmt_klass, selected_entries.order(:start).all)
     end
 
     # TODO: Consolidate display and format
@@ -152,16 +161,7 @@ where COMMAND is one of:
         say "Invalid format specified `#{args['-f']}'"
         return
       end
-      ee = if (sheet = sheet_name_from_string(unused_args)) == 'all'
-        Timetrap::Entry
-      elsif sheet =~ /.+/
-        Timetrap::Entry.filter(:sheet => sheet)
-      else
-        Timetrap::Entry.filter(:sheet => Timetrap.current_sheet)
-      end
-      ee = ee.filter(:start >= Date.parse(args['-s'])) if args['-s']
-      ee = ee.filter(:start <= Date.parse(args['-e']) + 1) if args['-e']
-      say Timetrap.format(fmt_klass, ee.all)
+      say Timetrap.format(fmt_klass, selected_entries.order(:start).all)
     end
 
     def switch

data/lib/timetrap/formatters/ical.rb

@@ -14,6 +14,7 @@ module Timetrap
 
       def initialize entries
         entries.each do |e|
+          next unless e.end
           calendar.event do
             dtstart DateTime.parse(e.start.to_s)
             dtend DateTime.parse(e.end.to_s)

data/lib/timetrap/helpers.rb

@@ -1,5 +1,19 @@
 module Timetrap
   module Helpers
+
+    def selected_entries
+      ee = if (sheet = sheet_name_from_string(unused_args)) == 'all'
+        Timetrap::Entry.filter('sheet not like ? escape "!"', '!_%')
+      elsif sheet =~ /.+/
+        Timetrap::Entry.filter('sheet = ?', sheet)
+      else
+        Timetrap::Entry.filter('sheet = ?', Timetrap.current_sheet)
+      end
+      ee = ee.filter(:start >= Date.parse(args['-s'])) if args['-s']
+      ee = ee.filter(:start <= Date.parse(args['-e']) + 1) if args['-e']
+      ee
+    end
+
     def format_time time
       return '' unless time.respond_to?(:strftime)
       time.strftime('%H:%M:%S')

data/spec/timetrap_spec.rb

@@ -25,35 +25,51 @@ describe Timetrap do
         Timetrap::CLI.invoke
       end
 
-      describe 'alter' do
+      describe 'archive' do
+        before do
+          3.times do |i|
+            create_entry
+          end
+        end
+
+        it "should put the entries in a hidden sheet" do
+          $stdin.string = "yes\n"
+          invoke 'archive'
+          Timetrap::Entry.each do |e|
+            e.sheet.should == '_default'
+          end
+        end
+      end
+
+      describe 'edit' do
         before do
           Timetrap.start "running entry", nil
         end
 
-        it "should alter the description of the active period" do
+        it "should edit the description of the active period" do
           Timetrap.active_entry.note.should == 'running entry'
-          invoke 'alter new description'
+          invoke 'edit new description'
           Timetrap.active_entry.note.should == 'new description'
         end
 
-        it "should alter the start time of the active period" do
-          invoke 'alter --start "yesterday 10am"'
+        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")
           Timetrap.active_entry.note.should == 'running entry'
         end
 
-        it "should alter the end time of the active period" do
+        it "should edit the end time of the active period" do
           entry = Timetrap.active_entry
-          invoke 'alter --end "yesterday 10am"'
+          invoke 'edit --end "yesterday 10am"'
           entry.refresh.end.should == Chronic.parse("yesterday 10am")
           entry.refresh.note.should == 'running entry'
         end
 
-        it "should alter a non running entry based on id" do
+        it "should edit a non running entry based on id" do
           not_running = Timetrap.active_entry
           Timetrap.stop
           Timetrap.start "another entry", nil
-          invoke "alter --id #{not_running.id} a new description"
+          invoke "edit --id #{not_running.id} a new description"
           not_running.refresh.note.should == 'a new description'
         end
       end
@@ -161,6 +177,14 @@ Grand Total                                 10:00:00
           invoke 'display all'
           $stdout.string.should == @desired_output_for_all
         end
+
+        it "should not display archived for all timesheets" do
+          $stdin.string = "yes\n"
+          invoke 'archive SpecSheet'
+          $stdout.string = ''
+          invoke 'display all'
+          $stdout.string.should_not =~ /_SpecSheet/
+        end
       end
 
       describe "format" do
@@ -170,6 +194,12 @@ Grand Total                                 10:00:00
             create_entry(:start => '2008-10-05 12:00:00', :end => '2008-10-05 14:00:00')
           end
 
+          it "should not export running items" do
+            invoke 'in'
+            invoke 'format --format ical'
+            $stdout.string.scan(/BEGIN:VEVENT/).should have(2).item
+          end
+
           it "should filter events by the passed dates" do
             invoke 'format --format ical --start 2008-10-03 --end 2008-10-03'
             $stdout.string.scan(/BEGIN:VEVENT/).should have(1).item

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: samg-timetrap
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-30 00:00:00 -07:00
+date: 2009-07-10 00:00:00 -07:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency