From c082c6eb7c786a432bea23cf78839f64585cb630 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 7 Jul 2021 14:07:29 +0900 Subject: [PATCH] Sync RubyGems and Bundler with upstream --- lib/bundler.rb | 2 +- lib/bundler/cli/doctor.rb | 12 +- lib/bundler/cli/install.rb | 2 +- lib/bundler/compact_index_client.rb | 4 +- lib/bundler/current_ruby.rb | 8 +- lib/bundler/definition.rb | 44 +----- lib/bundler/dsl.rb | 14 +- lib/bundler/installer.rb | 8 +- lib/bundler/lockfile_parser.rb | 22 +-- lib/bundler/plugin/installer.rb | 2 +- lib/bundler/rubygems_ext.rb | 2 + lib/bundler/source/rubygems.rb | 13 -- lib/bundler/source_list.rb | 55 +++++--- .../lib/connection_pool/monotonic_time.rb | 2 +- .../lib/connection_pool/timed_stack.rb | 4 +- lib/bundler/worker.rb | 4 +- lib/rubygems.rb | 2 +- lib/rubygems/core_ext/tcpsocket_init.rb | 4 +- lib/rubygems/deprecate.rb | 59 +++++++- lib/rubygems/gemcutter_utilities.rb | 13 +- lib/rubygems/installer.rb | 2 +- lib/rubygems/remote_fetcher.rb | 15 +- lib/rubygems/request/connection_pools.rb | 2 +- lib/rubygems/request/http_pool.rb | 2 +- lib/rubygems/request_set.rb | 2 +- lib/rubygems/specification.rb | 2 +- lib/rubygems/uri_parser.rb | 8 ++ lib/rubygems/uri_parsing.rb | 23 --- lib/rubygems/user_interaction.rb | 2 +- spec/bundler/bundler/cli_spec.rb | 34 +++-- spec/bundler/bundler/definition_spec.rb | 2 +- spec/bundler/bundler/source_list_spec.rb | 42 +++--- spec/bundler/commands/doctor_spec.rb | 24 +++- spec/bundler/commands/update_spec.rb | 88 ++++++++++++ .../install/gemfile/eval_gemfile_spec.rb | 32 +++++ spec/bundler/install/gemfile/sources_spec.rb | 70 +++++++++ .../install/gems/compact_index_spec.rb | 4 +- .../install/gems/dependency_api_spec.rb | 4 +- spec/bundler/install/global_cache_spec.rb | 7 +- spec/bundler/lock/lockfile_spec.rb | 82 +---------- spec/bundler/realworld/edgecases_spec.rb | 133 +----------------- spec/bundler/realworld/slow_perf_spec.rb | 10 +- spec/bundler/spec_helper.rb | 2 +- spec/bundler/support/api_request_limit_hax.rb | 16 +++ .../artifice/compact_index_rate_limited.rb | 2 +- spec/bundler/support/artifice/endpoint.rb | 2 +- spec/bundler/support/hax.rb | 25 ---- spec/bundler/support/helpers.rb | 4 - spec/bundler/support/matchers.rb | 8 +- spec/bundler/support/path.rb | 4 + test/rubygems/helper.rb | 2 +- test/rubygems/test_gem_gemcutter_utilities.rb | 12 ++ 52 files changed, 477 insertions(+), 466 deletions(-) delete mode 100644 lib/rubygems/uri_parsing.rb create mode 100644 spec/bundler/support/api_request_limit_hax.rb diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index c95664965c99..9828fc885c94 100644 --- a/lib/bundler/rubygems_ext.rb +++ b/lib/bundler/rubygems_ext.rb @@ -134,6 +134,8 @@ def to_lock class Requirement module OrderIndependentComparison def ==(other) + return unless Gem::Requirement === other + if _requirements_sorted? && other._requirements_sorted? super else