ruby-changes:71847
From: Hiroshi <ko1@a...>
Date: Wed, 18 May 2022 10:02:53 +0900 (JST)
Subject: [ruby-changes:71847] b5ef64a8a1 (ruby_3_1): Merge RubyGems-3.3.8 and Bundler-2.3.8
https://git.ruby-lang.org/ruby.git/commit/?id=b5ef64a8a1 From b5ef64a8a129919e035c4499e946c83b22ad0101 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Tue, 1 Mar 2022 12:11:15 +0900 Subject: Merge RubyGems-3.3.8 and Bundler-2.3.8 --- lib/bundler/definition.rb | 3 +- lib/bundler/man/bundle-add.1 | 2 +- lib/bundler/man/bundle-binstubs.1 | 2 +- lib/bundler/man/bundle-cache.1 | 2 +- lib/bundler/man/bundle-check.1 | 2 +- lib/bundler/man/bundle-clean.1 | 2 +- lib/bundler/man/bundle-config.1 | 4 +- lib/bundler/man/bundle-config.1.ronn | 2 +- lib/bundler/man/bundle-doctor.1 | 2 +- lib/bundler/man/bundle-exec.1 | 2 +- lib/bundler/man/bundle-gem.1 | 2 +- lib/bundler/man/bundle-info.1 | 2 +- lib/bundler/man/bundle-init.1 | 2 +- lib/bundler/man/bundle-inject.1 | 2 +- lib/bundler/man/bundle-install.1 | 2 +- lib/bundler/man/bundle-list.1 | 2 +- lib/bundler/man/bundle-lock.1 | 2 +- lib/bundler/man/bundle-open.1 | 2 +- lib/bundler/man/bundle-outdated.1 | 2 +- lib/bundler/man/bundle-platform.1 | 2 +- lib/bundler/man/bundle-pristine.1 | 2 +- lib/bundler/man/bundle-remove.1 | 2 +- lib/bundler/man/bundle-show.1 | 2 +- lib/bundler/man/bundle-update.1 | 2 +- lib/bundler/man/bundle-viz.1 | 2 +- lib/bundler/man/bundle.1 | 2 +- lib/bundler/man/gemfile.5 | 2 +- lib/bundler/shared_helpers.rb | 2 +- lib/bundler/source_map.rb | 17 ++++++- lib/bundler/version.rb | 2 +- lib/rubygems.rb | 2 +- spec/bundler/commands/check_spec.rb | 63 ++++++++++++++++++++++++ spec/bundler/other/major_deprecation_spec.rb | 4 +- test/rubygems/test_gem_commands_setup_command.rb | 2 + tool/bundler/dev_gems.rb.lock | 2 +- tool/bundler/rubocop_gems.rb.lock | 2 +- tool/bundler/standard_gems.rb.lock | 2 +- tool/bundler/test_gems.rb.lock | 2 +- 38 files changed, 118 insertions(+), 39 deletions(-) diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index fbe6b2c872..5760df640d 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -782,6 +782,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L782 else { :default => Source::RubygemsAggregate.new(sources, source_map) }.merge(source_map.direct_requirements) end + source_requirements.merge!(source_map.locked_requirements) unless @remote metadata_dependencies.each do |dep| source_requirements[dep.name] = sources.metadata_source end @@ -828,7 +829,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L829 end def source_map - @source_map ||= SourceMap.new(sources, dependencies) + @source_map ||= SourceMap.new(sources, dependencies, @locked_specs) end end end diff --git a/lib/bundler/man/bundle-add.1 b/lib/bundler/man/bundle-add.1 index 6c462ba839..9be796e531 100644 --- a/lib/bundler/man/bundle-add.1 +++ b/lib/bundler/man/bundle-add.1 @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/bundle-add.1#L1 .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-ADD" "1" "December 2021" "" "" +.TH "BUNDLE\-ADD" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install diff --git a/lib/bundler/man/bundle-binstubs.1 b/lib/bundler/man/bundle-binstubs.1 index 6d1b1d4247..e12d38e0cc 100644 --- a/lib/bundler/man/bundle-binstubs.1 +++ b/lib/bundler/man/bundle-binstubs.1 @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/bundle-binstubs.1#L1 .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-BINSTUBS" "1" "December 2021" "" "" +.TH "BUNDLE\-BINSTUBS" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems diff --git a/lib/bundler/man/bundle-cache.1 b/lib/bundler/man/bundle-cache.1 index acbdae0df2..36cf4df0cb 100644 --- a/lib/bundler/man/bundle-cache.1 +++ b/lib/bundler/man/bundle-cache.1 @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/bundle-cache.1#L1 .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-CACHE" "1" "December 2021" "" "" +.TH "BUNDLE\-CACHE" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-cache\fR \- Package your needed \fB\.gem\fR files into your application diff --git a/lib/bundler/man/bundle-check.1 b/lib/bundler/man/bundle-check.1 index e555c9b399..80915d6ef6 100644 --- a/lib/bundler/man/bundle-check.1 +++ b/lib/bundler/man/bundle-check.1 @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/bundle-check.1#L1 .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-CHECK" "1" "December 2021" "" "" +.TH "BUNDLE\-CHECK" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems diff --git a/lib/bundler/man/bundle-clean.1 b/lib/bundler/man/bundle-clean.1 index d403247524..ee45ea7386 100644 --- a/lib/bundler/man/bundle-clean.1 +++ b/lib/bundler/man/bundle-clean.1 @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/bundle-clean.1#L1 .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-CLEAN" "1" "December 2021" "" "" +.TH "BUNDLE\-CLEAN" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory diff --git a/lib/bundler/man/bundle-config.1 b/lib/bundler/man/bundle-config.1 index 5c07e227fd..50fb599629 100644 --- a/lib/bundler/man/bundle-config.1 +++ b/lib/bundler/man/bundle-config.1 @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/bundle-config.1#L1 .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-CONFIG" "1" "December 2021" "" "" +.TH "BUNDLE\-CONFIG" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-config\fR \- Set bundler configuration options @@ -83,7 +83,7 @@ A space\-separated list of groups referencing gems to skip during installation\. https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/bundle-config.1#L83 . .TP \fBwith\fR -A space\-separated list of groups referencing gems to include during installation\. +A space\-separated list of \fBoptional\fR groups referencing gems to include during installation\. . .SH "BUILD OPTIONS" You can use \fBbundle config\fR to give Bundler the flags to pass to the gem installer every time bundler tries to install a particular gem\. diff --git a/lib/bundler/man/bundle-config.1.ronn b/lib/bundler/man/bundle-config.1.ronn index a21aa027ad..e0533e05be 100644 --- a/lib/bundler/man/bundle-config.1.ronn +++ b/lib/bundler/man/bundle-config.1.ronn @@ -83,7 +83,7 @@ The options that can be configured are: https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/bundle-config.1.ronn#L83 A space-separated list of groups referencing gems to skip during installation. * `with`: - A space-separated list of groups referencing gems to include during installation. + A space-separated list of **optional** groups referencing gems to include during installation. ## BUILD OPTIONS diff --git a/lib/bundler/man/bundle-doctor.1 b/lib/bundler/man/bundle-doctor.1 index 87a7fe5f2f..8c41483345 100644 --- a/lib/bundler/man/bundle-doctor.1 +++ b/lib/bundler/man/bundle-doctor.1 @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/bundle-doctor.1#L1 .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-DOCTOR" "1" "December 2021" "" "" +.TH "BUNDLE\-DOCTOR" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-doctor\fR \- Checks the bundle for common problems diff --git a/lib/bundler/man/bundle-exec.1 b/lib/bundler/man/bundle-exec.1 index 69adfa7c92..bd9884ae51 100644 --- a/lib/bundler/man/bundle-exec.1 +++ b/lib/bundler/man/bundle-exec.1 @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/bundle-exec.1#L1 .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-EXEC" "1" "December 2021" "" "" +.TH "BUNDLE\-EXEC" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-exec\fR \- Execute a command in the context of the bundle diff --git a/lib/bundler/man/bundle-gem.1 b/lib/bundler/man/bundle-gem.1 index fae5c34e7e..a21a2cc3ec 100644 --- a/lib/bundler/man/bundle-gem.1 +++ b/lib/bundler/man/bundle-gem.1 @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/bundle-gem.1#L1 .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-GEM" "1" "December 2021" "" "" +.TH "BUNDLE\-GEM" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem diff --git a/lib/bundler/man/bundle-info.1 b/lib/bundler/man/bundle-info.1 index 9e1400ec56..2e9128f961 100644 --- a/lib/bundler/man/bundle-info.1 +++ b/lib/bundler/man/bundle-info.1 @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/bundle-info.1#L1 .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-INFO" "1" "December 2021" "" "" +.TH "BUNDLE\-INFO" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-info\fR \- Show information for the given gem in your bundle diff --git a/lib/ (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/