mirror of
https://github.com/ruby/ruby.git
synced 2025-09-15 08:33:58 +02:00
Adjust spec of bundler like as sync_default_gems
[ci skip]
This commit is contained in:
parent
60ccd1ca81
commit
1cd4db772c
1 changed files with 12 additions and 1 deletions
|
@ -540,11 +540,22 @@ module SyncDefaultGems
|
|||
end
|
||||
next if skipped
|
||||
|
||||
case gem
|
||||
when "rubygems"
|
||||
%w[bundler/spec/support/artifice/vcr_cassettes].each do |rem|
|
||||
if File.exist?(rem)
|
||||
system("git", "reset", rem)
|
||||
rm_rf(rem)
|
||||
end
|
||||
end
|
||||
system(*%w[git add spec/bundler])
|
||||
end
|
||||
|
||||
if result.empty?
|
||||
skipped = true
|
||||
elsif /^CONFLICT/ =~ result
|
||||
result = pipe_readlines(%W"git status --porcelain -z")
|
||||
result.map! {|line| line[/\A(?:.U|AA) (.*)/, 1]}
|
||||
result.map! {|line| line[/\A(?:.U|[UA]A) (.*)/, 1]}
|
||||
result.compact!
|
||||
ignore, conflict = result.partition {|name| IGNORE_FILE_PATTERN =~ name}
|
||||
unless ignore.empty?
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue