summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2024-06-27 19:53:27 +0200
committergit <svn-admin@ruby-lang.org>2024-07-23 19:40:08 +0000
commit5b931d9de6ca578b72ca55a134cd69863880092d (patch)
treed3b801809edb92b1e08e239d228c4fd590b3c5aa
parentb0a0eda2314968def241a94b36e25ce2affe655e (diff)
[rubygems/rubygems] Extract a `rake_path` helper
https://github.com/rubygems/rubygems/commit/0f2db73619
-rw-r--r--spec/bundler/support/builders.rb5
-rw-r--r--spec/bundler/support/path.rb4
2 files changed, 4 insertions, 5 deletions
diff --git a/spec/bundler/support/builders.rb b/spec/bundler/support/builders.rb
index 7102c1aad1..6fd3ac16f4 100644
--- a/spec/bundler/support/builders.rb
+++ b/spec/bundler/support/builders.rb
@@ -27,8 +27,6 @@ module Spec
end
def build_repo1
- rake_path = Dir["#{base_system_gems}/**/rake*.gem"].first
-
build_repo gem_repo1 do
FileUtils.cp rake_path, "#{gem_repo1}/gems/"
@@ -231,12 +229,9 @@ module Spec
end
def check_test_gems!
- rake_path = Dir["#{base_system_gems}/**/rake*.gem"].first
-
if rake_path.nil?
FileUtils.rm_rf(base_system_gems)
Spec::Rubygems.install_test_deps
- rake_path = Dir["#{base_system_gems}/**/rake*.gem"].first
end
if rake_path.nil?
diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb
index 26be5488c3..92594db9df 100644
--- a/spec/bundler/support/path.rb
+++ b/spec/bundler/support/path.rb
@@ -265,6 +265,10 @@ module Spec
ruby_core? ? source_root : source_root.parent
end
+ def rake_path
+ Dir["#{base_system_gems}/**/rake*.gem"].first
+ end
+
private
def git_ls_files(glob)