diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rubygems/installer.rb | 1 | ||||
| -rw-r--r-- | test/rubygems/test_gem_installer.rb | 3 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Tue Aug 2 06:18:15 2011 Luis Lavena <luislavena@gmail.com> + + * 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 + Mon Aug 1 20:12:03 2011 NAKAMURA Usaku <usa@ruby-lang.org> * test/ruby/test_process.rb (TestProcess#windows?): new method. diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index 338b926a83..74d803d7fa 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -434,6 +434,7 @@ 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 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." diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index d3791d7911..3c6fb45589 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -208,9 +208,10 @@ load Gem.bin_path('a', 'executable', version) 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" } |