summaryrefslogtreecommitdiff
path: root/spec/bundler/support
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2020-05-11 17:26:43 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-05-13 07:54:37 +0900
commitfcb5a9ee46e75cef38ee79c7307dadfae7a8b865 (patch)
treecf7c08ee3508a1320081b5566692a0292c75c4e1 /spec/bundler/support
parentcf9619084b458e10402eb37615b73b4cc0d61eeb (diff)
Resolved the file path of gemspec for ruby core repository
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3086
Diffstat (limited to 'spec/bundler/support')
-rw-r--r--spec/bundler/support/helpers.rb2
-rw-r--r--spec/bundler/support/path.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb
index 7ef32a5e8e..660a6817fe 100644
--- a/spec/bundler/support/helpers.rb
+++ b/spec/bundler/support/helpers.rb
@@ -330,7 +330,7 @@ module Spec
replace_version_file(version, dir: build_path) # rubocop:disable Style/HashSyntax
- gem_command! "build bundler.gemspec", :dir => build_path
+ gem_command! "build #{shipped_gemspec}", :dir => build_path
yield(bundler_path)
ensure
diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb
index b851fa389a..c64f555d90 100644
--- a/spec/bundler/support/path.rb
+++ b/spec/bundler/support/path.rb
@@ -37,6 +37,10 @@ module Spec
@tracked_files ||= sys_exec(ruby_core? ? "git ls-files -z -- lib/bundler lib/bundler.rb spec/bundler man/bundler*" : "git ls-files -z", :dir => root).split("\x0")
end
+ def shipped_gemspec
+ @shipped_gemspec ||= ruby_core? ? "lib/bundler/bundler.gemspec" : "bundler.gemspec"
+ end
+
def shipped_files
@shipped_files ||= sys_exec(ruby_core? ? "git ls-files -z -- lib/bundler lib/bundler.rb man/bundler* libexec/bundle*" : "git ls-files -z -- lib man exe CHANGELOG.md LICENSE.md README.md bundler.gemspec", :dir => root).split("\x0")
end