kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Use the gemspec in build_dir directly

Browse source
This commit is contained in:
Hiroshi SHIBATA 2020-05-13 21:58:27 +09:00
parent 65c5a39578
commit d4acf254e3
Notes: git 2020-05-14 09:11:58 +09:00 
Merged: https://github.com/ruby/ruby/pull/3105
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
spec/bundler/support/helpers.rb
View file

@ -328,9 +328,14 @@ module Spec
FileUtils.cp shipped_file, target_shipped_file, :preserve => true
end
# for Ruby core repository
if File.exist? File.join(build_path, "lib/bundler/bundler.gemspec")
FileUtils.mv File.join(build_path, "lib/bundler/bundler.gemspec"), build_path
end
replace_version_file(version, dir: build_path) # rubocop:disable Style/HashSyntax
gem_command! "build #{shipped_gemspec}", :dir => build_path
gem_command! "build bundler.gemspec", :dir => build_path
yield(bundler_path)
ensure

4
spec/bundler/support/path.rb
View file

@ -37,10 +37,6 @@ 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