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] Improve error message when operating_system.rb fails to load

Browse source 
Show an absolute path instead of an unhelpful relative path.

https://github.com/rubygems/rubygems/commit/f1eed36e2f
This commit is contained in:
David Rodríguez 2022-06-26 19:08:25 +02:00 committed by git
parent 232e2f5981
commit f83c5de6d5
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/rubygems.rb
View file

@ -1323,8 +1323,9 @@ begin
rescue LoadError rescue LoadError
# Ignored # Ignored
rescue StandardError => e rescue StandardError => e
path = e.backtrace_locations.reverse.find {|l| l.path.end_with?("rubygems/defaults/operating_system.rb") }.path
msg = "#{e.message}\n" \ msg = "#{e.message}\n" \
"Loading the rubygems/defaults/operating_system.rb file caused an error. " \ "Loading the #{path} file caused an error. " \
"This file is owned by your OS, not by rubygems upstream. " \ "This file is owned by your OS, not by rubygems upstream. " \
"Please find out which OS package this file belongs to and follow the guidelines from your OS to report " \ "Please find out which OS package this file belongs to and follow the guidelines from your OS to report " \
"the problem and ask for help." "the problem and ask for help."

15
test/rubygems/test_rubygems.rb
View file

@ -16,7 +16,7 @@ class GemTest < Gem::TestCase
output = Gem::Util.popen(*ruby_with_rubygems_and_fake_operating_system_in_load_path(path), '-e', "'require \"rubygems\"'", { :err => [:child, :out] }).strip output = Gem::Util.popen(*ruby_with_rubygems_and_fake_operating_system_in_load_path(path), '-e', "'require \"rubygems\"'", { :err => [:child, :out] }).strip
assert !$?.success? assert !$?.success?
assert_includes output, "undefined local variable or method `intentionally_not_implemented_method'" assert_includes output, "undefined local variable or method `intentionally_not_implemented_method'"
assert_includes output, "Loading the rubygems/defaults/operating_system.rb file caused an error. " \ assert_includes output, "Loading the #{operating_system_rb_at(path)} file caused an error. " \
"This file is owned by your OS, not by rubygems upstream. " \ "This file is owned by your OS, not by rubygems upstream. " \
"Please find out which OS package this file belongs to and follow the guidelines from your OS to report " \ "Please find out which OS package this file belongs to and follow the guidelines from your OS to report " \
"the problem and ask for help." "the problem and ask for help."
@ -53,16 +53,19 @@ class GemTest < Gem::TestCase
def util_install_operating_system_rb(content) def util_install_operating_system_rb(content)
dir_lib = Dir.mktmpdir("test_operating_system_lib", @tempdir) dir_lib = Dir.mktmpdir("test_operating_system_lib", @tempdir)
dir_lib_arg = File.join dir_lib dir_lib_arg = File.join dir_lib, "lib"
dir_lib_rubygems_defaults_arg = File.join dir_lib_arg, "lib", "rubygems", "defaults" operating_system_rb = operating_system_rb_at(dir_lib_arg)
FileUtils.mkdir_p dir_lib_rubygems_defaults_arg
operating_system_rb = File.join dir_lib_rubygems_defaults_arg, "operating_system.rb" FileUtils.mkdir_p File.dirname(operating_system_rb)
File.open(operating_system_rb, 'w') {|f| f.write content } File.open(operating_system_rb, 'w') {|f| f.write content }
File.join dir_lib_arg, "lib" dir_lib_arg
end
def operating_system_rb_at(dir)
File.join dir, "rubygems", "defaults", "operating_system.rb"
end end
def ruby_with_rubygems_and_fake_operating_system_in_load_path(operating_system_path) def ruby_with_rubygems_and_fake_operating_system_in_load_path(operating_system_path)