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

[bundler/bundler] Remove old rubies stuff no longer needed

Browse source 
https://github.com/bundler/bundler/commit/36fb3287f4
This commit is contained in:
David Rodríguez 2019-08-17 22:00:52 +02:00 • committed by Hiroshi SHIBATA
parent 864f23a457
commit 5ea08883cf
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/bundler/cli/exec.rb
View file

@ -13,7 +13,7 @@ module Bundler
@cmd = args.shift @cmd = args.shift
@args = args @args = args
if Bundler.current_ruby.ruby_2? && !Bundler.current_ruby.jruby? if !Bundler.current_ruby.jruby?
@args << { :close_others => !options.keep_file_descriptors? } @args << { :close_others => !options.keep_file_descriptors? }
elsif options.keep_file_descriptors? elsif options.keep_file_descriptors?
Bundler.ui.warn "Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec." Bundler.ui.warn "Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec."

4
lib/bundler/spec_set.rb
View file

@ -162,12 +162,8 @@ module Bundler
end end
def extract_circular_gems(error) def extract_circular_gems(error)
if Bundler.current_ruby.mri? && Bundler.current_ruby.on_19?
error.message.scan(/(\w+) \([^)]/).flatten
else
error.message.scan(/@name="(.*?)"/).flatten error.message.scan(/@name="(.*?)"/).flatten
end end
end
def lookup def lookup
@lookup ||= begin @lookup ||= begin

2
spec/bundler/bundler/dsl_spec.rb
View file

@ -275,7 +275,7 @@ RSpec.describe Bundler::Dsl do
end end
end end
describe "Runtime errors", :unless => Bundler.current_ruby.on_18? do describe "Runtime errors" do
it "will raise a Bundler::GemfileError" do it "will raise a Bundler::GemfileError" do
gemfile "raise RuntimeError, 'foo'" gemfile "raise RuntimeError, 'foo'"
expect { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }. expect { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.