Pratt 1.6.2 → 1.6.4

data/views/graph.eruby

@@ -3,19 +3,14 @@ Project detail
   by <%= scale.red %> from
   <%= when_to.send("beginning_of_#{scale}").strftime(Pratt::FMT).blue %> to <%= when_to.send("end_of_#{scale}").strftime(Pratt::FMT).blue %>
 <% end %>
-     <%= padded_to_max('') << '  ' << 'dys'.underline << ' '*5 << 'hrs'.underline << ' '*5 << 'min'.underline << ' '*3 << 'total'.underline %>
+     <%= '  '.with_label('') << 'dys'.underline << ' '*5 << 'hrs'.underline << ' '*5 << 'min'.underline << ' '*3 << 'total'.underline %>
 <%= ( '-'.or '·')*67 %>
 
 <% @projects.each do |proj| %>
   <% hour_spent = proj.time_spent(scale, when_to) %>
   <% if show_all or ( !show_all and hour_spent != 0.0 ) %>
-    <%= padded_to_max(proj.name) %><%= ('|'.or '⋮') %> <%= Pratt.fmt_i(hour_spent / 24, 'day', :cyan) %> <%= Pratt.fmt_i(hour_spent % 24, 'hour', :yellow) %> <%= Pratt.fmt_i((60*(hour_spent - hour_spent.to_i)), 'min', :green) %>   <%= "%0.2f".blue% hour_spent %>
+    <%= ('|'.or '⋮').with_label(proj.name) %> <%= (hour_spent / 24).format_integer.cyan %> day <%= (hour_spent % 24).format_integer.yellow %> hour <%= (60*(hour_spent - hour_spent.to_i)).format_integer.green %> min  <%= hour_spent.pretty_print.blue %>
   <% end %>
 <% end %>
 
 <%= ( '-'.or '·' )*67 %>
-
-    <%= padded_to_max('Total') %> <%= ("%0.2f"%@scaled_total).underline %> hrs
-    <%= Pratt.percent(Project.primary.name,  @primary.to_f,        @scaled_total, :green) %>
-    <%= Pratt.percent(Project.off.name,      @off_total.to_f,      @scaled_total, :yellow) %>
-    <%= Pratt.percent('Other',               @rest_total.to_f,     @scaled_total, :red) %>

data/views/invoice.eruby

@@ -101,13 +101,13 @@
           <P><%= project.name %></P>
         </TD>
         <TD WIDTH=96>
-          <P ALIGN=RIGHT><%= project.time_spent(scale, when_to) %></P>
+          <P ALIGN=RIGHT><%= project.time_spent(scale, when_to).pretty_print %></P>
         </TD>
         <TD WIDTH=96>
           <P ALIGN=RIGHT><%= project.payment.pretty_print %></P>
         </TD>
         <TD WIDTH=97>
-          <P ALIGN=RIGHT><FONT SIZE=2><%= project.amount(scale, when_to) %></FONT></P>
+          <P ALIGN=RIGHT><FONT SIZE=2><%= project.amount(scale, when_to).pretty_print %></FONT></P>
         </TD>
       </TR>
 		<% end %>
@@ -120,7 +120,7 @@
 				<P ALIGN=RIGHT><FONT SIZE=1 STYLE="font-size: 8pt">TOTAL</FONT></P>
 			</TD>
 			<TD WIDTH=97>
-				<P ALIGN=RIGHT><FONT SIZE=2><%= @total %></FONT></P>
+				<P ALIGN=RIGHT><FONT SIZE=2><%= @total.pretty_print %></FONT></P>
 			</TD>
 		</TR>
 	</TABLE>

data/views/main.rb

@@ -4,6 +4,8 @@ require 'tkextlib/tile'
 require 'optparse'
 require 'ostruct'
 
+include Tk::Tile
+
 opts = OpenStruct.new
 opts.projects = []
 opts.current  = -1
@@ -31,12 +33,12 @@ opts.current = opts.projects.index(opts.current) if opts.current == -1
 
 root = TkRoot.new { title "Pratt Main" }
 
-button_holder        = Tk::Tile::Frame.new(root){ padding "5 5 5 5" }
-button_holder_top    = Tk::Tile::Frame.new(button_holder) { padding "5 5 5 5" }
+button_holder        = Frame.new(root){ padding "5 5 5 5" }
+button_holder_top    = Frame.new(button_holder) { padding "5 5 5 5" }
 
-project_combo  = Tk::Tile::TCombobox.new(button_holder_top)
+project_combo  = TCombobox.new(button_holder_top)
 project_combo.values = opts.projects
-project_combo.current = opts.current
+project_combo.current = opts.current || 0
 project_combo.pack('side' => 'bottom', 'fill' => 'y')
 
 change = proc {
@@ -58,9 +60,9 @@ start = proc {
   exit
 }
 
-Tk::Tile::Label.new(button_holder_top) { text "What will you be working on?" }.pack('side' => 'top', :fill => 'y')
+Label.new(button_holder_top) { text "What will you be working on?" }.pack('side' => 'top', :fill => 'y')
 
-button_holder_bottom = Tk::Tile::Frame.new(button_holder) { padding "5 5 5 5" }
+button_holder_bottom = Frame.new(button_holder) { padding "5 5 5 5" }
 TkButton.new(button_holder_bottom) do 
   text 'Start'
   command start

data/views/proportions.eruby

@@ -0,0 +1,4 @@
+    <%= @scaled_total.to_f.pretty_print.underline.with_label("Total") %> hrs
+    <%= @primary.to_f.percentage( @scaled_total ).green.with_label(Project.primary.name) %>
+    <%= @off_total.to_f.percentage( @scaled_total).yellow.with_label(Project.off.name) %>
+    <%= @rest_total.to_f.percentage( @scaled_total ).red.with_label('Other') %>

data/views/raw.eruby

@@ -2,7 +2,7 @@
   @whences.each do |whence| 
   color = colors[whence.project.id%colors.size]
 %>
-<%= padded_to_max(whence.project.name) %> <%= '|'.or '⌈' %><%= whence.start_at.strftime(Pratt::FMT).send(color) -%>
+<%= ('|'.or '⌈').with_label whence.project.name %><%= whence.start_at.strftime(Pratt::FMT).send(color) -%>
 <% if whence.end_at -%>
  <%= '-'.or '­' %> <%= whence.end_at.strftime(Pratt::FMT).send(color) %><%= '|'.or '⌋' %> <%= "%6.2f"% [(whence.end_at-whence.start_at)/60] %> min
 <% else %>

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: Pratt
 version: !ruby/object:Gem::Version 
-  version: 1.6.2
+  prerelease: false
+  segments: 
+  - 1
+  - 6
+  - 4
+  version: 1.6.4
 platform: ruby
 authors: 
 - Scott Noel-Hemming
@@ -9,59 +14,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -08:00
+date: 2010-05-30 00:00:00 -07:00
 default_executable: pratt.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 6
         version: 1.2.6
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 5
         version: 0.9.5
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 1
         version: 2.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 4
         version: 1.2.4
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: shifty_week
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 0
         version: 0.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id005
 description: "\n\
   \t  Need a way to keep track of your time, but get caught up in work? Or constant interruptions?\n\
   \t  Yeah you know who I'm talking about. Those people from the [abc] department always \"NEEDING xyz FEATURE NOW!!!\".\n\
@@ -78,6 +103,7 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- README.html
 - README.txt
 - TODO
 files: 
@@ -87,6 +113,7 @@ files:
 - Manifest.txt
 - Pratt.gemspec
 - Pratt.mm
+- README.html
 - README.txt
 - Rakefile
 - Session.vim
@@ -95,16 +122,30 @@ files:
 - bin/pratt.rb
 - config.rb
 - db/sqlite_databases_go_here
+- db/zips.csv.zip
+- lib/models.rb
 - lib/pratt.rb
-- lib/pratt/array.rb
-- lib/pratt/string.rb
-- lib/pratt/time.rb
+- lib/pratt.rb.orig
+- lib/pratt/core_ext.rb
+- lib/pratt/core_ext/array.rb
+- lib/pratt/core_ext/float.rb
+- lib/pratt/core_ext/nil.rb
+- lib/pratt/core_ext/numeric.rb
+- lib/pratt/core_ext/string.rb
+- lib/pratt/core_ext/time.rb
+- lib/pratt/dialogs.rb
+- lib/pratt/formatting.rb
+- lib/pratt/project_actions.rb
+- lib/pratt/reports.rb
 - models/app.rb
 - models/customer.rb
+- models/invoice.rb
+- models/invoice_whence.rb
 - models/payment.rb
 - models/pratt.rb
 - models/project.rb
 - models/whence.rb
+- models/zip.rb
 - pkgs/tile-0.8.2.tar.gz
 - pkgs/tile-0.8.2/ANNOUNCE.txt
 - pkgs/tile-0.8.2/ChangeLog
@@ -349,26 +390,33 @@ files:
 - pkgs/tktray1.2.tar.gz
 - pratt.mm
 - reports/travel.log
+- reports/travel.log.2009
 - spec/app_spec.rb
 - spec/customer_spec.rb
 - spec/fixtures/graph.expectation
+- spec/fixtures/proportions.expectation
+- spec/float_spec.rb
+- spec/numeric_spec.rb
 - spec/payment_spec.rb
 - spec/pratt_spec.rb
 - spec/project_spec.rb
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/string_ext_spec.rb
 - spec/whence_spec.rb
 - tasks/pratt.rb
 - templates/model.eruby
 - templates/spec.eruby
-- views/env.rb
+- views/current.eruby
+- views/general-invoice.eruby
 - views/graph.eruby
 - views/invoice.eruby
 - views/main.rb
 - views/pid.eruby
 - views/pop.rb
 - views/pop2.rb
+- views/proportions.eruby
 - views/raw.eruby
 has_rdoc: true
 homepage: http://github.com/frogstarr78/pratt
@@ -383,26 +431,31 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: Pratt
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 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/customer_spec.rb
-- spec/project_spec.rb
-- spec/pratt_spec.rb
+- spec/whence_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/whence_spec.rb
+- spec/string_ext_spec.rb
+- spec/customer_spec.rb
 - spec/payment_spec.rb

data/lib/pratt/time.rb

@@ -1,12 +0,0 @@
-class Date
-  def beginning_of_week
-    (self - wday_offset).beginning_of_day
-  end
-
-  def end_of_week
-    (beginning_of_week+6).end_of_day
-  end
-end
-
-class DateTime < Date
-end

data/views/env.rb

@@ -1,22 +0,0 @@
-#!/usr/bin/ruby
-require 'tk'
-require 'tkextlib/tile'
-require 'optparse'
-require 'ostruct'
-
-root = TkRoot.new { title "Pratt Reminder" }
-
-max = ENV.inject(0) {|x,(h,v)| x = h.to_s.length if h.to_s.length > x; x }
-ENV.sort.each do |globl, val| 
-  Tk::Tile::Label.new(root) do
-    text "%#{max}.#{max}s: %0.20s"% [globl, val]
-  end.pack(:side => 'top', :fill => 'y')
-end
-
-Pratt.constants.each do |cnst|
-  Tk::Tile::Label.new(root) do
-    text cnst
-  end.pack(:side => 'top', :fill => 'y')
-end
-
-Tk.mainloop