Fix broken merge of gemutilities, add build_rake_in as necessary

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,4 +1,9 @@
-Thu Sep 25 19:13:12 2008
+Thu Sep 25 19:34:33 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rubygems/*: Update some new tests to use build_rake_in.
+	* test/rubygems/gemutilities.rb: Fix broken merge of rake detection.
+
+Thu Sep 25 19:13:12 2008  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems*: Update to RubyGems 1.3.0 r1891.
 

test/rubygems/gemutilities.rb

@@ -461,11 +461,11 @@ class RubyGemTestCase < Test::Unit::TestCase
 
   @@ruby = rubybin
   env_rake = ENV['rake']
-  ruby19_rake = @@ruby + " " + File.expand_path("../../../bin/rake", __FILE__)
+  ruby19_rake = File.expand_path("../../../bin/rake", __FILE__)
   @@rake = if env_rake then
              ENV["rake"]
            elsif File.exist? ruby19_rake then
-             ruby19_rake
+             @@ruby + " " + ruby19_rake
            else
              'rake'
            end

test/rubygems/test_gem_commands_uninstall_command.rb

@@ -12,9 +12,11 @@ class TestGemCommandsUninstallCommand < GemInstallerTestCase
     ui = MockGemUi.new
     util_setup_gem ui
 
+    build_rake_in do
       use_ui ui do
         @installer.install
       end
+    end
 
     @cmd = Gem::Commands::UninstallCommand.new
     @cmd.options[:executables] = true

test/rubygems/test_gem_installer.rb

@@ -618,9 +618,11 @@ load 'my_exec'
     @installer = Gem::Installer.new @gem, :install_dir => gemhome2,
                                     :source_index => source_index
 
+    build_rake_in do
       use_ui @ui do
         @installer.install
       end
+    end
 
     assert File.exist?(File.join(gemhome2, 'gems', @spec.full_name))
   end