ruby-changes:69858
From: Hiroshi <ko1@a...>
Date: Mon, 22 Nov 2021 10:52:13 +0900 (JST)
Subject: [ruby-changes:69858] b19b2e9867 (ruby_3_0): Merge RubyGems 3.2.31 and Bundler 2.2.31
https://git.ruby-lang.org/ruby.git/commit/?id=b19b2e9867 From b19b2e98675a132b4b4a59aa130fd5a9f65d775f Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Thu, 11 Nov 2021 11:13:48 +0900 Subject: Merge RubyGems 3.2.31 and Bundler 2.2.31 --- lib/bundler/cli.rb | 4 +- lib/bundler/cli/gem.rb | 75 +- lib/bundler/definition.rb | 9 +- lib/bundler/lockfile_parser.rb | 1 + 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 | 6 +- lib/bundler/man/bundle-config.1.ronn | 4 +- lib/bundler/man/bundle-doctor.1 | 2 +- lib/bundler/man/bundle-exec.1 | 2 +- lib/bundler/man/bundle-gem.1 | 15 +- lib/bundler/man/bundle-gem.1.ronn | 16 + 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/runtime.rb | 2 +- lib/bundler/source/git/git_proxy.rb | 7 +- lib/bundler/source/rubygems.rb | 2 +- lib/bundler/spec_set.rb | 2 +- lib/bundler/templates/newgem/Gemfile.tt | 7 +- lib/bundler/templates/newgem/Rakefile.tt | 6 +- lib/bundler/templates/newgem/newgem.gemspec.tt | 24 +- lib/bundler/templates/newgem/standard.yml.tt | 4 + .../molinillo/lib/molinillo/dependency_graph.rb | 4 +- lib/bundler/vendor/tsort/lib/tsort.rb | 453 ++++ lib/bundler/vendored_tsort.rb | 4 + lib/bundler/version.rb | 2 +- lib/rubygems.rb | 2 +- lib/rubygems/command.rb | 8 +- lib/rubygems/commands/cert_command.rb | 12 +- lib/rubygems/commands/fetch_command.rb | 2 +- lib/rubygems/commands/server_command.rb | 6 +- lib/rubygems/commands/setup_command.rb | 119 +- lib/rubygems/commands/uninstall_command.rb | 2 +- lib/rubygems/commands/update_command.rb | 2 +- lib/rubygems/dependency_list.rb | 4 +- lib/rubygems/ext/builder.rb | 11 +- lib/rubygems/ext/cmake_builder.rb | 2 +- lib/rubygems/install_update_options.rb | 4 +- lib/rubygems/installer.rb | 35 +- lib/rubygems/local_remote_options.rb | 6 +- lib/rubygems/optparse.rb | 3 + lib/rubygems/optparse/lib/optionparser.rb | 2 + lib/rubygems/optparse/lib/optparse.rb | 2230 ++++++++++++++++++++ lib/rubygems/optparse/lib/optparse/ac.rb | 54 + lib/rubygems/optparse/lib/optparse/date.rb | 18 + lib/rubygems/optparse/lib/optparse/kwargs.rb | 22 + lib/rubygems/optparse/lib/optparse/shellwords.rb | 7 + lib/rubygems/optparse/lib/optparse/time.rb | 11 + lib/rubygems/optparse/lib/optparse/uri.rb | 7 + lib/rubygems/optparse/lib/optparse/version.rb | 71 + lib/rubygems/request_set.rb | 4 +- .../molinillo/lib/molinillo/dependency_graph.rb | 4 +- lib/rubygems/security_option.rb | 6 +- lib/rubygems/specification.rb | 14 +- lib/rubygems/tsort.rb | 3 + lib/rubygems/tsort/lib/tsort.rb | 454 ++++ lib/rubygems/util/licenses.rb | 2 + lib/rubygems/version_option.rb | 4 +- spec/bundler/bundler/fetcher/downloader_spec.rb | 2 +- spec/bundler/bundler/gem_helper_spec.rb | 2 +- spec/bundler/commands/exec_spec.rb | 30 + spec/bundler/commands/newgem_spec.rb | 301 ++- spec/bundler/install/gemfile/git_spec.rb | 39 +- .../install/gemfile/specific_platform_spec.rb | 4 +- spec/bundler/install/gems/standalone_spec.rb | 2 +- spec/bundler/lock/lockfile_spec.rb | 108 +- spec/bundler/other/major_deprecation_spec.rb | 48 +- spec/bundler/quality_spec.rb | 29 - spec/bundler/realworld/edgecases_spec.rb | 3 +- spec/bundler/realworld/mirror_probe_spec.rb | 23 +- spec/bundler/runtime/inline_spec.rb | 4 +- spec/bundler/runtime/platform_spec.rb | 4 +- spec/bundler/runtime/setup_spec.rb | 91 +- spec/bundler/support/filters.rb | 1 + spec/bundler/support/helpers.rb | 2 +- spec/bundler/support/path.rb | 19 + spec/bundler/support/rubygems_ext.rb | 5 + test/rubygems/encrypted_private_key.pem | 52 +- test/rubygems/helper.rb | 40 +- test/rubygems/test_gem_command.rb | 2 +- test/rubygems/test_gem_commands_cert_command.rb | 16 +- test/rubygems/test_gem_commands_fetch_command.rb | 36 + test/rubygems/test_gem_commands_server_command.rb | 6 +- test/rubygems/test_gem_commands_setup_command.rb | 69 +- test/rubygems/test_gem_commands_signin_command.rb | 2 +- .../test_gem_commands_uninstall_command.rb | 2 +- test/rubygems/test_gem_commands_yank_command.rb | 2 +- test/rubygems/test_gem_install_update_options.rb | 4 +- test/rubygems/test_gem_request.rb | 14 +- test/rubygems/test_gem_resolver.rb | 14 +- test/rubygems/test_gem_specification.rb | 11 + tool/bundler/rubocop_gems.rb.lock | 2 +- tool/bundler/standard_gems.rb.lock | 32 +- tool/bundler/test_gems.rb.lock | 2 +- 111 files changed, 4470 insertions(+), 377 deletions(-) create mode 100644 lib/bundler/templates/newgem/standard.yml.tt create mode 100644 lib/bundler/vendor/tsort/lib/tsort.rb create mode 100644 lib/bundler/vendored_tsort.rb create mode 100644 lib/rubygems/optparse.rb create mode 100644 lib/rubygems/optparse/lib/optionparser.rb create mode 100644 lib/rubygems/optparse/lib/optparse.rb create mode 100644 lib/rubygems/optparse/lib/optparse/ac.rb create mode 100644 lib/rubygems/optparse/lib/optparse/date.rb create mode 100644 lib/rubygems/optparse/lib/optparse/kwargs.rb create mode 100644 lib/rubygems/optparse/lib/optparse/shellwords.rb create mode 100644 lib/rubygems/optparse/lib/optparse/time.rb create mode 100644 lib/rubygems/optparse/lib/optparse/uri.rb create mode 100644 lib/rubygems/optparse/lib/optparse/version.rb create mode 100644 lib/rubygems/tsort.rb create mode 100644 lib/rubygems/tsort/lib/tsort.rb diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index 97c6f25a985..02c2d19c83f 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -552,7 +552,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/cli.rb#L552 method_option :version, :type => :boolean, :default => false, :aliases => "-v", :desc => "Set to show each gem version." method_option :without, :type => :array, :default => [], :aliases => "-W", :banner => "GROUP[ GROUP...]", :desc => "Exclude gems that are part of the specified named group." def viz - SharedHelpers.major_deprecation 2, "The `viz` command has been moved to the `bundle-viz` gem, see https://github.com/bundler/bundler-viz" + SharedHelpers.major_deprecation 2, "The `viz` command has been moved to the `bundle-viz` gem, see https://github.com/rubygems/bundler-graph" require_relative "cli/viz" Viz.new(options.dup).run end @@ -575,6 +575,8 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/cli.rb#L575 :desc => "Generate a test directory for your library, either rspec, minitest or test-unit. Set a default with `bundle config set --global gem.test (rspec|minitest|test-unit)`." method_option :ci, :type => :string, :lazy_default => Bundler.settings["gem.ci"] || "", :desc => "Generate CI configuration, either GitHub Actions, Travis CI, GitLab CI or CircleCI. Set a default with `bundle config set --global gem.ci (github|travis|gitlab|circle)`" + method_option :linter, :type => :string, :lazy_default => Bundler.settings["gem.linter"] || "", + :desc => "Add a linter and code formatter, either RuboCop or Standard. Set a default with `bundle config set --global gem.linter (rubocop|standard)`" method_option :github_username, :type => :string, :default => Bundler.settings["gem.github_username"], :banner => "Set your username on GitHub", : (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/