rubygems-update 3.1.6 → 3.2.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf1897c1f4290a7c09ac7fc031441915d225aaa7ffab473229a244310eaa39ac
-  data.tar.gz: d6aef4fc02c767b99957e4dfaff7818399b9fb59de550d23bee19256b618a5f6
+  metadata.gz: f9674dd6c41b5b5949b145bff3ca8fe825b1d0b15b78643f91efdbb6b21f4058
+  data.tar.gz: 178b23925b626f81220bf05f6f26ea9c3e7bf60411b45b88090a0f0949c978aa
 SHA512:
-  metadata.gz: 2421931e30162b92a93891c80eb17bd3d78a135da9019f49a18ce701bf4ca1fa7731260f4cc6de1342a74accceb8df21024ccd5042cbefa9a89cf67c69528a54
-  data.tar.gz: 131eb583b3864dec611fab7574a8ebf75cc796288ed2a4c43e96d6b53d24509f282e83fa36b2851ad5e5c21b6d8f78fc3fadc3da974575428b3489d3d28d3a88
+  metadata.gz: 03b6e5757f0aa561a8559468438e260ff49846ab1a4d57a1089fced6e649813f896b065ce5817371340eb321cf64dfef4e8219451096c100bf70d40e1b07293e
+  data.tar.gz: c7b934dd19c4f6325e7f627cb70943ee39fe3ff0e65cb3eea768ad16ec0edb101a0e51f9aef24d7b4481880aad5d9e69bcad3e5055c3d319576b7b8e377135bb

data/CODE_OF_CONDUCT.md

@@ -1,45 +1,81 @@
-# Contributor Code of Conduct
+# RubyGems and Bundler Code of Conduct
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contributes to a positive environment for our community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Publishing others' private information, such as a physical or email address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the [project team](MAINTAINERS.txt). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at team@bundler.io, or directly contacting project team members via email or Slack. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
+available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
 
 [homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

data/CONTRIBUTING.md

@@ -42,7 +42,6 @@ To run commands like `gem install` from the repo:
 To run bundler test:
 
     $ cd bundler
-    $ git submodule update --init --recursive
     $ bin/rake spec:deps
     $ bin/rspec spec
 
@@ -152,7 +151,7 @@ an appropriate purple `platform: *` label. Current platform labels:
 ### Git
 
 Please sign your commits. Although not required in order for you to contribute,
-it does ensures that any code submitted by you wasn't altered while you were
+it ensures that any code submitted by you wasn't altered while you were
 transferring it, and proves that it was you who submitted it and not someone
 else.
 

data/History.txt

@@ -1,21 +1,110 @@
 # coding: UTF-8
 
-=== 3.1.6 / 2021-01-26
+=== 3.2.0.rc.1 / 2020-07-04
+
+Major enhancements:
+
+* Test TruffleRuby in CI. Pull request #2797 by Benoit Daloze.
+* Rework plugins system and speed up rubygems. Pull request #3108 by David
+  Rodríguez.
 
 Minor enhancements:
 
-* Improve require. Pull request #3133 by David Rodríguez.
-* Simplify nested gem activation exceptions. Pull request #3450 by David
+* Specify explicit separator not to be affected by $;. Pull request #3424
+  by Nobuyoshi Nakada.
+* Enable `Layout/ExtraSpacing` cop. Pull request #3449 by David Rodríguez.
+* Rollback gem deprecate. Pull request #3530 by Luis Sagastume.
+* Normalize heredoc delimiters. Pull request #3533 by David Rodríguez.
+* Log messages to stdout in `rake package`. Pull request #3632 by David
+  Rodríguez.
+* Remove explicit `psych` activation. Pull request #3636 by David
   Rodríguez.
-* Fix correctness and performance regression in `require`. Pull request
-  #3639 by David Rodríguez.
+* Delay `fileutils` loading to fix some warnings. Pull request #3637 by
+  David Rodríguez.
+* Make sure rubygems/package can be directly required reliably. Pull
+  request #3670 by Luis Sagastume.
+* Make sure `tmp` folder exists before calling `Dir.tmpdir`. Pull request
+  #3711 by David Rodríguez.
+* Add Gem.disable_system_update_message to disable gem update --system if
+  needed. Pull request #3720 by Josef Šimánek.
+* Tweaks to play nice with ruby-core setup. Pull request #3733 by David
+  Rodríguez.
+* Remove explicit require for auto-loaded constant. Pull request #3751 by
+  Karol Bucek.
+* Test files should not be included in spec.files. Pull request #3758 by
+  Marc-André Lafortune.
+* Remove TODO comment about warning on setting instead of pushing. Pull
+  request #2823 by Luis Sagastume.
+* Add deprecate command method. Pull request #2935 by Luis Sagastume.
+* Simplify deprecate command method. Pull request #2974 by Luis Sagastume.
+* Fix Gem::LOADED_SPECS_MUTEX handling for recursive locking. Pull request
+  #2985 by MSP-Greg.
+* Add `funding_uri ` metadata field to gemspec. Pull request #3060 by
+  Colby Swandale.
+* Updates to some old gem-signing docs. Pull request #3063 by Tieg
+  Zaharia.
+* Update the gem method for Gem::Installer. Pull request #3137 by Daniel
+  Berger.
+* Simplify initial gem help output. Pull request #3148 by Olivier Lacan.
+* Resolve latest version via `gem contents`. Pull request #3149 by Dan
+  Rice.
+* Install suggestions. Pull request #3151 by Sophia Castellarin.
+* Only rescue the errors we actually want to rescue. Pull request #3156 by
+  David Rodríguez.
 
-=== 3.1.5 / 2020-12-09
+Bug fixes:
 
-Minor enhancements:
+* Accept not only /usr/bin/env but also /bin/env in some tests. Pull
+  request #3422 by Yusuke Endoh.
+* Skip a test that attempts to remove the current directory on Solaris.
+  Pull request #3423 by Yusuke Endoh.
+* Fix race condition on bundler's parallel installer. Pull request #3440
+  by David Rodríguez.
+* Fix platform comparison check in #contains_requirable_file?. Pull
+  request #3495 by Benoit Daloze.
+* Improve missing spec error. Pull request #3559 by Luis Sagastume.
+* Fix hidden bundler template installation from rubygems updater. Pull
+  request #3674 by David Rodríguez.
+* Fix gem update --user-install. Pull request #2901 by Luis Sagastume.
+* Correct conflict list when uninstallation is prevented. Pull request
+  #2973 by David Rodríguez.
+* Fix error when trying to find bundler with a deleted "working directo….
+  Pull request #3090 by Luis Sagastume.
+* Fix -I require priority. Pull request #3124 by David Rodríguez.
+* Fix `ruby setup.rb` for new plugins layout. Pull request #3144 by David
+  Rodríguez.
 
-* Add GlobalSign Root CA - R3 cert and remove outdated certs. Pull request #4100
-  by Aditya Prakash.
+Compatibility changes:
+
+* Revert "Remove Gem::DependencyInstaller#find_gems_with_sources". Pull
+  request #3412 by David Rodríguez.
+* Version horizon deprecations. Pull request #3414 by Luis Sagastume.
+* Remove ruby 1.8 leftovers. Pull request #3442 by David Rodríguez.
+* Minitest cleanup. Pull request #3445 by David Rodríguez.
+* Remove `builder` gem requirement for `gem regenerate_index`. Pull
+  request #3552 by David Rodríguez.
+* Remove modelines for consistency. Pull request #3714 by David Rodríguez.
+* Stop using deprecated OpenSSL::Digest constants. Pull request #3763 by
+  Bart de Water.
+* Remove Gem module deprecated methods. Pull request #3101 by Luis
+  Sagastume.
+* Remove ubygems.rb. Pull request #3102 by Luis Sagastume.
+* Remove Gem::Commands::QueryCommand. Pull request #3104 by Luis
+  Sagastume.
+* Remove dependency installer deprecated methods. Pull request #3106 by
+  Luis Sagastume.
+* Set deprecation warning on query command. Pull request #2967 by Luis
+  Sagastume.
+* Remove Gem::UserInteraction#debug method. Pull request #3107 by Luis
+  Sagastume.
+* Remove options from Gem::GemRunner.new. Pull request #3110 by Luis
+  Sagastume.
+* Remove deprecated Gem::RemoteFetcher#fetch_size. Pull request #3111 by
+  Luis Sagastume.
+* Remove source_exception from Gem::Exception. Pull request #3112 by Luis
+  Sagastume.
+* Requiring rubygems/source_specific_file is deprecated, remove it. Pull
+  request #3114 by Luis Sagastume.
 
 === 3.1.4 / 2020-06-03
 
@@ -360,6 +449,25 @@ Style changes:
   David Rodríguez.
 * Rubocop 0.71. Pull request #2785 by David Rodríguez.
 
+=== 3.0.8 / 2020-02-19
+
+Bug fixes:
+
+* Gem::Specification#to_ruby needs OpenSSL. Pull request #2937 by
+  Nobuyoshi Nakada.
+
+=== 3.0.7 / 2020-02-18
+
+Bug fixes:
+
+* Fix underscore version selection for bundler #2908 by David Rodríguez.
+* Add missing wrapper. Pull request #2690 by David Rodríguez.
+* Make Gem::Specification#ruby_code handle OpenSSL::PKey::RSA objects.
+  Pull request #2782 by Luis Sagastume.
+* Installer.rb - fix #windows_stub_script. Pull request #2876 by MSP-Greg.
+* Use IAM role to extract security-credentials for EC2 instance. Pull
+  request #2894 by Alexander Pakulov.
+
 === 3.0.6 / 2019-08-17
 
 Bug fixes:
@@ -553,7 +661,7 @@ Minor enhancements:
   Swandale.
 * Add Gem.operating_system_defaults to allow packagers to override
   defaults. Pull request #2116 by Vít Ondruch.
-* Update for compatibilty with new minitest. Pull request #2118 by
+* Update for compatibility with new minitest. Pull request #2118 by
   MSP-Greg.
 * Make Windows bin stubs portable. Pull request #2119 by MSP-Greg.
 * Avoid to warnings about gemspec loadings in rubygems tests. Pull request
@@ -585,11 +693,11 @@ Minor enhancements:
   SHIBATA Hiroshi.
 * Add Rake task to install dev dependencies. Pull request #2173 by Ellen
   Marie Dash.
-* Add new sections to the README and explaination of what RubyGems is.
+* Add new sections to the README and explanation of what RubyGems is.
   Pull request #2174 by Colby Swandale.
 * Prefer to use `Numeric#zero?` instead of `== 0`. Pull request #2176 by
   SHIBATA Hiroshi.
-* Ignore perfomance test of version regexp pattern. Pull request #2179 by
+* Ignore performance test of version regexp pattern. Pull request #2179 by
   SHIBATA Hiroshi.
 * Ignore .DS_Store files in the update_manifest task. Pull request #2199
   by Colby Swandale.
@@ -821,7 +929,7 @@ Minor enhancements:
   by David Rodríguez.
 * [BudlerVersionFinder] set .filter! and .compatible? to match only on major versions.
   Pull request #2515 by Colby Swandale.
-+ Update for compatibilty with new minitest. Pull request #2118 by MSP-Greg.
++ Update for compatibility with new minitest. Pull request #2118 by MSP-Greg.
 
 === 2.7.9 / 2019-03-05
 
@@ -917,7 +1025,7 @@ Security fixes:
 * Fix possible Unsafe Object Deserialization Vulnerability in gem owner.
   Fixed by Jonathan Claudius.
 * Strictly interpret octal fields in tar headers.
-  Discoved by plover, fixed by Samuel Giddins.
+  Discovered by plover, fixed by Samuel Giddins.
 * Raise a security error when there are duplicate files in a package.
   Discovered by plover, fixed by Samuel Giddins.
 * Enforce URL validation on spec homepage attribute.

data/Manifest.txt

@@ -1,9 +1,5 @@
-.bundle/config
-.rubocop.yml
 CODE_OF_CONDUCT.md
 CONTRIBUTING.md
-Gemfile
-Gemfile.lock
 History.txt
 LICENSE.txt
 MAINTAINERS.txt
@@ -16,7 +12,6 @@ UPGRADING.md
 bin/gem
 bin/update_rubygems
 bundler/CHANGELOG.md
-bundler/CODE_OF_CONDUCT.md
 bundler/LICENSE.md
 bundler/README.md
 bundler/UPGRADING.md
@@ -147,19 +142,25 @@ bundler/lib/bundler/templates/newgem/README.md.tt
 bundler/lib/bundler/templates/newgem/Rakefile.tt
 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/newgem.c.tt
 bundler/lib/bundler/templates/newgem/ext/newgem/newgem.h.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
 bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt
 bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt
 bundler/lib/bundler/templates/newgem/newgem.gemspec.tt
 bundler/lib/bundler/templates/newgem/rspec.tt
+bundler/lib/bundler/templates/newgem/rubocop.yml.tt
 bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
 bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt
-bundler/lib/bundler/templates/newgem/test/newgem_test.rb.tt
-bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt
+bundler/lib/bundler/templates/newgem/test/minitest/newgem_test.rb.tt
+bundler/lib/bundler/templates/newgem/test/minitest/test_helper.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
@@ -396,6 +397,7 @@ lib/rubygems/install_message.rb
 lib/rubygems/install_update_options.rb
 lib/rubygems/installer.rb
 lib/rubygems/installer_test_case.rb
+lib/rubygems/installer_uninstaller_utils.rb
 lib/rubygems/local_remote_options.rb
 lib/rubygems/mock_gem_ui.rb
 lib/rubygems/name_tuple.rb
@@ -415,6 +417,7 @@ lib/rubygems/path_support.rb
 lib/rubygems/platform.rb
 lib/rubygems/psych_additions.rb
 lib/rubygems/psych_tree.rb
+lib/rubygems/query_utils.rb
 lib/rubygems/rdoc.rb
 lib/rubygems/remote_fetcher.rb
 lib/rubygems/request.rb
@@ -491,14 +494,13 @@ lib/rubygems/source/lock.rb
 lib/rubygems/source/specific_file.rb
 lib/rubygems/source/vendor.rb
 lib/rubygems/source_list.rb
-lib/rubygems/source_local.rb
-lib/rubygems/source_specific_file.rb
 lib/rubygems/spec_fetcher.rb
 lib/rubygems/specification.rb
 lib/rubygems/specification_policy.rb
 lib/rubygems/ssl_certs/.document
-lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem
-lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
+lib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem
+lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem
+lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem
 lib/rubygems/stub_specification.rb
 lib/rubygems/syck_hack.rb
 lib/rubygems/test_case.rb
@@ -515,7 +517,6 @@ lib/rubygems/util/list.rb
 lib/rubygems/validator.rb
 lib/rubygems/version.rb
 lib/rubygems/version_option.rb
-lib/ubygems.rb
 rubygems-update.gemspec
 setup.rb
 test/rubygems/alternate_cert.pem
@@ -702,16 +703,3 @@ test/rubygems/test_remote_fetch_error.rb
 test/rubygems/test_require.rb
 test/rubygems/wrong_key_cert.pem
 test/rubygems/wrong_key_cert_32.pem
-tmp/.keep
-util/CL2notes
-util/bisect
-util/ci.sh
-util/cops/deprecations.rb
-util/create_certs.rb
-util/create_certs.sh
-util/create_encrypted_key.rb
-util/generate_spdx_license_list.rb
-util/patch_with_prs.rb
-util/rubocop
-util/update_bundled_ca_certificates.rb
-util/update_changelog.rb

data/POLICIES.md

@@ -2,15 +2,8 @@
 
 Contributions to RubyGems are made via GitHub pull requests, which must be
 approved by a project committer other than the author. To approve a PR, a
-maintainer can leave a comment including the text "@bundlerbot r+", indicating
-that they have reviewed the PR and approve it. Bundlerbot will then
-automatically create a merge commit, test the merge, and land the PR if the
-merge commit passes the tests.
-
-This process guarantees that our release branches always have passing tests,
-and reduces siloing of information to a single contributor. For a full list of
-possible commands, see [the Bundlerbot
-documentation](https://bors.tech/documentation/).
+maintainer can use GitHubs PR review feature. After that, if the original author
+is happy to merge the PR, she can press the merge button.
 
 ## Long-Term Support
 

data/README.md

@@ -40,7 +40,7 @@ with your OS's package manager before installing RubyGems manually.
 If you would like to manually install RubyGems:
 
 * Download from https://rubygems.org/pages/download, unpack, and `cd` into RubyGems' src
-* OR clone this repository and `cd` into the repository (make sure to run `git submodule update --init`)
+* OR clone this repository and `cd` into the repository
 
 Install RubyGems by running:
 

data/Rakefile

@@ -1,4 +1,4 @@
-# -*- ruby -*-
+RakeFileUtils.verbose_flag = false
 
 require 'rubygems'
 require 'rubygems/package_task'
@@ -6,9 +6,10 @@ require "rake/testtask"
 require 'psych'
 
 desc "Setup Rubygems dev environment"
-task :setup => ["bundler:checkout"] do
-  sh "gem install bundler:2.0.2"
-  sh "bundle install"
+task :setup do
+  version = File.read("dev_gems.rb.lock").split(/BUNDLED WITH\n   /).last
+  sh "gem install bundler:#{version}"
+  sh "bundle install --gemfile=dev_gems.rb"
 end
 
 desc "Setup git hooks"
@@ -18,7 +19,7 @@ end
 
 Rake::TestTask.new do |t|
   t.ruby_opts = %w[-w]
-  t.ruby_opts << '-rdevkit' if Gem.win_platform?
+  t.ruby_opts << '-rdevkit' if RbConfig::CONFIG['host_os'].include?('mingw')
 
   t.libs << "test"
   t.libs << "bundler/lib"
@@ -38,9 +39,9 @@ RDoc::Task.new :rdoc => 'docs', :clobber_rdoc => 'clobber_docs' do |doc|
   doc.title  = "RubyGems #{v} API Documentation"
 
   rdoc_files = Rake::FileList.new %w[lib bundler/lib]
-  rdoc_files.add %w[History.txt LICENSE.txt MIT.txt CODE_OF_CONDUCT.md CONTRIBUTING.rdoc
-                    MAINTAINERS.txt Manifest.txt POLICIES.rdoc README.md UPGRADING.rdoc bundler/CHANGELOG.md
-                    bundler/CODE_OF_CONDUCT.md bundler/CONTRIBUTING.md bundler/LICENSE.md bundler/README.md
+  rdoc_files.add %w[History.txt LICENSE.txt MIT.txt CODE_OF_CONDUCT.md CONTRIBUTING.md
+                    MAINTAINERS.txt Manifest.txt POLICIES.md README.md UPGRADING.md bundler/CHANGELOG.md
+                    bundler/doc/contributing/README.md bundler/LICENSE.md bundler/README.md
                     hide_lib_for_update/note.txt].map(&:freeze)
 
   doc.rdoc_files = rdoc_files
@@ -63,21 +64,23 @@ rescue LoadError
   end
 end
 
-desc "Run rubocop"
-task(:rubocop) do
-  sh "util/rubocop"
+namespace :rubocop do
+  desc "Run rubocop for RubyGems. Pass positional arguments, e.g. -a, as Rake arguments."
+  task(:rubygems) do |_, args|
+    sh "util/rubocop", *args
+  end
+
+  desc "Run rubocop for Bundler. Pass positional arguments, e.g. -a, as Rake arguments."
+  task(:bundler) do |_, args|
+    sh "bundler/bin/rubocop", *args
+  end
 end
 
+task rubocop: %w[rubocop:rubygems rubocop:bundler]
+
 desc "Run a test suite bisection"
 task(:bisect) do
-  seed = begin
-           Integer(ENV["SEED"])
-         rescue
-           abort "Specify the failing seed as the SEED environment variable"
-         end
-
-  gemdir = `gem env gemdir`.chomp
-  sh "SEED=#{seed} MTB_VERBOSE=2 util/bisect -Ilib:bundler/lib:test:#{gemdir}/gems/minitest-server-1.0.5/lib test"
+  sh "util/bisect"
 end
 
 # --------------------------------------------------------------------
@@ -97,7 +100,7 @@ end
 
 desc "Install rubygems to local system"
 task :install => [:clear_package, :package] do
-  sh "ruby -Ilib bin/gem install pkg/rubygems-update-#{v}.gem && update_rubygems"
+  sh "ruby -Ilib bin/gem install --no-document pkg/rubygems-update-#{v}.gem && update_rubygems --no-document --no-format-executable"
 end
 
 desc "Clears previously built package"
@@ -151,7 +154,7 @@ file "pkg/rubygems-#{v}.tgz" => "pkg/rubygems-#{v}" do
       sh "7z a -ttar  rubygems-#{v}.tar rubygems-#{v}"
       sh "7z a -tgzip rubygems-#{v}.tgz rubygems-#{v}.tar"
     else
-      sh "tar -czf rubygems-#{v}.tgz --owner=rubygems:0 --group=rubygems:0 rubygems-#{v}"
+      sh "tar -czf rubygems-#{v}.tgz rubygems-#{v}"
     end
   end
 end
@@ -272,7 +275,7 @@ namespace 'blog' do
 
     history.force_encoding Encoding::UTF_8
 
-    _, change_log, = history.split %r%^===\s*\d.*%, 3
+    _, change_log, = history.split %r{^===\s*\d.*}, 3
 
     change_types = []
 
@@ -383,16 +386,16 @@ module Rubygems
 
     def self.all
       files = []
-      exclude = %r[\.git|\./bundler/(?!lib|man|exe|[^/]+\.md|bundler.gemspec)]ox
-      tracked_files = `git ls-files --recurse-submodules`.split("\n").map {|f| "./#{f}" }
+      exclude = %r{\A(?:\.|dev_gems|bundler/(?!lib|man|exe|[^/]+\.md|bundler.gemspec)|util/)}
+      tracked_files = `git ls-files`.split("\n")
 
       tracked_files.each do |path|
         next unless File.file?(path)
         next if path =~ exclude
-        files << path[2..-1]
+        files << path
       end
 
-      files
+      files.sort
     end
 
   end
@@ -400,22 +403,17 @@ end
 
 desc "Update the manifest to reflect what's on disk"
 task :update_manifest do
-  File.open('Manifest.txt', 'w') {|f| f.puts(Rubygems::ProjectFiles.all.sort) }
+  File.open('Manifest.txt', 'w') {|f| f.puts(Rubygems::ProjectFiles.all) }
 end
 
 desc "Check the manifest is up to date"
 task :check_manifest do
-  if File.read("Manifest.txt").split.sort != Rubygems::ProjectFiles.all.sort
+  if File.read("Manifest.txt").split != Rubygems::ProjectFiles.all
     abort "Manifest is out of date. Run `rake update_manifest` to sync it"
   end
 end
 
 namespace :bundler do
-  desc "Initialize bundler submodule"
-  task :checkout do
-    sh "git submodule update --init"
-  end
-
   task :build_metadata do
     chdir('bundler') { sh "rake build_metadata" }
   end