5 files changed, 13 insertions, 26 deletions
@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
 "source_code_uri" => "https://.com/rubygems/rubygems/tree/master/bundler",
 }
- s.required_ruby_version = ">= 2.6.0"
- s.required_rubygems_version = ">= 3.0.1"
 s.files = Dir.glob("lib/bundler{.rb,/**/*}", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
@@ -46,7 +46,7 @@ module Bundler
 @gemfile = expanded_gemfile_path
 @gemfiles << expanded_gemfile_path
 contents ||= Bundler.read_file(@gemfile.to_s)
- instance_eval(contents.dup.tap {|x| x.untaint if RUBY_VERSION < "2.7" }, gemfile.to_s, 1)
 rescue Exception => e # rubocop:disable Lint/RescueException
 message = "There was an error " \
 "#{e.is_a?(GemfileEvalError) ? "evaluating" : "parsing"} " \
@@ -46,7 +46,7 @@ module Gem
 def full_gem_path
 if source.respond_to?(:root)
- Pathname.new(loaded_from).dirname.expand_path(source.root).to_s.tap {|x| x.untaint if RUBY_VERSION < "2.7" }
 else
 rg_full_gem_path
 end
@@ -94,7 +94,7 @@ module Gem
 rg_missing_extensions?
 end
- remove_method :gem_dir if instance_methods(false).include?(:gem_dir)
 def gem_dir
 full_gem_path
 end
@@ -135,17 +135,6 @@ module Gem
 gemfile
 end
- # Backfill missing YAML require when not defined. Fixed since 3.1.0.pre1.
- module YamlBackfiller
- def to_yaml(opts = {})
- Gem.load_yaml unless defined?(::YAML)
-
- super(opts)
- end
- end
-
- prepend YamlBackfiller
-
 def nondevelopment_dependencies
 dependencies - development_dependencies
 end
@@ -382,9 +371,7 @@ module Gem
 require "rubygems/util"
 Util.singleton_class.module_eval do
- if Util.singleton_methods.include?(:glob_files_in_dir) # since 3.0.0.beta.2
- remove_method :glob_files_in_dir
- end
 def glob_files_in_dir(glob, base_path)
 Dir.glob(glob, :base => base_path).map! {|f| File.expand_path(f, base_path) }
@@ -13,13 +13,13 @@ module Bundler
 def root
 gemfile = find_gemfile
 raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
- Pathname.new(gemfile).tap {|x| x.untaint if RUBY_VERSION < "2.7" }.expand_path.parent
 end
 def default_gemfile
 gemfile = find_gemfile
 raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
- Pathname.new(gemfile).tap {|x| x.untaint if RUBY_VERSION < "2.7" }.expand_path
 end
 def default_lockfile
@@ -28,7 +28,7 @@ module Bundler
 case gemfile.basename.to_s
 when "gems.rb" then Pathname.new(gemfile.sub(/.rb$/, ".locked"))
 else Pathname.new("#{gemfile}.lock")
- end.tap {|x| x.untaint if RUBY_VERSION < "2.7" }
 end
 def default_bundle_dir
@@ -100,7 +100,7 @@ module Bundler
 #
 # @see {Bundler::PermissionError}
 def filesystem_access(path, action = :write, &block)
- yield(path.dup.tap {|x| x.untaint if RUBY_VERSION < "2.7" })
 rescue Errno::EACCES
 raise PermissionError.new(path, action)
 rescue Errno::EAGAIN
@@ -250,7 +250,7 @@ module Bundler
 def search_up(*names)
 previous = nil
- current = File.expand_path(SharedHelpers.pwd).tap {|x| x.untaint if RUBY_VERSION < "2.7" }
 until !File.directory?(current) || current == previous
 if ENV["BUNDLER_SPEC_RUN"]
@@ -299,7 +299,7 @@ module Bundler
 Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
 Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", find_gemfile.to_s
 Bundler::SharedHelpers.set_env "BUNDLER_VERSION", Bundler::VERSION
- Bundler::SharedHelpers.set_env "BUNDLER_SETUP", File.expand_path("setup", __dir__) unless RUBY_VERSION < "2.7"
 end
 def set_path
@@ -360,7 +360,7 @@ module Bundler
 def load_gemspec(file)
 stub = Gem::StubSpecification.gemspec_stub(file, install_path.parent, install_path.parent)
- stub.full_gem_path = Pathname.new(file).dirname.expand_path(root).to_s.tap {|x| x.untaint if RUBY_VERSION < "2.7" }
 StubSpecification.from_stub(stub)
 end