summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/bundler/rubygems_integration.rb2
-rw-r--r--lib/bundler/version.rb2
-rw-r--r--spec/bundler/runtime/setup_spec.rb6
3 files changed, 9 insertions, 1 deletions
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 88fcd4d9e0..18da5915a5 100644
--- 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
index 06d6a0f255..b63e39b8d2 100644
--- 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
index befc5f9d09..39240b7404 100644
--- a/spec/bundler/runtime/setup_spec.rb
+++ b/spec/bundler/runtime/setup_spec.rb
@@ -1344,5 +1344,11 @@ end
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