1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Merge master branch from rubygems upstream.

* It's preparation to release RubyGems 3.0.0.beta2 and Ruby 2.6.0
    preview 3.
  * https://github.com/rubygems/rubygems/compare/v3.0.0.beta1...fad2eb15a282b19dfcb4b48bc95b8b39ebb4511f

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2018-08-27 10:05:04 +00:00
parent 3a83ba90c3
commit 85d461456c
56 changed files with 868 additions and 242 deletions

View file

@ -23,12 +23,14 @@ class Gem::PathSupport
# hashtable, or defaults to ENV, the system environment.
#
def initialize(env)
@home = env["GEM_HOME"] || Gem.default_dir
@home = env["GEM_HOME"] || Gem.default_dir
if File::ALT_SEPARATOR then
@home = @home.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
@home = @home.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
end
@home = expand(@home)
@path = split_gem_path env["GEM_PATH"], @home
@spec_cache_dir = env["GEM_SPEC_CACHE"] || Gem.default_spec_cache_dir
@ -65,7 +67,7 @@ class Gem::PathSupport
gem_path = default_path
end
gem_path.uniq
gem_path.map { |path| expand(path) }.uniq
end
# Return the default Gem path
@ -77,4 +79,12 @@ class Gem::PathSupport
end
gem_path
end
def expand(path)
if File.directory?(path)
File.realpath(path)
else
path
end
end
end