ruby-changes:73471
From: David <ko1@a...>
Date: Thu, 8 Sep 2022 11:25:35 +0900 (JST)
Subject: [ruby-changes:73471] 24fd2f73d0 (master): Resync Bundler & RubyGems
https://git.ruby-lang.org/ruby.git/commit/?id=24fd2f73d0 From 24fd2f73d0835eea534225a6381551d591764002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Wed, 7 Sep 2022 07:13:04 +0200 Subject: Resync Bundler & RubyGems --- lib/bundler/bundler.gemspec | 14 +- lib/bundler/cli.rb | 2 +- lib/bundler/cli/console.rb | 4 +- lib/bundler/cli/gem.rb | 26 +-- lib/bundler/dependency.rb | 99 ++-------- lib/bundler/endpoint_specification.rb | 2 +- lib/bundler/graph.rb | 6 +- lib/bundler/lockfile_parser.rb | 6 +- 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 | 2 +- lib/bundler/man/bundle-console.1 | 53 ++++++ lib/bundler/man/bundle-console.1.ronn | 44 +++++ 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-help.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-plugin.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-version.1 | 35 ++++ lib/bundler/man/bundle-version.1.ronn | 24 +++ lib/bundler/man/bundle-viz.1 | 2 +- lib/bundler/man/bundle.1 | 6 +- lib/bundler/man/bundle.1.ronn | 3 + lib/bundler/man/gemfile.5 | 46 +---- lib/bundler/man/gemfile.5.ronn | 36 +--- lib/bundler/man/index.txt | 2 + lib/bundler/plugin/index.rb | 8 +- lib/bundler/source/rubygems.rb | 12 +- lib/rubygems/command_manager.rb | 4 +- lib/rubygems/commands/fetch_command.rb | 2 +- lib/rubygems/commands/install_command.rb | 6 +- lib/rubygems/commands/setup_command.rb | 2 +- lib/rubygems/commands/unpack_command.rb | 2 +- lib/rubygems/dependency_installer.rb | 48 ++--- lib/rubygems/indexer.rb | 2 +- lib/rubygems/installer.rb | 6 +- lib/rubygems/package/tar_header.rb | 22 +-- lib/rubygems/request_set/gem_dependency_api.rb | 208 ++++++++++----------- lib/rubygems/requirement.rb | 14 +- lib/rubygems/security.rb | 4 +- lib/rubygems/security/policies.rb | 80 ++++---- lib/rubygems/security/trust_dir.rb | 2 +- lib/rubygems/source.rb | 4 +- lib/rubygems/specification.rb | 66 +++---- lib/rubygems/stub_specification.rb | 4 +- spec/bundler/bundler/dependency_spec.rb | 106 +++++++++++ spec/bundler/commands/fund_spec.rb | 16 +- spec/bundler/commands/help_spec.rb | 4 +- spec/bundler/commands/info_spec.rb | 12 +- spec/bundler/install/gemfile/platform_spec.rb | 2 +- spec/bundler/install/gems/fund_spec.rb | 16 +- spec/bundler/realworld/dependency_api_spec.rb | 10 +- .../realworld/gemfile_source_header_spec.rb | 10 +- spec/bundler/realworld/mirror_probe_spec.rb | 10 +- spec/bundler/support/artifice/endpoint.rb | 6 +- spec/bundler/support/platforms.rb | 6 +- spec/bundler/update/gems/fund_spec.rb | 16 +- test/rubygems/test_gem.rb | 4 +- test/rubygems/test_gem_commands_update_command.rb | 12 +- test/rubygems/test_gem_config_file.rb | 2 +- ...st_gem_ext_cargo_builder_link_flag_converter.rb | 30 +-- test/rubygems/test_gem_package_tar_header.rb | 26 +-- test/rubygems/test_gem_platform.rb | 120 ++++++------ test/rubygems/test_gem_remote_fetcher.rb | 8 +- test/rubygems/test_gem_request_set.rb | 4 +- test/rubygems/test_gem_resolver_api_set.rb | 24 +-- .../test_gem_resolver_api_specification.rb | 38 ++-- test/rubygems/test_gem_security_policy.rb | 20 +- test/rubygems/test_gem_specification.rb | 18 +- test/rubygems/test_gem_uninstaller.rb | 2 +- 86 files changed, 814 insertions(+), 662 deletions(-) create mode 100644 lib/bundler/man/bundle-console.1 create mode 100644 lib/bundler/man/bundle-console.1.ronn create mode 100644 lib/bundler/man/bundle-version.1 create mode 100644 lib/bundler/man/bundle-version.1.ronn diff --git a/lib/bundler/bundler.gemspec b/lib/bundler/bundler.gemspec index 38c533b0c1..a9c9fac462 100644 --- a/lib/bundler/bundler.gemspec +++ b/lib/bundler/bundler.gemspec @@ -22,14 +22,12 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/lib/bundler/bundler.gemspec#L22 s.summary = "The best way to manage your application's dependencies" s.description = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably" - if s.respond_to?(:metadata=) - s.metadata = { - "bug_tracker_uri" => "https://github.com/rubygems/rubygems/issues?q=is%3Aopen+is%3Aissue+label%3ABundler", - "changelog_uri" => "https://github.com/rubygems/rubygems/blob/master/bundler/CHANGELOG.md", - "homepage_uri" => "https://bundler.io/", - "source_code_uri" => "https://github.com/rubygems/rubygems/", - } - end + s.metadata = { + "bug_tracker_uri" => "https://github.com/rubygems/rubygems/issues?q=is%3Aopen+is%3Aissue+label%3ABundler", + "changelog_uri" => "https://github.com/rubygems/rubygems/blob/master/bundler/CHANGELOG.md", + "homepage_uri" => "https://bundler.io/", + "source_code_uri" => "https://github.com/rubygems/rubygems/tree/master/bundler", + } s.required_ruby_version = ">= 2.3.0" s.required_rubygems_version = ">= 2.5.2" diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index 4f969b17bf..3ba4d0f8c4 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -517,7 +517,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/cli.rb#L517 end end - desc "version", "Prints the bundler's version information" + desc "version", "Prints Bundler version information" def version cli_help = current_command.name == "cli_help" if cli_help || ARGV.include?("version") diff --git a/lib/bundler/cli/console.rb b/lib/bundler/cli/console.rb index 97b8dc0663..1eb8ea8254 100644 --- a/lib/bundler/cli/console.rb +++ b/lib/bundler/cli/console.rb @@ -30,9 +30,9 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/cli/console.rb#L30 def get_constant(name) const_name = { - "pry" => :Pry, + "pry" => :Pry, "ripl" => :Ripl, - "irb" => :IRB, + "irb" => :IRB, }[name] Object.const_get(const_name) rescue NameError diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb index c4c76d1b69..8c8ebe8ff3 100644 --- a/lib/bundler/cli/gem.rb +++ b/lib/bundler/cli/gem.rb @@ -55,20 +55,20 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/cli/gem.rb#L55 end config = { - :name => name, + :name => name, :underscored_name => underscored_name, - :namespaced_path => namespaced_path, - :makefile_path => "#{underscored_name}/#{underscored_name}", - :constant_name => constant_name, - :constant_array => constant_array, - :author => git_author_name.empty? ? "TODO: Write your name" : git_author_name, - :email => git_user_email.empty? ? "TODO: Write your email address" : git_user_email, - :test => options[:test], - :ext => options[:ext], - :exe => options[:exe], - :bundler_version => bundler_dependency_version, - :git => use_git, - :github_username => github_username.empty? ? "[USERNAME]" : github_username, + :namespaced_path => namespaced_path, + :makefile_path => "#{underscored_name}/#{underscored_name}", + :constant_name => constant_name, + :constant_array => constant_array, + :author => git_author_name.empty? ? "TODO: Write your name" : git_author_name, + :email => git_user_email.empty? ? "TODO: Write your email address" : git_user_email, + :test => options[:test], + :ext => options[:ext], + :exe => options[:exe], + :bundler_version => bundler_dependency_version, + :git => use_git, + :github_username => github_username.empty? ? "[USERNAME]" : github_username, (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/