From 715757ee53513c4c51ac0b3bff5b5e044cd2e9aa Mon Sep 17 00:00:00 2001 From: Bundlerbot Date: Mon, 9 Sep 2019 11:42:18 +0000 Subject: Merge #7342 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7342: Start using automatiek 0.3.0 r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that I added a feature to automatiek to vendor subdependencies, but we were not using it because it had not yet been released. ### What is your fix for the problem, implemented in this PR? My fix is to start using the feature now that it has been released. ### Why did you choose this fix out of the possible options? I chose this fix because it allows us to manage the `net-http-persistent` dependency in an easier way. Co-authored-by: David Rodríguez (cherry picked from commit 48cb4eca964dc05b68f1c8fa2d83838da21ca182) --- Rakefile | 28 +++++++++------------------- spec/support/rubygems_ext.rb | 2 +- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Rakefile b/Rakefile index 4b16794a10..5fe293a863 100644 --- a/Rakefile +++ b/Rakefile @@ -222,9 +222,6 @@ rescue Gem::LoadError => e desc "Vendor a specific version of net-http-persistent" task(:"net-http-persistent") { abort msg } - - desc "Vendor a specific version of connection_pool" - task(:connection_pool) { abort msg } end else desc "Vendor a specific version of molinillo" @@ -254,15 +251,8 @@ else lib.vendor_lib = "lib/bundler/vendor/fileutils" end - # Currently `net-http-persistent` and it's dependency `connection_pool` are - # vendored separately, but `connection_pool` references inside the vendored - # copy of `net-http-persistent` are not properly updated to refer to the - # vendored copy of `connection_pool`, so they need to be manually updated. - # This will be automated once https://github.com/segiddins/automatiek/pull/3 - # is included in `automatiek` and we start using the new API for vendoring - # subdependencies. - # Besides that, we currently cherry-pick changes to use `require_relative` - # internally instead of regular `require`. They are pending review at + # We currently cherry-pick changes to use `require_relative` internally + # instead of regular `require`. They are pending review at # https://github.com/drbrain/net-http-persistent/pull/106 desc "Vendor a specific version of net-http-persistent" Automatiek::RakeTask.new("net-http-persistent") do |lib| @@ -270,14 +260,14 @@ else lib.namespace = "Net::HTTP::Persistent" lib.prefix = "Bundler::Persistent" lib.vendor_lib = "lib/bundler/vendor/net-http-persistent" - end - desc "Vendor a specific version of connection_pool" - Automatiek::RakeTask.new("connection_pool") do |lib| - lib.download = { :github => "https://github.com/mperham/connection_pool" } - lib.namespace = "ConnectionPool" - lib.prefix = "Bundler" - lib.vendor_lib = "lib/bundler/vendor/connection_pool" + lib.dependency("connection_pool") do |sublib| + sublib.version = "v2.2.2" + sublib.download = { :github => "https://github.com/mperham/connection_pool" } + sublib.namespace = "ConnectionPool" + sublib.prefix = "Bundler" + sublib.vendor_lib = "lib/bundler/vendor/connection_pool" + end end end diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb index d237897b67..1d41807cc8 100644 --- a/spec/support/rubygems_ext.rb +++ b/spec/support/rubygems_ext.rb @@ -5,7 +5,7 @@ require_relative "path" module Spec module Rubygems DEV_DEPS = { - "automatiek" => "~> 0.2.0", + "automatiek" => "~> 0.3.0", "parallel_tests" => "~> 2.29", "rake" => "~> 12.0", "ronn" => "~> 0.7.3", -- cgit v1.2.1