ruby-changes:66136
From: David <ko1@a...>
Date: Tue, 11 May 2021 11:29:58 +0900 (JST)
Subject: [ruby-changes:66136] cc4d8d037c (master): Simplify syncing bundler
https://git.ruby-lang.org/ruby.git/commit/?id=cc4d8d037c From cc4d8d037cd49ff338cc32969295c32ce188e384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Thu, 8 Apr 2021 10:40:53 +0200 Subject: Simplify syncing bundler These files no longer exist upstream, so they don't need to be synced. --- tool/sync_default_gems.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 7f0ecba..0a5761a 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -95,7 +95,7 @@ def sync_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L95 cp_r(Dir.glob("#{upstream}/lib/rubygems*"), "lib") cp_r("#{upstream}/test/rubygems", "test") when "bundler" - rm_rf(%w[lib/bundler lib/bundler.rb libexec/bundler libexec/bundle spec/bundler tool/bundler/*] + Dir.glob("man/{bundle*,gemfile*}")) + rm_rf(%w[lib/bundler lib/bundler.rb libexec/bundler libexec/bundle spec/bundler tool/bundler/*]) cp_r(Dir.glob("#{upstream}/bundler/lib/bundler*"), "lib") cp_r(Dir.glob("#{upstream}/bundler/exe/bundle*"), "libexec") cp_r("#{upstream}/bundler/bundler.gemspec", "lib/bundler") @@ -103,7 +103,6 @@ def sync_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L103 cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/test_gems*"), "tool/bundler") cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/rubocop_gems*"), "tool/bundler") cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/standard_gems*"), "tool/bundler") - cp_r(Dir.glob("#{upstream}/bundler/man/*.{1,5,1\.txt,5\.txt,ronn}"), "man") `git checkout lib/bundler/bundler.gemspec` rm_rf(%w[spec/bundler/support/artifice/vcr_cassettes]) when "rdoc" -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/