Pratt 1.6.5 → 1.6.8

data/spec/project_spec.rb

@@ -47,7 +47,10 @@ describe Project do
   end
 
   context "instances" do
+    include SeedData
+
     before :each do
+      load_seed_data
       @project = Project.primary
       @log_count = @project.whences.size
     end
@@ -118,15 +121,15 @@ describe Project do
       end
 
       it "is correct with no arguments" do
-        @project.amount.should == 6*3.15
+        @project.amount(@project.time_spent).should == 6*3.15
       end
 
       it "is correct with a scale" do
-        @project.amount(:month).should == 6*3.15
+        @project.amount(@project.time_spent(:month)).should == 6*3.15
       end
 
       it "is correct with a scale and time" do
-        @project.amount(:week, @now).should == 3*3.15
+        @project.amount(@project.time_spent(:week, @now)).should == 3*3.15
       end
     end
   end

data/spec/report_action_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+require 'pratt'
+
+describe "Pratt report actions" do
+  include SeedData
+
+  before :each do
+    @pratt = Pratt.new
+    @when_to = DateTime.now
+    load_seed_data
+  end
+
+  after :each do
+    Whence.delete_all
+  end
+
+  it "calls project#start! in begin method" do
+    @pratt.project = Project.primary
+    @pratt.when_to = @when_to
+    @pratt.project.expects(:start!).with @when_to
+    @pratt.begin
+  end
+
+  it "calls project#restart! in restart method with defined project" do
+    @next_when_to = @when_to + 7.minutes
+    primary = Project.primary
+    primary.start! @when_to
+    @pratt.project = primary
+    @pratt.when_to = @next_when_to
+    whence = primary.whences.last
+    Whence.expects(:last_unended).never
+    primary.expects(:restart!).with @next_when_to
+    @pratt.restart
+  end
+
+  it "calls last unended project in restart method without defined project" do
+    @next_when_to = @when_to + 7.minutes
+    primary = Project.primary
+    primary.start! @when_to
+    @pratt.when_to = @next_when_to
+    whence = primary.whences.last
+    Whence.expects(:last_unended).returns whence
+    whence.project.expects(:restart!).with @next_when_to
+    @pratt.restart
+    whence.project.should eql(primary)
+  end
+
+  it "stops! defined project in end method" do
+    @pratt.project = Project.primary
+    @pratt.when_to = @when_to
+    @pratt.project.expects(:stop!).with @when_to
+    @pratt.end
+  end
+
+  it "stops! the last unended project in end method without defined project" do
+    primary = Project.primary
+    primary.start! @when_to
+    whence = primary.whences.last
+    Whence.expects(:last_unended).returns whence
+    whence.expects(:stop!).with @when_to
+    @pratt.when_to = @when_to
+    @pratt.end
+  end
+
+  it "changes last project in change method" do
+    primary = Project.primary
+    primary.start! @when_to
+    primary.stop! @when_to+10.minutes
+    other = Project.rest.first
+    whence = primary.whences.last
+    Whence.expects(:last).returns whence
+    whence.expects(:change!).with other.name
+    @pratt.project = other
+    @pratt.change
+  end
+  
+  it "destroys defined project in destroy method" do
+    @pratt.project = Project.create :name => "to be destroyed"
+    lambda {
+      @pratt.destroy
+    }.should change(Project, :count).by -1
+  end
+end

data/spec/report_spec.rb

@@ -0,0 +1,205 @@
+require 'spec_helper'
+require 'pratt'
+
+describe "Pratt report method" do
+
+  describe "#pid" do
+    @pratt = Pratt.new
+    @pratt.expects(:template=).with("pid")
+    @pratt.expects(:process_template!)
+    @pratt.pid
+  end
+
+  # FIXME: Get this working
+  describe "#cpid" #do
+#    @pratt = Pratt.new
+#    ::Kernel.expects(:`)
+#    @pratt.cpid
+#  end
+
+  describe "#graph" do
+    before :each do
+      @pratt = Pratt.new
+    end
+
+    it "with no project uses Project.all to generate output" do
+      @pratt.expects(:template=).with("graph")
+      @pratt.expects(:project?).returns false
+      Project.expects(:all).returns([])
+      @pratt.expects(:process_template!)
+      @pratt.graph
+    end
+
+    it "with project uses defined project to generate output" do
+      @pratt.project = Project.new
+      @pratt.expects(:template=).with("graph")
+      @pratt.expects(:project?).returns true
+      @pratt.expects(:process_template!)
+      @pratt.graph
+      @pratt.instance_variable_get("@projects").should eql([@pratt.project])
+    end
+  end
+
+  describe "output" do
+    include SeedData
+
+    before :each do
+      @pratt = Pratt.new
+    end
+    before :each do
+      @when_to = Chronic.parse('September 29 2009').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 get_expected_display fixture_name
+      Pratt.root('spec', 'fixtures', "#{fixture_name}.expectation").first.read
+    end
+
+    it "graphs output as expected with no data" do
+      Pratt.color = false
+      Project.stubs(:longest_project_name).returns 12
+      Project.stubs(:all).returns([])
+      $stdout.expects(:puts)
+      @pratt.graph
+      @pratt.send(:output).should eql( get_expected_display("empty_graph") )
+    end
+
+    it "graphs output as expected with data" do
+      populate_with_data
+      Pratt.color = false
+      Project.stubs(:longest_project_name).returns 12
+      $stdout.expects(:puts)
+
+      @pratt.graph
+      @pratt.send(:output).should eql( get_expected_display("graph") )
+    end
+
+    it "generates proportions graphs output as expected with data" do
+      populate_with_data
+      Pratt.color = false
+      Project.stubs(:longest_project_name).returns 12
+      $stdout.expects(:puts)
+
+      @pratt.proportions
+      @pratt.send(:output).should eql( get_expected_display("proportions") )
+    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
+      load_seed_data
+      @tasks << Project.primary
+      task 'Lunch/Break', 1.hour+21.minutes+0.seconds
+      task 'Task1', 1.hour+4.minutes+0.seconds
+      task 'Task2', 58.minutes+0.seconds
+      task 'Another Task', 5.minutes+0.seconds
+      task 'Task3', 1.day+17.hours+32.minutes+0.seconds
+    end
+  end
+
+  describe "#proportions" do
+    include SeedData
+
+    before :each do
+      @pratt = Pratt.new
+    end
+    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, :weight => -1
+      task.start! @when_to
+      task.stop! @when_to+time_spent
+      @tasks << task
+    end
+
+    def populate_with_data
+      load_seed_data
+      primary = Project.primary
+      primary.start! @when_to
+      primary.stop! @when_to+20.hours
+      @tasks << primary
+      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
+
+    it "uses Project.all with data to generate output" do
+      populate_with_data
+      @pratt.expects(:template=).with("proportions")
+      @pratt.expects(:project?).returns false
+      @pratt.expects(:process_template!)
+      @pratt.proportions
+      @pratt.instance_variable_get("@primary").should eql(20.0)
+      @pratt.instance_variable_get("@off_total").should eql(1.35)
+      @pratt.instance_variable_get("@rest_total").should eql(43.65)
+      @pratt.instance_variable_get("@projects").should eql(Project.all)
+      @pratt.instance_variable_get("@scaled_total").should eql(63.65)
+    end
+
+    it "uses defined project with data to generate output" do
+      populate_with_data
+      @pratt.expects(:template=).with("proportions")
+      @pratt.expects(:project?).returns true
+      @pratt.project = Project.named('Task1')
+      @pratt.expects(:process_template!)
+      @pratt.proportions
+      @pratt.instance_variable_get("@primary").should eql(64/60.0)
+      @pratt.instance_variable_get("@off_total").should eql(0.0)
+      @pratt.instance_variable_get("@rest_total").should eql(0.0)
+      @pratt.instance_variable_get("@projects").should eql([@pratt.project])
+      @pratt.instance_variable_get("@scaled_total").should eql(64/60.0)
+    end
+
+    it "uses Project.all with no data to generate output" do
+      @pratt.expects(:template=).with("proportions")
+      @pratt.expects(:project?).returns false
+      Project.expects(:all).returns []
+      @pratt.expects(:process_template!).never
+      $stdout.expects(:puts).with "No data to report"
+      @pratt.proportions
+    end
+
+    it "uses defined project with no with data to generate output" do
+      @pratt.expects(:template=).with("proportions")
+      @pratt.expects(:project?).returns true
+      @pratt.project = Project.new
+      @pratt.project.expects(:time_spent).twice.returns 0.0
+      @pratt.expects(:process_template!).never
+      $stdout.expects(:puts).with "No data to report"
+      @pratt.proportions
+      @pratt.instance_variable_get("@primary").should eql(0.0)
+      @pratt.instance_variable_get("@off_total").should eql(0.0)
+      @pratt.instance_variable_get("@rest_total").should eql(0.0)
+      @pratt.instance_variable_get("@projects").should eql([@pratt.project])
+      @pratt.instance_variable_get("@scaled_total").should eql(0.0)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -6,39 +6,45 @@ require 'mocha'
 require 'lib/pratt'
 require 'ruby-debug'
 
+module SeedData
+  def load_seed_data
+    Customer.delete_all
+    customer = Customer.create(
+      :name         => 'Scott Noel-Hemming',
+      :company_name => 'Frogstarr78 Software',
+      :address      => '312 NW 7th',
+      :phone        => '509.730.5401',
+      :zip          => '97862'
+    ) 
+
+    Project.delete_all
+    Project.create(
+    [
+      {
+        :name => 'Refactor',
+        :weight => 1,
+        :customer => customer
+      },
+      {
+        :name => 'Lunch/Break',
+        :weight => 0,
+        :customer => customer
+      },
+      {
+        :name => 'Other',
+        :weight => -1,
+        :customer => customer
+      }
+    ]
+    )
+  end
+end
+
 Spec::Runner.configure do |config|
 #  config.mock_with :rspec
   config.mock_with :mocha
 
   Pratt.connect! 'test'
-
-  Customer.create(
-	:name         => 'Scott Noel-Hemming',
-	:company_name => 'Frogstarr78 Software',
-	:address      => '312 NW 7th',
-	:phone        => '509.730.5401',
-	:zip          => '97862'
-  ) unless Customer.count > 0
-
-  Project.create(
-	[
-	  {
-		:name => 'Refactor',
-		:weight => 1,
-		:customer_id => 0
-	  },
-	  {
-		:name => 'Lunch/Break',
-		:weight => 0,
-		:customer_id => 0
-	  },
-	  {
-		:name => 'Other',
-		:weight => -1,
-		:customer_id => 0
-	  }
-	]
-  ) unless Project.count > 0
 end
 
 shared_examples_for "Time spent on a project" do

data/views/general-invoice.eruby

@@ -450,7 +450,7 @@
 			<p><%= project.payment.pretty_print %></p>
         </td>
         <td style="text-align:right;  " class="ce31">
-          <p><%= project.amount(scale, when_to).pretty_print %></p>
+          <p><%= project.amount( project.time_spent( scale, when_to ) ).pretty_print %></p>
         </td>
       </tr>
 		<% end %>
@@ -468,7 +468,7 @@
           <!--p>SUBTOTAL</p-->
         </td>
         <td style="text-align:right;  " class="ce36">
-          <!--p><%= project.amount(scale, when_to).pretty_print %></p-->
+          <!--p><%= project.amount( project.time_spent( scale, when_to ) ).pretty_print %></p-->
         </td>
       </tr>
       <tr class="ro2">
@@ -480,7 +480,7 @@
           <p>TOTAL</p>
         </td>
 		<td style="text-align:right;  " class="ce21 ce34">
-          <p><%= project.amount(scale, when_to).pretty_print %></p>
+          <p><%= project.amount( project.time_spent( scale, when_to ) ).pretty_print %></p>
         </td>
       </tr>
       <tr class="ro2">

data/views/invoice.eruby

@@ -107,7 +107,7 @@
           <P ALIGN=RIGHT><%= project.payment.pretty_print %></P>
         </TD>
         <TD WIDTH=97>
-          <P ALIGN=RIGHT><FONT SIZE=2><%= project.amount(scale, when_to).pretty_print %></FONT></P>
+          <P ALIGN=RIGHT><FONT SIZE=2><%= project.amount( project.time_spent( scale, when_to ) ).pretty_print %></FONT></P>
         </TD>
       </TR>
 		<% end %>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 5
-  version: 1.6.5
+  - 8
+  version: 1.6.8
 platform: ruby
 authors: 
 - Scott Noel-Hemming
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-30 00:00:00 -07:00
+date: 2010-05-31 00:00:00 -07:00
 default_executable: pratt.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,7 +116,6 @@ files:
 - README.html
 - README.txt
 - Rakefile
-- Session.vim
 - TODO
 - VERSION
 - bin/pratt.rb
@@ -391,15 +390,22 @@ files:
 - 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
@@ -447,13 +453,19 @@ signing_key:
 specification_version: 3
 summary: Pro/Re-Active Time Tracker.  Track time based on what you expect to be working on, with frequent prompts to ensure accuracy.
 test_files: 
+- 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