achoo 0.4.2 → 0.5

data/lib/achoo/plugin/vcs.rb

@@ -0,0 +1,26 @@
+require 'achoo'
+require 'achoo/vcs'
+require 'achoo/ui'
+require 'plugman/plugin_base'
+
+module Achoo
+  class Plugin
+    class VCS < Plugman::PluginBase
+
+      include UI::ExceptionHandling
+      
+      def state_ok?; RC.has_key?(:vcs_dirs); end
+      
+      def before_register_hour_remark(date)
+        puts '-' * 80
+        puts "VCS logs for #{date}:"
+        begin
+          Achoo::VCS.print_logs_for(date, RC[:vcs_dirs])
+        rescue Exception => e
+          puts handle_exception("Failed to retrieve VCS logs.", e)
+        end
+      end
+      
+    end
+  end
+end

data/lib/achoo/plugin_base.rb

@@ -0,0 +1,6 @@
+require 'plugman/plugin_base'
+
+module Achoo
+  class PluginBase < Plugman::PluginBase
+  end
+end

data/lib/achoo/rc_loader.rb

@@ -49,6 +49,15 @@ module Achoo
           RC[key] = []
         end
       end
+
+      if RC.has_key?(:ical)
+        RC[:ical].each do |cal|
+          if cal.has_key?(:host)
+            puts Term.warn "You are using the old configuration format for ical. See the README for information on the new format"
+            return
+          end
+        end
+      end
     end
 
   end

data/lib/achoo/temporal/timespan.rb

@@ -18,14 +18,14 @@ module Achoo
       def contains?(timeish_or_timespan)
         if timeish_or_timespan.is_a? Timespan
           time = timeish_or_timespan
-          include?(time.first) && include?(time.last)
+          cover?(time.first) && cover?(time.last)
         else
-          include?(to_time(timeish_or_timespan))
+          cover?(to_time(timeish_or_timespan))
         end
       end
 
       def overlaps?(timespan)
-        include?(timespan.first) || include?(timespan.last) ||
+        cover?(timespan.first) || cover?(timespan.last) || 
           timespan.contains?(self)
       end
 

data/lib/achoo/term.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'achoo'
+require 'readline'
 
 module Achoo
   class Term
@@ -20,6 +21,11 @@ module Achoo
     def self.warn(text);      effect(YELLOW,    text); end
     def self.fatal(text);     effect(RED,       text); end
 
+    def self.clearscreen
+      print "\e[2J\e[H"
+      $stdout.flush
+    end
+
     def self.password
       `stty -echo`
       pas = ask('Password')
@@ -30,9 +36,7 @@ module Achoo
     def self.ask(question='')
       answer = nil
       loop do
-        print bold("#{question}> ")
-        $stdout.flush
-        answer = gets
+        answer = Readline.readline(bold("#{question}> "), true)
         
         # Answer is nil if user hits C-d on an empty input
         if answer.nil?

data/lib/achoo/term/table.rb

@@ -65,13 +65,12 @@ module Achoo
       end
 
       def calculate_table_cell_widths
-        lengths = []
-        @headers.each_with_index do |h, i|
-          lengths[i] = h.length
-        end
-        @data_rows.each do |r|
+        rows = [@headers] + @data_rows
+        rows += [@summaries] unless @summaries.nil?
+        lengths = Array.new(@headers.length, 0)
+        rows.each do |r|
           r.each_with_index do |d, i|
-            lengths[i] = [d.length, lengths[i]].max
+            lengths[i] = [d.scan(/./mu).length, lengths[i]].max # FIX scan is a 1.8 hack
           end
         end
         lengths

data/lib/achoo/ui/commands.rb

@@ -9,30 +9,30 @@ module Achoo
       include DateChoosers
       include Common
 
-      def show_registered_hours_for_day(agent)
+      def show_registered_hours_for_day
         date = date_chooser
-        form = Achievo::HourAdministrationForm.new(agent)
+        form = Achievo::HourAdministrationForm.new
         form.show_registered_hours_for_day(date)
       end
 
-      def show_registered_hours_for_week(agent)
+      def show_registered_hours_for_week
         date = date_chooser
-        form = Achievo::HourAdministrationForm.new(agent)
+        form = Achievo::HourAdministrationForm.new
         form.show_registered_hours_for_week(date)
       end
 
 
-      def show_flexi_time(agent)
+      def show_flexi_time
         date = date_chooser
-        form = Achievo::HourAdministrationForm.new(agent)
+        form = Achievo::HourAdministrationForm.new
         balance = form.flexi_time(date)
         puts "Flexi time balance: #{Term::underline(balance)}"
       end
 
 
-      def lock_month(agent)
+      def lock_month
         month = month_chooser
-        form  = Achievo::LockMonthForm.new(agent)
+        form  = Achievo::LockMonthForm.new
         form.lock_month(month)
         form.print_values
         if confirm
@@ -43,20 +43,20 @@ module Achoo
       end
 
   
-      def show_holiday_report(agent)
-        page = agent.get(RC[:holiday_report_url])
+      def show_holiday_report
+        page = AGENT.get(RC[:holiday_report_url])
         page.body.match(/<b>(\d+,\d+)<\/b>/)
         puts "Balance: #{Term::underline($1)}"
       end
 
       
-      def view_report(agent)
+      def view_report
         choices = RC[:reports].keys
         answer = Term.choose('Report', choices)
         key = choices[answer.to_i - 1]
         
         puts "Fetching data ..."
-        page = agent.get(RC[:url] + RC[:reports][key])
+        page = AGENT.get(RC[:url] + RC[:reports][key])
         
         table = Achievo::Table.new(page.search('#rl_1 tr'))
         table.select_columns do |c|

data/lib/achoo/ui/date_chooser.rb

@@ -67,7 +67,7 @@ module Achoo
         puts "Accepted formats:"
         puts date_format_help_string
         puts
-        system 'cal -3m'
+        system 'cal -3'
       end
       
       def date_format_help_string

data/lib/achoo/ui/exception_handling.rb

@@ -14,7 +14,7 @@ module Achoo
       end
 
       def get_exception_reason(e)
-        "\nReason: \n\t" + e.message.gsub("\n", "\n\t") + "\n---\n\t" + e.backtrace.join("\n\t")
+        "\nType:\t" + e.class.to_s +  "\nReason: \n\t" + e.message.gsub("\n", "\n\t") + "\n---\n\t" + e.backtrace.join("\n\t")
       end
 
     end

data/lib/achoo/ui/register_hours.rb

@@ -1,9 +1,7 @@
 require 'achoo/achievo'
-require 'achoo/awake'
-require 'achoo/ical'
 require 'achoo/term'
 require 'achoo/ui'
-require 'achoo/vcs'
+require 'readline'
 
 module Achoo
   module UI
@@ -12,7 +10,10 @@ module Achoo
       include DateChoosers
       include ExceptionHandling
 
-      def register_hours(agent)
+      def initialize
+      end
+
+      def register_hours
         date = optionally_ranged_date_chooser
         
         puts "Fetching data ..."
@@ -20,14 +21,14 @@ module Achoo
                  Achievo::HourRegistrationFormRanged
                else
                  Achievo::HourRegistrationForm
-               end.new(agent)
+               end.new
         
         form.date    = date
         form.project = project_chooser(form)
         form.phase   = phase_chooser(form)
-        print_remark_help(date) unless date.class == Array
+        PLUGINS.send_before_register_hour_remark(date) unless date.class == Array
         form.remark  = remark_chooser
-        print_hours_help(date) unless date.class == Array
+        PLUGINS.send_before_register_hour_hours(date) unless date.class == Array
         form.hours   = hours_chooser
         
         answer = Term.ask("Do you want to change the defaults for worktime period and/or billing percentage? [N/y]").downcase
@@ -43,6 +44,8 @@ module Achoo
         else
           puts "Cancelled"
         end
+
+        date
       end
       
 
@@ -53,17 +56,6 @@ module Achoo
       end
 
 
-      def print_hours_help(date)
-        puts "Awake log:"
-        begin
-          awake = Awake.new
-          awake.at(date)
-          puts
-        rescue Exception => e
-          print handle_exception("Failed to retrieve awake log.", e)
-        end
-      end
-
       def hours_chooser
         answer = Term::ask 'Hours [7:30]'
         return answer == '' ? '7.5' : answer
@@ -83,25 +75,6 @@ module Achoo
                        true)
       end
 
-      def print_remark_help(date)
-        puts "VCS logs for #{date}:"
-        begin
-          VCS.print_logs_for(date, RC[:vcs_dirs])
-        rescue Exception => e
-          puts handle_exception("Failed to retrieve VCS logs.", e)
-        end
-        puts '-' * 80
-        puts "Calendar events for #{date}:"
-        puts '---'
-        begin
-          RC[:ical].each do |config|
-            ICal.from_http_request(config).print_events(date)
-          end
-        rescue Exception => e
-          puts handle_exception("Failed to retrieve calendar events.", e)
-        end
-      end
-
       def remark_chooser
         Term::ask 'Remark'
       end
@@ -112,29 +85,56 @@ module Achoo
         projects = form.recent_projects
         answer = Term.choose('Project [1]', projects.collect { |p| p[1] },
                              'Other', [''])
-        case answer
-        when ''
-          projects[0][0]
-        when '0'
-          return all_projects_chooser(form)
-        else
-          return projects[answer.to_i-1][0]
-        end
+        return case answer
+               when '0'
+                 all_projects_chooser(form)
+               when ''
+                 projects[0][0]
+               else
+                 projects[answer.to_i-1][0]
+               end
       end
 
       
       
       def all_projects_chooser(form)
-        chooser_helper(form.all_projects, 
-                       'All projects', 
-                       'Project')
+        projects = form.all_projects
+
+        p projects
+
+        # FIX move readline stuff to the term modules
+        original_readline_comp_proc = Readline.completion_proc
+        original_readline_comp_append_char = Readline.completion_append_character
+        Readline.completion_append_character = ''
+        Readline.completion_proc = proc do |s|
+          projects.collect {|p| p[1] }.grep(/^#{Regexp.escape(s)}/)
+        end
+
+
+        answer = chooser_helper(projects, 
+                                'All projects', 
+                                'Project')
+
+        Readline.completion_proc = original_readline_comp_proc
+        Readline.completion_append_character = original_readline_comp_append_char
+
+        answer
       end
 
       def chooser_helper(options, heading, prompt, empty_allowed=false)
-        puts heading
         extra = empty_allowed ? [''] : []
-        answer = Achoo::Term.choose(prompt, options.collect {|p| p[1] }, nil, [''])
+        project_names = options.collect {|p| p[1] }
+        if heading == 'All projects'
+          # FIX ugly conditional
+          extra += project_names
+        end
+        answer = Achoo::Term.choose(prompt, options.collect {|p| p[1] }, nil, extra)
         answer = '1' if answer.empty?
+        if heading == 'All projects'
+          # FIX ugly conditional
+          index = project_names.find_index(answer) + 1
+          answer = index unless index.nil?
+        end
         options[answer.to_i-1][0]
       end
 

data/lib/achoo/vcs/git.rb

@@ -13,10 +13,12 @@ module Achoo
       end
       
       def log_for(date)
-        today    = date.strftime('%Y-%m-%d')
-        tomorrow = date.next.strftime('%Y-%m-%d')
+        format = '%Y-%m-%dT00:00:00'
+        from = date.strftime(format)
+        to   = (date+1).strftime(format)
         
-        `cd  #@dir; git log --author=#{ENV['USER']} --oneline --after=#{today} --before=#{tomorrow} | cut -d ' ' -f 2-`
+        cmd = "cd  #@dir; git log --author=#{ENV['USER']} --oneline --after=#{from} --before=#{to} | cut -d ' ' -f 2-"
+        `#{cmd}`
       end
 
     end

data/test/acceptance/test_flexi_time.rb

@@ -0,0 +1,41 @@
+require 'test_helpers'
+
+class TestFlexiTime < Test::Unit::TestCase
+
+  include AcceptanceBase
+
+  def setup
+    super
+    
+    hour_administration_html = %q{
+      <html>
+      <head></head>
+      <body>
+        <form name="dayview">
+          <input type="text" name="viewdate[day]"   value="20">
+          <input type="text" name="viewdate[month]" value="03">
+          <input type="text" name="viewdate[year]"  value="2010">
+        </form>
+      
+        <p>Flexi time balance: -44:30</p>
+      
+      </body>
+      </html>
+    }
+
+    @server.register(:get, '/time_registration', [ 200, nil, hour_administration_html ])
+  end
+
+  def test_flexi_time
+    achoo(:verbose => $DEBUG) do 
+      expect '2. Show flexitime balance'
+      expect_main_prompt
+      puts '2'
+      puts '2010-03-20'
+      expect /Flexi time balance:.*-44:30/
+      expect_main_prompt
+      puts 'q'
+    end
+  end
+
+end

data/test/acceptance/test_lock_month.rb

@@ -0,0 +1,39 @@
+require 'test_helpers'
+
+class TestLockMonth < Test::Unit::TestCase
+
+  include AcceptanceBase
+
+  def setup
+    super
+
+    lock_month_html = %q{
+      <html>
+      <head></head>
+      <body>
+        <form name="entryform">
+          <input type="text" name="period"   value="">
+        </form>
+      </body>
+      </html>
+    }
+
+    @server.register(:get, '/lock_months', [ 200, nil, lock_month_html ])
+  end
+    
+  def test_lock_month
+    achoo(:verbose => $DEBUG) do
+      expect '6. Lock month'
+      expect_main_prompt
+      puts '6'
+      expect /Period \(\[\d{6}\] | YYYYMM\)>/
+      puts '201003'
+      expect 'Month: 201003'
+      expect 'Submit? [Y/n]>'
+      puts 'n'
+      expect 'Cancelled'
+      expect_main_prompt
+      puts 'q'
+    end
+  end
+end