rake 0.8.3 → 0.8.4

data/test/test_task_manager.rb

@@ -2,12 +2,15 @@
 
 require 'test/unit'
 require 'rake'
+require 'test/rake_test_setup'
 
 class TaskManager
   include Rake::TaskManager
 end
 
 class TestTaskManager < Test::Unit::TestCase
+  include TestMethods
+
   def setup
     @tm = TaskManager.new
   end
@@ -68,7 +71,7 @@ class TestTaskManager < Test::Unit::TestCase
   end
 
   def test_name_lookup_with_nonexistent_task
-    assert_raise(RuntimeError) {
+    assert_exception(RuntimeError) {
       t = @tm["DOES NOT EXIST"]
     }
   end

data/test/test_tasks.rb

@@ -5,11 +5,13 @@ require 'fileutils'
 require 'rake'
 require 'test/filecreation'
 require 'test/capture_stdout'
+require 'test/rake_test_setup'
 
 ######################################################################
 class TestTask < Test::Unit::TestCase
   include CaptureStdout
   include Rake
+  include TestMethods
 
   def setup
     Task.clear
@@ -48,7 +50,7 @@ class TestTask < Test::Unit::TestCase
     t2 = task(:t2 => [:t1]) { |t| runlist << t.name }
     assert_equal ["t2"], t1.prerequisites
     assert_equal ["t1"], t2.prerequisites
-    ex = assert_raise RuntimeError do
+    ex = assert_exception RuntimeError do
       t1.invoke
     end
     assert_match(/circular dependency/i, ex.message)
@@ -121,7 +123,7 @@ class TestTask < Test::Unit::TestCase
   def test_find
     task :tfind
     assert_equal "tfind", Task[:tfind].name
-    ex = assert_raises(RuntimeError) { Task[:leaves] }
+    ex = assert_exception(RuntimeError) { Task[:leaves] }
     assert_equal "Don't know how to build task 'leaves'", ex.message
   end
 
@@ -218,6 +220,7 @@ end
 class TestTaskWithArguments < Test::Unit::TestCase
   include CaptureStdout
   include Rake
+  include TestMethods
 
   def setup
     Task.clear
@@ -255,7 +258,7 @@ class TestTaskWithArguments < Test::Unit::TestCase
   end
 
   def test_illegal_keys_in_task_name_hash
-    assert_raise RuntimeError do
+    assert_exception RuntimeError do
       t = task(:t, :x, :y => 1, :needs => [:pre])
     end
   end

data/test/test_test_task.rb

@@ -5,6 +5,8 @@ require 'rake/testtask'
 
 class TestTestTask < Test::Unit::TestCase
   include Rake
+  include TestMethods
+  
   def setup
     Task.clear
     ENV.delete('TEST')

data/test/test_top_level_functions.rb

@@ -7,12 +7,14 @@ rescue LoadError
 end
 
 require 'test/unit'
+require 'flexmock/test_unit'
 require 'test/capture_stdout'
+require 'test/rake_test_setup'
 require 'rake'
-require 'flexmock/test_unit'
 
 class TestTopLevelFunctions < Test::Unit::TestCase
   include CaptureStdout
+  include TestMethods
 
   def setup
     super
@@ -79,6 +81,6 @@ class TestTopLevelFunctions < Test::Unit::TestCase
   end
 
   def test_missing_other_constant
-    assert_raise(NameError) do Object.const_missing(:Xyz) end
+    assert_exception(NameError) do Object.const_missing(:Xyz) end
   end
 end

data/test/test_win32.rb

@@ -8,47 +8,62 @@ require 'rake'
 
 class TestWin32 < Test::Unit::TestCase
   include InEnvironment
+  include TestMethods
 
   Win32 = Rake::Win32
-  
-  def test_win32_system_dir_uses_appdata_if_defined
-    in_environment('RAKE_SYSTEM' => nil, 'APPDATA' => '\\AD') do
-      assert_equal "/AD/Rake", Win32.win32_system_dir 
+
+  def test_win32_system_dir_uses_home_if_defined
+    in_environment('RAKE_SYSTEM' => nil, 'HOME' => 'C:\\HP') do
+      assert_equal "C:/HP/Rake", Win32.win32_system_dir
     end
   end
 
-  def test_win32_system_dir_uses_homedrive_otherwise
+  def test_win32_system_dir_uses_homedrive_homepath_when_no_home_defined
     in_environment(
       'RAKE_SYSTEM' => nil,
-      'APPDATA' => nil,
+      'HOME' => nil,
       'HOMEDRIVE' => "C:",
-      "HOMEPATH" => "\\HP"
+      'HOMEPATH' => "\\HP"
       ) do
       assert_equal "C:/HP/Rake", Win32.win32_system_dir
     end
   end
 
-  def test_win32_system_dir_uses_userprofile_otherwise
+  def test_win32_system_dir_uses_appdata_when_no_home_or_home_combo
     in_environment(
       'RAKE_SYSTEM' => nil,
-      'APPDATA' => nil,
+      'HOME' => nil,
       'HOMEDRIVE' => nil,
-      "HOMEPATH" => nil,
-      "USERPROFILE" => '\\UP'
+      'HOMEPATH' => nil,
+      'APPDATA' => "C:\\Documents and Settings\\HP\\Application Data"
       ) do
-      assert_equal "/UP/Rake", Win32.win32_system_dir
+      assert_equal "C:/Documents and Settings/HP/Application Data/Rake", Win32.win32_system_dir
     end
   end
 
-  def test_win32_system_dir_nil_of_no_env_vars
+  def test_win32_system_dir_fallback_to_userprofile_otherwise
     in_environment(
       'RAKE_SYSTEM' => nil,
+      'HOME' => nil,
+      'HOMEDRIVE' => nil,
+      'HOMEPATH' => nil,
       'APPDATA' => nil,
+      'USERPROFILE' => "C:\\Documents and Settings\\HP"
+      ) do
+      assert_equal "C:/Documents and Settings/HP/Rake", Win32.win32_system_dir
+    end
+  end
+
+  def test_win32_system_dir_nil_of_no_env_vars
+    in_environment(
+      'RAKE_SYSTEM' => nil,
+      'HOME' => nil,
       'HOMEDRIVE' => nil,
       "HOMEPATH" => nil,
+      'APPDATA' => nil,
       "USERPROFILE" => nil
       ) do
-      assert_raise(Rake::Win32::Win32HomeError) do
+      assert_exception(Rake::Win32::Win32HomeError) do
         Win32.win32_system_dir
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rake
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Jim Weirich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-25 00:00:00 -04:00
+date: 2009-03-04 00:00:00 -05:00
 default_executable: rake
 dependencies: []
 
@@ -24,6 +24,7 @@ extra_rdoc_files:
 - MIT-LICENSE
 - TODO
 - CHANGES
+- doc/command_line_usage.rdoc
 - doc/glossary.rdoc
 - doc/proto_rake.rdoc
 - doc/rakefile.rdoc
@@ -41,6 +42,7 @@ extra_rdoc_files:
 - doc/release_notes/rake-0.8.0.rdoc
 - doc/release_notes/rake-0.8.2.rdoc
 - doc/release_notes/rake-0.8.3.rdoc
+- doc/release_notes/rake-0.8.4.rdoc
 files: 
 - install.rb
 - CHANGES
@@ -62,6 +64,7 @@ files:
 - lib/rake/packagetask.rb
 - lib/rake/rake_test_loader.rb
 - lib/rake/rdoctask.rb
+- lib/rake/repaired_system.rb
 - lib/rake/ruby182_test_unit_fix.rb
 - lib/rake/runtest.rb
 - lib/rake/tasklib.rb
@@ -98,6 +101,7 @@ files:
 - test/test_package_task.rb
 - test/test_pathmap.rb
 - test/test_rake.rb
+- test/test_rdoc_task.rb
 - test/test_require.rb
 - test/test_rules.rb
 - test/test_task_arguments.rb
@@ -119,6 +123,7 @@ files:
 - test/data/statusreturn/Rakefile
 - test/data/unittest/Rakefile
 - test/data/unittest/subdir
+- doc/command_line_usage.rdoc
 - doc/example
 - doc/example/a.c
 - doc/example/b.c
@@ -145,6 +150,7 @@ files:
 - doc/release_notes/rake-0.8.0.rdoc
 - doc/release_notes/rake-0.8.2.rdoc
 - doc/release_notes/rake-0.8.3.rdoc
+- doc/release_notes/rake-0.8.4.rdoc
 has_rdoc: true
 homepage: http://rake.rubyforge.org
 post_install_message: 
@@ -172,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rake
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Ruby based make-like utility.