luislavena	2011-08-05 07:39:35 +0900 (Fri, 05 Aug 2011)

  New Revision: 32850

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

  Log:
    Backported r32804 from trunk

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/rubygems/installer.rb
    branches/ruby_1_9_3/test/rubygems/test_gem_installer.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32849)
+++ ruby_1_9_3/ChangeLog	(revision 32850)
@@ -1,3 +1,10 @@
+Fri Aug  5 07:35:00 2011  Luis Lavena  <luislavena@g...>
+
+	* lib/rubygems/installer.rb (class Gem): Correct path check on Windows
+	  Possible fix for [Ruby 1.9 - Bug #5111]
+	* test/rubygems/test_gem_installer.rb (load Gem): ditto
+	  Backported from trunk r32804
+
 Fri Aug  5 07:00:31 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/io/console/test_io_console.rb (test_noctty): daemon() on
Index: ruby_1_9_3/lib/rubygems/installer.rb
===================================================================
--- ruby_1_9_3/lib/rubygems/installer.rb	(revision 32849)
+++ ruby_1_9_3/lib/rubygems/installer.rb	(revision 32850)
@@ -434,6 +434,7 @@
 
   def check_that_user_bin_dir_is_in_path
     user_bin_dir = @bin_dir || Gem.bindir(gem_home)
+    user_bin_dir.gsub!(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
     unless ENV['PATH'].split(File::PATH_SEPARATOR).include? user_bin_dir then
       unless self.class.path_warning then
         alert_warning "You don't have #{user_bin_dir} in your PATH,\n\t  gem executables will not run."
Index: ruby_1_9_3/test/rubygems/test_gem_installer.rb
===================================================================
--- ruby_1_9_3/test/rubygems/test_gem_installer.rb	(revision 32849)
+++ ruby_1_9_3/test/rubygems/test_gem_installer.rb	(revision 32850)
@@ -208,9 +208,10 @@
   end
 
   def test_generate_bin_bindir_with_user_install_warning
+    bin_dir = Gem.win_platform? ? File.expand_path(ENV["WINDIR"]) : "/usr/bin"
 
     options = {
-      :bin_dir => "/usr/bin",
+      :bin_dir => bin_dir,
       :install_dir => "/non/existant"
     }
 

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