diff options
author | Bundlerbot <bot@bundler.io> | 2019-09-09 11:42:18 +0000 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-12-13 20:07:17 +0100 |
commit | 715757ee53513c4c51ac0b3bff5b5e044cd2e9aa (patch) | |
tree | 1dd76a8e96125afefb5acc616a180e863ef82b3e /Rakefile | |
parent | 9e06edc33f7f1e8eeec370ff33a279b4d9bd1b9b (diff) | |
download | bundler-715757ee53513c4c51ac0b3bff5b5e044cd2e9aa.tar.gz |
Merge #7342
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 <deivid.rodriguez@riseup.net>
(cherry picked from commit 48cb4eca964dc05b68f1c8fa2d83838da21ca182)
Diffstat (limited to 'Rakefile')
-rw-r--r-- | Rakefile | 28 |
1 files changed, 9 insertions, 19 deletions
@@ -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 |