Pratt 1.6.5 → 1.6.8

data/Pratt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{Pratt}
-  s.version = "1.6.5"
+  s.version = "1.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Noel-Hemming"]
-  s.date = %q{2010-05-30}
+  s.date = %q{2010-05-31}
   s.default_executable = %q{pratt.rb}
   s.description = %q{
 	  Need a way to keep track of your time, but get caught up in work? Or constant interruptions?
@@ -40,7 +40,6 @@ Gem::Specification.new do |s|
      "README.html",
      "README.txt",
      "Rakefile",
-     "Session.vim",
      "TODO",
      "VERSION",
      "bin/pratt.rb",
@@ -315,15 +314,22 @@ Gem::Specification.new do |s|
      "reports/travel.log",
      "reports/travel.log.2009",
      "spec/app_spec.rb",
+     "spec/array_spec.rb",
      "spec/customer_spec.rb",
+     "spec/fixtures/empty_graph.expectation",
      "spec/fixtures/graph.expectation",
      "spec/fixtures/proportions.expectation",
      "spec/float_spec.rb",
+     "spec/formatting_spec.rb",
+     "spec/money_spec.rb",
+     "spec/nil_class_spec.rb",
      "spec/numeric_spec.rb",
      "spec/payment_spec.rb",
      "spec/pratt_spec.rb",
      "spec/project_spec.rb",
      "spec/rcov.opts",
+     "spec/report_action_spec.rb",
+     "spec/report_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/string_ext_spec.rb",
@@ -348,15 +354,21 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Pro/Re-Active Time Tracker.  Track time based on what you expect to be working on, with frequent prompts to ensure accuracy.}
   s.test_files = [
-    "spec/whence_spec.rb",
+    "spec/nil_class_spec.rb",
+     "spec/whence_spec.rb",
+     "spec/array_spec.rb",
      "spec/spec_helper.rb",
      "spec/float_spec.rb",
      "spec/pratt_spec.rb",
      "spec/project_spec.rb",
      "spec/numeric_spec.rb",
      "spec/app_spec.rb",
+     "spec/formatting_spec.rb",
      "spec/string_ext_spec.rb",
      "spec/customer_spec.rb",
+     "spec/report_spec.rb",
+     "spec/money_spec.rb",
+     "spec/report_action_spec.rb",
      "spec/payment_spec.rb"
   ]
 

data/Rakefile

@@ -42,6 +42,7 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  spec.rcov_opts = %w(--text-report --exclude=activerecord,ruby-debug,shifty_week,sqlite3-ruby,rspec,mocha,erubis,chronic,colored,columnize,builder,activesupport,i18n,linecache,json_pure,rcov,abstract,spec_helper.rb,config.rb,spec)
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-1.6.5
+1.6.8

data/config.rb

@@ -1,4 +1,3 @@
-require 'active_record'
 PRATT_ENV = ENV["PRATT_ENV"] || 'development' unless Object.const_defined? :PRATT_ENV
 
 class Pratt

data/lib/pratt.rb

@@ -77,7 +77,7 @@ class Pratt
   end
 
   # Connect to the database in irb for manual commands/investigation
-  def console options = []
+  def console
     require 'irb'
     require 'irb/completion'
     ARGV.clear

data/lib/pratt/core_ext/array.rb

@@ -7,7 +7,11 @@ class Pratt
       # @param [String] conjunction
       # @return [String] 
       def to_sentence conjunction = 'and'
-        self[0..-2].join(", ") << (self.size > 2 ? ',' : '') << " #{conjunction} #{self.last}"
+        if self.size >= 2
+          self[0..-2].join(", ") << (self.size > 2 ? ',' : '') << " #{conjunction} #{self.last}"
+        elsif self.size <= 1
+          self.first.to_s
+        end
       end
     end
   end

data/lib/pratt/core_ext/float.rb

@@ -22,6 +22,7 @@ class Money
   def initialize f
     @f = Float(f)
   end
+
   def pretty_print
     "$#{@f.pretty_print}"
   end

data/lib/pratt/dialogs.rb

@@ -61,8 +61,9 @@ class Pratt
     def pop
       reload_and_detect_lock 'pop'
       self.project = Whence.last_unended.project
+      project_time = project.formatted_time_spent_totals( project.time_spent(scale, when_to) )
       defork do
-        command = "ruby views/pop.rb  --project '#{project.name}' --start '#{project.whences.last_unended.start_at}' --project_time '#{Pratt.totals(project.time_spent)}'"
+        command = "ruby views/pop.rb  --project '#{project.name}' --start '#{project.whences.last_unended.start_at}' --project_time '#{project_time}'"
         system command
       end
     end

data/lib/pratt/formatting.rb

@@ -17,7 +17,7 @@ class Pratt
     end
 
     # Calculate totals. I think this should be an instance method on Projects/?/Whences
-    def totals hr, fmt = false
+    def totals hr
       "#{(hr / 24).format_integer.cyan} day #{(hr % 24).format_integer.yellow} hour #{(60*(hr -= hr.to_i)).format_integer.green} min"
     end
   end

data/lib/pratt/reports.rb

@@ -5,7 +5,7 @@ class Pratt
     self.template = 'graph'
 
     if project?
-      @projects = [project]
+      @projects = [ project ]
     else
       @projects = Project.all
     end
@@ -21,7 +21,7 @@ class Pratt
       @projects = [project]
 
       @primary = project.time_spent(scale, when_to)
-      @scaled_total = project.whences.time_spent(scale, when_to)
+      @scaled_total = project.time_spent(scale, when_to)
     else
       @projects = Project.all
 
@@ -30,13 +30,13 @@ class Pratt
         @off_total   = proj.time_spent(scale, when_to) if proj.name == Project.off.name
         @rest_total += proj.time_spent(scale, when_to) if Project.rest.collect(&:name).include?(proj.name)
       end
-      @scaled_total = Whence.time_spent(scale, when_to)-@off_total
+      @scaled_total = Whence.time_spent(scale, when_to) - @off_total
     end
 
     if @primary + @off_total + @rest_total > 0.0
       process_template!
     else
-      "No data to report"
+      $stdout.puts "No data to report"
     end
   end
 
@@ -47,13 +47,13 @@ class Pratt
     if project?
       @projects = [project]
 
-      @total = project.amount(scale, when_to)
+      @total = project.amount( project.time_spent(scale, when_to) )
     else
       @projects = (Project.all - [Project.primary, Project.off])
-      @projects.select! {|proj| show_all or ( !show_all and proj.time_spent(scale, when_to) != 0.0 ) }
+      @projects = @projects.select {|proj| show_all or ( !show_all and proj.time_spent(scale, when_to) != 0.0 ) }
 
       @total = @projects.inject 0.0 do |total, proj| 
-        total += proj.amount(scale, when_to)
+        total += proj.amount( proj.time_spent(scale, when_to) )
         total
       end
     end
@@ -64,7 +64,7 @@ class Pratt
     if @total > 0.0
       process_template!
     else
-      puts "No data to report"
+      $stdout.puts "No data to report in Pratt#invoice"
     end
   end
 
@@ -118,10 +118,17 @@ class Pratt
   end
 
   private
+   def output
+     # for testing
+     @__output
+   end
+
     def process_template!
       input = File.open(Pratt.root("views", "#{template}.eruby").first).read
       erubis = Erubis::Eruby.new(input)
-      puts erubis.evaluate(self)
+      @__output = erubis.evaluate(self)
+      $stdout.puts @__output
+      nil
     end
 
 end

data/models/customer.rb

@@ -13,7 +13,11 @@ class Customer < ActiveRecord::Base
     phone = read_attribute(:phone)
     class << phone
       def pretty_print sep = '.'
-        self.split(/(\d{3})(\d{3})(\d{4})/)[1,3] * sep
+        if self.blank?
+          ""
+        else
+          self.split(/(\d{3})(\d{3})(\d{4})/)[1,3] * sep
+        end
       end
     end
     phone

data/models/pratt.rb

@@ -6,5 +6,10 @@ class Pratt
       cond = [(cond << "start_at BETWEEN ? AND ?").join(' AND ')] | [when_to.send("beginning_of_#{scale}"), when_to.send("end_of_#{scale}")] unless scale.nil?
       cond
     end
+
+    def total_whences whences_since
+      seconds = whences_since.inject(0.0) {|total, whence| total += ( whence.end_at - whence.start_at ) }
+      hour = seconds / 3600
+    end
   end
 end

data/models/project.rb

@@ -25,19 +25,20 @@ class Project < ActiveRecord::Base
     self.start! at
   end
 
-  def time_spent scale = nil, when_to = DateTime.now
+  def time_spent scale = nil, when_to = DateTime.now, &block
     whences_since = self.whences.find :all, :conditions => conditions_for_time_spent(scale, when_to)
-    whences_since.inject(0.0) {|total, whence| 
-      total += ( whence.end_at - whence.start_at )
-    } / 3600
+    total_whences whences_since
   end
 
-  def amount scale = nil, when_to = Time.now
-    amount = time_spent(scale, when_to) 
-    amount *= payment.rate / 100.0
+  def amount hour
+    amount = hour * ( payment.rate / 100.0 )
     amount.to_money
   end
 
+  def formatted_time_spent_totals hour
+    "#{(hour / 24).format_integer.cyan} day #{(hour % 24).format_integer.yellow} hour #{(60*(hour -= hour.to_i)).format_integer.green} min"
+  end
+
   class << self
     def named name
       first :conditions => { :name => name }

data/models/whence.rb

@@ -45,9 +45,7 @@ class Whence < ActiveRecord::Base
 
     def time_spent scale = nil, when_to = Time.now
       whences_since = Whence.find :all, :conditions => conditions_for_time_spent(scale, when_to)
-      whences_since.inject(0.0) {|total, whence| 
-          total += ( whence.end_at - whence.start_at )
-        } / 3600
+      total_whences whences_since
     end
 
     def last_unended

data/spec/array_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'pratt'
+
+describe Array do
+  it "to_sentence concatenates each element correctly with no elements" do
+    [].to_sentence.should eql('')
+  end
+
+  it "to_sentence concatenates each element correctly with one element" do
+    %w(a).to_sentence.should eql('a')
+  end
+
+  it "to_sentence concatenates each element correctly with two elements" do
+    %w(a b).to_sentence.should eql('a and b')
+  end
+
+  it "to_sentence concatenates each element correctly with >= three elements" do
+    %w(a b c d).to_sentence.should eql('a, b, c, and d')
+  end
+
+  it "to_sentence concatenates each element correctly with >= three elements and a different conjunction" do
+    %w(a b c d).to_sentence('&').should eql('a, b, c, & d')
+  end
+end

data/spec/fixtures/empty_graph.expectation

@@ -0,0 +1,8 @@
+Project detail
+  by week from
+  Mon 00:00:00 Sep 28 2009 to Sun 23:59:59 Oct 04 2009
+                    dys     hrs     min   total
+-------------------------------------------------------------------
+
+
+-------------------------------------------------------------------

data/spec/fixtures/graph.expectation

@@ -1,13 +1,13 @@
 Project detail
   by week from
   Mon 00:00:00 Sep 28 2009 to Sun 23:59:59 Oct 04 2009
-                          dys     hrs     min
-------------------------------------------------------------
+                    dys     hrs     min   total
+-------------------------------------------------------------------
 
-     Lunch/Break| 00 day 01 hour 21 min
-           Task1| 00 day 01 hour 04 min
-           Task2| 00 day 00 hour 58 min
-    Another Task| 00 day 00 hour 05 min
-           Task3| 01 day 17 hour 32 min
+     Lunch/Break | 00 day 01 hour 21 min  1.35
+           Task1 | 00 day 01 hour 03 min  1.07
+           Task2 | 00 day 00 hour 58 min  0.97
+    Another Task | 00 day 00 hour 05 min  0.08
+           Task3 | 01 day 17 hour 31 min  41.53
 
-------------------------------------------------------------
+-------------------------------------------------------------------

data/spec/fixtures/proportions.expectation

@@ -1,4 +1,4 @@
-                    Total 43.69 hrs
-            **** ******** 0.00%
-              Lunch/Break 3.11%
-                    Other 100.00%
+           Total 43.65 hrs
+        Refactor 0.00%
+     Lunch/Break 3.09%
+           Other 100.00%

data/spec/formatting_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'pratt'
+
+describe 'formatting' do
+  it "" do
+  end
+end

data/spec/money_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+require 'pratt'
+
+describe Money do
+  it "generates expected pretty_print output" do
+    @money = Money.new 2.5
+    @money.pretty_print.should eql("$2.50")
+  end
+end

data/spec/nil_class_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'pratt'
+
+describe NilClass do
+  it "generates expected pretty_print output" do
+    nil.pretty_print.should eql("")
+  end
+end

data/spec/pratt_spec.rb

@@ -81,59 +81,7 @@ describe Pratt do
     end
   end
 
-  describe "graph" do
-    before :each do
-      @when_to = Chronic.parse('last week').beginning_of_week
-      @pratt.scale = 'week'
-      @pratt.when_to = @when_to
-      @customer = Customer.create :name => 'Bob Hope', :address => '123 Where St', :zip => '22222'
-      @tasks = []
-    end
-
-    after :each do
-      Whence.delete_all
-      @customer.destroy
-      @tasks.each(&:destroy)
-    end
-
-    def task name, time_spent
-      task = Project.find_or_create_by_name :name => name, :customer => @customer
-      task.start! @when_to
-      task.stop! @when_to+time_spent
-      @tasks << task
-    end
-
-    def populate_with_data
-      @tasks << Project.find_or_create_by_name( :name => '**** ********', :weight => 1, :customer => @customer )
-      task 'Lunch/Break', 1.hour+21.minutes
-      task 'Task1', 1.hour+4.minutes
-      task 'Task2', 58.minutes
-      task 'Another Task', 5.minutes
-      task 'Task3', 1.day+17.hours+32.minutes
-    end
-
-    def get_expected_display
-      e = ''
-      Pratt.root('spec', 'fixtures', 'graph.expectation') {|file| e = File.open(file).read }
-      e
-    end
-
-    it "report no data" do
-      Project.expects(:all).returns([])
-      @pratt.expects(:process_template!).never
-      @pratt.graph.should == "No data to report"
-    end
-
-    it "should look right with data" do
-      populate_with_data
-      @pratt.expects(:process_template!)
-
-      @pratt.graph.should == get_expected_display
-    end
-  end
-
   describe "parse" do
-    it "handles cli arg -n setting appropriate environment config"
 #    do
 ##      Pratt.expects(:connect).with('staging')
 ##      lambda {
@@ -142,14 +90,17 @@ describe Pratt do
 #      ENV['PRATT_ENV'].should == 'staging'
 #    end
 
-#    it "inits an irb console when given console argument" do
-#      Pratt.any_instance.stubs(:i_should?).returns false
-#      # ^ to bypass actually calling exec
-#      # :i_should? and Pratt#run should be 
-#      # tested independently and we don't
-#      # need to test exec
-#      Pratt.any_instance.expects(:<<).with(:console)
-#      Pratt.parse %w(console)
-#    end
+    it "inits an irb console when given console argument" do
+      Pratt.any_instance.stubs(:i_should?).returns false
+      # ^ to bypass actually calling the code
+      Pratt.any_instance.expects(:<<).with(:console)
+      Pratt.parse %w(console)
+    end
+  end
+
+  it "should start IRB when console method is called" do
+    ARGV.expects(:clear)
+    IRB.expects(:start)
+    @pratt.console
   end
 end