Merge pull request #4267 from rubygems/release/bundler_2.2.5_rubygems…

…_3.2.5

Prepare bundler 2.2.5 & rubygems 3.2.5 releases

.github/workflows/daily-bundler.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   daily_bundler:
     name: Bundler (ruby-head)
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     if: github.repository == 'rubygems/rubygems'
     env:
       RGV: ..

.github/workflows/daily-rubygems.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   daily_rubygems:
     name: Rubygems (ruby-head)
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     if: github.repository == 'rubygems/rubygems'
     strategy:
       fail-fast: false

.github/workflows/install-rubygems.yml

@@ -11,18 +11,19 @@ on:
 jobs:
   install_rubygems_ubuntu:
     name: Install Rubygems on Ubuntu (${{ matrix.ruby.name }}, ${{ matrix.openssl.name }})
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - { name: 2.3, value: 2.3.8 }
-          - { name: 2.4, value: 2.4.10 }
-          - { name: 2.5, value: 2.5.8 }
-          - { name: 2.6, value: 2.6.6 }
-          - { name: 2.7, value: 2.7.2 }
+          - { name: "2.3", value: 2.3.8 }
+          - { name: "2.4", value: 2.4.10 }
+          - { name: "2.5", value: 2.5.8 }
+          - { name: "2.6", value: 2.6.6 }
+          - { name: "2.7", value: 2.7.2 }
+          - { name: "3.0", value: 3.0.0 }
           - { name: jruby-9.2, value: jruby-9.2.14.0 }
-          - { name: truffleruby-20.2, value: truffleruby-20.2.0 }
+          - { name: truffleruby-20.3, value: truffleruby-20.3.0 }
         openssl:
           - { name: "openssl", value: true }
           - { name: "no-openssl", value: false }
@@ -52,10 +53,10 @@ jobs:
         run: bundle --version
       - name: Check bundler man pages were installed and are properly picked up
         run: bundle install --help | grep -q BUNDLE-INSTALL
-        if: matrix.ruby.name != 'truffleruby-20.2'
+        if: matrix.ruby.name != 'truffleruby-20.3'
       - name: Check bundler fallback man pages are properly picked up
         run: sudo rm $(which man) && bundle install --help
-        if: matrix.ruby.name != 'truffleruby-20.2'
+        if: matrix.ruby.name != 'truffleruby-20.3'
       - name: Build bundler
         run: gem build bundler.gemspec
         working-directory: ./bundler
@@ -67,7 +68,7 @@ jobs:
         working-directory: ./bundler
       - name: Check rails can be installed
         run: gem install rails
-        if: matrix.ruby.name != 'truffleruby-20.2'
+        if: matrix.ruby.name != 'truffleruby-20.3'
     timeout-minutes: 10
 
   install_rubygems_windows:
@@ -77,7 +78,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - { name: 2.7, value: 2.7.2 }
+          - { name: "3.0", value: 3.0.0 }
           - { name: jruby-9.2, value: jruby-9.2.14.0 }
     steps:
       - uses: actions/checkout@v2

.github/workflows/jruby-bundler.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   jruby_bundler:
     name: Bundler (JRuby)
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     env:
       RGV: ..

.github/workflows/legacy-git.yml

@@ -0,0 +1,25 @@
+name: legacy-git
+
+on:
+  pull_request:
+
+  push:
+    branches:
+      - master
+      - 3.2
+
+jobs:
+  legacy_git:
+    name: Verify behavior under old git
+    runs-on: ubuntu-20.04
+    container:
+      image: centos/ruby-27-centos7@sha256:b24b875dcdb6cb8f2145706dcaac74bb25ae3b9d9f7ba69d7ae700a7aee1e1bd
+      options: --user=root
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install rubygems
+        run: ruby setup.rb
+      - name: Check we can install a Gemfile with git sources
+        run: bundle init && bundle add fileutils --git https://github.com/ruby/fileutils
+
+    timeout-minutes: 10

.github/workflows/macos-rubygems.yml

@@ -16,10 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - { name: 2.4, value: 2.4.10 }
-          - { name: 2.5, value: 2.5.8 }
-          - { name: 2.6, value: 2.6.6 }
-          - { name: 2.7, value: 2.7.2 }
+          - { name: "2.4", value: 2.4.10 }
+          - { name: "2.5", value: 2.5.8 }
+          - { name: "2.6", value: 2.6.6 }
+          - { name: "2.7", value: 2.7.2 }
+          - { name: "3.0", value: 3.0.0 }
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby

.github/workflows/older-rubygems-bundler.yml

@@ -14,44 +14,28 @@ on:
 
 jobs:
   older_rubygems_bundler:
-    name: Bundler ${{ matrix.bundler.name }} against old Rubygems (${{ matrix.ruby.name }}, ${{ matrix.rgv.name}})
-    runs-on: ubuntu-18.04
+    name: Bundler ${{ matrix.bundler.name }} against old Rubygems (${{ matrix.ruby.name }}, ${{ matrix.rgv.name }})
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - { name: ruby-2.3, value: 2.3.8 }
-          - { name: ruby-2.4, value: 2.4.10 }
-          - { name: ruby-2.5, value: 2.5.8 }
-          - { name: ruby-2.6, value: 2.6.6 }
-          - { name: ruby-2.7, value: 2.7.2 }
-        rgv:
-          - { name: rgv-2.5, value: v2.5.2 }
-          - { name: rgv-2.6, value: v2.6.14 }
-          - { name: rgv-2.7, value: v2.7.10 }
-          - { name: rgv-3.0, value: v3.0.8 }
-          - { name: rgv-3.1, value: v3.1.4 }
-
-        bundler:
-          - { name: 2, value: '' }
-
-        exclude:
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.4, value: 2.4.10 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.5, value: 2.5.8 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.5, value: 2.5.8 }, rgv: { name: rgv-2.6, value: v2.6.14 } }
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-2.6, value: v2.6.14 } }
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-2.7, value: v2.7.10 } }
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-2.6, value: v2.6.14 } }
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-2.7, value: v2.7.10 } }
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-3.0, value: v3.0.8 } }
-
         include:
-          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.4, value: 2.4.10 }, rgv: { name: rgv-3.1, value: v3.1.4 } }
-          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.5, value: 2.5.8 }, rgv: { name: rgv-3.1, value: v3.1.4 } }
-          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-3.1, value: v3.1.4 } }
-          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-3.1, value: v3.1.4 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.3, value: 2.3.8 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.3, value: 2.3.8 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.4, value: 2.4.10 }, rgv: { name: rgv-2.6, value: v2.6.14 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.4, value: 2.4.10 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.5, value: 2.5.8 }, rgv: { name: rgv-2.7, value: v2.7.11 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.5, value: 2.5.8 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-3.0, value: v3.0.9 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-3.1, value: v3.1.5 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.0 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
+          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.4, value: 2.4.10 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
+          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.5, value: 2.5.8 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
+          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
+          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
+          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.0 }, rgv: { name: rgv-3.2, value: v3.2.4 } }
     env:
       RGV: ${{ matrix.rgv.value }}
       RUBYOPT: --disable-gems

.github/workflows/ruby-core.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   ruby_core:
     name: ${{matrix.target}} under a ruby-core setup
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:

.github/workflows/spell-checker.yml

@@ -0,0 +1,17 @@
+name: 💎 Spellchecker
+
+on: [pull_request]
+
+jobs:
+  misspell:
+    name: 🧹 Check Spelling
+    runs-on: ubuntu-20.04
+    steps:
+      - name: 🍓 Check Out
+        uses: actions/checkout@v2
+      - name: 🍎 Install
+        run: |
+          wget -O - -q https://git.io/misspell | sh -s -- -b .
+      - name: 🌶️ Misspell
+        run: |
+          find . -type f -not -path "./bundler/spec/support/artifice/vcr_cassettes/realworld/index.rubygems.org/versions**" | xargs ./misspell -i "automatiek,wille"

.github/workflows/ubuntu-bundler.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   ubuntu_bundler:
     name: Bundler ${{ matrix.bundler.name }} (${{ matrix.ruby.name }})
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -21,6 +21,7 @@ jobs:
           - { name: ruby-2.5, value: 2.5.8 }
           - { name: ruby-2.6, value: 2.6.6 }
           - { name: ruby-2.7, value: 2.7.2 }
+          - { name: ruby-3.0, value: 3.0.0 }
 
         bundler:
           - { name: 2, value: '' }

.github/workflows/ubuntu-lint.yml

@@ -11,13 +11,13 @@ on:
 jobs:
   ubuntu_lint:
     name: Lint
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.2
+          ruby-version: 3.0.0
           bundler: none
       - name: Install Dependencies
         run: rake setup

.github/workflows/ubuntu-rubygems.yml

@@ -11,18 +11,19 @@ on:
 jobs:
   ubuntu_rubygems:
     name: Rubygems on Ubuntu (${{ matrix.ruby.name }})
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - { name: 2.3, value: 2.3.8 }
-          - { name: 2.4, value: 2.4.10 }
-          - { name: 2.5, value: 2.5.8 }
-          - { name: 2.6, value: 2.6.6 }
-          - { name: 2.7, value: 2.7.2 }
+          - { name: "2.3", value: 2.3.8 }
+          - { name: "2.4", value: 2.4.10 }
+          - { name: "2.5", value: 2.5.8 }
+          - { name: "2.6", value: 2.6.6 }
+          - { name: "2.7", value: 2.7.2 }
+          - { name: "3.0", value: 3.0.0 }
           - { name: jruby-9.2, value: jruby-9.2.14.0 }
-          - { name: truffleruby-20.2, value: truffleruby-20.2.0 }
+          - { name: truffleruby-20.3, value: truffleruby-20.3.0 }
     env:
       TRUFFLERUBYOPT: "--experimental-options --testing-rubygems"
     steps:

.github/workflows/windows-bundler.yml

@@ -26,6 +26,7 @@ jobs:
           - { name: ruby-2.5, value: 2.5.8 }
           - { name: ruby-2.6, value: 2.6.6 }
           - { name: ruby-2.7, value: 2.7.2 }
+          - { name: ruby-3.0, value: 3.0.0 }
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/windows-rubygems.yml

@@ -16,10 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - { name: 2.4, value: 2.4.10 }
-          - { name: 2.5, value: 2.5.8 }
-          - { name: 2.6, value: 2.6.6 }
-          - { name: 2.7, value: 2.7.2 }
+          - { name: "2.4", value: 2.4.10 }
+          - { name: "2.5", value: 2.5.8 }
+          - { name: "2.6", value: 2.6.6 }
+          - { name: "2.7", value: 2.7.2 }
+          - { name: "3.0", value: 3.0.0 }
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 3.2.5 / 2021-01-11
+
+## Bug fixes:
+
+* Don't load more specs after the whole set of specs has been setup. Pull
+  request #4262 by deivid-rodriguez
+* Fix broken `bundler` executable after `gem update --system`. Pull
+  request #4221 by deivid-rodriguez
+
 # 3.2.4 / 2020-12-31
 
 ## Enhancements:

Rakefile

@@ -7,9 +7,7 @@ require 'psych'
 
 desc "Setup Rubygems dev environment"
 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"
+  sh "ruby bundler/bin/bundle install --gemfile=dev_gems.rb"
 end
 
 desc "Setup git hooks"
@@ -183,11 +181,7 @@ end
 
 desc "Upload release to S3"
 task :upload_to_s3 do
-  begin
-    require "aws-sdk-s3"
-  rescue LoadError
-    abort "Install the aws-sdk-s3 gem to be able to upload gems to rubygems.org."
-  end
+  require "aws-sdk-s3"
 
   s3 = Aws::S3::Resource.new(region:'us-west-2')
   %w[zip tgz].each do |ext|
@@ -313,9 +307,7 @@ To update to the latest RubyGems you can run:
 
     gem update --system
 
-If you need to upgrade or downgrade please follow the [how to upgrade/downgrade
-RubyGems][upgrading] instructions.  To install RubyGems by hand see the
-[Download RubyGems][download] page.
+To install RubyGems by hand see the [Download RubyGems][download] page.
 
 #{history.release_notes_for_blog.join("\n")}
 
@@ -324,7 +316,6 @@ SHA256 Checksums:
 #{checksums}
 
 [download]: https://rubygems.org/pages/download
-[upgrading]: http://docs.seattlerb.org/rubygems/UPGRADING_rdoc.html
 
       ANNOUNCEMENT
 

bundler/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 2.2.5 (January 11, 2021)
+
+## Enhancements:
+
+  - Improve rubocop setup in the new gem template [#4220](https://github.com/rubygems/rubygems/pull/4220)
+  - Support repositories with default branch not named master [#4224](https://github.com/rubygems/rubygems/pull/4224)
+
+## Bug fixes:
+
+  - Let Net::HTTP decompress the index instead of doing it manually [#4081](https://github.com/rubygems/rubygems/pull/4081)
+  - Workaround for another jruby crash when autoloading a constant [#4252](https://github.com/rubygems/rubygems/pull/4252)
+  - Fix another performance regression in the resolver [#4243](https://github.com/rubygems/rubygems/pull/4243)
+  - Restore support for old git versions [#4233](https://github.com/rubygems/rubygems/pull/4233)
+  - Give a proper error if cache path does not have write access [#4215](https://github.com/rubygems/rubygems/pull/4215)
+  - Fix running `rake release` from an ambiguous ref [#4219](https://github.com/rubygems/rubygems/pull/4219)
+
 # 2.2.4 (December 31, 2020)
 
 ## Bug fixes:
@@ -327,7 +343,7 @@
   - Fix `bundle update` message about exclude groups saying "installed" instead of "updated" ([#7150](https://github.com/rubygems/bundler/pull/7150))
   - Fix `bundle licenses` not showing correct information about bundler itself ([#7147](https://github.com/rubygems/bundler/pull/7147))
   - Fix installation path not including ruby scope when `BUNDLE_PATH` was set ([#7163](https://github.com/rubygems/bundler/pull/7163))
-  - Fix `bundle clean` incorrectly removing git depedencies present in the Gemfile when rubygems 3.0+ was used and path involved a symlink ([#7211](https://github.com/rubygems/bundler/pull/7211))
+  - Fix `bundle clean` incorrectly removing git dependencies present in the Gemfile when rubygems 3.0+ was used and path involved a symlink ([#7211](https://github.com/rubygems/bundler/pull/7211))
   - Fix platform specific gems always being re-resolved when bundler was not running under that platform ([#7212](https://github.com/rubygems/bundler/pull/7212))
   - Fix `bundle package --all-platforms` causing `bundle install` to ignore `--with` and `--without` ([#6113](https://github.com/rubygems/bundler/pull/6113))
   - Fix `MissingRevision` git errors to include the specific `git` command that failed under the hood ([#7225](https://github.com/rubygems/bundler/pull/7225))
@@ -499,7 +515,7 @@ Changes
 ## Bug fixes:
 
   - Fix issue where updating a gem resulted in the gem's version being downgraded when `BUNDLE_ONLY_UPDATE_TO_NEWER_VERSIONS` was set ([#6529](https://github.com/rubygems/bundler/issues/6529), @theflow)
-  - Fix some rescue calls that don't specifiy error type (@utilum)
+  - Fix some rescue calls that don't specify error type (@utilum)
   - Fix an issue when the Lockfile would contain platform-specific gems that it didn't need ([#6491](https://github.com/rubygems/bundler/issues/6491), @segiddins)
   - Improve handling of adding new gems with only a single group to the Gemfile in `bundle add` (@agrim123)
   - Refactor check for OpenSSL in `bundle env` (@voxik)