[前][次][番号順一覧][スレッド一覧]

ruby-changes:24996

From: naruse <ko1@a...>
Date: Fri, 28 Sep 2012 17:29:34 +0900 (JST)
Subject: [ruby-changes:24996] naruse:r37048 (trunk): * lib/rubygems/installer.rb (check_that_user_bin_dir_is_in_path):

naruse	2012-09-28 17:29:21 +0900 (Fri, 28 Sep 2012)

  New Revision: 37048

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

  Log:
    * 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:
    trunk/ChangeLog
    trunk/lib/rubygems/installer.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37047)
+++ ChangeLog	(revision 37048)
@@ -1,3 +1,12 @@
+Fri Sep 28 17:26:27 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
+
 Fri Sep 28 15:44:45 2012  Shugo Maeda  <shugo@r...>
 
 	* vm_method.c (search_method): copy refinement iclasses to search
Index: lib/rubygems/installer.rb
===================================================================
--- lib/rubygems/installer.rb	(revision 37047)
+++ lib/rubygems/installer.rb	(revision 37048)
@@ -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

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

[前][次][番号順一覧][スレッド一覧]