diff options
| -rw-r--r-- | Rakefile | 28 | ||||
| -rw-r--r-- | lib/bundler/resolver/spec_group.rb | 1 | ||||
| -rw-r--r-- | spec/commands/exec_spec.rb | 2 | ||||
| -rw-r--r-- | spec/runtime/inline_spec.rb | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 | ||||
| -rw-r--r-- | spec/support/rubygems_ext.rb | 2 |
6 files changed, 13 insertions, 23 deletions
@@ -275,9 +275,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" @@ -310,15 +307,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| @@ -326,14 +316,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/lib/bundler/resolver/spec_group.rb b/lib/bundler/resolver/spec_group.rb index 119f63b5c8..e5772eed81 100644 --- a/lib/bundler/resolver/spec_group.rb +++ b/lib/bundler/resolver/spec_group.rb @@ -62,6 +62,7 @@ module Bundler end def eql?(other) + return unless other.is_a?(SpecGroup) name.eql?(other.name) && version.eql?(other.version) && source.eql?(other.source) diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb index a36b303060..cf76d3fb93 100644 --- a/spec/commands/exec_spec.rb +++ b/spec/commands/exec_spec.rb @@ -55,7 +55,7 @@ RSpec.describe "bundle exec" do expect(out).to eq("hi") end - it "respects custom process title when loading through ruby", :github_action_linux do + it "respects custom process title when loading through ruby" do script_that_changes_its_own_title_and_checks_if_picked_up_by_ps_unix_utility = <<~'RUBY' Process.setproctitle("1-2-3-4-5-6-7-8-9-10-11-12-13-14-15") puts `ps -ocommand= -p#{$$}` diff --git a/spec/runtime/inline_spec.rb b/spec/runtime/inline_spec.rb index 6c268a7c10..92243a77b6 100644 --- a/spec/runtime/inline_spec.rb +++ b/spec/runtime/inline_spec.rb @@ -90,7 +90,7 @@ RSpec.describe "bundler/inline#gemfile" do expect(out).to include("Installing activesupport") err.gsub! %r{(.*lib/sinatra/base\.rb:\d+: warning: constant ::Fixnum is deprecated$)}, "" err_lines = err.split("\n") - err_lines.reject!{|line| line =~ /\.rb:\d+: warning: The last/ } + err_lines.reject!{|line| line =~ /\.rb:\d+: warning: / } expect(err_lines).to be_empty expect(exitstatus).to be_zero if exitstatus end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f10f6c464f..58d498e070 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -71,7 +71,6 @@ RSpec.configure do |config| config.filter_run_excluding :bundler => RequirementChecker.against(Bundler::VERSION.split(".")[0]) config.filter_run_excluding :ruby_repo => !ENV["GEM_COMMAND"].nil? config.filter_run_excluding :no_color_tty => Gem.win_platform? || !ENV["GITHUB_ACTION"].nil? - config.filter_run_excluding :github_action_linux => !ENV["GITHUB_ACTION"].nil? && (ENV["RUNNER_OS"] == "Linux") config.filter_run_when_matching :focus unless ENV["CI"] diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb index faa474a917..faa44b0944 100644 --- a/spec/support/rubygems_ext.rb +++ b/spec/support/rubygems_ext.rb @@ -7,7 +7,7 @@ require "fileutils" 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", |