diff options
| -rw-r--r-- | lib/rubygems.rb | 1 | ||||
| -rwxr-xr-x | lib/rubygems/core_ext/kernel_warn.rb | 21 | ||||
| -rw-r--r-- | test/rubygems/test_require.rb | 18 |
3 files changed, 40 insertions, 0 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 858d910610..9716464718 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -1392,5 +1392,6 @@ Gem::Specification.load_defaults require 'rubygems/core_ext/kernel_gem' require 'rubygems/core_ext/kernel_require' +require 'rubygems/core_ext/kernel_warn' Gem.use_gemdeps diff --git a/lib/rubygems/core_ext/kernel_warn.rb b/lib/rubygems/core_ext/kernel_warn.rb new file mode 100755 index 0000000000..a06ccd39af --- /dev/null +++ b/lib/rubygems/core_ext/kernel_warn.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +if RUBY_VERSION >= "2.5" + module Kernel + path = "#{__dir__}/" + original_warn = instance_method(:warn) + Module.new {define_method(:warn, original_warn)} + original_warn = method(:warn) + + module_function define_method(:warn) {|message, uplevel: nil| + if uplevel + while (loc, = caller_locations(uplevel, 1); loc && loc.path.start_with?(path)) + uplevel += 1 + end + original_warn.call(message, uplevel: uplevel + 1) + else + original_warn.call(message) + end + } + end +end diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb index ed856c7648..65e1505bd2 100644 --- a/test/rubygems/test_require.rb +++ b/test/rubygems/test_require.rb @@ -412,6 +412,24 @@ class TestGemRequire < Gem::TestCase end end + if RUBY_VERSION >= "2.5" + def test_no_kernel_require_in_warn_with_uplevel + lib = File.realpath("../../../lib", __FILE__) + Dir.mktmpdir("warn_test") do |dir| + File.write(dir + "/sub.rb", "warn 'uplevel test', uplevel: 2\n") + File.write(dir + "/main.rb", "require 'sub'\n") + _, err = capture_subprocess_io do + system(@@ruby, "-w", "--disable=gems", "-I", lib, "-C", dir, "-I.", "main.rb") + end + assert_equal "main.rb:1: warning: uplevel test\n", err + _, err = capture_subprocess_io do + system(@@ruby, "-w", "--enable=gems", "-I", lib, "-C", dir, "-I.", "main.rb") + end + assert_equal "main.rb:1: warning: uplevel test\n", err + end + end + end + def silence_warnings old_verbose, $VERBOSE = $VERBOSE, false yield |