Merge pull request #6847 from rubygems/release/bundler_2.4.18_rubygems_3.4.18

Prepare RubyGems 3.4.18 and Bundler 2.4.18

Author: deivid-rodriguez

.githooks/pre-commit-rubocop

@@ -5,7 +5,7 @@ length=${#files}
 
 # Run rubocop hook only when analyzable files are present
 if [[ $length -ne 0 ]]; then
-  ./util/rubocop $files
+  ./bin/rubocop $files
 else
   echo "No files to analyze"
 fi

.github/workflows/bundler.yml

@@ -18,7 +18,6 @@ permissions:  # added using https://github.com/step-security/secure-workflows
 defaults:
   run:
     shell: bash
-    working-directory: ./bundler
 
 jobs:
   bundler:
@@ -80,4 +79,5 @@ jobs:
       - name: Run Test
         run: |
           bin/parallel_rspec
+        working-directory: ./bundler
     timeout-minutes: ${{ matrix.timeout || 60 }}

.github/workflows/daily-bundler.yml

@@ -10,7 +10,6 @@ permissions:
 defaults:
   run:
     shell: bash
-    working-directory: ./bundler
 
 jobs:
   daily_bundler:
@@ -39,7 +38,6 @@ jobs:
       - name: Run Test
         run: |
           bin/rake spec:all
-
       - name: Get previous status
         if: always()
         run: echo "OLD_STATUS=$(curl -sS 'https://api.github.com/repos/rubygems/rubygems/actions/workflows/daily-bundler.yml/runs?event=schedule&branch=master' | jq '.workflow_runs | .[1].conclusion')" >> $GITHUB_ENV

.github/workflows/jruby-bundler.yml

@@ -18,7 +18,6 @@ permissions:  # added using https://github.com/step-security/secure-workflows
 defaults:
   run:
     shell: bash
-    working-directory: ./bundler
 
 jobs:
   jruby_bundler:
@@ -52,10 +51,11 @@ jobs:
       - name: Run Test
         run: |
           bin/parallel_rspec --tag jruby_only --tag jruby
+        working-directory: ./bundler
         if: startsWith(matrix.os.name, 'ubuntu')
       - name: Install local bundler
         run: |
-          bin/rake install:local
+          bin/rake bundler:install:local
         if: startsWith(matrix.os.name, 'ubuntu')
       - name: Run a warbler project
         run: |

.github/workflows/realworld-bundler.yml

@@ -55,14 +55,11 @@ jobs:
           bundler: none
       - name: Prepare dependencies
         run: bin/rake spec:deps
-        working-directory: ./bundler
       - name: Replace version
         run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
         if: matrix.bundler.value != ''
-        working-directory: ./bundler
       - name: Run Test
         run: bin/rake spec:realworld
-        working-directory: ./bundler
       - name: Upload used cassettes as artifact
         uses: actions/upload-artifact@v3
         with:
@@ -95,14 +92,11 @@ jobs:
           bundler: none
       - name: Prepare dependencies
         run: bin/rake spec:deps
-        working-directory: ./bundler
       - name: Replace version
         run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
         if: matrix.bundler.value != ''
-        working-directory: ./bundler
       - name: Run Test
         run: bin/rake spec:realworld
-        working-directory: ./bundler
       - name: Upload used cassettes as artifact
         uses: actions/upload-artifact@v3
         with:
@@ -127,4 +121,3 @@ jobs:
           path: ./bundler/spec/support/artifice/used_vcr_cassettes
       - name: Check unused cassettes
         run: bin/rake spec:realworld:check_unused_cassettes
-        working-directory: ./bundler

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

@@ -22,7 +22,6 @@ permissions:  # added using https://github.com/step-security/secure-workflows
 defaults:
   run:
     shell: bash
-    working-directory: ./bundler
 
 jobs:
   system_rubygems_bundler:
@@ -60,6 +59,7 @@ jobs:
       - name: Run Test
         run: |
           bin/parallel_rspec
+        working-directory: ./bundler
       - name: Save system RubyGems version to ENV
         run: |
           RGV=$(ruby -e 'puts Gem::VERSION.split(".")[0..2].join(".")')

.github/workflows/truffleruby-bundler.yml

@@ -18,7 +18,6 @@ permissions:  # added using https://github.com/step-security/secure-workflows
 defaults:
   run:
     shell: bash
-    working-directory: ./bundler
 
 jobs:
   truffleruby_bundler:
@@ -38,4 +37,5 @@ jobs:
       - name: Run Test
         run: |
           bin/parallel_rspec --tag truffleruby_only --tag truffleruby
+        working-directory: ./bundler
     timeout-minutes: 20

.github/workflows/ubuntu-lint.yml

@@ -36,8 +36,6 @@ jobs:
         run: rake docs
       - name: Install & Check Dependencies
         run: bin/rake dev:frozen_deps
-        working-directory: ./bundler
       - name: Misc checks
         run: bin/rake check_rvm_integration man:check check_rubygems_integration
-        working-directory: ./bundler
     timeout-minutes: 15

.rubocop.yml

@@ -11,6 +11,11 @@ AllCops:
     - 'tmp/**/*'
   TargetRubyVersion: 2.6
 
+Layout/EmptyLineAfterMagicComment:
+  Enabled: true
+  Exclude:
+    - test/rubygems/specifications/foo-0.0.1-x86-mswin32.gemspec
+
 Layout/AccessModifierIndentation:
   Enabled: true
 
@@ -137,6 +142,16 @@ Performance/StringReplacement:
 Security/Open:
   Enabled: true
 
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always
+  Exclude:
+    - test/rubygems/test_gem.rb
+    - test/rubygems/specifications/foo-0.0.1-x86-mswin32.gemspec
+
+Style/StderrPuts:
+  Enabled: true
+
 Style/AndOr:
   Enabled: true
   EnforcedStyle: always

.rubocop_bundler.yml

@@ -259,9 +259,6 @@ Layout/ElseAlignment:
 Layout/EmptyComment:
   Enabled: true
 
-Layout/EmptyLineAfterMagicComment:
-  Enabled: true
-
 Layout/EmptyLineBetweenDefs:
   Enabled: true
 
@@ -609,10 +606,6 @@ Style/For:
 Style/FormatString:
   Enabled: true
 
-Style/FrozenStringLiteralComment:
-  Enabled: true
-  EnforcedStyle: always
-
 # 1.8.7 support
 Style/HashSyntax:
   Enabled: true
@@ -791,9 +784,6 @@ Style/SingleLineMethods:
 Style/StabbyLambdaParentheses:
   Enabled: true
 
-Style/StderrPuts:
-  Enabled: true
-
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes