1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Use caller_locations instead of splitting caller

Browse Source 
Also limit caller ranges

https://github.com/rubygems/rubygems/commit/a274b1af78
This commit is contained in:
Nobuyoshi Nakada 2022-12-14 02:16:43 +09:00 committed by git
parent c639bacd45
commit c032e2c225
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bundler/env.rb
View File

@ -120,7 +120,7 @@ module Bundler
specs = Bundler.rubygems.find_name(name) specs = Bundler.rubygems.find_name(name)
out << [" #{name}", "(#{specs.map(&:version).join(",")})"] unless specs.empty? out << [" #{name}", "(#{specs.map(&:version).join(",")})"] unless specs.empty?
end end
if (exe = caller.last.split(":").first)&.match? %r{(exe|bin)/bundler?\z} if (exe = caller_locations.last.absolute_path)&.match? %r{(exe|bin)/bundler?\z}
shebang = File.read(exe).lines.first shebang = File.read(exe).lines.first
shebang.sub!(/^#!\s*/, "") shebang.sub!(/^#!\s*/, "")
unless shebang.start_with?(Gem.ruby, "/usr/bin/env ruby") unless shebang.start_with?(Gem.ruby, "/usr/bin/env ruby")

2
lib/bundler/rubygems_integration.rb
View File

@ -220,7 +220,7 @@ module Bundler
[::Kernel.singleton_class, ::Kernel].each do |kernel_class| [::Kernel.singleton_class, ::Kernel].each do |kernel_class|
redefine_method(kernel_class, :gem) do |dep, *reqs| redefine_method(kernel_class, :gem) do |dep, *reqs|
if executables&.include?(File.basename(caller.first.split(":").first)) if executables&.include?(File.basename(caller_locations(1, 1).first.path))
break break
end end

2
lib/rubygems/specification.rb
View File

@ -874,7 +874,7 @@ class Gem::Specification < Gem::BasicSpecification
# You probably want to use one of the Enumerable methods instead. # You probably want to use one of the Enumerable methods instead.
def self.all def self.all
warn "NOTE: Specification.all called from #{caller.first}" unless warn "NOTE: Specification.all called from #{caller(1, 1).first}" unless
Gem::Deprecate.skip Gem::Deprecate.skip
_all _all
end end

3
spec/bundler/support/builders.rb
View File

@ -245,7 +245,8 @@ module Spec
end end
def update_repo(path, build_compact_index: true) def update_repo(path, build_compact_index: true)
if path == gem_repo1 && caller.first.split(" ").last != "`build_repo'" exempted_caller = Gem.ruby_version >= Gem::Version.new("3.4.0.dev") ? "#{Module.nesting.first}#build_repo" : "build_repo"
if path == gem_repo1 && caller_locations(1, 1).first.label != exempted_caller
raise "Updating gem_repo1 is unsupported -- use gem_repo2 instead" raise "Updating gem_repo1 is unsupported -- use gem_repo2 instead"
end end
return unless block_given? return unless block_given?