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

[rubygems/rubygems] Simplify nested require exceptions

Browse source 
7fbef2f0e3
This commit is contained in:
David Rodríguez 2020-03-27 18:31:51 +01:00 • committed by Hiroshi SHIBATA
parent 43daf4d288
commit 1039c32de6
Notes: git 2020-05-08 14:14:28 +09:00
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/rubygems/core_ext/kernel_require.rb
View file

@ -156,8 +156,7 @@ module Kernel
RUBYGEMS_ACTIVATION_MONITOR.enter RUBYGEMS_ACTIVATION_MONITOR.enter
begin begin
if load_error.message.start_with?("Could not find") or if load_error.message.end_with?(path) and Gem.try_activate(path)
(load_error.message.end_with?(path) and Gem.try_activate(path))
require_again = true require_again = true
end end
ensure ensure

19
test/rubygems/test_kernel.rb
View file

@ -91,6 +91,25 @@ class TestKernel < Gem::TestCase
refute $:.any? { |p| %r{a-1/bin} =~ p } refute $:.any? { |p| %r{a-1/bin} =~ p }
end end
def test_gem_failing_inside_require_doesnt_cause_double_exceptions
File.write("activate.rb", "gem('a', '= 999')\n")
require "open3"
output, _ = Open3.capture2e(
{ "GEM_HOME" => Gem.paths.home },
Gem.ruby,
"-I",
File.expand_path("../../lib", __dir__),
"-r",
"./activate.rb"
)
load_errors = output.split("\n").select { |line| line.include?("Could not find")}
assert_equal 1, load_errors.size
end
def test_gem_bundler def test_gem_bundler
quick_gem 'bundler', '1' quick_gem 'bundler', '1'
quick_gem 'bundler', '2.a' quick_gem 'bundler', '2.a'