Merge Bundler 2.1.2 from bundler/bundler.

[Misc #16449][ruby-core:96458]
ruby · Dec 24, 2019 · 1857b44 · 1857b44
1 parent da0a0ba
commit 1857b44
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
@@ -1,5 +1,7 @@
 # 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
@@ -1,7 +1,7 @@
 # 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
@@ -1344,5 +1344,11 @@ def lock_with(ruby_version = nil)
       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