Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rubygem-bundler for openSUSE:Factory checked in at 2022-03-07 17:48:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-bundler (Old) and /work/SRC/openSUSE:Factory/.rubygem-bundler.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-bundler" Mon Mar 7 17:48:12 2022 rev:56 rq:959946 version:2.3.8 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-bundler/rubygem-bundler.changes 2022-01-28 22:12:40.582832361 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-bundler.new.1958/rubygem-bundler.changes 2022-03-07 17:49:01.483083739 +0100 @@ -1,0 +2,30 @@ +Thu Mar 3 08:20:08 UTC 2022 - Stephan Kulow <co...@suse.com> + +updated to version 2.3.8 + see installed CHANGELOG.md + + # 2.3.8 (February 23, 2022) + + ## Bug fixes: + + - Fix corrupted lockfile when running `bundle check` and having to re-resolve locally [#5344](https://github.com/rubygems/rubygems/pull/5344) + - Fix typo in multiple gemfiles warning [#5342](https://github.com/rubygems/rubygems/pull/5342) + + ## Documentation: + + - Add clarification for bundle-config "with" option [#5346](https://github.com/rubygems/rubygems/pull/5346) + + # 2.3.7 (February 9, 2022) + + ## Enhancements: + + - Don't activate `yaml` gem from Bundler [#5277](https://github.com/rubygems/rubygems/pull/5277) + - Add Reverse Dependencies section to info command [#3966](https://github.com/rubygems/rubygems/pull/3966) + + ## Bug fixes: + + - Don't silently persist `BUNDLE_WITH` and `BUNDLE_WITHOUT` envs locally [#5335](https://github.com/rubygems/rubygems/pull/5335) + - Fix `bundle config` inside an application saving configuration globally [#4152](https://github.com/rubygems/rubygems/pull/4152) + + +------------------------------------------------------------------- Old: ---- bundler-2.3.6.gem New: ---- bundler-2.3.8.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-bundler.spec ++++++ --- /var/tmp/diff_new_pack.LnZjpv/_old 2022-03-07 17:49:02.135083551 +0100 +++ /var/tmp/diff_new_pack.LnZjpv/_new 2022-03-07 17:49:02.139083550 +0100 @@ -24,7 +24,7 @@ # Name: rubygem-bundler -Version: 2.3.6 +Version: 2.3.8 Release: 0 %define mod_name bundler %define mod_full_name %{mod_name}-%{version} ++++++ bundler-2.3.6.gem -> bundler-2.3.8.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md --- old/CHANGELOG.md 2022-01-26 11:15:43.000000000 +0100 +++ new/CHANGELOG.md 2022-02-23 23:33:07.000000000 +0100 @@ -1,3 +1,26 @@ +# 2.3.8 (February 23, 2022) + +## Bug fixes: + + - Fix corrupted lockfile when running `bundle check` and having to re-resolve locally [#5344](https://github.com/rubygems/rubygems/pull/5344) + - Fix typo in multiple gemfiles warning [#5342](https://github.com/rubygems/rubygems/pull/5342) + +## Documentation: + + - Add clarification for bundle-config "with" option [#5346](https://github.com/rubygems/rubygems/pull/5346) + +# 2.3.7 (February 9, 2022) + +## Enhancements: + + - Don't activate `yaml` gem from Bundler [#5277](https://github.com/rubygems/rubygems/pull/5277) + - Add Reverse Dependencies section to info command [#3966](https://github.com/rubygems/rubygems/pull/3966) + +## Bug fixes: + + - Don't silently persist `BUNDLE_WITH` and `BUNDLE_WITHOUT` envs locally [#5335](https://github.com/rubygems/rubygems/pull/5335) + - Fix `bundle config` inside an application saving configuration globally [#4152](https://github.com/rubygems/rubygems/pull/4152) + # 2.3.6 (January 26, 2022) ## Enhancements: Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/build_metadata.rb new/lib/bundler/build_metadata.rb --- old/lib/bundler/build_metadata.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/build_metadata.rb 2022-02-23 23:33:07.000000000 +0100 @@ -4,8 +4,8 @@ # Represents metadata from when the Bundler gem was built. module BuildMetadata # begin ivars - @built_at = "2022-01-26".freeze - @git_commit_sha = "056f64c33a".freeze + @built_at = "2022-02-23".freeze + @git_commit_sha = "4e812b9ca5".freeze @release = true # end ivars diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/cli/config.rb new/lib/bundler/cli/config.rb --- old/lib/bundler/cli/config.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/cli/config.rb 2022-02-23 23:33:07.000000000 +0100 @@ -180,7 +180,7 @@ scopes = %w[global local].select {|s| options[s] } case scopes.size when 0 - @scope = "global" + @scope = inside_app? ? "local" : "global" @explicit_scope = false when 1 @scope = scopes.first @@ -189,6 +189,15 @@ "The options #{scopes.join " and "} were specified. Please only use one of the switches at a time." end end + + private + + def inside_app? + Bundler.root + true + rescue GemfileNotFound + false + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/cli/info.rb new/lib/bundler/cli/info.rb --- old/lib/bundler/cli/info.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/cli/info.rb 2022-02-23 23:33:07.000000000 +0100 @@ -73,7 +73,8 @@ gem_info << "\tBug Tracker: #{metadata["bug_tracker_uri"]}\n" if metadata.key?("bug_tracker_uri") gem_info << "\tMailing List: #{metadata["mailing_list_uri"]}\n" if metadata.key?("mailing_list_uri") gem_info << "\tPath: #{spec.full_gem_path}\n" - gem_info << "\tDefault Gem: yes" if spec.respond_to?(:default_gem?) && spec.default_gem? + gem_info << "\tDefault Gem: yes\n" if spec.respond_to?(:default_gem?) && spec.default_gem? + gem_info << "\tReverse Dependencies: \n\t\t#{gem_dependencies.join("\n\t\t")}" if gem_dependencies.any? if name != "bundler" && spec.deleted_gem? return Bundler.ui.warn "The gem #{name} has been deleted. Gemspec information is still available though:\n#{gem_info}" @@ -81,5 +82,13 @@ Bundler.ui.info gem_info end + + def gem_dependencies + @gem_dependencies ||= Bundler.definition.specs.map do |spec| + dependency = spec.dependencies.find {|dep| dep.name == gem_name } + next unless dependency + "#{spec.name} (#{spec.version}) depends on #{gem_name} (#{dependency.requirements_list.join(", ")})" + end.compact.sort + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/cli/install.rb new/lib/bundler/cli/install.rb --- old/lib/bundler/cli/install.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/cli/install.rb 2022-02-23 23:33:07.000000000 +0100 @@ -135,32 +135,13 @@ end def normalize_groups - options[:with] &&= options[:with].join(":").tr(" ", ":").split(":") - options[:without] &&= options[:without].join(":").tr(" ", ":").split(":") - check_for_group_conflicts_in_cli_options - Bundler.settings.set_command_option :with, nil if options[:with] == [] - Bundler.settings.set_command_option :without, nil if options[:without] == [] - - with = options.fetch(:with, []) - with |= Bundler.settings[:with].map(&:to_s) - with -= options[:without] if options[:without] - - without = options.fetch(:without, []) - without |= Bundler.settings[:without].map(&:to_s) - without -= options[:with] if options[:with] - - options[:with] = with - options[:without] = without - - unless Bundler.settings[:without] == options[:without] && Bundler.settings[:with] == options[:with] - # need to nil them out first to get around validation for backwards compatibility - Bundler.settings.set_command_option :without, nil - Bundler.settings.set_command_option :with, nil - Bundler.settings.set_command_option :without, options[:without] - options[:with] - Bundler.settings.set_command_option :with, options[:with] - end + # need to nil them out first to get around validation for backwards compatibility + Bundler.settings.set_command_option :without, nil + Bundler.settings.set_command_option :with, nil + Bundler.settings.set_command_option :without, options[:without] + Bundler.settings.set_command_option :with, options[:with] end def normalize_settings @@ -184,7 +165,7 @@ Bundler.settings.set_command_option_if_given :clean, options["clean"] - normalize_groups + normalize_groups if options[:without] || options[:with] options[:force] = options[:redownload] end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/definition.rb new/lib/bundler/definition.rb --- old/lib/bundler/definition.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/definition.rb 2022-02-23 23:33:07.000000000 +0100 @@ -782,6 +782,7 @@ 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 @@ end def source_map - @source_map ||= SourceMap.new(sources, dependencies) + @source_map ||= SourceMap.new(sources, dependencies, @locked_specs) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/fetcher.rb new/lib/bundler/fetcher.rb --- old/lib/bundler/fetcher.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/fetcher.rb 2022-02-23 23:33:07.000000000 +0100 @@ -240,7 +240,7 @@ raise SSLError if needs_ssl && !defined?(OpenSSL::SSL) con = PersistentHTTP.new :name => "bundler", :proxy => :ENV - if gem_proxy = Bundler.rubygems.configuration[:http_proxy] + if gem_proxy = Gem.configuration[:http_proxy] con.proxy = Bundler::URI.parse(gem_proxy) if gem_proxy != :no_proxy end @@ -251,8 +251,8 @@ end ssl_client_cert = Bundler.settings[:ssl_client_cert] || - (Bundler.rubygems.configuration.ssl_client_cert if - Bundler.rubygems.configuration.respond_to?(:ssl_client_cert)) + (Gem.configuration.ssl_client_cert if + Gem.configuration.respond_to?(:ssl_client_cert)) if ssl_client_cert pem = File.read(ssl_client_cert) con.cert = OpenSSL::X509::Certificate.new(pem) @@ -283,8 +283,8 @@ def bundler_cert_store store = OpenSSL::X509::Store.new ssl_ca_cert = Bundler.settings[:ssl_ca_cert] || - (Bundler.rubygems.configuration.ssl_ca_cert if - Bundler.rubygems.configuration.respond_to?(:ssl_ca_cert)) + (Gem.configuration.ssl_ca_cert if + Gem.configuration.respond_to?(:ssl_ca_cert)) if ssl_ca_cert if File.directory? ssl_ca_cert store.add_path ssl_ca_cert diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-add.1 new/lib/bundler/man/bundle-add.1 --- old/lib/bundler/man/bundle-add.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-add.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-binstubs.1 new/lib/bundler/man/bundle-binstubs.1 --- old/lib/bundler/man/bundle-binstubs.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-binstubs.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-cache.1 new/lib/bundler/man/bundle-cache.1 --- old/lib/bundler/man/bundle-cache.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-cache.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-check.1 new/lib/bundler/man/bundle-check.1 --- old/lib/bundler/man/bundle-check.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-check.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-clean.1 new/lib/bundler/man/bundle-clean.1 --- old/lib/bundler/man/bundle-clean.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-clean.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-config.1 new/lib/bundler/man/bundle-config.1 --- old/lib/bundler/man/bundle-config.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-config.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" 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 @@ . .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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-config.1.ronn new/lib/bundler/man/bundle-config.1.ronn --- old/lib/bundler/man/bundle-config.1.ronn 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-config.1.ronn 2022-02-23 23:33:07.000000000 +0100 @@ -83,7 +83,7 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-doctor.1 new/lib/bundler/man/bundle-doctor.1 --- old/lib/bundler/man/bundle-doctor.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-doctor.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-exec.1 new/lib/bundler/man/bundle-exec.1 --- old/lib/bundler/man/bundle-exec.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-exec.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-gem.1 new/lib/bundler/man/bundle-gem.1 --- old/lib/bundler/man/bundle-gem.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-gem.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-info.1 new/lib/bundler/man/bundle-info.1 --- old/lib/bundler/man/bundle-info.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-info.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-init.1 new/lib/bundler/man/bundle-init.1 --- old/lib/bundler/man/bundle-init.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-init.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-INIT" "1" "December 2021" "" "" +.TH "BUNDLE\-INIT" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-init\fR \- Generates a Gemfile into the current working directory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-inject.1 new/lib/bundler/man/bundle-inject.1 --- old/lib/bundler/man/bundle-inject.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-inject.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-INJECT" "1" "December 2021" "" "" +.TH "BUNDLE\-INJECT" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-inject\fR \- Add named gem(s) with version requirements to Gemfile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-install.1 new/lib/bundler/man/bundle-install.1 --- old/lib/bundler/man/bundle-install.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-install.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-INSTALL" "1" "December 2021" "" "" +.TH "BUNDLE\-INSTALL" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-install\fR \- Install the dependencies specified in your Gemfile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-list.1 new/lib/bundler/man/bundle-list.1 --- old/lib/bundler/man/bundle-list.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-list.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-LIST" "1" "December 2021" "" "" +.TH "BUNDLE\-LIST" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-list\fR \- List all the gems in the bundle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-lock.1 new/lib/bundler/man/bundle-lock.1 --- old/lib/bundler/man/bundle-lock.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-lock.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-LOCK" "1" "December 2021" "" "" +.TH "BUNDLE\-LOCK" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-lock\fR \- Creates / Updates a lockfile without installing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-open.1 new/lib/bundler/man/bundle-open.1 --- old/lib/bundler/man/bundle-open.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-open.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-OPEN" "1" "December 2021" "" "" +.TH "BUNDLE\-OPEN" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-open\fR \- Opens the source directory for a gem in your bundle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-outdated.1 new/lib/bundler/man/bundle-outdated.1 --- old/lib/bundler/man/bundle-outdated.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-outdated.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-OUTDATED" "1" "December 2021" "" "" +.TH "BUNDLE\-OUTDATED" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-outdated\fR \- List installed gems with newer versions available diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-platform.1 new/lib/bundler/man/bundle-platform.1 --- old/lib/bundler/man/bundle-platform.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-platform.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-PLATFORM" "1" "December 2021" "" "" +.TH "BUNDLE\-PLATFORM" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-platform\fR \- Displays platform compatibility information diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-pristine.1 new/lib/bundler/man/bundle-pristine.1 --- old/lib/bundler/man/bundle-pristine.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-pristine.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-PRISTINE" "1" "December 2021" "" "" +.TH "BUNDLE\-PRISTINE" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-pristine\fR \- Restores installed gems to their pristine condition diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-remove.1 new/lib/bundler/man/bundle-remove.1 --- old/lib/bundler/man/bundle-remove.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-remove.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-REMOVE" "1" "December 2021" "" "" +.TH "BUNDLE\-REMOVE" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-remove\fR \- Removes gems from the Gemfile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-show.1 new/lib/bundler/man/bundle-show.1 --- old/lib/bundler/man/bundle-show.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-show.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-SHOW" "1" "December 2021" "" "" +.TH "BUNDLE\-SHOW" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-show\fR \- Shows all the gems in your bundle, or the path to a gem diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-update.1 new/lib/bundler/man/bundle-update.1 --- old/lib/bundler/man/bundle-update.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-update.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-UPDATE" "1" "December 2021" "" "" +.TH "BUNDLE\-UPDATE" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-update\fR \- Update your gems to the latest available versions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle-viz.1 new/lib/bundler/man/bundle-viz.1 --- old/lib/bundler/man/bundle-viz.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle-viz.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE\-VIZ" "1" "December 2021" "" "" +.TH "BUNDLE\-VIZ" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\-viz\fR \- Generates a visual dependency graph for your Gemfile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/bundle.1 new/lib/bundler/man/bundle.1 --- old/lib/bundler/man/bundle.1 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/bundle.1 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BUNDLE" "1" "December 2021" "" "" +.TH "BUNDLE" "1" "February 2022" "" "" . .SH "NAME" \fBbundle\fR \- Ruby Dependency Management diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/man/gemfile.5 new/lib/bundler/man/gemfile.5 --- old/lib/bundler/man/gemfile.5 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/man/gemfile.5 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GEMFILE" "5" "December 2021" "" "" +.TH "GEMFILE" "5" "February 2022" "" "" . .SH "NAME" \fBGemfile\fR \- A format for describing gem dependencies for Ruby programs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/psyched_yaml.rb new/lib/bundler/psyched_yaml.rb --- old/lib/bundler/psyched_yaml.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/psyched_yaml.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -# frozen_string_literal: true - -begin - require "psych" -rescue LoadError - # Apparently Psych wasn't available. Oh well. -end - -# At least load the YAML stdlib, whatever that may be -require "yaml" unless defined?(YAML.dump) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/rubygems_ext.rb new/lib/bundler/rubygems_ext.rb --- old/lib/bundler/rubygems_ext.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/rubygems_ext.rb 2022-02-23 23:33:07.000000000 +0100 @@ -4,14 +4,12 @@ require "rubygems/specification" -# Possible use in Gem::Specification#source below and require -# shouldn't be deferred. -require "rubygems/source" - require_relative "match_platform" module Gem class Specification + include ::Bundler::MatchPlatform + attr_accessor :remote, :location, :relative_loaded_from remove_method :source @@ -81,6 +79,17 @@ gemfile end + # Backfill missing YAML require when not defined. Fixed since 3.1.0.pre1. + module YamlBackfiller + def to_yaml(opts = {}) + Gem.load_yaml unless defined?(::YAML) + + super(opts) + end + end + + prepend YamlBackfiller + def nondevelopment_dependencies dependencies - development_dependencies end @@ -228,9 +237,3 @@ end end end - -module Gem - class Specification - include ::Bundler::MatchPlatform - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/rubygems_integration.rb new/lib/bundler/rubygems_integration.rb --- old/lib/bundler/rubygems_integration.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/rubygems_integration.rb 2022-02-23 23:33:07.000000000 +0100 @@ -104,18 +104,6 @@ obj.to_s end - def configuration - require_relative "psyched_yaml" - Gem.configuration - rescue Gem::SystemExitException, LoadError => e - Bundler.ui.error "#{e.class}: #{e.message}" - Bundler.ui.trace e - raise - rescue ::Psych::SyntaxError => e - raise YamlSyntaxError.new(e, "Your RubyGems configuration, which is " \ - "usually located in ~/.gemrc, contains invalid YAML syntax.") - end - def ruby_engine Gem.ruby_engine end @@ -217,7 +205,7 @@ def spec_from_gem(path, policy = nil) require "rubygems/security" - require_relative "psyched_yaml" + require "psych" gem_from_path(path, security_policies[policy]).spec rescue Exception, Gem::Exception, Gem::Security::Exception => e # rubocop:disable Lint/RescueException if e.is_a?(Gem::Security::Exception) || @@ -522,7 +510,7 @@ def gem_remote_fetcher require "rubygems/remote_fetcher" - proxy = configuration[:http_proxy] + proxy = Gem.configuration[:http_proxy] Gem::RemoteFetcher.new(proxy) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/settings.rb new/lib/bundler/settings.rb --- old/lib/bundler/settings.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/settings.rb 2022-02-23 23:33:07.000000000 +0100 @@ -367,7 +367,7 @@ def to_array(value) return [] unless value - value.split(":").map(&:to_sym) + value.tr(" ", ":").split(":").map(&:to_sym) end def array_to_s(array) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/shared_helpers.rb new/lib/bundler/shared_helpers.rb --- old/lib/bundler/shared_helpers.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/shared_helpers.rb 2022-02-23 23:33:07.000000000 +0100 @@ -141,7 +141,7 @@ end return unless multiple_gemfiles message = "Multiple gemfiles (gems.rb and Gemfile) detected. " \ - "Make sure you remove Gemfile and Gemfile.lock since bundler is ignoring them in favor of gems.rb and gems.rb.locked." + "Make sure you remove Gemfile and Gemfile.lock since bundler is ignoring them in favor of gems.rb and gems.locked." Bundler.ui.warn message end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/source_map.rb new/lib/bundler/source_map.rb --- old/lib/bundler/source_map.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/source_map.rb 2022-02-23 23:33:07.000000000 +0100 @@ -2,11 +2,12 @@ module Bundler class SourceMap - attr_reader :sources, :dependencies + attr_reader :sources, :dependencies, :locked_specs - def initialize(sources, dependencies) + def initialize(sources, dependencies, locked_specs) @sources = sources @dependencies = dependencies + @locked_specs = locked_specs end def pinned_spec_names(skip = nil) @@ -53,6 +54,18 @@ end requirements end + end + + def locked_requirements + @locked_requirements ||= begin + requirements = {} + locked_specs.each do |locked_spec| + source = locked_spec.source + source.add_dependency_names(locked_spec.name) + requirements[locked_spec.name] = source + end + requirements + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler/version.rb new/lib/bundler/version.rb --- old/lib/bundler/version.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler/version.rb 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ # frozen_string_literal: false module Bundler - VERSION = "2.3.6".freeze + VERSION = "2.3.8".freeze def self.bundler_major_version @bundler_major_version ||= VERSION.split(".").first.to_i diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/bundler.rb new/lib/bundler.rb --- old/lib/bundler.rb 2022-01-26 11:15:43.000000000 +0100 +++ new/lib/bundler.rb 2022-02-23 23:33:07.000000000 +0100 @@ -654,7 +654,7 @@ private def eval_yaml_gemspec(path, contents) - require_relative "bundler/psyched_yaml" + Kernel.require "psych" Gem::Specification.from_yaml(contents) rescue ::Psych::SyntaxError, ArgumentError, Gem::EndOfYAMLException, Gem::Exception diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2022-01-26 11:15:43.000000000 +0100 +++ new/metadata 2022-02-23 23:33:07.000000000 +0100 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: bundler version: !ruby/object:Gem::Version - version: 2.3.6 + version: 2.3.8 platform: ruby authors: - Andr?? Arko @@ -22,7 +22,7 @@ autorequire: bindir: exe cert_chain: [] -date: 2022-01-26 00:00:00.000000000 Z +date: 2022-02-23 00:00:00.000000000 Z dependencies: [] description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably @@ -178,7 +178,6 @@ - lib/bundler/plugin/installer/rubygems.rb - lib/bundler/plugin/source_list.rb - lib/bundler/process_lock.rb -- lib/bundler/psyched_yaml.rb - lib/bundler/remote_specification.rb - lib/bundler/resolver.rb - lib/bundler/resolver/spec_group.rb @@ -370,7 +369,7 @@ - !ruby/object:Gem::Version version: 2.5.2 requirements: [] -rubygems_version: 3.3.6 +rubygems_version: 3.3.8 signing_key: specification_version: 4 summary: The best way to manage your application's dependencies