Pratt 1.5.8 → 1.6.2

data/tasks/pratt.rb

@@ -19,9 +19,12 @@ namespace :pratt do
 
     namespace :schema do
       desc "Run schema file" 
-      task :run => :establish_connection do
-        raise "Missing required file argument" unless ENV.include? 'file'
-        schema_change = File.open( ENV['file'] ).read
+      task :run, :file, :needs => :establish_connection do |t, args|
+		puts args.inspect
+		puts args.file.nil?
+		puts args.file.empty?
+        raise "Missing required file argument" if args.file.nil? or ( not args.file.nil? and args.file.empty? )
+        schema_change = File.open( args.file ).read
 
         ActiveRecord::Schema.define do
           ActiveRecord::Base.transaction do

data/views/graph.eruby

@@ -3,16 +3,17 @@ 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 %>
-<%= ( '-'.or '·')*60 %>
+     <%= padded_to_max('') << '  ' << 'dys'.underline << ' '*5 << 'hrs'.underline << ' '*5 << 'min'.underline << ' '*3 << 'total'.underline %>
+<%= ( '-'.or '·')*67 %>
 
 <% @projects.each do |proj| %>
-  <% if show_all or ( !show_all and proj.time_spent(scale, when_to) != 0.0 ) %>
-    <%= padded_to_max(proj.name) %><%= ('|'.or '⋮') %> <%= Pratt.totals(proj.time_spent(scale, when_to)) %>
+  <% 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 %>
   <% end %>
 <% end %>
 
-<%= ( '-'.or '·' )*60 %>
+<%= ( '-'.or '·' )*67 %>
 
     <%= padded_to_max('Total') %> <%= ("%0.2f"%@scaled_total).underline %> hrs
     <%= Pratt.percent(Project.primary.name,  @primary.to_f,        @scaled_total, :green) %>

data/views/main.rb

@@ -41,19 +41,19 @@ project_combo.pack('side' => 'bottom', 'fill' => 'y')
 
 change = proc {
   Process.detach(   
-    fork { system("ruby bin/pratt.rb  --change '#{project_combo.get}' --begin '#{project_combo.get}' --unlock") } 
+    fork { system("ruby bin/pratt.rb --project '#{project_combo.get}' --change --begin --unlock") } 
   )
   exit
 }
 quit = proc {
   Process.detach(
-    fork { system("ruby bin/pratt.rb  --end '#{project_combo.get}' --unlock --quit") }
+    fork { system("ruby bin/pratt.rb --project '#{project_combo.get}' --end --unlock --quit") }
   )
   exit
 }
 start = proc {
   Process.detach(
-    fork { system("ruby bin/pratt.rb  --begin '#{project_combo.get}' --unlock") }
+    fork { system("ruby bin/pratt.rb --project '#{project_combo.get}' --begin --unlock") }
   )
   exit
 }

data/views/pop.rb

@@ -27,21 +27,15 @@ ARGV.options do |opt|
 end
 
 yes = proc {
-  c = fork { system("ruby bin/pratt.rb --restart '#{opts.project_name}' --unlock") }
+  c = fork { system("ruby bin/pratt.rb --project '#{opts.project_name}' --restart --unlock") }
   Process.detach(c)
   exit 
 }
 adjust = proc {
-  c = fork { system("ruby bin/pratt.rb --end '#{opts.project_name}' --unlock --gui") }
+  c = fork { system("ruby bin/pratt.rb --project '#{opts.project_name}' --end --unlock --gui") }
   Process.detach(c)
   exit 
 }
-ignore = proc {
-  Process.detach(
-    fork { system("ruby bin/pratt.rb --unlock") }
-  )
-  exit 
-}
 
 root = TkRoot.new { title "Pratt Reminder" }
 
@@ -72,14 +66,6 @@ end.pack('side' => 'left', :fill => 'y')
 root.bind("Alt-y", yes)
 #root.bind("Return", yes)
 
-TkButton.new(botm_frm) do
-  text "Ignore"
-  command ignore
-  underline 0
-end.pack('side' => 'right', :fill => 'y')
-root.bind("Alt-i", ignore)
-root.bind("Escape", ignore)
-
 TkButton.new(botm_frm) do
   text "Adjust"
   command adjust

data/views/pop2.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/ruby
 require 'tk'
 require 'tkextlib/tile'
-require 'optparse'
-require 'ostruct'
 
 $project = self.project
 
@@ -51,15 +49,6 @@ TkButton.new(botm_frm) do
   underline 0
 end.pack('side' => 'left', :fill => 'y')
 root.bind("Alt-y", yes)
-#root.bind("Return", yes)
-
-TkButton.new(botm_frm) do
-  text "Ignore"
-  command cleanup
-  underline 0
-end.pack('side' => 'right', :fill => 'y')
-root.bind("Alt-i", cleanup)
-root.bind("Escape", cleanup)
 
 TkButton.new(botm_frm) do
   text "Adjust"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Pratt
 version: !ruby/object:Gem::Version 
-  version: 1.5.8
+  version: 1.6.2
 platform: ruby
 authors: 
 - Scott Noel-Hemming
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 -07:00
+date: 2010-02-15 00:00:00 -08:00
 default_executable: pratt.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.4
     version: 
+- !ruby/object:Gem::Dependency 
+  name: shifty_week
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
+    version: 
 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\
@@ -69,21 +79,26 @@ extensions: []
 
 extra_rdoc_files: 
 - README.txt
+- TODO
 files: 
 - .exrc
 - .gitignore
 - History.txt
 - Manifest.txt
 - Pratt.gemspec
+- Pratt.mm
 - README.txt
 - Rakefile
+- Session.vim
 - TODO
 - VERSION
 - bin/pratt.rb
 - config.rb
+- db/sqlite_databases_go_here
 - lib/pratt.rb
 - lib/pratt/array.rb
 - lib/pratt/string.rb
+- lib/pratt/time.rb
 - models/app.rb
 - models/customer.rb
 - models/payment.rb
@@ -331,6 +346,9 @@ files:
 - pkgs/tile-0.8.2/win/tile.rc
 - pkgs/tile-0.8.2/win/winTheme.c
 - pkgs/tile-0.8.2/win/xpTheme.c
+- pkgs/tktray1.2.tar.gz
+- pratt.mm
+- reports/travel.log
 - spec/app_spec.rb
 - spec/customer_spec.rb
 - spec/fixtures/graph.expectation
@@ -375,16 +393,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: Pratt
 rubygems_version: 1.3.5
 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/spec_helper.rb
+- spec/app_spec.rb
 - spec/whence_spec.rb
 - spec/payment_spec.rb
-- spec/app_spec.rb
-- spec/project_spec.rb
-- spec/spec_helper.rb
-- spec/customer_spec.rb