drbrain	2008-09-25 19:37:01 +0900 (Thu, 25 Sep 2008)

  New Revision: 19549

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19549

  Log:
    Fix broken merge of gemutilities, add build_rake_in as necessary

  Modified files:
    trunk/ChangeLog
    trunk/test/rubygems/gemutilities.rb
    trunk/test/rubygems/test_gem_commands_uninstall_command.rb
    trunk/test/rubygems/test_gem_installer.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19548)
+++ ChangeLog	(revision 19549)
@@ -1,5 +1,10 @@
-Thu Sep 25 19:13:12 2008
+Thu Sep 25 19:34:33 2008  Eric Hodel  <drbrain@s...>
 
+	* 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@s...>
+
 	* lib/rubygems*: Update to RubyGems 1.3.0 r1891.
 
 Thu Sep 25 18:40:42 2008  Yuki Sonoda (Yugui)  <yugui@y...>
Index: test/rubygems/test_gem_commands_uninstall_command.rb
===================================================================
--- test/rubygems/test_gem_commands_uninstall_command.rb	(revision 19548)
+++ test/rubygems/test_gem_commands_uninstall_command.rb	(revision 19549)
@@ -12,8 +12,10 @@
     ui = MockGemUi.new
     util_setup_gem ui
 
-    use_ui ui do
-      @installer.install
+    build_rake_in do
+      use_ui ui do
+        @installer.install
+      end
     end
 
     @cmd = Gem::Commands::UninstallCommand.new
Index: test/rubygems/test_gem_installer.rb
===================================================================
--- test/rubygems/test_gem_installer.rb	(revision 19548)
+++ test/rubygems/test_gem_installer.rb	(revision 19549)
@@ -618,8 +618,10 @@
     @installer = Gem::Installer.new @gem, :install_dir => gemhome2,
                                     :source_index => source_index
 
-    use_ui @ui do
-      @installer.install
+    build_rake_in do
+      use_ui @ui do
+        @installer.install
+      end
     end
 
     assert File.exist?(File.join(gemhome2, 'gems', @spec.full_name))
Index: test/rubygems/gemutilities.rb
===================================================================
--- test/rubygems/gemutilities.rb	(revision 19548)
+++ test/rubygems/gemutilities.rb	(revision 19549)
@@ -461,11 +461,11 @@
 
   @@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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/