achoo 0.3 → 0.4.1

data/lib/achoo/ui/register_hours.rb

@@ -1,137 +1,139 @@
+require 'achoo/achievo'
 require 'achoo/awake'
-require 'achoo/hour_registration_form'
-require 'achoo/hour_registration_form_ranged'
 require 'achoo/ical'
 require 'achoo/term'
 require 'achoo/ui'
 require 'achoo/vcs'
-require 'stringio'
-
-module Achoo::UI::RegisterHours
-
-  include Achoo::UI::DateChoosers
-  include Achoo::UI::ExceptionHandling
-
-  def register_hours(agent)
-    date       = optionally_ranged_date_chooser
-
-    puts "Fetching data ..."
-    form = if date.class == Date
-             Achoo::HourRegistrationForm
-           else
-             Achoo::HourRegistrationFormRanged
-           end.new(agent)
-
-    form.date    = date
-    form.project = project_chooser(form)
-    form.phase   = phase_chooser(form)
-    print_remark_help(date) if date.class == Date
-    form.remark  = remark_chooser
-    print_hours_help(date) if date.class == Date
-    form.hours   = hours_chooser
-
-    answer = Achoo::Term.ask("Do you want to change the defaults for worktime period and/or billing percentage? [N/y]").downcase
-    if answer == 'y'
-      form.workperiod = workperiod_chooser(form)
-      form.billing    = billing_chooser(form)
-    end
 
-    form.print_values
-    if confirm
-      puts "Submitting ..."
-      form.submit
-    else
-      puts "Cancelled"
-    end
-  end
+module Achoo
+  module UI
+    module RegisterHours
+
+      include DateChoosers
+      include ExceptionHandling
+
+      def register_hours(agent)
+        date = optionally_ranged_date_chooser
+        
+        puts "Fetching data ..."
+        form = if date.class == Array
+                 Achievo::HourRegistrationFormRanged
+               else
+                 Achievo::HourRegistrationForm
+               end.new(agent)
+        
+        form.date    = date
+        form.project = project_chooser(form)
+        form.phase   = phase_chooser(form)
+        print_remark_help(date) unless date.class == Array
+        form.remark  = remark_chooser
+        print_hours_help(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
+        if answer == 'y'
+          form.workperiod = workperiod_chooser(form)
+          form.billing    = billing_chooser(form)
+        end
+
+        form.print_values
+        if confirm
+          puts "Submitting ..."
+          form.submit
+        else
+          puts "Cancelled"
+        end
+      end
+      
 
+      def phase_chooser(form)
+        phases = form.phases_for_selected_project
+        puts "Phases"
+        answer = Term.choose('Phase', phases.collect {|p| p[1] })
+        phases[answer.to_i-1][0]
+      end
 
-  def phase_chooser(form)
-    phases = form.phases_for_selected_project
-    puts "Phases"
-    answer = Achoo::Term.choose('Phase', phases.collect {|p| p[1] })
-    phases[answer.to_i-1][0]
-  end
 
+      def workperiod_chooser(form)
+        periods = form.worktime_periods
+        puts "Worktime periods"
+        answer = Term.choose('Period [1]', periods.collect {|p| p[1] }, nil, [''])
+        answer = '1' if answer.empty?
+        periods[answer.to_i-1][0]
+      end
 
-  def workperiod_chooser(form)
-    periods = form.worktime_periods
-    puts "Worktime periods"
-    answer = Achoo::Term.choose('Period [1]', periods.collect {|p| p[1] }, nil, [''])
-    answer = '1' if answer.empty?
-    periods[answer.to_i-1][0]
-  end
+      def billing_chooser(form)
+        options = form.billing_options
+        puts "Billing options"
+        answer = Term.choose('Billing [1]', options.collect {|p| p[1] }, nil, [''])
+        answer = '1' if answer.empty?
+        options[answer.to_i-1][0]
+      end
 
-  def billing_chooser(form)
-    options = form.billing_options
-    puts "Billing options"
-    answer = Achoo::Term.choose('Billing [1]', options.collect {|p| p[1] }, nil, [''])
-    answer = '1' if answer.empty?
-    options[answer.to_i-1][0]
-  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 print_hours_help(date)
-    puts "Awake log:"
-    begin
-      awake = Achoo::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
+      end
 
-  def hours_chooser
-    answer = Achoo::Term::ask 'Hours [7:30]'
-    return answer == '' ? '7.5' : answer
-  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 print_remark_help(date)
-    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
-    puts '-' * 80
-    puts "Calendar events for #{date}:"
-    puts '---'
-    begin
-      RC[:ical].each do |config|
-        Achoo::ICal.from_http_request(config).print_events(date)
+      def remark_chooser
+        Term::ask 'Remark'
       end
-    rescue Exception => e
-      puts handle_exception("Failed to retrieve calendar events.", e)
-    end
-  end
 
-  def remark_chooser
-    Achoo::Term::ask 'Remark'
-  end
 
+      def project_chooser(form)
+        puts 'Recently used projects'
+        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
+      end
 
-  def project_chooser(form)
-    puts 'Recently used projects'
-    projects = form.recent_projects
-    answer = Achoo::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]
+      
+      def all_projects_chooser(form)
+        projects = form.all_projects
+        answer = Term.choose('Project', projects.collect { |p| p[1] })
+        projects[answer.to_i-1][0]
+      end
+      
     end
   end
-
-
-  def all_projects_chooser(form)
-    projects = form.all_projects
-    answer = Achoo::Term.choose('Project', projects.collect { |p| p[1] })
-    projects[answer.to_i-1][0]
-  end
-
 end

data/lib/achoo/vcs.rb

@@ -1,43 +1,45 @@
-class Achoo; end
+require 'achoo'
 
-require 'achoo/vcs/subversion'
-require 'achoo/vcs/git'
+module Achoo
+  class VCS
 
-class Achoo::VCS
+    autoload :Git,        'achoo/vcs/git'
+    autoload :Subversion, 'achoo/vcs/subversion'
+    
+    LINE_LENGTH = 80
 
-  LINE_LENGTH = 80
-
-  def self.factory(dir)
-    klass = [Achoo::VCS::Git, Achoo::VCS::Subversion].find do |k|
-      k.repository?(dir)
+    def self.factory(dir)
+      klass = [Git, Subversion].find do |k|
+        k.repository?(dir)
+      end
+      return nil if klass.nil?
+      klass.new(dir)
     end
-    return nil if klass.nil?
-    klass.new(dir)
-  end
 
-  def self.print_logs_for(date, vcs_dirs, io=$stdout)
-    vcs_dirs.each do |dir|
-      Dir.glob("#{dir}/*/").each do |dir|
-        vcs = factory(dir)
-        next if vcs.nil?
+    def self.print_logs_for(date, vcs_dirs, io=$stdout)
+      vcs_dirs.each do |dir|
+        Dir.glob("#{dir}/*/").each do |dir|
+          vcs = factory(dir)
+          next if vcs.nil?
 
-        log = vcs.log_for(date)
-        print_log(log, dir, io)
+          log = vcs.log_for(date)
+          print_log(log, dir, io)
+        end
       end
     end
-  end
 
-  private
+    private
 
-  def self.print_log(log, dir, io)
-    return if log.empty?
-    io.puts header(dir)
-    io.puts log.chomp
-  end
+    def self.print_log(log, dir, io)
+      return if log.empty?
+      io.puts header(dir)
+      io.puts log.chomp
+    end
 
-  def self.header(dir)
-    project = "<( #{File.basename(dir).upcase} )>"
-    dashes = '-' * ((LINE_LENGTH - project.length) / 2)
-    dashes + project + dashes
+    def self.header(dir)
+      project = "<( #{File.basename(dir).upcase} )>"
+      dashes = '-' * ((LINE_LENGTH - project.length) / 2)
+      dashes + project + dashes
+    end
   end
 end

data/lib/achoo/vcs/git.rb

@@ -1,20 +1,24 @@
-class Achoo; class VCS; end; end
+require 'achoo/vcs'
 
-class Achoo::VCS::Git
+module Achoo
+  class VCS
+    class Git
 
-  def self.repository?(dir)
-    File.exists?("#{dir}/.git")
-  end
+      def self.repository?(dir)
+        File.exists?("#{dir}/.git")
+      end
 
-  def initialize(dir)
-    @dir = dir
-  end
+      def initialize(dir)
+        @dir = dir
+      end
+      
+      def log_for(date)
+        today    = date.strftime('%Y-%m-%d')
+        tomorrow = date.next.strftime('%Y-%m-%d')
+        
+        `cd  #@dir; git log --author=#{ENV['USER']} --oneline --after=#{today} --before=#{tomorrow} | cut -d ' ' -f 2-`
+      end
 
-  def log_for(date)
-    today    = date.strftime('%Y-%m-%d')
-    tomorrow = date.next.strftime('%Y-%m-%d')
-    
-    `cd  #@dir; git log --author=#{ENV['USER']} --oneline --after=#{today} --before=#{tomorrow} | cut -d ' ' -f 2-`
+    end
   end
-
 end

data/lib/achoo/vcs/subversion.rb

@@ -1,32 +1,34 @@
+require 'achoo/vcs'
 require 'nokogiri'
 
-class Achoo; class VCS; end; end
+module Achoo
+  class VCS
+    class Subversion
 
-class Achoo::VCS::Subversion
-
-  def self.repository?(dir)
-    File.exist?("#{dir}/.svn")
-  end
-
-  def initialize(dir)
-    @dir = dir
-  end
+      def self.repository?(dir)
+        File.exist?("#{dir}/.svn")
+      end
 
-  def log_for(date)
-    date = date.strftime("%F")
-    xml = Nokogiri::XML(`cd #@dir; svn log --xml`)
-    logentries = xml.xpath("/log/logentry/author[contains(., \"#{ENV['USER']}\")]/parent::*")
+      def initialize(dir)
+        @dir = dir
+      end
 
-    # FIX are the dates in the xml local time, or do they need to be
-    # converted?
-    log = ""
-    logentries.each do |e|
-      if e.css('date').text.start_with?(date)
-        log << e.css('msg').text.strip << "\n"
+      def log_for(date)
+        date = date.strftime("%F")
+        xml = Nokogiri::XML(`cd #@dir; svn log --xml`)
+        logentries = xml.xpath("/log/logentry/author[contains(., \"#{ENV['USER']}\")]/parent::*")
+        
+        # FIX are the dates in the xml local time, or do they need to be
+        # converted?
+        log = ""
+        logentries.each do |e|
+          if e.css('date').text.start_with?(date)
+            log << e.css('msg').text.strip << "\n"
+          end
+        end
+        log
       end
+
     end
-    log
   end
-
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: achoo
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.4.1
 platform: ruby
 authors: 
 - "Kjell-Magne \xC3\x98ierud"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +02:00
+date: 2010-04-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,41 +45,47 @@ extra_rdoc_files: []
 
 files: 
 - bin/awake
+- bin/ical
 - bin/achoo
 - bin/vcs_commits
-- bin/ical
-- lib/achoo/hour_administration_form.rb
-- lib/achoo/vcs/git.rb
-- lib/achoo/vcs/subversion.rb
-- lib/achoo/ui.rb
-- lib/achoo/term.rb
-- lib/achoo/system.rb
-- lib/achoo/open_timespan.rb
-- lib/achoo/lock_month_form.rb
-- lib/achoo/hour_registration_form.rb
+- lib/achoo.rb
 - lib/achoo/vcs.rb
-- lib/achoo/ui/date_chooser.rb
-- lib/achoo/ui/exception_handling.rb
 - lib/achoo/ui/month_chooser.rb
+- lib/achoo/ui/common.rb
 - lib/achoo/ui/commands.rb
+- lib/achoo/ui/date_chooser.rb
+- lib/achoo/ui/exception_handling.rb
 - lib/achoo/ui/optionally_ranged_date_chooser.rb
-- lib/achoo/ui/common.rb
 - lib/achoo/ui/date_choosers.rb
 - lib/achoo/ui/register_hours.rb
-- lib/achoo/ical.rb
-- lib/achoo/binary/cstruct.rb
-- lib/achoo/binary/utmp_record.rb
+- lib/achoo/achievo/form.rb
+- lib/achoo/achievo/lock_month_form.rb
+- lib/achoo/achievo/login_form.rb
+- lib/achoo/achievo/hour_registration_form.rb
+- lib/achoo/achievo/hour_administration_form.rb
+- lib/achoo/achievo/hour_registration_form_ranged.rb
+- lib/achoo/achievo/table.rb
+- lib/achoo/system.rb
+- lib/achoo/system/log_entry.rb
 - lib/achoo/system/wtmp.rb
+- lib/achoo/system/utmp_record.rb
 - lib/achoo/system/pm_suspend.rb
-- lib/achoo/hour_registration_form_ranged.rb
-- lib/achoo/rc_loader.rb
+- lib/achoo/system/cstruct.rb
+- lib/achoo/vcs/subversion.rb
+- lib/achoo/vcs/git.rb
 - lib/achoo/awake.rb
-- lib/achoo/timespan.rb
-- lib/achoo/binary.rb
-- lib/achoo/form.rb
+- lib/achoo/term.rb
+- lib/achoo/app.rb
 - lib/achoo/term/menu.rb
 - lib/achoo/term/table.rb
-- lib/achoo.rb
+- lib/achoo/extensions.rb
+- lib/achoo/temporal/open_timespan.rb
+- lib/achoo/temporal/timespan.rb
+- lib/achoo/achievo.rb
+- lib/achoo/temporal.rb
+- lib/achoo/rc_loader.rb
+- lib/achoo/ui.rb
+- lib/achoo/ical.rb
 - Rakefile
 - README.rdoc
 - CHANGES