Merge #7274

7274: Fix more leaks to default copy of bundler r=hsbt a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that in some places, it was still possible to end up requiring files in a different copy of bundler (the default copy). I noticed this when I removed a rubygems monkeypatch from the test suite that was preventing the default copy of bundler from being activated when requiring files.

This thing:

https://github.com/bundler/bundler/blob/e1c518363641208429f397170354054b3d28effd/spec/support/hax.rb#L15-L20

### What was your diagnosis of the problem?

My diagnosis was that I should use relative requires wherever they were missing.

### What is your fix for the problem, implemented in this PR?

My fix is to remove the rubygems hack, migrate the rest of the internal requires to be relative, and also introduce some hacks on our specs to make sure we never load the incorrect copy of bundler.

I think this PR should fix the issues in https://github.com/rubygems/rubygems/pull/2863.


Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>

1 files changed, 3 insertions, 1 deletions

diff --git a/Rakefile b/Rakefile
index 3399f4dd25..6655af7d8d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -312,7 +312,9 @@ else
   # This will be automated once https://github.com/segiddins/automatiek/pull/3
   # is included in `automatiek` and we start using the new API for vendoring
   # subdependencies.
-
+  # Besides that, we currently cherry-pick changes to use `require_relative`
+  # internally instead of regular `require`. They are pending review at
+  # https://github.com/drbrain/net-http-persistent/pull/106
   desc "Vendor a specific version of net-http-persistent"
   Automatiek::RakeTask.new("net-http-persistent") do |lib|
     lib.download = { :github => "https://github.com/drbrain/net-http-persistent" }