summaryrefslogtreecommitdiff
path: root/lib/rubygems/path_support.rb
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-01 12:43:26 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-01 12:43:26 +0000
commita21d403f21473b21b5766c2483b4325240e9edda (patch)
treebd10197f9589251f35f0f9dc6fa387f0e298a6ef /lib/rubygems/path_support.rb
parent94cfa2893ccab71341d4671201253339d56d6c97 (diff)
* 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/path_support.rb')
-rw-r--r--lib/rubygems/path_support.rb21
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