rubygems-update 3.3.18 → 3.4.19

data/CONTRIBUTING.md

@@ -29,13 +29,26 @@ here: https://guides.rubygems.org/contributing/
 
 ## Getting Started
 
+### Installing dependencies
+
     rake setup
 
-> Optionally you can configure git hooks with: rake git_hooks
+> **NOTE**: If the above fails with permission related errors, you're most
+> likely using a global Ruby installation (like the one packaged by your OS),
+> which sets `GEM_HOME` to a location regular users can't write to. Consider
+> using a Ruby version manager like [RVM](https://github.com/rvm/rvm),
+> [rbenv](https://github.com/rbenv/rbenv),
+> [chruby](https://github.com/postmodern/chruby) or [asdf](https://github.com/asdf-vm/asdf-ruby). These will install Ruby to a
+> location regular users can write to, so you won't run into permission issues.
+> Alternatively, consider setting `GEM_HOME` environment variable to a writable
+> location with something like `export GEM_HOME=/tmp/rubygems.gems` and try
+> again.
+
+### Manually trying your local changes
 
 To run commands like `gem install` from the repo:
 
-    ruby -Ilib bin/gem install
+    ruby -Ilib exe/gem install
 
 To run commands like `bundle install` from the repo:
 
@@ -43,15 +56,15 @@ To run commands like `bundle install` from the repo:
 
 ### Running Tests
 
-To run the entire test suite you can use: 
+To run the entire test suite you can use:
 
     rake test
 
-To run an individual test file located for example in `test/rubygems/test_deprecate.rb` you can use: 
+To run an individual test file located for example in `test/rubygems/test_deprecate.rb` you can use:
 
     ruby -Ilib:test:bundler/lib test/rubygems/test_deprecate.rb
-    
-And to run an individual test method named `test_default` within a test file, you can use: 
+
+And to run an individual test method named `test_default` within a test file, you can use:
 
     ruby -Ilib:test:bundler/lib test/rubygems/test_deprecate.rb -n /test_default/
 
@@ -67,14 +80,24 @@ To run the entire bundler test suite in parallel (it takes a while):
 
     bin/parallel_rspec
 
-To run the entire bundler test suite sequentially (get a coffee because it's very slow):
+There are some realworld higher level specs run in CI, but not run by `bin/parallel_rspec`. You can run those with:
 
-    bin/rspec
+    bin/rake spec:realworld
 
 To run an individual test file location for example in `spec/install/gems/standalone_spec.rb` you can use:
 
     bin/rspec spec/install/gems/standalone_spec.rb
 
+### Checking code style
+
+You can check compliance with our code style with
+
+    rake rubocop
+
+Optionally you can configure git hooks with to check this before every commit with
+
+    rake git_hooks
+
 ## Issues
 
 RubyGems uses labels to track all issues and pull requests. In order to

data/Manifest.txt

@@ -8,8 +8,6 @@ Manifest.txt
 POLICIES.md
 README.md
 UPGRADING.md
-bin/gem
-bin/update_rubygems
 bundler/CHANGELOG.md
 bundler/LICENSE.md
 bundler/README.md
@@ -57,7 +55,6 @@ bundler/lib/bundler/compact_index_client/updater.rb
 bundler/lib/bundler/constants.rb
 bundler/lib/bundler/current_ruby.rb
 bundler/lib/bundler/definition.rb
-bundler/lib/bundler/dep_proxy.rb
 bundler/lib/bundler/dependency.rb
 bundler/lib/bundler/deployment.rb
 bundler/lib/bundler/deprecate.rb
@@ -74,6 +71,7 @@ bundler/lib/bundler/fetcher/compact_index.rb
 bundler/lib/bundler/fetcher/dependency.rb
 bundler/lib/bundler/fetcher/downloader.rb
 bundler/lib/bundler/fetcher/index.rb
+bundler/lib/bundler/force_platform.rb
 bundler/lib/bundler/friendly_errors.rb
 bundler/lib/bundler/gem_helper.rb
 bundler/lib/bundler/gem_helpers.rb
@@ -103,12 +101,16 @@ bundler/lib/bundler/man/bundle-clean.1
 bundler/lib/bundler/man/bundle-clean.1.ronn
 bundler/lib/bundler/man/bundle-config.1
 bundler/lib/bundler/man/bundle-config.1.ronn
+bundler/lib/bundler/man/bundle-console.1
+bundler/lib/bundler/man/bundle-console.1.ronn
 bundler/lib/bundler/man/bundle-doctor.1
 bundler/lib/bundler/man/bundle-doctor.1.ronn
 bundler/lib/bundler/man/bundle-exec.1
 bundler/lib/bundler/man/bundle-exec.1.ronn
 bundler/lib/bundler/man/bundle-gem.1
 bundler/lib/bundler/man/bundle-gem.1.ronn
+bundler/lib/bundler/man/bundle-help.1
+bundler/lib/bundler/man/bundle-help.1.ronn
 bundler/lib/bundler/man/bundle-info.1
 bundler/lib/bundler/man/bundle-info.1.ronn
 bundler/lib/bundler/man/bundle-init.1
@@ -127,6 +129,8 @@ bundler/lib/bundler/man/bundle-outdated.1
 bundler/lib/bundler/man/bundle-outdated.1.ronn
 bundler/lib/bundler/man/bundle-platform.1
 bundler/lib/bundler/man/bundle-platform.1.ronn
+bundler/lib/bundler/man/bundle-plugin.1
+bundler/lib/bundler/man/bundle-plugin.1.ronn
 bundler/lib/bundler/man/bundle-pristine.1
 bundler/lib/bundler/man/bundle-pristine.1.ronn
 bundler/lib/bundler/man/bundle-remove.1
@@ -135,6 +139,8 @@ bundler/lib/bundler/man/bundle-show.1
 bundler/lib/bundler/man/bundle-show.1.ronn
 bundler/lib/bundler/man/bundle-update.1
 bundler/lib/bundler/man/bundle-update.1.ronn
+bundler/lib/bundler/man/bundle-version.1
+bundler/lib/bundler/man/bundle-version.1.ronn
 bundler/lib/bundler/man/bundle-viz.1
 bundler/lib/bundler/man/bundle-viz.1.ronn
 bundler/lib/bundler/man/bundle.1
@@ -142,7 +148,9 @@ bundler/lib/bundler/man/bundle.1.ronn
 bundler/lib/bundler/man/gemfile.5
 bundler/lib/bundler/man/gemfile.5.ronn
 bundler/lib/bundler/man/index.txt
+bundler/lib/bundler/match_metadata.rb
 bundler/lib/bundler/match_platform.rb
+bundler/lib/bundler/match_remote_metadata.rb
 bundler/lib/bundler/mirror.rb
 bundler/lib/bundler/plugin.rb
 bundler/lib/bundler/plugin/api.rb
@@ -157,6 +165,11 @@ bundler/lib/bundler/plugin/source_list.rb
 bundler/lib/bundler/process_lock.rb
 bundler/lib/bundler/remote_specification.rb
 bundler/lib/bundler/resolver.rb
+bundler/lib/bundler/resolver/base.rb
+bundler/lib/bundler/resolver/candidate.rb
+bundler/lib/bundler/resolver/incompatibility.rb
+bundler/lib/bundler/resolver/package.rb
+bundler/lib/bundler/resolver/root.rb
 bundler/lib/bundler/resolver/spec_group.rb
 bundler/lib/bundler/retry.rb
 bundler/lib/bundler/ruby_dsl.rb
@@ -165,6 +178,7 @@ bundler/lib/bundler/rubygems_ext.rb
 bundler/lib/bundler/rubygems_gem_installer.rb
 bundler/lib/bundler/rubygems_integration.rb
 bundler/lib/bundler/runtime.rb
+bundler/lib/bundler/safe_marshal.rb
 bundler/lib/bundler/self_manager.rb
 bundler/lib/bundler/settings.rb
 bundler/lib/bundler/settings/validator.rb
@@ -190,9 +204,9 @@ bundler/lib/bundler/templates/Executable
 bundler/lib/bundler/templates/Executable.bundler
 bundler/lib/bundler/templates/Executable.standalone
 bundler/lib/bundler/templates/Gemfile
-bundler/lib/bundler/templates/gems.rb
 bundler/lib/bundler/templates/newgem/CHANGELOG.md.tt
 bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
+bundler/lib/bundler/templates/newgem/Cargo.toml.tt
 bundler/lib/bundler/templates/newgem/Gemfile.tt
 bundler/lib/bundler/templates/newgem/LICENSE.txt.tt
 bundler/lib/bundler/templates/newgem/README.md.tt
@@ -201,9 +215,12 @@ bundler/lib/bundler/templates/newgem/bin/console.tt
 bundler/lib/bundler/templates/newgem/bin/setup.tt
 bundler/lib/bundler/templates/newgem/circleci/config.yml.tt
 bundler/lib/bundler/templates/newgem/exe/newgem.tt
-bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt
+bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt
+bundler/lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt
+bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt
 bundler/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt
 bundler/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt
+bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt
 bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt
 bundler/lib/bundler/templates/newgem/gitignore.tt
 bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt
@@ -220,12 +237,12 @@ bundler/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt
 bundler/lib/bundler/templates/newgem/test/minitest/test_newgem.rb.tt
 bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt
 bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt
-bundler/lib/bundler/templates/newgem/travis.yml.tt
 bundler/lib/bundler/ui.rb
 bundler/lib/bundler/ui/rg_proxy.rb
 bundler/lib/bundler/ui/shell.rb
 bundler/lib/bundler/ui/silent.rb
 bundler/lib/bundler/uri_credentials_filter.rb
+bundler/lib/bundler/uri_normalizer.rb
 bundler/lib/bundler/vendor/.document
 bundler/lib/bundler/vendor/connection_pool/LICENSE
 bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb
@@ -234,32 +251,28 @@ bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
 bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb
 bundler/lib/bundler/vendor/fileutils/LICENSE.txt
 bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb
-bundler/lib/bundler/vendor/molinillo/LICENSE
-bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb
 bundler/lib/bundler/vendor/net-http-persistent/README.rdoc
 bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
 bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb
 bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb
 bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb
+bundler/lib/bundler/vendor/pub_grub/LICENSE.txt
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb
 bundler/lib/bundler/vendor/thor/LICENSE.md
 bundler/lib/bundler/vendor/thor/lib/thor.rb
 bundler/lib/bundler/vendor/thor/lib/thor/actions.rb
@@ -292,7 +305,6 @@ bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb
 bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb
 bundler/lib/bundler/vendor/thor/lib/thor/util.rb
 bundler/lib/bundler/vendor/thor/lib/thor/version.rb
-bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb
 bundler/lib/bundler/vendor/tsort/LICENSE.txt
 bundler/lib/bundler/vendor/tsort/lib/tsort.rb
 bundler/lib/bundler/vendor/uri/LICENSE.txt
@@ -312,17 +324,17 @@ bundler/lib/bundler/vendor/uri/lib/uri/version.rb
 bundler/lib/bundler/vendor/uri/lib/uri/ws.rb
 bundler/lib/bundler/vendor/uri/lib/uri/wss.rb
 bundler/lib/bundler/vendored_fileutils.rb
-bundler/lib/bundler/vendored_molinillo.rb
 bundler/lib/bundler/vendored_persistent.rb
+bundler/lib/bundler/vendored_pub_grub.rb
 bundler/lib/bundler/vendored_thor.rb
-bundler/lib/bundler/vendored_tmpdir.rb
 bundler/lib/bundler/vendored_tsort.rb
 bundler/lib/bundler/vendored_uri.rb
 bundler/lib/bundler/version.rb
-bundler/lib/bundler/version_ranges.rb
 bundler/lib/bundler/vlad.rb
 bundler/lib/bundler/worker.rb
 bundler/lib/bundler/yaml_serializer.rb
+exe/gem
+exe/update_rubygems
 hide_lib_for_update/note.txt
 lib/rubygems.rb
 lib/rubygems/available_set.rb
@@ -337,6 +349,7 @@ lib/rubygems/commands/cleanup_command.rb
 lib/rubygems/commands/contents_command.rb
 lib/rubygems/commands/dependency_command.rb
 lib/rubygems/commands/environment_command.rb
+lib/rubygems/commands/exec_command.rb
 lib/rubygems/commands/fetch_command.rb
 lib/rubygems/commands/generate_index_command.rb
 lib/rubygems/commands/help_command.rb
@@ -390,6 +403,9 @@ lib/rubygems/ext/ext_conf_builder.rb
 lib/rubygems/ext/rake_builder.rb
 lib/rubygems/gem_runner.rb
 lib/rubygems/gemcutter_utilities.rb
+lib/rubygems/gemcutter_utilities/webauthn_listener.rb
+lib/rubygems/gemcutter_utilities/webauthn_listener/response.rb
+lib/rubygems/gemcutter_utilities/webauthn_poller.rb
 lib/rubygems/indexer.rb
 lib/rubygems/install_default_message.rb
 lib/rubygems/install_message.rb
@@ -496,6 +512,7 @@ lib/rubygems/security/policy.rb
 lib/rubygems/security/signer.rb
 lib/rubygems/security/trust_dir.rb
 lib/rubygems/security_option.rb
+lib/rubygems/shellwords.rb
 lib/rubygems/source.rb
 lib/rubygems/source/git.rb
 lib/rubygems/source/installed.rb
@@ -518,6 +535,7 @@ lib/rubygems/tsort/LICENSE.txt
 lib/rubygems/tsort/lib/tsort.rb
 lib/rubygems/uninstaller.rb
 lib/rubygems/unknown_command_spell_checker.rb
+lib/rubygems/update_suggestion.rb
 lib/rubygems/uri.rb
 lib/rubygems/uri_formatter.rb
 lib/rubygems/user_interaction.rb
@@ -533,6 +551,7 @@ test/rubygems/alternate_cert.pem
 test/rubygems/alternate_cert_32.pem
 test/rubygems/alternate_key.pem
 test/rubygems/bad_rake.rb
+test/rubygems/bundler_test_gem.rb
 test/rubygems/ca_cert.pem
 test/rubygems/child_cert.pem
 test/rubygems/child_cert_32.pem
@@ -565,7 +584,9 @@ test/rubygems/invalid_signer_cert_32.pem
 test/rubygems/invalidchild_cert.pem
 test/rubygems/invalidchild_cert_32.pem
 test/rubygems/invalidchild_key.pem
+test/rubygems/multifactor_auth_utilities.rb
 test/rubygems/package/tar_test_case.rb
+test/rubygems/packages/Bluebie-legs-0.6.2.gem
 test/rubygems/packages/ascii_binder-0.1.10.1.gem
 test/rubygems/packages/ill-formatted-platform-1.0.0.10.gem
 test/rubygems/plugin/exception/rubygems_plugin.rb
@@ -603,6 +624,7 @@ test/rubygems/test_gem_commands_cleanup_command.rb
 test/rubygems/test_gem_commands_contents_command.rb
 test/rubygems/test_gem_commands_dependency_command.rb
 test/rubygems/test_gem_commands_environment_command.rb
+test/rubygems/test_gem_commands_exec_command.rb
 test/rubygems/test_gem_commands_fetch_command.rb
 test/rubygems/test_gem_commands_generate_index_command.rb
 test/rubygems/test_gem_commands_help_command.rb
@@ -639,15 +661,14 @@ test/rubygems/test_gem_doctor.rb
 test/rubygems/test_gem_ext_builder.rb
 test/rubygems/test_gem_ext_cargo_builder.rb
 test/rubygems/test_gem_ext_cargo_builder/custom_name/.gitignore
-test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock
-test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml
-test/rubygems/test_gem_ext_cargo_builder/custom_name/build.rb
 test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec
-test/rubygems/test_gem_ext_cargo_builder/custom_name/src/lib.rs
+test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock
+test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml
+test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/src/lib.rs
+test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb
 test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/.gitignore
 test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock
 test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml
-test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/build.rb
 test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/rust_ruby_example.gemspec
 test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs
 test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb
@@ -726,6 +747,7 @@ test/rubygems/test_gem_stub_specification.rb
 test/rubygems/test_gem_text.rb
 test/rubygems/test_gem_uninstaller.rb
 test/rubygems/test_gem_unsatisfiable_dependency_error.rb
+test/rubygems/test_gem_update_suggestion.rb
 test/rubygems/test_gem_uri.rb
 test/rubygems/test_gem_uri_formatter.rb
 test/rubygems/test_gem_util.rb
@@ -737,6 +759,9 @@ test/rubygems/test_project_sanity.rb
 test/rubygems/test_remote_fetch_error.rb
 test/rubygems/test_require.rb
 test/rubygems/test_rubygems.rb
+test/rubygems/test_webauthn_listener.rb
+test/rubygems/test_webauthn_listener_response.rb
+test/rubygems/test_webauthn_poller.rb
 test/rubygems/utilities.rb
 test/rubygems/wrong_key_cert.pem
 test/rubygems/wrong_key_cert_32.pem

data/POLICIES.md

@@ -42,8 +42,19 @@ at version 2.7, so when RubyGems 2.8 is released, it will only support Ruby
 
 ## Release Process
 
-Releases of new versions should follow these steps, to ensure the process is
-smooth and no needed steps are missed.
+### Permissions
+
+You'll need the following environment variables set to release RubyGems &
+Bundler:
+
+* AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY: to be able to push RubyGems zip
+  files to s3 so that they appear at RubyGems [download page].
+
+* GITHUB_RELEASE_PAT: A [GitHub PAT] with repo permissions, in order to push
+  GitHub releases and to use the GitHub API for changelog generation.
+
+[download page]: https://rubygems.org/pages/download
+[GitHub PAT]: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token
 
 ### Recommendations for security releases
 
@@ -54,30 +65,54 @@ smooth and no needed steps are missed.
     have to work on weekends.
 *   Continue with the regular release process below.
 
+### Automatic changelog and backport generation
+
+PR labels and titles are used to automatically generate changelogs for patch and
+minor releases.
+
+When releasing, a changelog generation script goes through all PRs that have
+never made it into a release, and selects only the ones with specific labels as
+detailed in the `.changelog.yml` and `bundler/.changelog.yml` files. Those
+particular PRs get backported to the stable branch and included in the release
+changelog.
+
+If PRs don't have a proper label, they won't be backported to patch releases.
+
+If you want a PR to be backported to a patch level release, but don't want to
+include it in the changelog, you can use the special `rubygems: backport` and
+`bundler: backport` labels. For example, this is useful when backporting a PR
+generates conflicts that are solved by backporting another PR with no user
+visible changes. You can use these special labels to also backport the other PR
+and not get any conflicts.
 
 ### Steps for patch releases
 
 *   Confirm all PRs that you want backported are properly tagged with `rubygems:
     <type>` or `bundler: <type>` labels at GitHub.
-*   Run `rake prepare_release[<target_version>]`, create a PR and merge it
-    to the stable branch once CI passes.
-*   Switch to the stable branch and pull the PR just merged.
-*   Release `bundler` with `(cd bundler && bin/rake release)`.
+*   Run `rake prepare_release[<target_version>]`. This will create a PR to the
+    stable branch with the backports included in the release, and proper
+    changelogs and version bumps. It will also create a PR to merge release
+    changelogs into master.
+*   Once CI passes, merge the release PR, switch to the stable branch and pull
+    the PR just merged.
+*   Release `bundler` with `rake bundler:release`.
 *   Release `rubygems` with `rake release`.
 
 ### Steps for minor and major releases
 
 *   Confirm all PRs that you want listed in changelogs are properly tagged with
     `rubygems: <type>` or `bundler: <type>` labels at GitHub.
-*   Run `rake prepare_release[<target_version>]`.
-*   Add the new stable branch `x.y` where `x.y` are the first two components of
-    the rubygems version being released to the CI workflows as an extra commit
-    on top of what the `prepare_release` task generated.
-*   Create a PR to the main branch, and merge it once CI passes.
-*   From the main branch, cut a new stable branch with `git pull && git checkout
-    -b x.y`.
-*   Push the stable branch and wait for CI to be green.
-*   Release `bundler` with `(cd bundler && bin/rake release)`.
+*   Run `rake prepare_release[<target_version>]`. This will create a new stable
+    branch off the master branch, and create a PR to it with the proper version
+    bumps and changelogs. It will also create a PR to merge release changelogs
+    into master.
+*   Replace the stable branch in the workflows with the new stable branch, and
+    push that change to the release PR.
+*   Replace version numbers with the next ".dev" version, and push that change
+    to the master PR.
+*   Once CI passes, merge the release PR, switch to  the stable branch and pull
+    the PR just merged.
+*   Release `bundler` with `rake bundler:release`.
 *   Release `rubygems` with `rake release`.
 
 ## Committer Access
@@ -93,8 +128,8 @@ permissions compromised or exposed.
 
 ## Changing These Policies
 
-These policies were set in order to reduce the burden of maintenance and to
-keep committers current with existing development and policies. RubyGems work
-is primarily volunteer-driven which limits the ability to provide long-term
-support. By joining [Ruby Together](https://rubytogether.org) you can help
-extend support for older RubyGems versions.
+These policies were set in order to reduce the burden of maintenance and to keep
+committers current with existing development and policies. RubyGems work is
+primarily volunteer-driven which limits the ability to provide long-term
+support. By joining [Ruby Central](https://rubycentral.org/#/portal/signup) you
+can help extend support for older RubyGems versions.

data/README.md

@@ -64,6 +64,22 @@ To upgrade to the latest RubyGems, run:
 
 See [UPGRADING](UPGRADING.md) for more details and alternative instructions.
 
+## Release policy
+
+RubyGems and Bundler are released in sync, although they do not share their
+major version number. It is planned that also their major version numbers will
+be sync'ed in the future.
+
+The release policy is somewhat similar to the release policy of Ruby itself:
+
+* Frequent patch releases (every 2-4 weeks) including bug fixes, minor
+  enhancements, small features, or even medium sized features declared as
+  experimental for battle testing.
+* Yearly minor releases including bigger features, and minor breaking changes
+  (affecting only edge cases and a very small set of users).
+* Occasional major releases (replacing yearly minors) including major breaking
+  changes.
+
 ## Documentation
 
 RubyGems uses [rdoc](https://github.com/rdoc/rdoc) for documentation. A compiled set of the docs
@@ -79,23 +95,20 @@ creating a new gem, security practices and other resources at https://guides.rub
 Got a bug and you're not sure?  You're sure you have a bug, but don't know
 what to do next?  In any case, let us know about it!  The best place
 for letting the RubyGems team know about bugs or problems you're having is
-[on the RubyGems issues page at GitHub](http://github.com/rubygems/rubygems/issues).
+[on the RubyGems issues page at GitHub](https://github.com/rubygems/rubygems/issues).
 
 ### Bundler Compatibility
 
-See http://bundler.io/compatibility for known issues.
+See https://bundler.io/compatibility for known issues.
 
 ### Supporting
 
-<a href="https://rubytogether.org/"><img src="https://rubytogether.org/images/rubies.svg" width=200></a><br/>
-<a href="https://rubytogether.org/">Ruby Together</a> pays some RubyGems maintainers for their ongoing work. As a grassroots initiative committed to supporting the critical Ruby infrastructure you rely on, Ruby Together is funded entirely by the Ruby community. Contribute today <a href="https://rubytogether.org/developers">as an individual</a> or even better, <a href="https://rubytogether.org/companies">as a company</a>, and ensure that RubyGems, Bundler, and other shared tooling is around for years to come.
+RubyGems is managed by [Ruby Central](https://rubycentral.org), a non-profit organization that supports the Ruby community through projects like this one, as well as [RubyConf](https://rubyconf.org), [RailsConf](https://railsconf.org), and [RubyGems.org](https://rubygems.org). You can support Ruby Central by attending or [sponsoring](sponsors@rubycentral.org) a conference, or by [joining as a supporting member](https://rubycentral.org/#/portal/signup).
 
 ### Contributing
 
 If you'd like to contribute to RubyGems, that's awesome, and we <3 you. Check out our [guide to contributing](CONTRIBUTING.md) for more information.
 
-While some RubyGems contributors are compensated by Ruby Together, the project maintainers make decisions independent of Ruby Together. As a project, we welcome contributions regardless of the author’s affiliation with Ruby Together.
-
 ### Code of Conduct
 
 Everyone interacting in the RubyGems project’s codebases, issue trackers, chat rooms, and mailing lists is expected to follow the [contributor code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).