ruby-changes:71071
From: Hiroshi <ko1@a...>
Date: Wed, 2 Feb 2022 16:57:57 +0900 (JST)
Subject: [ruby-changes:71071] 6794f8cf92 (ruby_3_1): Merge pull request #5482 from hsbt/rubygems-3-3-bundler-2-3
https://git.ruby-lang.org/ruby.git/commit/?id=6794f8cf92 From 6794f8cf928ab8c009b301ec49a5a81e97e6eb2f Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Wed, 2 Feb 2022 16:57:34 +0900 Subject: Merge pull request #5482 from hsbt/rubygems-3-3-bundler-2-3 Merge RubyGems 3.3.x and Bundler 2.3.x --- common.mk | 8 +- gems/bundled_gems | 2 +- lib/bundler/cli.rb | 13 +- lib/bundler/cli/doctor.rb | 10 +- lib/bundler/cli/gem.rb | 12 +- lib/bundler/cli/platform.rb | 2 +- lib/bundler/cli/update.rb | 8 +- lib/bundler/compact_index_client.rb | 6 - lib/bundler/compact_index_client/cache.rb | 9 - lib/bundler/definition.rb | 11 +- lib/bundler/endpoint_specification.rb | 24 +- lib/bundler/env.rb | 2 +- lib/bundler/fetcher.rb | 13 +- lib/bundler/fetcher/compact_index.rb | 10 - lib/bundler/fetcher/index.rb | 26 --- lib/bundler/gem_helper.rb | 4 +- lib/bundler/lazy_specification.rb | 4 +- lib/bundler/lockfile_generator.rb | 2 +- lib/bundler/remote_specification.rb | 7 + lib/bundler/resolver.rb | 19 +- lib/bundler/resolver/spec_group.rb | 2 +- lib/bundler/ruby_version.rb | 2 +- lib/bundler/self_manager.rb | 120 ++++++++-- lib/bundler/templates/newgem/newgem.gemspec.tt | 2 +- lib/bundler/templates/newgem/standard.yml.tt | 1 + .../newgem/test/minitest/test_newgem.rb.tt | 2 +- .../thor/lib/thor/actions/inject_into_file.rb | 5 +- lib/bundler/vendor/thor/lib/thor/version.rb | 2 +- lib/bundler/version.rb | 2 +- lib/rubygems.rb | 28 +-- lib/rubygems/basic_specification.rb | 16 +- lib/rubygems/bundler_version_finder.rb | 6 +- lib/rubygems/command.rb | 8 +- lib/rubygems/commands/cleanup_command.rb | 12 +- lib/rubygems/commands/dependency_command.rb | 50 ++-- lib/rubygems/commands/fetch_command.rb | 35 ++- lib/rubygems/commands/list_command.rb | 2 +- lib/rubygems/commands/pristine_command.rb | 24 +- lib/rubygems/commands/push_command.rb | 16 +- lib/rubygems/commands/query_command.rb | 2 +- lib/rubygems/commands/rdoc_command.rb | 12 +- lib/rubygems/commands/search_command.rb | 2 +- lib/rubygems/commands/setup_command.rb | 16 +- lib/rubygems/commands/specification_command.rb | 8 +- lib/rubygems/commands/update_command.rb | 19 +- lib/rubygems/config_file.rb | 8 +- lib/rubygems/doctor.rb | 10 +- lib/rubygems/gem_runner.rb | 10 +- lib/rubygems/install_update_options.rb | 8 +- lib/rubygems/installer.rb | 63 ++++- lib/rubygems/package.rb | 22 +- lib/rubygems/package/old.rb | 2 +- lib/rubygems/platform.rb | 84 +++---- lib/rubygems/psych_additions.rb | 2 +- lib/rubygems/query_utils.rb | 34 ++- lib/rubygems/remote_fetcher.rb | 8 +- lib/rubygems/request_set/lockfile.rb | 8 +- lib/rubygems/resolver/installer_set.rb | 18 +- lib/rubygems/safe_yaml.rb | 16 +- lib/rubygems/security.rb | 2 +- lib/rubygems/source.rb | 12 +- lib/rubygems/source_list.rb | 14 +- lib/rubygems/spec_fetcher.rb | 50 ++-- lib/rubygems/specification.rb | 101 ++++---- lib/rubygems/specification_policy.rb | 32 +-- lib/rubygems/stub_specification.rb | 35 ++- lib/rubygems/uninstaller.rb | 14 +- lib/rubygems/user_interaction.rb | 24 +- lib/rubygems/version.rb | 16 +- spec/bundler/bundler/cli_spec.rb | 4 +- .../bundler/bundler/endpoint_specification_spec.rb | 7 +- spec/bundler/bundler/gem_helper_spec.rb | 15 ++ spec/bundler/commands/binstubs_spec.rb | 22 +- spec/bundler/commands/cache_spec.rb | 16 +- spec/bundler/commands/doctor_spec.rb | 6 +- spec/bundler/commands/install_spec.rb | 19 +- spec/bundler/commands/lock_spec.rb | 3 +- spec/bundler/commands/newgem_spec.rb | 24 +- spec/bundler/commands/remove_spec.rb | 4 +- spec/bundler/commands/update_spec.rb | 258 +++++++++++++++++++-- spec/bundler/install/gemfile/gemspec_spec.rb | 73 +++++- spec/bundler/install/gemfile/git_spec.rb | 11 +- spec/bundler/install/gemfile/platform_spec.rb | 10 +- spec/bundler/install/gemfile/ruby_spec.rb | 32 ++- spec/bundler/install/gemfile/sources_spec.rb | 53 +++++ spec/bundler/install/gems/dependency_api_spec.rb | 11 - spec/bundler/install/gems/resolving_spec.rb | 39 +++- spec/bundler/lock/lockfile_spec.rb | 38 ++- spec/bundler/other/platform_spec.rb | 8 +- spec/bundler/runtime/inline_spec.rb | 2 +- spec/bundler/runtime/platform_spec.rb | 14 ++ spec/bundler/runtime/self_management_spec.rb | 62 +++-- .../support/artifice/endpoint_api_missing.rb | 18 -- spec/bundler/support/artifice/vcr.rb | 2 +- spec/bundler/support/hax.rb | 10 - spec/bundler/support/helpers.rb | 10 - spec/bundler/support/rubygems_ext.rb | 2 +- test/rubygems/helper.rb | 20 +- test/rubygems/test_gem.rb | 2 + test/rubygems/test_gem_command_manager.rb | 2 +- test/rubygems/test_gem_commands_fetch_command.rb | 97 ++++++++ test/rubygems/test_gem_commands_install_command.rb | 16 ++ test/rubygems/test_gem_commands_update_command.rb | 59 +++++ test/rubygems/test_gem_installer.rb | 228 +++++++++++++----- test/rubygems/test_gem_package.rb | 4 +- test/rubygems/test_gem_stream_ui.rb | 2 +- test/rubygems/test_gem_stub_specification.rb | 16 -- test/rubygems/test_gem_version.rb | 4 + test/rubygems/utilities.rb | 8 +- tool/bundler/dev_gems.rb | 24 ++ tool/bundler/dev_gems.rb.lock | 73 ++++++ tool/bundler/rubocop_gems.rb.lock | 22 +- tool/bundler/standard_gems.rb.lock | 30 +-- tool/bundler/test_gems.rb.lock | 2 +- tool/sync_default_gems.rb | 1 + 115 files changed, 1687 insertions(+), 875 deletions(-) delete mode 100644 spec/bundler/support/artifice/endpoint_api_missing.rb create mode 100644 tool/bundler/dev_gems.rb create mode 100644 tool/bundler/dev_gems.rb.lock diff --git a/common.mk b/common.mk index 664f750a16b..e7a63fea5dc 100644 --- a/common.mk +++ b/common.mk @@ -1407,8 +1407,12 @@ yes-test-bundler-precheck: main https://github.com/ruby/ruby/blob/trunk/common.mk#L1407 no-test-bundler-prepare: no-test-bundler-precheck yes-test-bundler-prepare: yes-test-bundler-precheck $(ACTIONS_GROUP) - $(XRUBY) -C "$(srcdir)" bin/gem install --no-document \ - --install-dir .bundle --conservative "rspec:~> 3.8" "rake:~> 13.0" "parallel_tests:~> 2.29" + $(XRUBY) -C $(srcdir) -Ilib \ + -e 'ENV["GEM_HOME"] = File.expand_path(".bundle")' \ + -e 'ENV["BUNDLE_APP_CONFIG"] = File.expand_path(".bundle")' \ + -e 'ENV["BUNDLE_PATH__SYSTEM"] = "true"' \ + -e 'ENV["BUNDLE_WITHOUT"] = "lint doc"' \ + -e 'load "spec/bundler/support/bundle.rb"' -- install --gemfile=tool/bundler/dev_gems.rb $(ACTIONS_ENDGROUP) RSPECOPTS = diff --git a/gems/bundled_gems b/gems/bundled_gems index 0d5cddae809..875910dc7f5 100644 --- a/gems/bundled_gems +++ b/gems/bundled_gems @@ -11,6 +11,6 @@ net-pop 0.1.1 https://github.com/ruby/net-pop https://github.com/ruby/ruby/blob/trunk/gems/bundled_gems#L11 net-smtp 0.3.1 https://github.com/ruby/net-smtp matrix 0.4.2 https://github.com/ruby/matrix prime 0.1.2 https://github.com/ruby/prime -rbs 2.0.0 https://github.com/ruby/rbs +rbs 2.1.0 https://github.com/ruby/rbs typeprof 0.21.1 https://github.com/ruby/typeprof debug 1.4.0 https://github.com/ruby/debug diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index f6e20e7c675..16651dfad94 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -809,17 +809,10 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/cli.rb#L809 current = Gem::Version.new(VERSION) return if current >= latest - latest_installed = Bundler.rubygems.find_name("bundler").map(&:version).max - installation = "To install the latest version, run `gem install bundler#{" --pre" if latest.prerelease?}`" - if latest_installed && latest_installed > current - suggestion = "To update to the most recent installed version (#{latest_installed}), run `bundle update --bundler`" - suggestion = "#{installation}\n#{suggestion}" if latest_installed < latest - else - suggestion = installation - end - - Bundler.ui.warn "The latest bundler is #{latest}, but you are currently running #{current}.\n#{suggestion}" + Bundle (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/