diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-24 15:28:23 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-24 15:28:23 +0000 |
| commit | 996b1bfa95347e5171c3f7ab32b6740656ed7a8b (patch) | |
| tree | be0310be446bf313f16a12a3a3b56c30b4900cbd /lib/rubygems/path_support.rb | |
| parent | ce8729feb61d507805d965c5479f343e3701c659 (diff) | |
merge revision(s) 53707,53708,53709,53712,53777,53781: [Backport #12326]
* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.5.2.
It supports to enable frozen string literal and add `--norc` option for
disable to `.gemrc` configuration.
See 2.5.2 release notes for other fixes and enhancements.
https://github.com/rubygems/rubygems/blob/a8aa3bac723f045c52471c7b9328310a048561e0/History.txt#L3
* lib/rubygems/specification.rb: `coding` is affect only first line except
shebang.
* lib/rubygems/package.rb, lib/rubygems/package/*: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/path_support.rb')
| -rw-r--r-- | lib/rubygems/path_support.rb | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/lib/rubygems/path_support.rb b/lib/rubygems/path_support.rb index 0ec29f8b60..afb559d472 100644 --- a/lib/rubygems/path_support.rb +++ b/lib/rubygems/path_support.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # # Gem::PathSupport facilitates the GEM_HOME and GEM_PATH environment settings @@ -59,6 +59,9 @@ class Gem::PathSupport gem_path = gpaths.dup else gem_path = gpaths.split(Gem.path_separator) + if gpaths.end_with?(Gem.path_separator) + gem_path += default_path + end end if File::ALT_SEPARATOR then @@ -69,13 +72,19 @@ class Gem::PathSupport gem_path << @home else - gem_path = Gem.default_path + [@home] - - if defined?(APPLE_GEM_HOME) - gem_path << APPLE_GEM_HOME - end + gem_path = default_path end @path = gem_path.uniq end + + # Return the default Gem path + def default_path + gem_path = Gem.default_path + [@home] + + if defined?(APPLE_GEM_HOME) + gem_path << APPLE_GEM_HOME + end + gem_path + end end |