From 948169c5be76936a2e8ccffe6301bf4ee1b6d559 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 28 Sep 2012 08:29:21 +0000 Subject: [PATCH] * 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ lib/rubygems/installer.rb | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5451553564..2ddaffe765 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Sep 28 17:26:27 2012 NARUSE, Yui + + * 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 * vm_method.c (search_method): copy refinement iclasses to search diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index 31fb1209c9..514316f099 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -435,7 +435,13 @@ class Gem::Installer 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