kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Merge Bundler 2.1.2 from bundler/bundler.

Browse source 
[Misc #16449][ruby-core:96458]
This commit is contained in:
Hiroshi SHIBATA 2019-12-25 07:28:02 +09:00
parent da0a0bae8b
commit 1857b44278
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/bundler/rubygems_integration.rb
View file

@ -1,5 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
require "rubygems"
module Bundler module Bundler
class RubygemsIntegration class RubygemsIntegration
if defined?(Gem::Ext::Builder::CHDIR_MONITOR) if defined?(Gem::Ext::Builder::CHDIR_MONITOR)

2
lib/bundler/version.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: false # frozen_string_literal: false
module Bundler module Bundler
VERSION = "2.1.1".freeze VERSION = "2.1.2".freeze
def self.bundler_major_version def self.bundler_major_version
@bundler_major_version ||= VERSION.split(".").first.to_i @bundler_major_version ||= VERSION.split(".").first.to_i

6
spec/bundler/runtime/setup_spec.rb
View file

@ -1344,5 +1344,11 @@ end
expect(last_command.stdboth).not_to include "FAIL" expect(last_command.stdboth).not_to include "FAIL"
expect(err).to include "private method `require'" expect(err).to include "private method `require'"
end 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
end end