timesheet 0.2.8 → 0.3.0

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/.rdebugrc

@@ -0,0 +1,3 @@
+set autolist
+set autoeval
+set autoreload

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.9.3@timesheet

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in timesheet.gemspec
+gemspec

data/Rakefile

@@ -1,29 +1,11 @@
-require 'rubygems'
-gem 'hoe', '>= 2.1.0'
-require 'hoe'
-require 'fileutils'
-require './lib/timesheet'
-
-Hoe::plugin :newgem
-Hoe::plugin :gemcutter
-# Hoe.plugin :website
-# Hoe.plugin :cucumberfeatures
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$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'], ['hoe', '>= 0'], ['json_pure', '>= 0'], ['newgem', '>= 0'], ['rake', '>= 0'], ['RedCloth', '>= 0'], ['richunits', '>= 0'], ['rspec', '>= 0'], ['rubigen', '>= 0'], ['rubyforge', '>= 0'], ['syntax', '>= 0'], ['transaction-simple', '>= 0']]
-  # self.extra_deps         = [['activesupport','>= 2.0.2']]
-
-end
-
-require 'newgem/tasks'
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# remove_task :default
-# task :default => [:spec, :features]
+require "bundler/gem_tasks"
+require 'rake'
+require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new
 
+# desc "Run the specs under spec/models"
+# Spec::Rake::SpecTask.new do |t|
+#   t.spec_opts = ['--options', "spec/spec.opts"]
+#   t.spec_files = FileList['spec/**/*_spec.rb']
+# end

data/bin/timesheet

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'timesheet'
 
-Timesheet.run(ARGV)
+Timesheet::Timesheet.run(ARGV)

data/lib/timesheet.rb

@@ -1,6 +1,3 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
 require 'rubygems'
 require 'fileutils'
 require 'richunits'
@@ -14,73 +11,73 @@ require 'timesheet/time_log'
 require 'timesheet/time_report'
 require 'timesheet/trollop'
 require 'timesheet/timesheet_parser'
+require "timesheet/version"
 
-class Timesheet
+module Timesheet
+  class Timesheet
 
-  VERSION = '0.2.8'
+    def self.run(params)
+      command_hash = {}
+      command_hash = TimesheetParser.parse(params)
 
-  def self.run(params)
-    command_hash = {}
-    command_hash = TimesheetParser.parse(params)
+      raise "Cannot determine location for data. Try timesheet --help for details." unless (ENV["TIMESHEET_DATA_FILE"] || ENV["HOME"])
 
-    raise "Cannot determine location for data. Try timesheet --help for details." unless (ENV["TIMESHEET_DATA_FILE"] || ENV["HOME"])
+      data_file ||= ENV["TIMESHEET_DATA_FILE"]
+      data_file ||= (ENV["HOME"] + "/.timesheet/store.yaml")
 
-    data_file ||= ENV["TIMESHEET_DATA_FILE"]
-    data_file ||= (ENV["HOME"] + "/.timesheet/store.yaml")
+      FileUtils.makedirs(File.dirname(data_file))
 
-    FileUtils.makedirs(File.dirname(data_file))
+      store = YAML::Store.new(data_file)
+      tl = TimeLog.new(store)
+      ts = Timesheet.new(tl)
+      ts.process(command_hash)
 
-    store = YAML::Store.new(data_file)
-    tl = TimeLog.new(store)
-    ts = Timesheet.new(tl)
-    ts.process(command_hash)
+    rescue Exception => e
+      raise if command_hash[:debug]
+      puts e.message
 
-  rescue Exception => e
-    raise if command_hash[:debug]
-    puts e.message
+    end
 
-  end
+    def initialize(timelog)
+      @timelog = timelog
+    end
 
-  def initialize(timelog)
-    @timelog = timelog
-  end
+    def process(command_opts)
+      command = command_opts[:command]
+      case command
+        when :add    then process_add_command(command_opts)
+        when :edit   then process_edit_command(command_opts)
+        when :delete then process_delete_command(command_opts)
+        when :report then process_report_command(command_opts)
+        else raise "Unknown command #{command}"
+      end
+    end
 
-  def process(command_opts)
-    command = command_opts[:command]
-    case command
-      when :add    : process_add_command(command_opts)
-      when :edit   : process_edit_command(command_opts)
-      when :delete : process_delete_command(command_opts)
-      when :report : process_report_command(command_opts)
-      else raise "Unknown command #{command}"
+    def process_add_command(command_opts)
+      te = TimeEntry.new(command_opts[:project], command_opts[:start], command_opts[:end], command_opts[:comment])
+      @timelog.add(te)
     end
-  end
 
-  def process_add_command(command_opts)
-    te = TimeEntry.new(command_opts[:project], command_opts[:start], command_opts[:end], command_opts[:comment])
-    @timelog.add(te)
-  end
+    def process_edit_command(command_opts)
+      record_number = command_opts.delete(:record_number)
+      @timelog.update(record_number, command_opts)
+      entries = [@timelog.find(record_number)]
+      time_report = TimeReport.new(entries)
+      time_report.report({:dump => true})
+    end
 
-  def process_edit_command(command_opts)
-    record_number = command_opts.delete(:record_number)
-    @timelog.update(record_number, command_opts)
-    entries = [@timelog.find(record_number)]
-    time_report = TimeReport.new(entries)
-    time_report.report({:dump => true})
-  end
+    def process_delete_command(command_opts)
+      record_number = command_opts.delete(:record_number)
+      @timelog.delete(record_number)
+    end
 
-  def process_delete_command(command_opts)
-    record_number = command_opts.delete(:record_number)
-    @timelog.delete(record_number)
-  end
+    def process_report_command(command_opts)
+      start_time = command_opts[:start]
+      end_time = command_opts[:end]
+      entries = @timelog.extract_entries(start_time, end_time)
+      time_report = TimeReport.new(entries)
+      time_report.report(command_opts)
+    end
 
-  def process_report_command(command_opts)
-    start_time = command_opts[:start]
-    end_time = command_opts[:end]
-    entries = @timelog.extract_entries(start_time, end_time)
-    time_report = TimeReport.new(entries)
-    time_report.report(command_opts)
   end
-
 end
-

data/lib/timesheet/range_extensions.rb

@@ -1,24 +1,27 @@
 # Thanks to: http://opensoul.org/2007/2/13/ranges-include-or-overlap-with-ranges
 class Range
 
+  unless (0..5).respond_to?(:cover?)
+    alias_method :cover?, :include?
+  end
 
   def overlap?(range)
-    self.include?(range.first) || range.include?(self.first)
+    self.cover?(range.first) || range.cover?(self.first)
   end
 
-  alias_method :include_without_range?, :include?
+  alias_method :cover_without_range?, :cover?
 
-  def include_with_range?(value)
+  def cover_with_range?(value)
     if value.is_a?(Range)
-      last = value.exclude_end? ? value.last - 1 : value.last
-      self.include?(value.first) && self.include?(last)
+      last = value.exclude_end? ? value.last-1 : value.last
+      self.cover?(value.first) && self.cover?(last)
     else
-      include_without_range?(value)
+      cover_without_range?(value)
     end
   end
 
-  alias_method :include?, :include_with_range?
+  alias_method :cover?, :cover_with_range?
 
 #  alias_method_chain :include?, :range
 
-end
+end

data/lib/timesheet/report_item.rb

@@ -1,19 +1,21 @@
 require 'delegate'
 
-class ReportItem < DelegateClass(TimeEntry)
+class ReportItem 
 
   include Comparable
 
   def initialize( report, time_entry)
     @time_entry = time_entry
-    super(@time_entry)
     @report = report
   end
 
   def start_time_sliced?
-    @time_entry.to_range.include?(@report.report_start)
+    @time_entry.to_range.cover?(@report.report_start)
+  end
+  
+  def project
+    @time_entry.project
   end
-
 
   def start_time
     if start_time_sliced?
@@ -30,7 +32,7 @@ class ReportItem < DelegateClass(TimeEntry)
 
 
   def end_time_sliced?
-    @time_entry.to_range.include?(@report.report_end)
+    @time_entry.to_range.cover?(@report.report_end)
   end
 
   def start_slice_indication
@@ -50,7 +52,7 @@ class ReportItem < DelegateClass(TimeEntry)
   end
 
   def formatted_record_number
-    sprintf("%5d", @time_entry.record_number)    
+    sprintf("%5d", @time_entry.record_number || 0)    
   end
 
   def formatted_start_time

data/lib/timesheet/version.rb

@@ -0,0 +1,3 @@
+module Timesheet
+  VERSION = "0.3.0"
+end

data/spec/range_extensions_spec.rb

@@ -8,10 +8,29 @@ describe Range do
   end
 
   it "should allow include?" do
-    (1..5).include?(2..3).should be_true
+    (1..5).include?(2..3).should be_false
     (1..5).include?(4..8).should be_false
     (1..5).include?(3).should be_true
     (1..5).include?(6).should be_false
   end
 
+  context "with times" do
+
+    before(:all) do
+      @time = Time.now
+  end
+
+    it "should detect overlaps" do
+      (@time..@time+5).overlap?(@time+4..@time+8).should be_true
+      (@time...@time+5).overlap?(@time+5..@time+10).should be_false
+    end
+
+    it "should allow cover?" do
+      (@time..@time+5).cover?(@time+2..@time+3).should be_true
+      (@time..@time+5).cover?(@time+4..@time+8).should be_false
+      (@time..@time+5).cover?(@time+3).should be_true
+      (@time..@time+5).cover?(@time+6).should be_false
+    end
+  end
+
 end

data/spec/report_item_spec.rb

@@ -0,0 +1,159 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe ReportItem do
+
+  describe "#start_time" do
+
+    context "when constrained by the parent report" do
+
+      it "should use the report start time" do
+        time_entries = [ TimeEntry.new("Project", Time.local(2009, 12, 1, 9, 0, 0), Time.local(2009, 12, 1, 18, 0, 0)) ]
+        time_report = TimeReport.new(time_entries)
+        time_report.constrain( Time.local(2009, 12, 1, 12, 0, 0), Time.local(2009, 12, 2, 12, 0, 0))
+
+        time_report.entries[0].start_time.should eql(time_report.report_start)
+      end
+
+    end
+
+    context "when not constrained by the parent report" do
+
+      it "should use the entry's start time" do
+        time_entries = [ TimeEntry.new("Project", Time.local(2009, 12, 1, 9, 0, 0), Time.local(2009, 12, 1, 18, 0, 0)) ]
+        time_report = TimeReport.new(time_entries)
+        time_report.constrain( Time.local(2009, 11, 1, 12, 0, 0), Time.local(2009, 12, 2, 12, 0, 0))
+
+        time_report.entries[0].start_time.should eql(time_entries[0].start_time)
+      end
+    end
+
+  end
+
+  describe "#end_time" do
+
+    context "when constrained by the parent report" do
+
+      it "should use the report end time" do
+        time_entries = [ TimeEntry.new("Project", Time.local(2009, 12, 1, 9, 0, 0), Time.local(2009, 12, 1, 18, 0, 0)) ]
+        time_report = TimeReport.new(time_entries)
+        time_report.constrain( Time.local(2009, 11, 1, 12, 0, 0), Time.local(2009, 12, 1, 12, 0, 0))
+
+        time_report.entries[0].end_time.should eql(time_report.report_end)
+      end
+
+    end
+
+    context "when not constrained by the parent report" do
+
+      it "should use the entry's end time" do
+        time_entries = [ TimeEntry.new("Project", Time.local(2009, 12, 1, 9, 0, 0), Time.local(2009, 12, 1, 18, 0, 0)) ]
+        time_report = TimeReport.new(time_entries)
+        time_report.constrain( Time.local(2009, 11, 1, 12, 0, 0), Time.local(2009, 12, 2, 12, 0, 0))
+
+        time_report.entries[0].end_time.should eql(time_entries[0].end_time)
+
+      end
+
+    end
+
+  end
+
+end
+
+describe "formatting behavior" do
+
+  before :each do
+    @report = mock("TimeReport")
+    @time_entry = mock("TimeEntry")
+    @report_item = ReportItem.new(@report, @time_entry)
+  end
+
+  it "should format the record number" do
+    @time_entry.should_receive(:record_number).once.and_return(1)
+    @report_item.formatted_record_number.should eql("    1")
+  end
+
+  describe "#times" do
+
+    context "when start and end times are on the same day" do
+      it "should show the date only once" do        
+        entry_start  = Time.local(2009, 12, 1, 9, 0, 0)
+        entry_end    = Time.local(2009, 12, 1, 17, 0, 0)
+        report_start = Time.local(2009, 12, 1, 8, 0, 0)
+        report_end   = Time.local(2009, 12, 1, 18, 0, 0)
+        
+        @time_entry.should_receive(:to_range).any_number_of_times.and_return(entry_start..entry_end)
+        @time_entry.should_receive(:start_time).any_number_of_times.and_return(entry_start)
+        @time_entry.should_receive(:end_time).any_number_of_times.and_return(entry_end)
+
+        @report.should_receive(:report_start).any_number_of_times.and_return(report_start)
+        @report.should_receive(:report_end).any_number_of_times.and_return(report_end)
+        
+        @report_item.formatted_times.should eql(" 12/01/2009 at 09:00 AM to 05:00 PM ")
+      end
+    end
+
+    context "when start and end times are on the same day and the start end end times are sliced" do
+      it "should show the date only once" do
+        entry_start  = Time.local(2009, 12, 1, 9, 0, 0)
+        entry_end    = Time.local(2009, 12, 1, 17, 0, 0)
+        report_start = Time.local(2009, 12, 1, 10, 0, 0)
+        report_end   = Time.local(2009, 12, 1, 16, 0, 0)
+        
+        @time_entry.should_receive(:to_range).any_number_of_times.and_return(entry_start..entry_end)
+        @time_entry.should_receive(:start_time).any_number_of_times.and_return(entry_start)
+        @time_entry.should_receive(:end_time).any_number_of_times.and_return(entry_end)
+
+        @report.should_receive(:report_start).any_number_of_times.and_return(report_start)
+        @report.should_receive(:report_end).any_number_of_times.and_return(report_end)
+        
+        @report_item.formatted_times.should eql("<12/01/2009 at 10:00 AM to 04:00 PM>")
+      end
+    end
+
+    context "when start and end times are on different days" do
+      it "should show the date for both start and end" do
+        entry_start  = Time.local(2009, 12, 1, 9, 0, 0)
+        entry_end    = Time.local(2009, 12, 2, 18, 0, 0)
+        report_start = Time.local(2009, 12, 1, 8, 0, 0)
+        report_end   = Time.local(2009, 12, 2, 19, 0, 0)
+        
+        @time_entry.should_receive(:to_range).any_number_of_times.and_return(entry_start..entry_end)
+        @time_entry.should_receive(:start_time).any_number_of_times.and_return(entry_start)
+        @time_entry.should_receive(:end_time).any_number_of_times.and_return(entry_end)
+
+        @report.should_receive(:report_start).any_number_of_times.and_return(report_start)
+        @report.should_receive(:report_end).any_number_of_times.and_return(report_end)
+        
+        @report_item.formatted_times.should eql(" 12/01/2009 at 09:00 AM to 12/02/2009 at 06:00 PM ")
+      end
+
+    end
+  end
+
+  describe "#duration" do
+
+    context "when the duration is longer than one day" do
+
+      it "should include days in the display" do
+        @report_item.should_receive(:duration).any_number_of_times.and_return(RichUnits::Duration.new(30.hours.to_i + 15.minutes.to_i))
+        # @report_item.should_receive(:duration).any_number_of_times.and_return(RichUnits::Duration.new(30.hours.to_i + 15.minutes.to_i))
+        @report_item.formatted_duration.should eql("1 Days 6h 15m")
+      end
+
+    end
+
+    context "when the duration is less than one day" do
+
+      it "should not include days in the display" do
+        # report_item = ReportItem.new(@report, @time_entry)
+        @report_item.stub(:duration).any_number_of_times.and_return(RichUnits::Duration.new(12.hours.to_i + 15.minutes.to_i))
+
+        # report_item.should_receive(:duration).any_number_of_times.and_return(RichUnits::Duration.new(12.hours.to_i + 15.minutes.to_i))
+        @report_item.formatted_duration.should eql("12h 15m")
+      end
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,17 +1,4 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  gem 'rspec'
-  require 'spec'
-end
-
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'timesheet'
 
-
-#Spec::Runner.configure do |config|
-#  config.mock_with :mocha
-#end
-

data/spec/timesheet_parser_spec.rb

@@ -48,7 +48,7 @@ describe TimesheetParser do
     end
 
     it "should allow comment to be optional" do
-      hash = TimesheetParser.parse(%w[add -p a\ project\ name --start 12/1/2009\at\ 11:00\ am --end 12/1/2009\ at\ 2:00\ pm])
+      hash = TimesheetParser.parse(%w[add -p a\ project\ name --start 12/1/2009\ at\ 11:00\ am --end 12/1/2009\ at\ 2:00\ pm])
       hash[:command].should eql(:add)
       hash[:project].should eql("a project name")
       hash[:start].should eql(Time.local(2009, 12, 1, 11, 0, 0))
@@ -79,7 +79,7 @@ describe TimesheetParser do
     end
 
     it "should accept a start and end time" do
-      hash = TimesheetParser.parse(%w[list --start 12/1/2009\at\ 11:00\ am --end 12/1/2009\ at\ 2:00\ pm])
+      hash = TimesheetParser.parse(%w[list --start 12/1/2009\ at\ 11:00\ am --end 12/1/2009\ at\ 2:00\ pm])
       hash[:command].should eql(:report)
       hash[:detail].should be_true
       hash[:start].should eql(Time.local(2009, 12, 1, 11, 0, 0))
@@ -95,11 +95,11 @@ describe TimesheetParser do
     end
 
     it "should fail if start date and --today are used" do
-      lambda {TimesheetParser.parse(%w[list --today --start 12/1/2009\at\ 11:00\ am --end 12/1/2009\ at\ 2:00\ pm])}.should raise_error SystemExit
+      lambda {TimesheetParser.parse(%w[list --today --start 12/1/2009\ at\ 11:00\ am --end 12/1/2009\ at\ 2:00\ pm])}.should raise_error SystemExit
     end
 
     it "should fail if start date is missing end date" do
-      lambda {TimesheetParser.parse(%w[list --start 12/1/2009\at\ 11:00\ am])}.should raise_error SystemExit
+      lambda {TimesheetParser.parse(%w[list --start 12/1/2009\ at\ 11:00\ am])}.should raise_error SystemExit
     end
 
   end
@@ -114,7 +114,7 @@ describe TimesheetParser do
     end
 
     it "should parse a valid complete edit command" do
-      hash = TimesheetParser.parse(%w[edit -r 100 -p a\ project\ name --start 12/1/2009\at\ 11:00\ am --end 12/1/2009\ at\ 2:00\ pm --comment a\ comment])
+      hash = TimesheetParser.parse(%w[edit -r 100 -p a\ project\ name --start 12/1/2009\ at\ 11:00\ am --end 12/1/2009\ at\ 2:00\ pm --comment a\ comment])
       hash[:command].should eql(:edit)
       hash[:record_number].should eql(100)
       hash[:project].should eql("a project name")
@@ -144,7 +144,7 @@ describe TimesheetParser do
     end
 
     it "should allow just start time" do
-      hash = TimesheetParser.parse(%w[edit -r 1 -s 12/1/2009\at\ 11:00\ am])
+      hash = TimesheetParser.parse(%w[edit -r 1 -s 12/1/2009\ at\ 11:00\ am])
       hash[:command].should eql(:edit)
       hash[:record_number].should eql(1)
       hash[:project].should be_nil
@@ -154,7 +154,7 @@ describe TimesheetParser do
     end
 
     it "should allow just end time" do
-      hash = TimesheetParser.parse(%w[edit -r 1 -e 12/1/2009\at\ 2:00\ pm])
+      hash = TimesheetParser.parse(%w[edit -r 1 -e 12/1/2009\ at\ 2:00\ pm])
       hash[:command].should eql(:edit)
       hash[:record_number].should eql(1)
       hash[:project].should be_nil
@@ -192,7 +192,7 @@ describe TimesheetParser do
     end
 
     it "should parse a valid complete report command" do
-      hash = TimesheetParser.parse(%w[report --summary --start 12/1/2009\at\ 11:00\ am --end 12/1/2009\ at\ 2:00\ pm])
+      hash = TimesheetParser.parse(%w[report --summary --start 12/1/2009\ at\ 11:00\ am --end 12/1/2009\ at\ 2:00\ pm])
       hash[:command].should eql(:report)
       hash[:summary].should be_true
       hash[:detail].should be_false

data/spec/timesheet_spec.rb

@@ -16,9 +16,9 @@ describe Timesheet do
 
       command_hash.should_receive(:[]).with(:debug).once.and_return(nil)
 
-      Timesheet.should_receive(:puts).with("Cannot determine location for data. Try timesheet --help for details.").once.and_return(nil)
+      Timesheet::Timesheet.should_receive(:puts).with("Cannot determine location for data. Try timesheet --help for details.").once.and_return(nil)
 
-      Timesheet.run(params)
+      Timesheet::Timesheet.run(params)
 
     end
 
@@ -43,10 +43,10 @@ describe Timesheet do
 
       YAML::Store.should_receive(:new).with(expected_timesheet_data_file).once.and_return(store)
       TimeLog.should_receive(:new).with(store).once.and_return(time_log)
-      Timesheet.should_receive(:new).with(time_log).once.and_return(time_sheet)
+      Timesheet::Timesheet.should_receive(:new).with(time_log).once.and_return(time_sheet)
       time_sheet.should_receive(:process).with(command_hash)
 
-      Timesheet.run(params)
+      Timesheet::Timesheet.run(params)
 
     end
 
@@ -72,10 +72,10 @@ describe Timesheet do
 
       YAML::Store.should_receive(:new).with(expected_data_file).once.and_return(store)
       TimeLog.should_receive(:new).with(store).once.and_return(time_log)
-      Timesheet.should_receive(:new).with(time_log).once.and_return(time_sheet)
+      Timesheet::Timesheet.should_receive(:new).with(time_log).once.and_return(time_sheet)
       time_sheet.should_receive(:process).with(command_hash)
 
-      Timesheet.run(params)
+      Timesheet::Timesheet.run(params)
 
     end
 
@@ -86,7 +86,7 @@ describe Timesheet do
     before :each do
       @command = mock("command")
       @timelog = mock("timelog")
-      @timesheet = Timesheet.new(@timelog)
+      @timesheet = Timesheet::Timesheet.new(@timelog)
     end
 
     it "should dispatch to the proper command handler" do
@@ -114,7 +114,7 @@ describe Timesheet do
     it "should perform an add" do
       command = mock("add command")
       timelog = mock("timelog")
-      timesheet = Timesheet.new(timelog)
+      timesheet = Timesheet::Timesheet.new(timelog)
 
       project = mock("project")
       start_time = mock("start time")
@@ -138,7 +138,7 @@ describe Timesheet do
     it "should perform an edit" do
       command = mock("dump command")
       timelog = mock("timelog")
-      timesheet = Timesheet.new(timelog)
+      timesheet = Timesheet::Timesheet.new(timelog)
       time_report = mock("time report")
       entries = mock("entries")
 
@@ -158,7 +158,7 @@ describe Timesheet do
     it "should perform a delete" do
       command = mock("delete command")
       timelog = mock("timelog")
-      timesheet = Timesheet.new(timelog)
+      timesheet = Timesheet::Timesheet.new(timelog)
 
       command.should_receive(:delete).with(:record_number).once.and_return(100)
       timelog.should_receive(:delete).with(100)
@@ -177,7 +177,7 @@ describe Timesheet do
       end_time = mock("end time")
       entries = mock("entries")
       time_report = mock("time report")
-      timesheet = Timesheet.new(timelog)
+      timesheet = Timesheet::Timesheet.new(timelog)
 
       command.should_receive(:[]).with(:start).once.and_return(start_time)
       command.should_receive(:[]).with(:end).once.and_return(end_time)

data/timesheet.gemspec

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "timesheet/version"
+
+Gem::Specification.new do |s|
+  s.name               = "timesheet"
+  s.version            = Timesheet::VERSION
+  s.date               = "2010-10-25"
+  s.authors            = ["John F. Schank III"]
+  s.email              = ["jschank@mac.com"]
+  s.homepage           = "http://github.com/jschank/timesheet"
+  s.summary            = "Timesheet is simple ruby application for tracking time spent on projects"
+  s.default_executable = "timesheet"
+  s.description        = "Timesheet is simple ruby application for tracking time spent on projects.
+It is a console application that uses a simple text file storage back-end (YAML::Store)
+
+The main idea is to be able to produce reports of hours spent, such that I can use geektool to display the reports."
+
+  s.rubyforge_project  = "timesheet"
+
+  s.files              = `git ls-files`.split("\n")
+  s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables        = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths      = ["lib"]
+
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "syntax"
+  
+  s.add_runtime_dependency "richunits"
+  s.add_runtime_dependency "chronic"
+  
+end

metadata

@@ -1,219 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: timesheet
-version: !ruby/object:Gem::Version 
-  version: 0.2.8
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - John F. Schank III
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-03-08 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: chronic
-  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
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: json_pure
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: richunits
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
+date: 2010-10-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rubigen
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
+  requirement: &70346204068560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70346204068560
+- !ruby/object:Gem::Dependency
   name: syntax
+  requirement: &70346204068080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70346204068080
+- !ruby/object:Gem::Dependency
+  name: richunits
+  requirement: &70346204067440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: transaction-simple
+  prerelease: false
+  version_requirements: *70346204067440
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: &70346204066860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
-description: |-
-  <i>Timesheet</i> is simple ruby application for tracking time spent on projects.
+  prerelease: false
+  version_requirements: *70346204066860
+description: ! 'Timesheet is simple ruby application for tracking time spent on projects.
+
   It is a console application that uses a simple text file storage back-end (YAML::Store)
-  
-  The main idea is to be able to produce reports of hours spent, such that I can use geektool to display the reports.
-email: 
+
+
+  The main idea is to be able to produce reports of hours spent, such that I can use
+  geektool to display the reports.'
+email:
 - jschank@mac.com
-executables: 
+executables:
 - timesheet
 extensions: []
-
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-files: 
-- History.txt
-- Manifest.txt
+extra_rdoc_files: []
+files:
+- .gitignore
+- .rdebugrc
+- .rvmrc
+- Gemfile
 - README.rdoc
 - Rakefile
 - bin/timesheet
 - lib/timesheet.rb
 - lib/timesheet/range_extensions.rb
-- lib/timesheet/time_entry.rb
 - lib/timesheet/report_item.rb
+- lib/timesheet/time_entry.rb
 - lib/timesheet/time_log.rb
 - lib/timesheet/time_report.rb
 - lib/timesheet/timesheet_parser.rb
 - lib/timesheet/trollop.rb
-- script/console
-- script/destroy
-- script/generate
+- lib/timesheet/version.rb
+- notes/Creating a RubyGem Package | 5dollarwhitebox.org.webloc
+- notes/Gem--Specification Reference | RubyGems Manuals.webloc
+- notes/Kuiper DevBlog- Day 89- The Gemification.webloc
+- notes/Kuiper DevBlog- Day 90- Gemification 2, the revenge.webloc
 - spec/range_extensions_spec.rb
+- spec/report_item_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/time_entry_spec.rb
@@ -221,35 +98,38 @@ files:
 - spec/time_report_spec.rb
 - spec/timesheet_parser_spec.rb
 - spec/timesheet_spec.rb
-- tasks/rspec.rake
-has_rdoc: true
+- timesheet.gemspec
 homepage: http://github.com/jschank/timesheet
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: timesheet
-rubygems_version: 1.3.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: <i>Timesheet</i> is simple ruby application for tracking time spent on projects
-test_files: []
-
+summary: Timesheet is simple ruby application for tracking time spent on projects
+test_files:
+- spec/range_extensions_spec.rb
+- spec/report_item_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/time_entry_spec.rb
+- spec/time_log_spec.rb
+- spec/time_report_spec.rb
+- spec/timesheet_parser_spec.rb
+- spec/timesheet_spec.rb

data/History.txt

@@ -1,8 +0,0 @@
-=== 0.2.4 2010-02-07
-
-* removed dependency on ruport
-
-=== 0.0.1 2009-11-29
-
-* 1 major enhancement:
-  * Initial release

data/Manifest.txt

@@ -1,25 +0,0 @@
-History.txt
-Manifest.txt
-README.rdoc
-Rakefile
-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
-lib/timesheet/trollop.rb
-script/console
-script/destroy
-script/generate
-spec/range_extensions_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-spec/time_entry_spec.rb
-spec/time_log_spec.rb
-spec/time_report_spec.rb
-spec/timesheet_parser_spec.rb
-spec/timesheet_spec.rb
-tasks/rspec.rake

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/timesheet.rb'}"
-puts "Loading timesheet gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)

data/tasks/rspec.rake

@@ -1,21 +0,0 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
-
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end