From 8598f8c2dc78c6d1ae87cb6ae19c34ba2cb29241 Mon Sep 17 00:00:00 2001 From: hsbt Date: Fri, 8 Sep 2017 08:45:41 +0000 Subject: Merge bundler to standard libraries. rubygems 2.7.x depends bundler-1.15.x. This is preparation for rubygems and bundler migration. * lib/bundler.rb, lib/bundler/*: files of bundler-1.15.4 * spec/bundler/*: rspec examples of bundler-1.15.4. I applied patches. * https://github.com/bundler/bundler/pull/6007 * Exclude not working examples on ruby repository. * Fake ruby interpriter instead of installed ruby. * Makefile.in: Added test task named `test-bundler`. This task is only working macOS/linux yet. I'm going to support Windows environment later. * tool/sync_default_gems.rb: Added sync task for bundler. [Feature #12733][ruby-core:77172] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/sync_default_gems.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tool') diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index f533ad61bb..189048570b 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -1,6 +1,7 @@ # sync following repositories to ruby repository # # * https://github.com/rubygems/rubygems +# * https://github.com/bundler/bundler # * https://github.com/ruby/rdoc # * https://github.com/flori/json # * https://github.com/ruby/psych @@ -25,6 +26,7 @@ $repositories = { rubygems: 'rubygems/rubygems', + bundler: 'bundler/bundler', rdoc: 'ruby/rdoc', json: 'flori/json', psych: 'ruby/psych', @@ -63,6 +65,12 @@ def sync_default_gems(gem) `cp -r ../../rubygems/rubygems/lib/ubygems.rb ./lib` `cp -r ../../rubygems/rubygems/test/rubygems ./test` `cp ../../rubygems/rubygems/LICENSE.txt ./lib/rubygems` + when "bundler" + `rm -rf lib/bundler* bin/bundler bin/bundle bin/bundle_ruby spec/bundler` + `cp -r ../../bundler/bundler/lib/bundler* ./lib` + `cp -r ../../bundler/bundler/exe/bundle* ./bin` + `cp ../../bundler/bundler/bundler.gemspec ./lib` + `cp ../../bundler/bundler/spec spec/bundler when "rdoc" `rm -rf lib/rdoc* test/rdoc` `cp -rf ../rdoc/lib/rdoc* ./lib` -- cgit v1.2.3