achoo 0.5 → 0.5.1

data/CHANGES

@@ -1,3 +1,9 @@
+2011-06-10: version 0.5.1
+
+ - Fixed failing tests
+
+ - Some menu headers was not printed
+
 2011-06-10: version 0.5
 
  - Added support for plugins.

data/Rakefile

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
-require 'rake/gempackagetask'
 require 'rake/testtask'
 require 'rubygems'
+require 'rubygems/package_task'
 
 load File.dirname(__FILE__) + '/achoo.gemspec'
 
@@ -10,17 +10,13 @@ task :default => ['test:unit']
 
 namespace 'build' do
 
-  Rake::GemPackageTask.new(Spec) do |pkg|
+  Gem::PackageTask.new(Spec) do |pkg|
     pkg.need_tar = true
   end
 
 end
 
-Rake::TestTask.new do |t|
-  t.libs << "test/lib"
-  t.test_files = FileList['test/**/test*.rb']
-  #t.verbose = true
-end
+task :test => ['test:unit', 'test:acceptance']
 
 namespace 'test' do
 
@@ -30,10 +26,12 @@ namespace 'test' do
     t.test_files = FileList['test/unit/test*.rb']
   end
 
-  Rake::TestTask.new do |t|
-    t.name = :acceptance
-    t.libs << "test/lib"
-    t.test_files = FileList['test/acceptance/test*.rb']
+  # Need a fresh ruby interpreter for each acceptance test, so I can't
+  # use Rake::TestTask
+  task :acceptance do
+    FileList['test/acceptance/test*.rb'].each do |f|
+      ruby "-Ilib -Itest/lib #{f}"
+    end
   end
 
 end

data/lib/achoo/plugin/ical.rb

@@ -1,15 +1,15 @@
 require 'achoo'
 require 'achoo/ical'
+require 'achoo/plugin_base'
 require 'achoo/ui'
-require 'plugman/plugin_base'
 
 module Achoo
   class Plugin
-    class Ical < Plugman::PluginBase
+    class Ical < PluginBase
 
       include UI::ExceptionHandling
 
-      def state_ok?; RC.has_key?(:ical); end
+      def state_ok?; RC.has_key?(:ical) && !RC[:ical].empty?; end
       
       def at_startup
         warm_up_ical_cache

data/lib/achoo/plugin/vcs.rb

@@ -1,15 +1,15 @@
 require 'achoo'
-require 'achoo/vcs'
+require 'achoo/plugin_base'
 require 'achoo/ui'
-require 'plugman/plugin_base'
+require 'achoo/vcs'
 
 module Achoo
   class Plugin
-    class VCS < Plugman::PluginBase
+    class VCS < PluginBase
 
       include UI::ExceptionHandling
       
-      def state_ok?; RC.has_key?(:vcs_dirs); end
+      def state_ok?; RC.has_key?(:vcs_dirs) && !RC[:vcs_dirs].empty?; end
       
       def before_register_hour_remark(date)
         puts '-' * 80

data/lib/achoo/ui/register_hours.rb

@@ -122,6 +122,8 @@ module Achoo
       end
 
       def chooser_helper(options, heading, prompt, empty_allowed=false)
+        puts heading
+
         extra = empty_allowed ? [''] : []
         project_names = options.collect {|p| p[1] }
         if heading == 'All projects'

data/test/acceptance/test_lock_month.rb

@@ -22,7 +22,7 @@ class TestLockMonth < Test::Unit::TestCase
   end
     
   def test_lock_month
-    achoo(:verbose => $DEBUG) do
+    achoo(:verbose => ENV['DEBUG_ACHOO']) do
       expect '6. Lock month'
       expect_main_prompt
       puts '6'

data/test/acceptance/test_register_hours.rb

@@ -105,7 +105,7 @@ class TestLockMonth < Test::Unit::TestCase
   end
     
   def test_register_hours
-    achoo(:verbose => $DEBUG) do
+    achoo(:verbose => ENV['ACHOO_DEBUG']) do
       expect '1. Register hours'
       expect_main_prompt
       puts '1'
@@ -127,7 +127,10 @@ class TestLockMonth < Test::Unit::TestCase
       expect 'Hours [7:30]>'
       puts '2'
 
-      expect 'Do you want to change the defaults for worktime period and/or billing percentage? [N/y]>'
+      # Bug in expect? 
+      # Can't check for the whole string
+      # expect 'Do you want to change the defaults for worktime period and/or billing percentage? [N/y]>'
+      expect 'Do you want to change the defaults for worktime period and/or billing percent'
       puts 'y'
 
       expect 'Worktime periods'

data/test/lib/achievo_mock.rb

@@ -12,7 +12,7 @@ class AchievoMock
     @server.silent = true
     @thread = Thread.new { @server.start }
     sleep 1
-    @logger = Logger.new(File.dirname(__FILE__) + '/../../tmp/test.log')
+    @logger = Logger.new('/tmp/achoo-test.log')
   end
 
   def stop

data/test/unit/test_achievo_date_field.rb

@@ -11,23 +11,23 @@ class TestTermMenu < Test::Unit::TestCase
     end
 
     should 'mixin foo accessor' do
-      assert @a.instance_methods.include?('foo')
+      assert @a.instance_methods.include?(:foo)
     end
 
     should 'mixin foo= accessor' do
-      assert @a.instance_methods.include?('foo=')
+      assert @a.instance_methods.include?(:foo=)
     end
     
     should 'mixin foo_day_field accessor' do
-      assert @a.instance_methods.include?('foo_day_field')
+      assert @a.instance_methods.include?(:foo_day_field)
     end
 
     should 'mixin foo_month_field accessor' do
-      assert @a.instance_methods.include?('foo_month_field')
+      assert @a.instance_methods.include?(:foo_month_field)
     end
 
     should 'mixin foo_year_field accessor' do
-      assert @a.instance_methods.include?('foo_year_field')
+      assert @a.instance_methods.include?(:foo_year_field)
     end
   end
 end

data/test/unit/test_term_table.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'achoo/term/table'
 require 'test_helpers'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: achoo
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &82174030 !ruby/object:Gem::Requirement
+  requirement: &82297840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *82174030
+  version_requirements: *82297840
 - !ruby/object:Gem::Dependency
   name: plugman
-  requirement: &82173670 !ruby/object:Gem::Requirement
+  requirement: &82268340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *82173670
+  version_requirements: *82268340
 - !ruby/object:Gem::Dependency
   name: ri_cal
-  requirement: &82173430 !ruby/object:Gem::Requirement
+  requirement: &82268080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82173430
+  version_requirements: *82268080
 description: Command line interface for Achievo (http://achievo.org)
 email: kjellm@acm.org
 executables: