usa	2012-10-25 18:18:59 +0900 (Thu, 25 Oct 2012)

  New Revision: 37325

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

  Log:
    merge revision(s) 37048:
    
    * lib/rubygems/installer.rb (check_that_user_bin_dir_is_in_path):
      test_generate_bin_bindir_with_user_install_warning(TestGemInstaller)
      fails on Windows with msys bash. It makes comparing paths
      case-insensitive.
      pick from upstream to fix a failure of test-all [ruby-core:47711]
      https://github.com/rubygems/rubygems/commit/c474edb2f3704206f04da1c8c6cf9fb079d84abe

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/rubygems/installer.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37324)
+++ ruby_1_9_3/ChangeLog	(revision 37325)
@@ -1,3 +1,12 @@
+Thu Oct 25 18:16:25 2012  NARUSE, Yui  <naruse@r...>
+
+	* lib/rubygems/installer.rb (check_that_user_bin_dir_is_in_path):
+	  test_generate_bin_bindir_with_user_install_warning(TestGemInstaller)
+	  fails on Windows with msys bash. It makes comparing paths
+	  case-insensitive.
+	  pick from upstream to fix a failure of test-all [ruby-core:47711]
+	  https://github.com/rubygems/rubygems/commit/c474edb2f3704206f04da1c8c6cf9fb079d84abe
+
 Thu Oct 25 17:55:01 2012  NAKAMURA Usaku  <usa@r...>
 
 	* test/etc/test_etc.rb (TestEtc#test_getpwuid): `s' is never set to nil.
Index: ruby_1_9_3/lib/rubygems/installer.rb
===================================================================
--- ruby_1_9_3/lib/rubygems/installer.rb	(revision 37324)
+++ ruby_1_9_3/lib/rubygems/installer.rb	(revision 37325)
@@ -435,7 +435,13 @@
   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
+    path = ENV['PATH']
+    if Gem.win_platform? then
+      path = path.downcase
+      user_bin_dir = user_bin_dir.downcase
+    end
+
+    unless 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."
         self.class.path_warning = true
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37324)
+++ ruby_1_9_3/version.h	(revision 37325)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 300
+#define RUBY_PATCHLEVEL 301
 
 #define RUBY_RELEASE_DATE "2012-10-25"
 #define RUBY_RELEASE_YEAR 2012

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