diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-02-28 10:32:28 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-02-28 11:39:20 +0900 |
commit | ff3d7b720ec21e4856aac0b3c493bc78cbac83d4 (patch) | |
tree | 5954bdfc783adb6060337b0f7dbb1589984e6291 /lib/bundler/rubygems_integration.rb | |
parent | 02ead4a82eff7dd48153d6457929fe48f50e28df (diff) |
Merge RubyGems and Bundler master
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/5606
Diffstat (limited to 'lib/bundler/rubygems_integration.rb')
-rw-r--r-- | lib/bundler/rubygems_integration.rb | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index 785f7fa360..1c2b374d8b 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -104,18 +104,6 @@ module Bundler obj.to_s end - def configuration - require_relative "psyched_yaml" - Gem.configuration - rescue Gem::SystemExitException, LoadError => e - Bundler.ui.error "#{e.class}: #{e.message}" - Bundler.ui.trace e - raise - rescue ::Psych::SyntaxError => e - raise YamlSyntaxError.new(e, "Your RubyGems configuration, which is " \ - "usually located in ~/.gemrc, contains invalid YAML syntax.") - end - def ruby_engine Gem.ruby_engine end @@ -217,7 +205,7 @@ module Bundler def spec_from_gem(path, policy = nil) require "rubygems/security" - require_relative "psyched_yaml" + require "psych" gem_from_path(path, security_policies[policy]).spec rescue Exception, Gem::Exception, Gem::Security::Exception => e # rubocop:disable Lint/RescueException if e.is_a?(Gem::Security::Exception) || @@ -522,7 +510,7 @@ module Bundler def gem_remote_fetcher require "rubygems/remote_fetcher" - proxy = configuration[:http_proxy] + proxy = Gem.configuration[:http_proxy] Gem::RemoteFetcher.new(proxy) end |