achoo 0.3 → 0.4.1

data/lib/achoo/ui.rb

@@ -1,10 +1,14 @@
-class Achoo; class UI; end; end
+require 'achoo'
 
-Achoo::UI.autoload :Commands, 'achoo/ui/commands'
-Achoo::UI.autoload :Common, 'achoo/ui/common'
-Achoo::UI.autoload :DateChooser, 'achoo/ui/date_chooser'
-Achoo::UI.autoload :DateChoosers, 'achoo/ui/date_choosers'
-Achoo::UI.autoload :ExceptionHandling, 'achoo/ui/exception_handling'
-Achoo::UI.autoload :MonthChooser, 'achoo/ui/month_chooser'
-Achoo::UI.autoload :OptionallyRangedDateChooser, 'achoo/ui/optionally_ranged_date_chooser'
-Achoo::UI.autoload :RegisterHours, 'achoo/ui/register_hours'
+module Achoo
+  module UI
+    autoload :Commands,                    'achoo/ui/commands'
+    autoload :Common,                      'achoo/ui/common'
+    autoload :DateChooser,                 'achoo/ui/date_chooser'
+    autoload :DateChoosers,                'achoo/ui/date_choosers'
+    autoload :ExceptionHandling,           'achoo/ui/exception_handling'
+    autoload :MonthChooser,                'achoo/ui/month_chooser'
+    autoload :OptionallyRangedDateChooser, 'achoo/ui/optionally_ranged_date_chooser'
+    autoload :RegisterHours,               'achoo/ui/register_hours'
+  end
+end

data/lib/achoo/ui/commands.rb

@@ -1,51 +1,73 @@
-require 'achoo/hour_administration_form'
-require 'achoo/lock_month_form'
+require 'achoo/achievo'
+require 'achoo/term'
 require 'achoo/ui'
 
-module Achoo::UI::Commands
+module Achoo
+  module UI
+    module Commands
 
-  include Achoo::UI::DateChoosers
-  include Achoo::UI::Common
+      include DateChoosers
+      include Common
 
-  def show_registered_hours_for_day(agent)
-    date = date_chooser
-    form = Achoo::HourAdministrationForm.new(agent)
-    form.show_registered_hours_for_day(date)
-  end
+      def show_registered_hours_for_day(agent)
+        date = date_chooser
+        form = Achievo::HourAdministrationForm.new(agent)
+        form.show_registered_hours_for_day(date)
+      end
 
-  def show_registered_hours_for_week(agent)
-    date = date_chooser
-    form = Achoo::HourAdministrationForm.new(agent)
-    form.show_registered_hours_for_week(date)
-  end
+      def show_registered_hours_for_week(agent)
+        date = date_chooser
+        form = Achievo::HourAdministrationForm.new(agent)
+        form.show_registered_hours_for_week(date)
+      end
 
 
-  def show_flexi_time(agent)
-    date = date_chooser
-    form = Achoo::HourAdministrationForm.new(agent)
-    balance = form.flexi_time(date)
-    puts "Flexi time balance: #{Achoo::Term::underline(balance)}"
-  end
+      def show_flexi_time(agent)
+        date = date_chooser
+        form = Achievo::HourAdministrationForm.new(agent)
+        balance = form.flexi_time(date)
+        puts "Flexi time balance: #{Term::underline(balance)}"
+      end
 
 
-  def lock_month(agent)
-    month = month_chooser
-    form   = Achoo::LockMonthForm.new(agent)
-    form.lock_month(month)
-    form.print_values
-    if confirm
-      form.submit
-    else
-      puts "Cancelled"
-    end
-  end
+      def lock_month(agent)
+        month = month_chooser
+        form  = Achievo::LockMonthForm.new(agent)
+        form.lock_month(month)
+        form.print_values
+        if confirm
+          form.submit
+        else
+          puts "Cancelled"
+        end
+      end
 
   
-  def show_holiday_report(agent)
-    page = agent.get(RC[:holiday_report_url])
-    page.body.match(/<b>(\d+,\d+)<\/b>/)
-    puts "Balance: #{Achoo::Term::underline($1)}"
-  end
-
+      def show_holiday_report(agent)
+        page = agent.get(RC[:holiday_report_url])
+        page.body.match(/<b>(\d+,\d+)<\/b>/)
+        puts "Balance: #{Term::underline($1)}"
+      end
 
+      
+      def view_report(agent)
+        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])
+        
+        table = Achievo::Table.new(page.search('#rl_1 tr'))
+        table.select_columns do |c|
+          ['Date', 'Project', 'Phase', 'Remark', 'Time'].include?(c[0])
+        end
+        
+        Term::Table.new(table.first,
+                        table[2...table.length-1],
+                        table.last).print
+      end
+      
+    end
+  end
 end

data/lib/achoo/ui/common.rb

@@ -1,15 +1,18 @@
 require 'achoo/term'
+require 'achoo/ui'
 
-class Achoo; class UI; end; end
+module Achoo
+  module UI
+    module Common
 
-module Achoo::UI::Common
+      def confirm
+        answer = Term::ask "Submit? [Y/n]"
+        answer.downcase!
+        return answer == 'y' || answer == ''
+      end
 
-  def confirm
-    answer = Achoo::Term::ask "Submit? [Y/n]"
-    answer.downcase!
-    return answer == 'y' || answer == ''
+    end
   end
-
 end
 
 

data/lib/achoo/ui/date_chooser.rb

@@ -1,75 +1,79 @@
 require 'achoo/term'
+require 'achoo/ui'
 
-class Achoo; class UI; end; end
+module Achoo
+  module UI
 
-class Achoo::UI::DateChooser
+    class DateChooser
 
-  PROMPT = "Date ([today] | ?)"
-  FORMAT = "        today | (+|-)n | [[[YY]YY]-[M]M]-[D]D"
+      PROMPT = "Date ([today] | ?)"
+      FORMAT = "        today | (+|-)n | [[[YY]YY]-[M]M]-[D]D"
 
-  def choose
-    loop do
-      answer = Achoo::Term::ask PROMPT 
-      begin
-        date = handle_answer(answer)
-        return date if date
-      rescue ArgumentError => e
-        puts e
+      def choose
+        loop do
+          answer = Term::ask PROMPT 
+          begin
+            date = handle_answer(answer)
+            return date if date
+          rescue ArgumentError => e
+            puts e
+          end
+        end
+      end
+      
+      def parse_date(date_str, base=Date.today)
+        raise ArgumentError.new('Invalid date') if date_str.nil?
+        
+        # Today (default)
+        if date_str == 'today' || date_str.empty?
+          return Date.today
+        end
+        
+        # Base offset
+        case date_str.chars.first
+        when '-'
+          return base - Integer(date_str[1..-1])
+        when '+'
+          return base + Integer(date_str[1..-1])
+        end
+        
+        # 
+        date = date_str.split('-').collect {|d| d.to_i}
+        case date.length
+        when 1
+          return Date.civil(base.year, base.month, *date)
+        when 2
+          return Date.civil(base.year, *date)
+        when 3
+          date[0] += 2000 if date[0] < 100
+          return Date.civil(*date)
+        end
+        
+        raise ArgumentError.new('Invalid date')
+      end
+      
+      private
+      
+      def handle_answer(answer)
+        if answer == '?'
+          print_help_message
+          return false
+        else
+          return parse_date(answer)
+        end
+      end
+      
+      def print_help_message   
+        puts "Accepted formats:"
+        puts date_format_help_string
+        puts
+        system 'cal -3m'
+      end
+      
+      def date_format_help_string
+        FORMAT
       end
-    end
-  end
-
-  def parse_date(date_str, base=Date.today)
-    raise ArgumentError.new('Invalid date') if date_str.nil?
-
-    # Today (default)
-    if date_str == 'today' || date_str.empty?
-      return Date.today
-    end
-    
-    # Base offset
-    case date_str.chars.first
-    when '-'
-      return base - Integer(date_str[1..-1])
-    when '+'
-      return base + Integer(date_str[1..-1])
-    end
-    
-    # 
-    date = date_str.split('-').collect {|d| d.to_i}
-    case date.length
-    when 1
-      return Date.civil(base.year, base.month, *date)
-    when 2
-      return Date.civil(base.year, *date)
-    when 3
-      date[0] += 2000 if date[0] < 100
-      return Date.civil(*date)
-    end
-    
-    raise ArgumentError.new('Invalid date')
-  end
-
-  private
 
-  def handle_answer(answer)
-    if answer == '?'
-      print_help_message
-      return false
-    else
-      return parse_date(answer)
     end
   end
-  
-  def print_help_message   
-    puts "Accepted formats:"
-    puts date_format_help_string
-    puts
-    system 'cal -3m'
-  end
-
-  def date_format_help_string
-    FORMAT
-  end
-
 end

data/lib/achoo/ui/date_choosers.rb

@@ -1,21 +1,22 @@
-require 'achoo/ui/date_chooser'
-require 'achoo/ui/optionally_ranged_date_chooser'
-require 'achoo/ui/month_chooser'
+require 'achoo/ui'
 
-class Achoo; class UI; end; end
+module Achoo
+  module UI
 
-module Achoo::UI::DateChoosers
+    module DateChoosers
 
-  def date_chooser
-    Achoo::UI::DateChooser.new.choose
-  end
+      def date_chooser
+        DateChooser.new.choose
+      end
 
-  def optionally_ranged_date_chooser
-    Achoo::UI::OptionallyRangedDateChooser.new.choose
-  end
+      def optionally_ranged_date_chooser
+        OptionallyRangedDateChooser.new.choose
+      end
 
-  def month_chooser
-    Achoo::UI::MonthChooser.new.choose
-  end
+      def month_chooser
+        MonthChooser.new.choose
+      end
 
+    end
+  end
 end

data/lib/achoo/ui/exception_handling.rb

@@ -1,20 +1,22 @@
 require 'achoo/term'
+require 'achoo/ui'
 
-class Achoo; class UI; end; end;
+module Achoo
+  module UI
+    module ExceptionHandling
 
-module Achoo::UI::ExceptionHandling
+      def handle_exception(user_message, e)
+        Term::warn(user_message) + get_exception_reason(e)
+      end
 
-  def handle_exception(user_message, e)
-    Achoo::Term::warn(user_message) + get_exception_reason(e)
-  end
+      def handle_fatal_exception(user_message, e)
+        abort Term::fatal(user_message) + get_exception_reason(e)
+      end
 
-  def handle_fatal_exception(user_message, e)
-    puts Achoo::Term::fatal(user_message) + get_exception_reason(e)
-    exit 1
-  end
+      def get_exception_reason(e)
+        "\nReason: \n\t" + e.message.gsub("\n", "\n\t") + "\n---\n\t" + e.backtrace.join("\n\t")
+      end
 
-  def get_exception_reason(e)
-    "\nReason: \n\t" + e.message.gsub("\n", "\n\t") + "\n---\n\t" + e.backtrace.join("\n\t")
+    end
   end
-
 end

data/lib/achoo/ui/month_chooser.rb

@@ -1,27 +1,40 @@
 require 'achoo/term'
-
-class Achoo; class UI; end; end
-
-class Achoo::UI::MonthChooser
-
-  def choose
-    default = one_month_ago
-    period  = Achoo::Term::ask "Period ([#{default}] | YYYYMM)"
-    period  = default if !period || period.empty?
-    # FIX validate YYYYMM
-    period
-  end
-
-  def one_month_ago
-    now   = Time.now
-    year  = now.year
-
-    # Use -2 + 1 to shift range from 0-11 to 1-12 
-    month = (now.month - 2)%12 + 1
-    year -= 1 if month > now.month
-
-    sprintf "%d%02d", year, month
+require 'achoo/ui'
+
+module Achoo
+  module UI
+    class MonthChooser
+
+      def choose
+        loop do
+          answer = Term::ask "Period ([#{one_month_ago}] | YYYYMM)"
+          begin
+            return handle_answer(answer)
+          rescue ArgumentError => e
+            puts e
+          end
+        end
+      end
+
+      def handle_answer(answer)
+        period = !answer || answer.empty? ? one_month_ago : answer
+        period =~ /\A \d{4} (?: 0\d | 1[0-2]) \z/x \
+        or raise ArgumentError.new('Invalid month')
+        period
+      end
+
+      def one_month_ago
+        now   = Time.now
+        year  = now.year
+        
+        # Use -2 + 1 to shift range from 0-11 to 1-12 
+        month = (now.month - 2)%12 + 1
+        year -= 1 if month > now.month
+        
+        sprintf "%d%02d", year, month
+      end
+
+    end
   end
-
-end    
+end
 

data/lib/achoo/ui/optionally_ranged_date_chooser.rb

@@ -1,33 +1,37 @@
 require 'achoo/ui/date_chooser'
 
-class Achoo::UI::OptionallyRangedDateChooser < Achoo::UI::DateChooser
+module Achoo
+  module UI
+    class OptionallyRangedDateChooser < DateChooser
 
-  def parse_date_range(date_range_str)
-    start_date_str, finish_date_str = *date_range_str.split('->')
-    start_date = parse_date(start_date_str.strip)
-    finish_date = parse_date(finish_date_str.strip, start_date)
-    
-    if start_date >= finish_date
-      raise ArgumentError.new('Invalid date range')
-    end
-    
-    [start_date, finish_date]
-  end
+      def parse_date_range(date_range_str)
+        start_date_str, finish_date_str = *date_range_str.split('->')
+        start_date = parse_date(start_date_str.strip)
+        finish_date = parse_date(finish_date_str.strip, start_date)
+        
+        if start_date >= finish_date
+          raise ArgumentError.new('Invalid date range')
+        end
+        
+        [start_date, finish_date]
+      end
 
-  private 
+      private 
+      
+      def handle_answer(answer)
+        if answer.include? '->'
+          return parse_date_range(answer)
+        else 
+          return super
+        end
+      end
+      
+      def date_format_help_string
+        return "    DATE [-> DATE]\n" \
+            << "    DATE:\n"          \
+            << FORMAT
+      end
 
-  def handle_answer(answer)
-    if answer.include? '->'
-      return parse_date_range(answer)
-    else 
-      return super
     end
   end
-
-  def date_format_help_string
-    return "    DATE [-> DATE]\n" \
-        << "    DATE:\n"          \
-        << FORMAT
-  end
-
 end