summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-09-24 03:14:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-09-24 03:14:43 +0000
commit7fbe79f63a49dfcb2dfc915e62e1797585fb9922 (patch)
tree78217c917e394853a5cb40d198c0b14e7e44983b /lib
parent85e5424a4618ced4d7e04a713e55c6ae2741756d (diff)
kernel_warn.rb: skip kernel_require.rb
* lib/rubygems/core_ext/kernel_warn.rb (Kernel#warn): skip kernel_require.rb's frames when `uplevel` option is given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/rubygems.rb1
-rwxr-xr-xlib/rubygems/core_ext/kernel_warn.rb21
2 files changed, 22 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