samg-timetrap 0.1.0 → 0.1.1

data/README.md

@@ -101,9 +101,9 @@ Commands
 
 **display**
   Display a given timesheet. If no timesheet is specified, show the current
-  timesheet. 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``.
+  timesheet. If ``all`` is passed as timesheet 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``.
 
   usage: ``t display [--ids] [--start DATE] [--end DATE] [TIMESHEET]``
 

data/bin/t

@@ -1,3 +1,11 @@
 #!/usr/bin/env ruby
-require 'timetrap'
+begin
+  require 'timetrap'
+rescue LoadError
+  if File.symlink? __FILE__
+    require File.dirname(File.readlink(__FILE__)) + '/../lib/timetrap'
+  else
+    require File.dirname(__FILE__) + '/../lib/timetrap'
+  end
+end
 Timetrap::CLI.invoke

data/lib/timetrap/cli.rb

@@ -18,8 +18,9 @@ where COMMAND is one of:
     -e, --end <time:qs>       Change the end time to <time>
   * backend - open an sqlite shell to the database
     usage: t backend
-  * display - display the current timesheet
-    usage: t display [--ids] [--start DATE] [--end DATE] [TIMESHEET]
+  * display - display the current timesheet or a specific. Pass `all' as
+      timesheet to display all sheets.
+    usage: t display [--ids] [--start DATE] [--end DATE] [TIMESHEET | all ]
     -v, --ids                 Print database ids (for use with alter)
     -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
@@ -121,42 +122,58 @@ where COMMAND is one of:
     end
 
     def display
-      sheet = sheet_name_from_string(unused_args)
-      sheet = (sheet =~ /.+/ ? sheet : Timetrap.current_sheet)
-      say "Timesheet: #{sheet}"
-      id_heading = args['-v'] ? 'Id' : '  '
-      say "#{id_heading}  Day                Start      End        Duration   Notes"
-      last_start = nil
-      from_current_day = []
-      ee = Timetrap::Entry.filter(:sheet => sheet).order(:start)
-      ee = ee.filter(:start >= Date.parse(args['-s'])) if args['-s']
-      ee = ee.filter(:start <= Date.parse(args['-e']) + 1) if args['-e']
-      ee.each_with_index do |e, i|
-
-
-        from_current_day << e
-        e_end = e.end || Time.now
-        say "%-4s%16s%11s -%9s%10s    %s" % [
-          (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),
-          e.note
-        ]
-
-        nxt = ee.map[i+1]
-        if nxt == nil or !same_day?(e.start, nxt.start)
-          say "%52s" % format_total(from_current_day)
-          from_current_day = []
-        else
-        end
-        last_start = e.start
+      sheets = if (sheet = sheet_name_from_string(unused_args)) == 'all'
+        Timetrap::Entry.sheets
+      elsif sheet =~ /.+/
+        [sheet]
+      else
+        [Timetrap.current_sheet]
       end
-      say <<-OUT
+      entries = []
+      sheets.each do |sheet|
+        say "Timesheet: #{sheet}"
+        id_heading = args['-v'] ? 'Id' : '  '
+        say "#{id_heading}  Day                Start      End        Duration   Notes"
+        last_start = nil
+        from_current_day = []
+        ee = Timetrap::Entry.filter(:sheet => sheet).order(:start)
+        ee = ee.filter(:start >= Date.parse(args['-s'])) if args['-s']
+        ee = ee.filter(:start <= Date.parse(args['-e']) + 1) if args['-e']
+        entries += ee.all
+        ee.each_with_index do |e, i|
+
+
+          from_current_day << e
+          e_end = e.end || Time.now
+          say "%-4s%16s%11s -%9s%10s    %s" % [
+            (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),
+            e.note
+          ]
+
+          nxt = ee.map[i+1]
+          if nxt == nil or !same_day?(e.start, nxt.start)
+            say "%52s" % format_total(from_current_day)
+            from_current_day = []
+          else
+          end
+          last_start = e.start
+        end
+        say <<-OUT
     ---------------------------------------------------------
-      OUT
-      say "    Total%43s" % format_total(ee)
+        OUT
+        say "    Total%43s" % format_total(ee)
+        say "\n" unless sheet == sheets.last
+      end
+      if sheets.size > 1
+        say <<-OUT
+-------------------------------------------------------------
+        OUT
+        say "Grand Total%41s" % format_total(entries)
+      end
     end
 
     # TODO: Consolidate display and format
@@ -180,7 +197,7 @@ where COMMAND is one of:
     end
 
     def list
-      sheets = Entry.map{|e|e.sheet}.uniq.sort.map do |sheet|
+      sheets = Entry.sheets.map do |sheet|
         sheet_atts = {:total => 0, :running => 0, :today => 0}
         DB[:entries].filter(:sheet => sheet).inject(sheet_atts) do |m, e|
           e_end = e[:end] || Time.now

data/lib/timetrap/helpers.rb

@@ -35,6 +35,7 @@ module Timetrap
     end
 
     def sheet_name_from_string string
+      return "all" if string =~ /^\W*all\W*$/
       return "" unless string =~ /.+/
       DB[:entries].filter(:sheet.like("#{string}%")).first[:sheet]
     rescue

data/lib/timetrap/models.rb

@@ -10,6 +10,10 @@ module Timetrap
       self[:end]= Chronic.parse(time) || time
     end
 
+    def self.sheets
+      map{|e|e.sheet}.uniq.sort
+    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

@@ -109,6 +109,28 @@ Id  Day                Start      End        Duration   Notes
     ---------------------------------------------------------
     Total                                    8:00:00
           OUTPUT
+
+          @desired_output_for_all = <<-OUTPUT
+Timesheet: SpecSheet
+    Day                Start      End        Duration   Notes
+    Fri Oct 03, 2008   12:00:00 - 14:00:00   2:00:00    entry 1
+                       16:00:00 - 18:00:00   2:00:00    entry 2
+                                             4:00:00
+    Sun Oct 05, 2008   16:00:00 - 18:00:00   2:00:00    entry 3
+                       18:00:00 -            2:00:00    entry 4
+                                             4:00:00
+    ---------------------------------------------------------
+    Total                                    8:00:00
+
+Timesheet: another
+    Day                Start      End        Duration   Notes
+    Sun Oct 05, 2008   18:00:00 -            2:00:00    entry 4
+                                             2:00:00
+    ---------------------------------------------------------
+    Total                                    2:00:00
+-------------------------------------------------------------
+Grand Total                                 10:00:00
+          OUTPUT
         end
 
         it "should display the current timesheet" do
@@ -133,6 +155,12 @@ Id  Day                Start      End        Duration   Notes
           invoke 'display S --ids'
           $stdout.string.should == @desired_output_with_ids
         end
+
+        it "should display all timesheets" do
+          Timetrap.current_sheet = 'another'
+          invoke 'display all'
+          $stdout.string.should == @desired_output_for_all
+        end
       end
 
       describe "format" do
@@ -419,44 +447,58 @@ current sheet: 0:01:00 (a timesheet that is running)
 end
 
 describe Timetrap::Entry do
-  before do
-    @time = Time.now
-    @entry = Timetrap::Entry.new
-  end
-
-  describe 'attributes' do
-    it "should have a note" do
-      @entry.note = "world takeover"
-      @entry.note.should == "world takeover"
+  describe "with an instance" do
+    before do
+      @time = Time.now
+      @entry = Timetrap::Entry.new
     end
 
-    it "should have a start" do
-      @entry.start = @time
-      @entry.start.should == @time
-    end
+    describe 'attributes' do
+      it "should have a note" do
+        @entry.note = "world takeover"
+        @entry.note.should == "world takeover"
+      end
 
-    it "should have a end" do
-      @entry.end = @time
-      @entry.end.should == @time
-    end
+      it "should have a start" do
+        @entry.start = @time
+        @entry.start.should == @time
+      end
 
-    it "should have a sheet" do
-      @entry.sheet= 'name'
-      @entry.sheet.should == 'name'
+      it "should have a end" do
+        @entry.end = @time
+        @entry.end.should == @time
+      end
+
+      it "should have a sheet" do
+        @entry.sheet= 'name'
+        @entry.sheet.should == 'name'
+      end
     end
-  end
 
-  describe "parsing natural language times" do
-    it "should set start time using english" do
-      @entry.start = "yesterday 10am"
-      @entry.start.should_not be_nil
-      @entry.start.should == Chronic.parse("yesterday 10am")
+    describe "parsing natural language times" do
+      it "should set start time using english" do
+        @entry.start = "yesterday 10am"
+        @entry.start.should_not be_nil
+        @entry.start.should == Chronic.parse("yesterday 10am")
+      end
+
+      it "should set end time using english" do
+        @entry.end = "tomorrow 1pm"
+        @entry.end.should_not be_nil
+        @entry.end.should == Chronic.parse("tomorrow 1pm")
+      end
     end
+  end
 
-    it "should set end time using english" do
-      @entry.end = "tomorrow 1pm"
-      @entry.end.should_not be_nil
-      @entry.end.should == Chronic.parse("tomorrow 1pm")
+  describe '::sheets' do
+    it "should output a list of all the available sheets" do
+      Timetrap::Entry.create( :sheet => 'another',
+        :note => 'entry 4', :start => '2008-10-05 18:00:00'
+      )
+      Timetrap::Entry.create( :sheet => 'SpecSheet',
+        :note => 'entry 2', :start => '2008-10-03 16:00:00', :end => '2008-10-03 18:00:00'
+      )
+      Timetrap::Entry.sheets.should == %w(another SpecSheet).sort
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: samg-timetrap
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Sam Goldstein