diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-12-25 07:28:02 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-12-25 07:28:02 +0900 |
| commit | 1857b4427817755bb0879ca67e1b2f3276f95d4c (patch) | |
| tree | 2a1f64ac6bb954e668944ae10e8d2c506c60123b | |
| parent | da0a0bae8b50087d140309b27eb4d4b4776c27e4 (diff) | |
| download | ruby-1857b4427817755bb0879ca67e1b2f3276f95d4c.tar.gz | |
Merge Bundler 2.1.2 from bundler/bundler.
[Misc #16449][ruby-core:96458]
| -rw-r--r-- | lib/bundler/rubygems_integration.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/runtime/setup_spec.rb | 6 |
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 |