timesheet 0.2.1 → 0.2.2

data/Manifest.txt

@@ -6,6 +6,7 @@ bin/timesheet
 lib/timesheet.rb
 lib/timesheet/range_extensions.rb
 lib/timesheet/time_entry.rb
+lib/timesheet/report_item.rb
 lib/timesheet/time_log.rb
 lib/timesheet/time_report.rb
 lib/timesheet/timesheet_parser.rb

data/lib/timesheet.rb

@@ -9,6 +9,7 @@ require 'yaml'
 require 'yaml/store'
 require 'timesheet/range_extensions'
 require 'timesheet/time_entry'
+require 'timesheet/report_item'
 require 'timesheet/time_log'
 require 'timesheet/time_report'
 require 'timesheet/trollop'
@@ -16,7 +17,7 @@ require 'timesheet/timesheet_parser'
 
 class Timesheet
 
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 
   def self.run(params)
     command_hash = {}

data/lib/timesheet/report_item.rb

@@ -0,0 +1,53 @@
+require 'delegate'
+
+class ReportItem < DelegateClass(TimeEntry)
+
+  include Comparable
+
+  def initialize( report, time_entry)
+    @time_entry = time_entry
+    super(@time_entry)
+    @report = report
+  end
+
+  def start_time
+    if @time_entry.to_range.include?(@report.report_start)
+      @report.report_start
+    else
+      @time_entry.start_time
+    end
+  end
+
+  def end_time
+    if to_range.include?(@report.report_end)
+      @report.report_end
+    else
+      @time_entry.end_time
+    end
+  end
+
+  def formatted_record_number
+    sprintf("%5d", @time_entry.record_number)    
+  end
+
+  def formatted_times
+    puts start_time
+    puts end_time
+    str = ""
+    str << start_time.strftime("%m/%d/%Y at %I:%M %p")
+    str << " to "
+    str << end_time.strftime("%m/%d/%Y at ") if ((start_time.year != end_time.year) || (start_time.yday != end_time.yday))
+    str << end_time.strftime("%I:%M %p")    
+  end
+
+  def formatted_duration
+    str = ""
+    str << @time_entry.duration.strftime("%d Days ") if @time_entry.duration.days > 0
+    str << @time_entry.duration.strftime("%hh %mm")
+  end
+
+  def <=>(other_time_entry)
+    self.start_time <=> other_time_entry.start_time
+  end
+
+end

data/lib/timesheet/time_entry.rb

@@ -46,5 +46,19 @@ class TimeEntry
   def to_range
     Range.new(@start_time, @end_time, true)
   end
+  
+  def to_s
+    label_width = 10
+    str = ""
+    str << "#{"class:".ljust(label_width)}#{self.class}\n"
+    str << "#{"record:".ljust(label_width)}#{record_number}\n"
+    str << "#{"project:".ljust(label_width)}#{project}\n"
+    str << "#{"start:".ljust(label_width)}#{start_time.strftime("%m/%d/%Y at %I:%M %p")}\n"
+    str << "#{"end:".ljust(label_width)}#{end_time.strftime("%m/%d/%Y at %I:%M %p")}\n"
+    str << "#{"duration:".ljust(label_width)}#{duration}\n"
+    str << "#{"comment:".ljust(label_width)}#{comment}\n"
+    
+    str
+  end
 
 end

data/lib/timesheet/time_report.rb

@@ -4,17 +4,16 @@ require 'time'
 class TimeReport
 
   def initialize(entries)
-    @entries = entries
+    @entries = (entries.nil?) ? [] : entries.map { |entry| ReportItem.new(self, entry)}
   end
 
   attr_accessor :entries
+  attr_reader :report_start
+  attr_reader :report_end
 
-  def trim(start_time, end_time)
-    @entries.map! do |e|
-      e.start_time = start_time if e.to_range.include?(start_time)
-      e.end_time = end_time if e.to_range.include?(end_time)
-      e
-    end
+  def constrain(start_time, end_time)
+    @report_start = start_time
+    @report_end = end_time
   end
 
   def report(command_options, outstream = STDOUT)
@@ -22,7 +21,7 @@ class TimeReport
     if (@entries.nil? || @entries.empty?)
       outstream.puts("No data available.")
     else
-      trim(command_options[:start], command_options[:end])
+      constrain(command_options[:start], command_options[:end])
 
       detail_report(outstream) if command_options[:detail]
       summary_report(outstream) if command_options[:summary]
@@ -33,29 +32,25 @@ class TimeReport
   private
 
   def detail_report(outstream)
+    
+#    field_names = ["Id", "Project", "Start - Stop", "Hours", "Comment"]
+#    field_methods = [:formatted_record_number, :project, :formatted_times, :formatted_duration, :comment]
+
    table = Ruport::Data::Table({ :column_names => ["Id", "Project", "Start - Stop", "Hours", "Comment"]}) do |table|
       @entries.sort.each do |entry|
         row = []
 
         # format record number
-        row << sprintf("%5d", entry.record_number)
+        row << entry.formatted_record_number
 
         # format project
         row << entry.project
 
         # format start - stop
-        str = ""
-        str << entry.start_time.strftime("%m/%d/%Y at %I:%M %p")
-        str << " to "
-        str << entry.end_time.strftime("%m/%d/%Y at ") if ( (entry.start_time.year != entry.end_time.year) && (entry.start_time.yday != entry.end_time.yday))
-        str << entry.end_time.strftime("%I:%M %p")
-        row << str
+        row << entry.formatted_times
 
         # format duration
-        str = ""
-        str << entry.duration.strftime("%d Days ") if entry.duration.days > 0
-        str << entry.duration.strftime("%hh %mm")
-        row << str
+        row << entry.formatted_duration
 
         # format comment
         row << entry.comment

data/lib/timesheet/timesheet_parser.rb

@@ -212,7 +212,7 @@ EOS
 
       when :current_week
         periods[:start] = Chronic.parse("this week #{WEEK_START} at 12 am")
-        periods[:end] = periods[:start] + 7.days
+        periods[:end] = periods[:start] + 1.week
 
       when :current_month
         today = Date.today
@@ -225,8 +225,8 @@ EOS
         periods[:end] = periods[:start] + 1.day
 
       when :last_week
-        periods[:start] = Chronic.parse("last week #{WEEK_START} at 12 am")
-        periods[:end] = periods[:start] + 7.days
+        periods[:start] = Chronic.parse("this week #{WEEK_START} at 12 am") - 1.week
+        periods[:end] = periods[:start] + 1.week
 
       when :last_month
         today = Date.today

data/spec/time_entry_spec.rb

@@ -17,7 +17,8 @@ describe TimeEntry do
   context "Basic Features" do
 
     before :each do
-      @time_entry = TimeEntry.new("Project", Time.local(2009, 12, 1, 9, 0, 0), Time.local(2009, 12, 1, 17, 0, 0))
+      @time_entry = TimeEntry.new("Project", Time.local(2009, 12, 1, 9, 0, 0), Time.local(2009, 12, 1, 17, 0, 0), "a comment")
+      @time_entry.record_number = 1
     end
 
 
@@ -34,7 +35,8 @@ describe TimeEntry do
     end
 
     it "should have an initial comment of nil" do
-      @time_entry.comment.should == nil
+      time_entry =  TimeEntry.new("Project", Time.local(2009, 12, 1, 9, 0, 0), Time.local(2009, 12, 1, 17, 0, 0))
+      time_entry.comment.should == nil
     end
 
     it "should calculate its duration from start and end times" do
@@ -74,6 +76,20 @@ describe TimeEntry do
     it "should not allow assignment to duration" do
       @time_entry.should_not respond_to :duration=
     end
+    
+    it "should have a to_s method to display its contents" do
+      @time_entry.should respond_to :to_s
+      @time_entry.to_s.should eql( <<EOS
+class:    TimeEntry
+record:   1
+project:  Project
+start:    12/01/2009 at 09:00 AM
+end:      12/01/2009 at 05:00 PM
+duration: 0 seconds 0 minutes 8 hours 0 days
+comment:  a comment
+EOS
+)
+    end
 
   end
 

data/spec/time_report_spec.rb

@@ -13,13 +13,13 @@ describe TimeReport do
   end
 
   it "should be able to trim its entries to a specific time span" do
-    @time_report.trim(Time.local(2009, 12, 1, 11, 0, 0), Time.local(2009, 12, 5, 12, 0, 0))
+    @time_report.constrain(Time.local(2009, 12, 1, 11, 0, 0), Time.local(2009, 12, 5, 12, 0, 0))
     @time_report.entries[0].start_time.should eql(Time.local(2009, 12, 1, 11, 0, 0))
     @time_report.entries[-1].end_time.should eql(Time.local(2009, 12, 5, 12, 0, 0))
   end
 
   it "should leave entries alone when the trim span is outside the entry range" do
-    @time_report.trim(Time.local(2009, 11, 1, 0, 0, 0), Time.local(2009, 12, 31, 0, 0, 0))
+    @time_report.constrain(Time.local(2009, 11, 1, 0, 0, 0), Time.local(2009, 12, 31, 0, 0, 0))
     @time_report.entries[0].start_time.should eql(Time.local(2009, 12, 1, 9, 0, 0))
     @time_report.entries[-1].end_time.should eql(Time.local(2009, 12, 5, 17, 0, 0))
   end
@@ -92,6 +92,7 @@ EOS
 
   it "should be able to produce a byday report" do
     @entries << TimeEntry.new("ProjectB", Time.local(2009, 12, 1, 17, 0, 0), Time.local(2009, 12, 1, 19, 0, 0), "another comment")
+    @time_report = TimeReport.new(@entries)
 
     command_options = {:byday => true, :start => Time.local(2009, 12, 1), :end => Time.local(2009, 12, 6)}
     stream = StringIO.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timesheet
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - John F. Schank III
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -05:00
+date: 2010-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -225,6 +225,7 @@ files:
 - lib/timesheet.rb
 - lib/timesheet/range_extensions.rb
 - lib/timesheet/time_entry.rb
+- lib/timesheet/report_item.rb
 - lib/timesheet/time_log.rb
 - lib/timesheet/time_report.rb
 - lib/timesheet/timesheet_parser.rb