https://git.ruby-lang.org/ruby.git/commit/?id=1857b44278

From 1857b4427817755bb0879ca67e1b2f3276f95d4c Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Wed, 25 Dec 2019 07:28:02 +0900
Subject: Merge Bundler 2.1.2 from bundler/bundler.

[Misc #16449][ruby-core:96458]

diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 88fcd4d..18da591 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -1,5 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/rubygems_integration.rb#L1
 # frozen_string_literal: true
 
+require "rubygems"
+
 module Bundler
   class RubygemsIntegration
     if defined?(Gem::Ext::Builder::CHDIR_MONITOR)
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 06d6a0f..b63e39b 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/version.rb#L1
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.1.1".freeze
+  VERSION = "2.1.2".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i
diff --git a/spec/bundler/runtime/setup_spec.rb b/spec/bundler/runtime/setup_spec.rb
index befc5f9..39240b7 100644
--- a/spec/bundler/runtime/setup_spec.rb
+++ b/spec/bundler/runtime/setup_spec.rb
@@ -1344,5 +1344,11 @@ end https://github.com/ruby/ruby/blob/trunk/spec/bundler/runtime/setup_spec.rb#L1344
       expect(last_command.stdboth).not_to include "FAIL"
       expect(err).to include "private method `require'"
     end
+
+    it "takes care of requiring rubygems" do
+      sys_exec("#{Gem.ruby} -I#{lib_dir} -e \"puts require('bundler/setup')\"", "RUBYOPT" => "--disable=gems")
+
+      expect(last_command.stdboth).to eq("true")
+    end
   end
 end
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/