Pratt 1.6.2 → 1.6.4

data/.gitignore

@@ -2,3 +2,5 @@ pratt.pid
 *.sqlite3
 migrations
 reports
+*.swp
+*.swo

data/Pratt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{Pratt}
-  s.version = "1.6.2"
+  s.version = "1.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Noel-Hemming"]
-  s.date = %q{2010-02-15}
+  s.date = %q{2010-05-30}
   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?
@@ -26,7 +26,8 @@ Gem::Specification.new do |s|
   s.email = %q{frogstarr78@gmail.com}
   s.executables = ["pratt.rb"]
   s.extra_rdoc_files = [
-    "README.txt",
+    "README.html",
+     "README.txt",
      "TODO"
   ]
   s.files = [
@@ -36,6 +37,7 @@ Gem::Specification.new do |s|
      "Manifest.txt",
      "Pratt.gemspec",
      "Pratt.mm",
+     "README.html",
      "README.txt",
      "Rakefile",
      "Session.vim",
@@ -44,16 +46,30 @@ Gem::Specification.new do |s|
      "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",
@@ -298,41 +314,51 @@ Gem::Specification.new do |s|
      "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"
   ]
   s.homepage = %q{http://github.com/frogstarr78/pratt}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{Pratt}
-  s.rubygems_version = %q{1.3.5}
+  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/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/README.html

@@ -0,0 +1,85 @@
+<p>= pratt</p>
+
+<ul>
+<li>Pratt (url)</li>
+</ul>
+
+
+<p>== DESCRIPTION:</p>
+
+<p>Pratt (describe your package)
+(Pro/Re)-Active Time Tracker</p>
+
+<p>== FEATURES/PROBLEMS:</p>
+
+<p>(list of features or problems)
+* Currently you'll need to manually fix the project data since I haven't
+fully integrated the support for Projects to have customer's and my current
+implementation is shoddy.
+* Upgrading versions looses your database. (See TODO)
+* Windows doesn't work (no fork). (See TODO)</p>
+
+<p>== SYNOPSIS:</p>
+
+<ul>
+<li>pratt (code sample of usage)</li>
+</ul>
+
+
+<p><strong> PRATT_ENV=production pratt -D # daemonize (or if already daemonized init the
+gui)
+</strong> pratt -h (as you'd expect lists available commands)</p>
+
+<p>== REQUIREMENTS:</p>
+
+<ul>
+<li>pratt
+debian: libtcltk-ruby tk-tile libsqlite3-dev
+gems: activerecord sqlite3-ruby rspec mocha
+tk: http://sourceforge.net/project/showfiles.php?group_id=11464&amp;package_id=107795&amp;release_id=562098</li>
+</ul>
+
+
+<p>== INSTALL:</p>
+
+<ul>
+<li>sudo gem install</li>
+</ul>
+
+
+<p>Credits</p>
+
+<p>Michael Goff</p>
+
+<pre><code>Thanks for helping me with some of the workflow details
+</code></pre>
+
+<p>Michael and Kent Krenrich</p>
+
+<pre><code>Thanks for the UI input, suggestions, and testing.
+</code></pre>
+
+<p>== LICENSE:</p>
+
+<p>(The MIT License)</p>
+
+<p>Copyright (c) 2009 Frogstarr78 Software</p>
+
+<p>Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:</p>
+
+<p>The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.</p>
+
+<p>THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>

data/README.txt

@@ -9,10 +9,13 @@ Pratt (describe your package)
 
 == FEATURES/PROBLEMS:
 
-* (list of features or problems)
-Currently you'll need to manually fix the project data since I haven't
+(list of features or problems)
+* Currently you'll need to manually fix the project data since I haven't
 fully integrated the support for Projects to have customer's and my current
 implementation is shoddy.
+* Upgrading versions looses your database. (See TODO)
+* Windows doesn't work (no fork). (See TODO)
+
 
 == SYNOPSIS:
 
@@ -44,7 +47,7 @@ Michael and Kent Krenrich
 
 (The MIT License)
 
-Copyright (c) 2009 QualitySmith LLC
+Copyright (c) 2009 Frogstarr78 Software
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/TODO

@@ -1,12 +1,12 @@
 General:
-[ ] Add environment ability
+[ ] Remove environment ability
 [ ] Change to use raw command line arguments / Remove optparse lib
 [ ] Update general package setup (It's messy)
 [?]   Add file watching like merb
 [?] Move to Observer Pattern for reporting functionality
 
 Invoicing:
-[ ] Add shifty week plugin
+[x] Add shifty week plugin
 [ ] Add support for variable rates.
 
 	Templating:
@@ -14,8 +14,9 @@ Invoicing:
 [ ] Move other output to template based
 
 Data:
-[ ] Change to Use DataMapper
+[?] Change to Use DataMapper
 [?] Put everything in the db? (logs, app locks, etc)
+[ ] Move database location to central location that doesn't dissappear when upgrading the app.
 
 GUI:
 [ ] Add TrayIcon.
@@ -23,6 +24,8 @@ GUI:
 [ ] Payment CRUD
 [ ] Re-design prompts
 [ ] Remove fork in favor of ( eval OR (!?!) GUI classes )
+[ ] Don't assume gui.
+[ ] Add options for cli user prompting.
 
 Test:
 [ ] Add more I'm not testing everything

data/VERSION

@@ -1 +1 @@
-1.6.2
+1.6.4

data/config.rb

@@ -2,22 +2,13 @@ require 'active_record'
 PRATT_ENV = ENV["PRATT_ENV"] || 'development' unless Object.const_defined? :PRATT_ENV
 
 class Pratt
-  @@connected_to = nil
-  module Test
-  end
-
   include FileUtils
 
   class << self
-    def connected_to?
-      @@connected_to
-    end
-
     def connect! to_env = :development
-      puts "Connecting to: #{to_env}"
-      @@connected_to = "db/#{to_env}.sqlite3"
-      ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => connected_to? )
-      unless File.exists? connected_to?
+      connect_to = "db/#{to_env}.sqlite3"
+      ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => connect_to  )
+      unless File.exists? connect_to
         Pratt.migrate
       end
     end
@@ -25,10 +16,5 @@ class Pratt
     def connected?
       ActiveRecord::Base.connected?
     end
-    
-    def config= env
-      include Pratt::Test
-    end
   end
-
 end

data/lib/models.rb

@@ -0,0 +1,8 @@
+require 'models/app'
+require 'models/customer'
+require 'models/whence'
+require 'models/project'
+require 'models/payment'
+require 'models/invoice'
+require 'models/invoice_whence'
+require 'models/zip'

data/lib/pratt.rb

@@ -8,22 +8,18 @@ require 'colored'
 require 'chronic'
 require 'active_record'
 require 'erubis'
-require 'hoe'
-require 'mocha'
 require 'config'
 require 'shifty_week'
 require 'shifty_week/time'
 require 'shifty_week/date'
 
-require 'lib/pratt/array'
-require 'lib/pratt/string'
-require 'lib/pratt/time'
+require 'lib/pratt/formatting'
+require 'lib/pratt/core_ext'
+require 'lib/pratt/dialogs'
+require 'lib/pratt/project_actions'
+require 'lib/pratt/reports'
+require 'lib/models'
 
-require 'models/app'
-require 'models/customer'
-require 'models/whence'
-require 'models/project'
-require 'models/payment'
 
 class Pratt
 
@@ -49,9 +45,8 @@ class Pratt
   PID_FILE='pratt.pid'
   FMT = "%a %X %b %d %Y"
   INVOICE_FMT = "%x"
-  @@color = true
 
-  attr_accessor :when_to, :scale, :color, :show_all, :env, :raw_conditions, :template, :week_day_start
+  attr_accessor :when_to, :scale, :color, :show_all, :raw_conditions, :template, :week_day_start
   attr_reader :project, :todo
   def initialize proj = nil
     @when_to        = DateTime.now
@@ -61,7 +56,6 @@ class Pratt
     @scale          = nil
     @show_all       = false
     @template       = nil
-    @env            = :development
     @raw_conditions = ''
     self.project = proj unless proj.nil?
   end
@@ -82,300 +76,85 @@ class Pratt
     @todo << what
   end
 
-  # Singleton Accessor for @app
-  def app
-    @app ||= App.last
-    @app
-  end
-
-  # TODO Rename
-  def graph
-    @primary = @off_total = @rest_total = 0.0
-    self.template = 'graph'
-
-    if project?
-      @projects = [project]
-
-      @primary = project.time_spent(scale, when_to)
-      @scaled_total = project.whences.time_spent(scale, when_to)
-    else
-      @projects = Project.all
-
-      @projects.each do |proj| 
-        @primary     = proj.time_spent(scale, when_to) if proj.name == Project.primary.name
-        @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
-    end
-
-    if @primary + @off_total + @rest_total > 0.0
-      process_template!
-    else
-      "No data to report"
-    end
-  end
-
-  # Generate an invoice for a given time period
-  def invoice
-    self.template = 'invoice'
-
-    if project?
-      @projects = [project]
-
-      @total = 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 ) }
-
-      @total = @projects.inject 0.0 do |total, proj| 
-        total += proj.time_spent(scale, when_to)
-        total
-      end
-    end
-
-    @projects.each do |project| 
-      puts "#{project.name} #{project.payment.inspect}"
-    end
-    if @total > 0.0
-      puts process_template!
-    else
-      puts "No data to report"
-    end
-  end
-
+  # Connect to the database in irb for manual commands/investigation
   def console options = []
-    options << %w(-r\ irb/completion -r\ lib/pratt --simple-prompt)
-    exec "irb #{options.join ' '}"
-  end
-
-  def current
-    project_names = ([Project.primary, Project.off] | Project.rest).collect(&:name)
-
-    if last_whence = Whence.last_unended || Whence.last
-      puts "   projects: " << (
-        project_names.collect {|project_name| "'#{project_name.send(last_whence.end_at.nil? && last_whence.project.name == project_name ? :green : :magenta)}'" }
-      ) * ' '
-      if last_whence.end_at.nil?
-        puts "    started: #{last_whence.start_at.strftime(FMT).send(:blue)}"
-        time_til = ( app.interval - ( Time.now - last_whence.start_at ) )
-        puts "next prompt: %s %s"% [Pratt.fmt_i( time_til / 60.0, 'min', :yellow ), Pratt.fmt_i( time_til % 60, 'sec', :yellow ) ], ''
-      end
-    else
-      puts "   projects: " << (
-        project_names.collect do |project_name| 
-          "'#{project_name.magenta}'" 
-        end
-      ) * ' '
-    end
-  end
-
-  def begin
-    self.project.start! when_to
-  end
-  def restart
-    if project?
-      project.restart! when_to
-    else
-      Whence.last_unended.project.restart! when_to
-    end
-  end
-  def end
-    if project?
-      project.stop! when_to
-    else
-      Whence.last_unended.stop! when_to
-    end
-  end
-  def change
-    Whence.last.change! project.name
-  end
-  def destroy
-    project.destroy
-  end
-
-  def cpid
-    `pgrep -fl 'bin/pratt'`.chomp.split(' ').first
-  end
-
-  def pid
-    self.template = 'pid'
-    puts process_template!
-  end
-
-  def raw
-    self.template = 'raw'
-
-    if project?
-      @whences = project.whences.all
-    else
-      case raw_conditions
-        when 'all'
-          @whences = Whence.find raw_conditions.to_sym
-        when /^last$/, 'first'
-          @whences = [Whence.find raw_conditions.to_sym]
-        when /last[\(\s]?(\d+)[\)\s]?/
-          @whences = Whence.all.last($1.to_i)
-        else
-          @whences = Whence.all :conditions => ["start_at > ?", Chronic.parse("today 00:00")]
-      end
-    end
-    @whences.sort_by(&:id)
-    puts process_template!
+    require 'irb'
+    require 'irb/completion'
+    ARGV.clear
+    IRB.start
   end
 
+  # Stop everything and kill daemonized processes.
   def quit
     project.stop! if project? and project.whences.last_unended
     Whence.last_unended.stop! if Whence.last_unended
     begin
       Process.kill("KILL", app.pid.to_i)
     rescue Errno::ESRCH
+      puts "Unable to kill Pratt@pid(#{app.pid})."
     end
     app.pid = ''
     app.gui = ''
     app.save!
   end
 
-  def gui
-    if Whence.last_unended
-      pop
-    else
-      main
-    end
-  end
-
-  def show_env
-    defork { system("ruby views/env.rb ") } 
-  end
-
-  def detect
-    if self.daemonized?
-      gui
-    else
-      daemonize!
-    end
+  # Singleton Accessor for @app
+  def app
+    @app ||= App.last
+    @app
   end
 
+  # "Unlock" the gui. 
   def unlock
     self.app.unlock
   end
 
   def run
+    # ensure we've shifted the when_to value to the 
+    # current start of week
     self.when_to.week_day_start = self.week_day_start
-    puts self.when_to.inspect, self.when_to.week_day_start
-    # must happen before any actions but after all cli argument parsing
-
-    self.begin      if i_should? :begin
-    self.change     if i_should? :change
-    self.restart    if i_should? :restart
-    self.end        if i_should? :end
-
-    self.destroy    if i_should? :destroy
-
-    self.pid        if i_should? :pid
-    self.raw        if i_should? :raw
-    self.current    if i_should? :current
-    puts self.graph      if i_should? :graph
-    self.invoice    if i_should? :invoice
-    self.console    if i_should? :console
-    self.gui        if i_should? :gui
-    self.show_env   if i_should? :env
-    self.detect     if i_should? :detect
-    self.unlock     if i_should? :unlock
-
-    self.quit       if i_should? :quit
-    self.daemonize! if i_should? :daemonize and not self.daemonized?
-  end
 
-  def daemonized?
-    !app.pid.blank? and ( cpid.to_i == app.pid )
-  end
-  def daemonize!
-    defork { 
-      puts "pratt (#{Process.pid.to_s.yellow})"
-      app.pid = Process.pid
-      app.save!
-
-      gui
-      while(daemonized?)
-        sleep(app.interval)
-        gui
-      end
-      quit
-    }
-  end
-
-  def max 
-    self.class.max
+    # << order is semi important
+    self.end         if i_should? :end
+    self.begin       if i_should? :begin
+    self.change      if i_should? :change
+    self.restart     if i_should? :restart
+
+    self.destroy     if i_should? :destroy
+    # end order is semi important
+
+    # << order doesn't matter within this set
+    self.pid         if i_should? :pid
+    self.raw         if i_should? :raw
+    self.current     if i_should? :current
+    self.graph       if i_should? :graph
+    self.proportions if i_should? :proportions
+    self.invoice     if i_should? :invoice
+    self.console     if i_should? :console
+    self.gui         if i_should? :gui
+    self.detect      if i_should? :detect
+    self.unlock      if i_should? :unlock
+    # end order doesn't matter within this set
+
+    # << these should happen last
+    self.quit        if i_should? :quit
+    self.daemonize!  if i_should? :daemonize and not self.daemonized?
+    # end these should happen last
   end
 
   private
-    def main
-      self.app.reload
-      return if self.app.gui?('main', true)
-      self.app.log('main')
-      projects = ([Project.primary, Project.off] | Project.rest).collect(&:name)
-      if Whence.count == 0 
-        # first run
-        project = Whence.new(:project => Project.primary)
-      else
-        project = Whence.last_unended || Whence.last
-      end
-      defork { system("ruby views/main.rb  --projects '#{projects*"','"}' --current '#{project.project.name}'") } 
-    end
-    def pop
-      self.app.reload
-      return if self.app.gui?('pop', true)
-      self.app.log('pop')
-      self.project = Whence.last_unended.project
-      defork { system("ruby views/pop.rb  --project '#{project.name}' --start '#{project.whences.last_unended.start_at}' --project_time '#{Pratt.totals(project.time_spent)}'") }
-    end
-
     def i_should? what
       @todo.include?(what)
     end
 
+    # Is there a project that can be operated on?
     def project?
       !@project.nil? and @project.name?
     end
 
-    def process_template!
-      input = File.open(Pratt.root("views", "#{template}.eruby").first).read
-      erubis = Erubis::Eruby.new(input)
-      erubis.evaluate(self)
-    end
-
-    def padded_to_max string
-      self.class.padded_to_max string
-    end
-
-    def defork &block
-      Process.detach(
-        fork &block 
-      )
-    end
-
   class << self
 
-
-    def max
-      # TODO Fix me
-      @max ||= Project.all.inject(0) {|x,p| x = p.name.length if p.name.length > x; x }
-    end
-
-    def color
-      @@color
-    end
-
-    def color= c
-      @@color = c
-    end
-
-    def color?
-      @@color == true
-    end
-
-
+    # Parse cli arguments and init Pratt
     def parse args
       me = Pratt.new
 
@@ -409,6 +188,9 @@ class Pratt
         opt.on('-I', "--invoice", "Create an invoice.") do
           me << :invoice
         end
+        opt.on('-r', '--proportions', "") do
+          me << :proportions
+        end
         opt.on('-p', '--pid', "Process id display. (Is it still running)") do
             me << :pid
         end
@@ -442,7 +224,11 @@ class Pratt
         end
 
         # Strictly configuration options
-        opt.on('-P', "--project PROJECT_NAME", String, "Set project.") do |proj|
+        project_names = Project.all.collect(&:name)
+        colored_project_names = project_names.collect{|name| 
+"                                        #{name.cyan}"}
+        opt.on('-P', "--project PROJECT_NAME", project_names, "Set project.
+                                      Available projects are:\n#{colored_project_names*"\n"}") do |proj|
           me.project = proj
         end
 
@@ -485,22 +271,11 @@ class Pratt
         opt.parse!
       end
 
-      me << :env if args.include? 'env'
       me << :console if args.include? 'console'
 
       me.run
     end
 
-    # Calculate totals. I think this should be an instance method on Projects/?/Whences
-    def totals hr, fmt = false
-      "#{fmt_i(hr / 24, 'day', :cyan)} #{fmt_i(hr % 24, 'hour', :yellow)} #{fmt_i((60*(hr -= hr.to_i)), 'min', :green)}"
-    end
-
-    def percent label, off, total, color
-      percent = "%0.2f"% ((off/total)*100)
-      padded_to_max(label) << " #{percent}%".send(color)
-    end
-
     # Where is Pratt installed.
     # We've already chdir'd to it's base dir in the bin file
     def root *globs, &block
@@ -518,15 +293,10 @@ class Pratt
       end
     end
 
-    # Pad the output string to the maximum Project name
-    def padded_to_max string
-      "%#{max}.#{max}s"% string
-    end
-
     # Migrate schema.
     def migrate
       Pratt.root( 'models', '*.rb' ) do |model_file|
-        klass = File.basename( model_file, '.rb' ).capitalize.constantize
+        klass = File.basename( model_file, '.rb' ).classify.constantize
         begin
           ActiveRecord::Base.connection.table_structure(model_file)
         rescue ActiveRecord::StatementInvalid
@@ -534,10 +304,5 @@ class Pratt
         end
       end
     end
-     
-      def fmt_i int, label, color
-        "%s #{label}"% [("%02i"% int).send(color), label]
-      end
-
   end
 end