From bc4be91a553b4b9f16a596d6daca6d70690b4e26 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 25 Oct 2012 09:18:59 +0000 Subject: [PATCH] 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ lib/rubygems/installer.rb | 8 +++++++- version.h | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 997babc169..7d9e68e081 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Oct 25 18:16:25 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 + Thu Oct 25 17:55:01 2012 NAKAMURA Usaku * test/etc/test_etc.rb (TestEtc#test_getpwuid): `s' is never set to nil. 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 diff --git a/version.h b/version.h index e9b90dbd8e..a00bd6a0fa 100644 --- a/version.h +++ b/version.h @@ -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