timesheet 0.2.2 → 0.2.3

data/Rakefile

@@ -14,7 +14,7 @@ Hoe::plugin :gemcutter
 $hoe = Hoe.spec 'timesheet' do
   self.developer 'John F. Schank III', 'jschank@mac.com'
   self.rubyforge_name       = self.name # TODO this is default value
-  self.extra_deps           = [['activesupport', '>= 0'], ['archive-tar-minitar', '>= 0'], ['chronic', '>= 0'], ['color', '>= 0'], ['fastercsv', '>= 0'], ['hoe', '>= 0'], ['json_pure', '>= 0'], ['newgem', '>= 0'], ['pdf-writer', '>= 0'], ['rake', '>= 0'], ['RedCloth', '>= 0'], ['rich_units', '>= 0'], ['rspec', '>= 0'], ['rubigen', '>= 0'], ['rubyforge', '>= 0'], ['ruport', '>= 0'], ['syntax', '>= 0'], ['transaction-simple', '>= 0']]
+  self.extra_deps           = [['activesupport', '>= 0'], ['archive-tar-minitar', '>= 0'], ['chronic', '>= 0'], ['hoe', '>= 0'], ['json_pure', '>= 0'], ['newgem', '>= 0'], ['rake', '>= 0'], ['RedCloth', '>= 0'], ['rich_units', '>= 0'], ['rspec', '>= 0'], ['rubigen', '>= 0'], ['rubyforge', '>= 0'], ['syntax', '>= 0'], ['transaction-simple', '>= 0']]
   # self.extra_deps         = [['activesupport','>= 2.0.2']]
 
 end

data/lib/timesheet.rb

@@ -17,7 +17,7 @@ require 'timesheet/timesheet_parser'
 
 class Timesheet
 
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 
   def self.run(params)
     command_hash = {}

data/lib/timesheet/report_item.rb

@@ -31,8 +31,6 @@ class ReportItem < DelegateClass(TimeEntry)
   end
 
   def formatted_times
-    puts start_time
-    puts end_time
     str = ""
     str << start_time.strftime("%m/%d/%Y at %I:%M %p")
     str << " to "

data/lib/timesheet/time_report.rb

@@ -1,4 +1,3 @@
-require 'ruport'
 require 'time'
 
 class TimeReport
@@ -32,34 +31,47 @@ 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 << entry.formatted_record_number
+    fields = [
+      {:name => "Id", :method => :formatted_record_number },
+      {:name => "Project", :method => :project},
+      {:name => "Start - Stop", :method => :formatted_times},
+      {:name => "Hours", :method => :formatted_duration},
+      {:name => "Comment", :method => :comment}
+    ]
+
+    max_widths = Hash.new(0)
+    @entries.each do |item|
+      fields.each do |field|
+        method = field[:method]
+        max_widths[method] = [max_widths[method], item.send(method).length].max
+      end
+    end
 
-        # format project
-        row << entry.project
+    fields.each do |field|
+      name = field[:name]
+      method = field[:method]
+      max_widths[method] = [max_widths[method], name.length].max
+    end
 
-        # format start - stop
-        row << entry.formatted_times
+    header = "|"
+    fields.each { |field| header << " #{field[:name].center(max_widths[field[:method]])} |" }
 
-        # format duration
-        row << entry.formatted_duration
+    separator = "+" + ("-" * (header.length - 2)) + "+"
 
-        # format comment
-        row << entry.comment
+    outstream.puts separator
+    outstream.puts header
+    outstream.puts separator
 
-        table << row
+    @entries.sort.each do |item|
+      row = "|"
+      fields.each do |field|
+        row << " #{item.send(field[:method]).ljust(max_widths[field[:method]])} |"
       end
+      outstream.puts row
     end
 
-    outstream.puts table.as(:text, {:ignore_table_width => true})
+    outstream.puts separator
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timesheet
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - John F. Schank III
@@ -42,26 +42,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: color
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :runtime
@@ -93,7 +73,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: pdf-writer
+  name: rake
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -103,7 +83,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: RedCloth
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -113,7 +93,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  name: rich_units
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -123,7 +103,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rich_units
+  name: rspec
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -133,7 +113,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rubigen
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -143,7 +123,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rubigen
+  name: rubyforge
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -153,7 +133,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: syntax
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -163,7 +143,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ruport
+  name: transaction-simple
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -173,24 +153,24 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: syntax
-  type: :runtime
+  name: rubyforge
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.0.3
     version: 
 - !ruby/object:Gem::Dependency 
-  name: transaction-simple
-  type: :runtime
+  name: gemcutter
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -200,7 +180,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 2.5.0
     version: 
 description: |-
   <i>Timesheet</i> is simple ruby application for tracking time spent on projects.