achoo 0.4.1 → 0.4.2

data/CHANGES

@@ -1,3 +1,9 @@
+2010-05-11: version 0.4.2
+
+ - Fixed problem with identifying the halt event in the awake log.
+
+ - Improved command line argument handling in the ical binary.
+
 2010-04-20: version 0.4.1
 
  - Bug fixes

data/Rakefile

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require 'rake/gempackagetask'
-require 'rake/rdoctask'
 require 'rake/testtask'
 require 'rubygems'
 
@@ -37,30 +36,99 @@ namespace 'test' do
     t.test_files = FileList['test/acceptance/test*.rb']
   end
 
+end
+
+namespace 'metrics' do
+
+  begin
+    require 'code_stats'
+    CodeStats::Tasks.new
+  rescue LoadError => e
+    warn "Package code_stats required for the metrics:code_stats task to be available."
+  end
+
   desc 'Measures test coverage'
   task :coverage do
     rm_f('coverage')
-    system("rcov -T -Ilib test/unit/test_*.rb")
+    system("rcov -T -Ilib:test/lib test/unit/test_*.rb")
   end
 
 end
 
+
+begin
+  require 'metric_fu'
+  MetricFu::Configuration.run do |config|
+    dirs = %w(lib bin)
+    
+    # Define which metrics you want to use.
+    # [:churn, :saikuro, :stats, :flog, :flay, :reek, :roodi, :rcov]
+    #  - :stats only works for rails applications
+    config.metrics  = [:churn, :saikuro, :flog, :flay, :reek, :roodi, :rcov] 
+    
+    # [:flog, :flay, :reek, :roodi, :rcov]
+    config.graphs   = [:flog, :flay, :reek, :roodi, :rcov] 
+    
+    config.flay     = { 
+      :dirs_to_flay  => dirs,
+      :minimum_score => 0,
+    } 
+    config.flog     = { :dirs_to_flog  => dirs  }
+    config.reek     = { :dirs_to_reek  => dirs  }
+    config.roodi    = { :dirs_to_roodi => dirs }
+    config.saikuro  = { 
+      :output_directory => 'scratch_directory/saikuro', 
+      :input_directory  => dirs,
+      :cyclo            => "",
+      :filter_cyclo     => "0",
+      :warn_cyclo       => "5",
+      :error_cyclo      => "7",
+      :formater         => "text"  #this needs to be set to "text"
+    }
+    config.churn    = { 
+      :start_date => "1 year ago", 
+      :minimum_churn_count => 10
+    }
+    config.rcov     = { 
+      :environment => '',
+      :test_files => ['test/unit/**/test_*.rb'],
+      :rcov_opts => ["--sort coverage", 
+                     "--no-html", 
+                     "--text-coverage",
+                     "--no-color",
+                     "--profile",
+                     "--exclude /gems/,/test/",
+                     "--include lib:test/lib",
+                    ]}
+    
+    # :bluff or :gchart
+    config.graph_engine = :bluff
+  end
+rescue LoadError => e
+  warn "Package metric_fu required for the metrics:all task to be available."
+end
+
+
 namespace 'doc' do
 
+  begin 
+    require 'hanna/rdoctask'
+  rescue LoadError => e
+    warn "Package hanna recommended for better rdoc output."
+    require 'rake/rdoctask'
+  end
   Rake::RDocTask.new do |rd|
     rd.title = 'Achoo --- The Achievo CLI'
     rd.main = "README.rdoc"
     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-    rd.template = `allison --path`.chop + '.rb'
     rd.options << '--line-numbers' << '--inline-source'
     rd.rdoc_dir = 'doc'
   end
-
 end
 
 desc 'Install development dependencies'
 task :setup do
-  system 'gem install shoulda rack thin redgreen allison'
+  system 'gem install shoulda rack thin redgreen metric_fu code_stats hanna'
 end
 
 desc 'Remove generated files and folders'

data/bin/ical

@@ -9,8 +9,22 @@ include Achoo::RCLoader
 def main
   load_rc
 
+  options = {
+    :date => Date.today,
+  }
+  
+  optparse = OptionParser.new do|opts|
+    opts.banner = "Usage: $0 [options]"
+  
+    opts.on( '-d', '--date [DATE]', 'FIX' ) do |date|
+      options[:date] = Date.parse(date)
+    end
+  end
+  
+  optparse.parse!
+  
   RC[:ical].each do |config|
-    Achoo::ICal.from_http_request(config).print_events(Date.parse(ARGV[0]))
+    Achoo::ICal.from_http_request(config).print_events(options[:date])
   end
 end
 

data/lib/achoo/achievo.rb

@@ -1,8 +1,8 @@
 require 'achoo'
+require 'achoo/achievo/date_field'
 
 module Achoo
   module Achievo
-    autoload :Form,                       'achoo/achievo/form.rb'
     autoload :HourAdministrationForm,     'achoo/achievo/hour_administration_form.rb'
     autoload :HourRegistrationForm,       'achoo/achievo/hour_registration_form.rb'
     autoload :HourRegistrationFormRanged, 'achoo/achievo/hour_registration_form_ranged.rb'

data/lib/achoo/achievo/date_field.rb

@@ -0,0 +1,35 @@
+require 'achoo/achievo'
+
+module Achoo
+  module Achievo
+
+    def self.DateField(attr_name, field_name)
+      Module.new do
+        define_method("#{attr_name}=") do |date|
+          # Day and month must be prefixed with '0' if single
+          # digit. Date.day and Date.month doesn't do this. Use strftime
+          send("#{attr_name}_day_field=",   date.strftime('%d'))
+          send("#{attr_name}_month_field=", date.strftime('%m'))
+          send("#{attr_name}_year_field=",  date.year)
+        end
+        
+        define_method("#{attr_name}") do
+          Date.new(*[send("#{attr_name}_year_field"),
+                     send("#{attr_name}_month_field"),
+                     send("#{attr_name}_day_field")].collect {|e| e.to_i})
+        end
+        
+        %w(day month year).each do |e|
+          define_method("#{attr_name}_#{e}_field") do
+            @form.field_with(:name => "#{field_name}[#{e}]").value
+          end 
+              
+          define_method("#{attr_name}_#{e}_field=") do |val|
+            @form.field_with(:name => "#{field_name}[#{e}]").value = val
+          end 
+        end
+      end
+    end
+
+  end
+end

data/lib/achoo/achievo/hour_administration_form.rb

@@ -3,7 +3,9 @@ require 'achoo/term/table'
 
 module Achoo
   module Achievo
-    class HourAdministrationForm < Form
+    class HourAdministrationForm
+
+      include Achievo::DateField('date', 'viewdate')
 
       def initialize(agent)
         @agent = agent
@@ -74,18 +76,6 @@ module Achoo
         @page = @form.submit
       end
       
-      def day_field
-        @form.field_with(:name => 'viewdate[day]')
-      end
-      
-      def month_field
-        @form.field_with(:name => 'viewdate[month]')
-      end
-      
-      def year_field
-        @form.field_with(:name => 'viewdate[year]')
-      end
-
     end  
   end
 end

data/lib/achoo/achievo/hour_registration_form.rb

@@ -2,7 +2,9 @@ require 'achoo/achievo'
 
 module Achoo
   module Achievo
-    class HourRegistrationForm < Form
+    class HourRegistrationForm
+
+      include Achievo::DateField('date', 'activitydate')
 
       def initialize(agent)
         @agent = agent
@@ -65,10 +67,17 @@ module Achoo
         @form.billpercent = "billpercent.id='#{billing}'"
       end
 
-
       def worktime_periods
-        @form.field_with(:name => 'workperiod').options.collect do |opt|
-          [opt.value.match(/workperiod\.id='(\d+)'/)[1], opt.text]
+        collect_options('workperiod')
+      end
+      
+      def billing_options
+        collect_options('billpercent')
+      end
+
+      def collect_options(field_name, pattern)
+        @form.field_with(:name => field_name).options.collect do |opt|
+          [opt.value.match(/#{field_name}\.id='(\d+)'/)[1], opt.text]
         end
       end
 
@@ -178,18 +187,6 @@ module Achoo
                                    body, nil, @agent)
       end
 
-      def day_field
-        @form.field_with(:name => 'activitydate[day]')
-      end
-
-      def month_field
-        @form.field_with(:name => 'activitydate[month]')
-      end
-
-      def year_field
-        @form.field_with(:name => 'activitydate[year]')
-      end
-
       def extract_number_from_projectid(projectid)
         projectid.match(/project\.id='(\d+)'/)[1]
       end

data/lib/achoo/achievo/hour_registration_form_ranged.rb

@@ -4,42 +4,25 @@ module Achoo
   module Achievo
     class HourRegistrationFormRanged < HourRegistrationForm
 
+      include Achievo::DateField('to_date', 'todate')
+
       def initialize(agent)
         super
-        
         @page = @agent.get(atk_submit_to_url(@page.link_with(:text => 'Select range').href))
         @form = @page.form('entryform')
       end
 
       def date=(date_range)
         super(date_range[0])
-
-        to_day_field.value   = date_range[1].strftime('%d')
-        to_month_field.value = date_range[1].strftime('%m')
-        to_year_field.value  = date_range[1].year
+        self.to_date = date_range[1]
       end
 
       def date
-        start = super
-        finish = Date.new(to_year_field.value.to_i, to_month_field.value.to_i, 
-                          to_day_field.value.to_i)
-        [start, finish]
+        [super, to_date()]
       end
       
       private
 
-      def to_day_field
-        @form.field_with(:name => 'todate[day]')
-      end
-
-      def to_month_field
-        @form.field_with(:name => 'todate[month]')
-      end
-
-      def to_year_field
-        @form.field_with(:name => 'todate[year]')
-      end
-
       def date_to_s
         date.map {|d| d.strftime("%Y-%m-%d")}.join(" -> ")
       end

data/lib/achoo/awake.rb

@@ -7,7 +7,7 @@ module Achoo
   class Awake
 
     def initialize
-      log = wtmp.merge!(suspend)
+      log = wtmp.merge!(suspend).reverse
       log.unshift(System::LogEntry.new(Time.now, :now))
       @sessions = sessions(log)
     end
@@ -69,16 +69,11 @@ module Achoo
     end
 
     def suspend
-      log     = System::PMSuspend.new.reverse
-      new_log = []
-      log.each do |entry|
-        new_log << System::LogEntry.new(entry.time, entry.event == 'Awake.' ? :awake : :suspend)
-      end
-      new_log
+      System::PMSuspend.new
     end
 
     def wtmp
-      log     = System::Wtmp.new.reverse
+      log     = System::Wtmp.new
       new_log = []
       log.each do |entry|
         if entry.boot_event?

data/lib/achoo/extensions.rb

@@ -1,8 +1,12 @@
 class Array
 
+  %w(merge!).each do |method|
+    raise "Method already defined: #{name}\##{method}" \
+      if method_defined?(method)
+  end
+
   #
-  # Useful for merging two sorted arrays with Comparable
-  # elements. 
+  # Useful for merging two sorted arrays with Comparable elements.
   #
   # The content of the two input arrays should not be trusted after
   # being mistreated by this method.
@@ -22,3 +26,22 @@ class Array
   end
 
 end
+
+
+class Integer
+
+  %w(day days hour hours minute minutes).each do |method|
+    raise "Method already defined: #{name}\##{method}" \
+      if method_defined?(method)
+  end
+    
+  def day; self * 86400; end
+  alias days day
+
+  def hour; self * 3600; end
+  alias hours hour
+
+  def minute; self * 60; end
+  alias minutes minute
+
+end

data/lib/achoo/system/pm_suspend.rb

@@ -16,7 +16,7 @@ module Achoo
               next unless l =~ /Awake|performing suspend/
               time, event = *l.split(': ')
               time = Time.parse(time)
-              self << LogEntry.new(time, event)
+              self << LogEntry.new(time, event == 'Awake.' ? :awake : :suspend)
             end
           end
         end

data/lib/achoo/system/utmp_record.rb

@@ -56,7 +56,7 @@ module Achoo
       end
       
       def halt_event?
-        record_type_symbol == :term && device_name == ':0'
+        record_type_symbol == :run_lvl && username == 'shutdown'
       end
       
     end

data/lib/achoo/system/wtmp.rb

@@ -17,6 +17,10 @@ module Achoo
         end
       end
 
+      def to_s
+        inject('') {|str, e| str << e.to_s << "\n"}
+      end
+
     end
   end
 end

data/lib/achoo/temporal/timespan.rb

@@ -3,51 +3,30 @@ require 'time'
 
 module Achoo
   module Temporal
-    class Timespan
-
-      SECONDS_IN_A_DAY    = 86400
-      SECONDS_IN_AN_HOUR  = 3600
-      SECONDS_IN_A_MINUTE = 60
-
-      attr :start
-      attr :end
+    class Timespan < Range
 
       def initialize(start, end_)
         raise ArgumentError.new('Nil in parameters not allowed') if start.nil? || end_.nil?
 
-        self.start = start
-        self.end   = end_
-      end
-
-      def start=(timeish)
-        @start = to_time(timeish)
-      end
-      
-      def end=(timeish)
-        @end = to_time(timeish)
+        super(to_time(start), to_time(end_))
       end
 
       def to_s
-        duration = duration_string
-        from_to  = from_to_string
-
-        sprintf("(%s) %s", duration, from_to)
+        "(%s) %s" % [duration_string, from_to_string]
       end
 
       def contains?(timeish_or_timespan)
         if timeish_or_timespan.is_a? Timespan
-          timespan = timeish_or_timespan
-          return start <= timespan.start && self.end >= timespan.end
+          time = timeish_or_timespan
+          include?(time.first) && include?(time.last)
         else
-          time = to_time(timeish_or_timespan)
-          return start <= time && self.end >= time
+          include?(to_time(timeish_or_timespan))
         end
       end
 
       def overlaps?(timespan)
-        start <= timespan.start && self.end >= timespan.start \
-        || start <= timespan.end && self.end >= timespan.end \
-        || contains?(timespan) || timespan.contains?(self)
+        include?(timespan.first) || include?(timespan.last) ||
+          timespan.contains?(self)
       end
 
       private 
@@ -69,25 +48,33 @@ module Achoo
         end
       end
 
-
       def duration_string
-        delta = @end - @start
-        d     = delta.to_i / SECONDS_IN_A_DAY
+        "%d+%02d:%02d" % duration
+      end
 
-        delta = delta - d*SECONDS_IN_A_DAY
-        h     = delta.to_i / SECONDS_IN_AN_HOUR
+      def duration
+        delta = last - first
+        d     = delta.to_i / 1.day
 
-        delta = delta - h*SECONDS_IN_AN_HOUR
-        m     = delta.to_i / SECONDS_IN_A_MINUTE
+        delta = delta - d.days
+        h     = delta.to_i / 1.hour
 
-        sprintf "%d+%02d:%02d", d, h, m
+        delta = delta - h.hours
+        m     = delta.to_i / 1.minute
+
+        return [d, h, m]
       end
 
       def from_to_string
         today      = Date.today
-        start_date = start.send(:to_date)
-        end_date   = self.end.send(:to_date)
+        start_date = first.send(:to_date)
+        end_date   = last.send(:to_date)
+        
+        "%s - %s" % [from_as_string(start_date, today),
+                     to_as_string(start_date, end_date, today)]
+      end
 
+      def from_as_string(start_date, today)
         format = if start_date == today
                    "Today"
                  elsif start_date.month == today.month && 
@@ -98,8 +85,10 @@ module Achoo
                  else
                    "%a %e. %b %Y"
                  end
-        from = start.strftime(format << " %R")
+        from = first.strftime(format << " %R")
+      end
 
+      def to_as_string(start_date, end_date, today)
         format = if end_date == start_date
                    "%R"
                  elsif end_date == today
@@ -112,11 +101,10 @@ module Achoo
                  else
                    "%a %e. %b %Y %R"
                  end
-        to = self.end.strftime(format)
-
-        sprintf "%s - %s", from, to
+        to = last.strftime(format)
       end
 
     end
   end
 end
+

data/lib/achoo/term.rb

@@ -8,13 +8,17 @@ module Achoo
     autoload :Menu,  'achoo/term/menu'
     autoload :Table, 'achoo/term/table'
 
-    def self.bold(text); "\e[1m#{text}\e[0m"; end
-    
-    def self.underline(text); "\e[4m#{text}\e[0m"; end
+    BOLD      = 1
+    UNDERLINE = 4
+    RED       = 31
+    YELLOW    = 33
 
-    def self.warn(text); "\e[1;33m#{text}\e[0m"; end
+    def self.effect(code, text); "\e[#{code}m#{text}\e[0m"; end
 
-    def self.fatal(text); "\e[1;31m#{text}\e[0m"; end
+    def self.bold(text);      effect(BOLD,      text); end
+    def self.underline(text); effect(UNDERLINE, text); end
+    def self.warn(text);      effect(YELLOW,    text); end
+    def self.fatal(text);     effect(RED,       text); end
 
     def self.password
       `stty -echo`

data/lib/achoo/ui/register_hours.rb

@@ -47,27 +47,9 @@ module Achoo
       
 
       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 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 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]
+        chooser_helper(form.phases_for_selected_project,
+                       "Phases",
+                       'Phase')
       end
 
 
@@ -87,6 +69,19 @@ module Achoo
         return answer == '' ? '7.5' : answer
       end
 
+      def workperiod_chooser(form)
+        chooser_helper(form.worktime_periods,
+                       "Worktime periods",
+                       'Period [1]',
+                       true)
+      end
+
+      def billing_chooser(form)
+        chooser_helper(form.billing_options,
+                       "Billing options", 
+                       'Billing [1]',
+                       true)
+      end
 
       def print_remark_help(date)
         puts "VCS logs for #{date}:"
@@ -128,12 +123,21 @@ module Achoo
       end
 
       
+      
       def all_projects_chooser(form)
-        projects = form.all_projects
-        answer = Term.choose('Project', projects.collect { |p| p[1] })
-        projects[answer.to_i-1][0]
+        chooser_helper(form.all_projects, 
+                       'All projects', 
+                       'Project')
       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, [''])
+        answer = '1' if answer.empty?
+        options[answer.to_i-1][0]
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: achoo
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - "Kjell-Magne \xC3\x98ierud"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 +02:00
+date: 2010-05-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ files:
 - lib/achoo/ui/optionally_ranged_date_chooser.rb
 - lib/achoo/ui/date_choosers.rb
 - lib/achoo/ui/register_hours.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/date_field.rb
 - lib/achoo/achievo/table.rb
 - lib/achoo/system.rb
 - lib/achoo/system/log_entry.rb

data/lib/achoo/achievo/form.rb

@@ -1,22 +0,0 @@
-require 'achoo/achievo'
-
-module Achoo
-  module Achievo
-    class Form
-
-      def date=(date)
-        # Day and month must be prefixed with '0' if single
-        # digit. Date.day and Date.month doesn't do this. Use strftime
-        day_field.value   = date.strftime('%d')
-        month_field.value = date.strftime('%m')
-        year_field.value  = date.year
-      end
-      
-      def date
-        Date.new(year_field.value.to_i, month_field.value.to_i, 
-                 day_field.value.to_i)
-      end
-
-    end
-  end
-end