ruby-changes:73772
From: David <ko1@a...>
Date: Thu, 29 Sep 2022 03:42:09 +0900 (JST)
Subject: [ruby-changes:73772] c7232a2a0a (master): [rubygems/rubygems] Require bundler consistently
https://git.ruby-lang.org/ruby.git/commit/?id=c7232a2a0a From c7232a2a0a8f754ac566480363cc551d88993792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Sat, 4 Dec 2021 12:57:00 +0100 Subject: [rubygems/rubygems] Require bundler consistently The `$LOAD_PATH` should be properly setup so that the local version is used. https://github.com/rubygems/rubygems/commit/03c0ab4082 --- test/rubygems/helper.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb index 8c959bae9c..5eae310222 100644 --- a/test/rubygems/helper.rb +++ b/test/rubygems/helper.rb @@ -16,12 +16,7 @@ begin https://github.com/ruby/ruby/blob/trunk/test/rubygems/helper.rb#L16 rescue Gem::LoadError end -if File.exist?(bundler_gemspec) - require_relative "../../bundler/lib/bundler" -else - require "bundler" -end - +require "bundler" require "test/unit" ENV["JARS_SKIP"] = "true" if Gem.java_platform? # avoid unnecessary and noisy `jar-dependencies` post install hook -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/