From 0314bc4aad8ac13f2b6d25b30b1d24a6b22f884c Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 16 Feb 2024 15:39:36 +0900 Subject: [PATCH] Try to load original gemspec from `.bundle/gems/foo-x.y.z/foo.gemspec`. `.bundle/specification/foo-x.y.z.gemspec` may be changed our toolchain --- tool/rbinstall.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 96de12846c..6670bf9740 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -1046,12 +1046,13 @@ install?(:ext, :comm, :gem, :'bundled-gems') do next if /^\s*(?:#|$)/ =~ name next unless /^(\S+)\s+(\S+).*/ =~ name gem_name = "#$1-#$2" - # Try to find the gemspec file for C ext gems - # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec - # This gemspec keep the original dependencies - path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" + # Try to find the gemspec file + path = "#{srcdir}/.bundle/gems/#{gem_name}/#{name}.gemspec" unless File.exist?(path) - path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec" + # Try to find the gemspec file for C ext gems + # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec + # This gemspec keep the original dependencies + path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" unless File.exist?(path) skipped[gem_name] = "gemspec not found" next