Flatten the Bundler layout to the repository top level

.codespellrc

@@ -2,4 +2,4 @@
 check-filenames=
 check-hidden=
 ignore-words=.codespellignore
-skip=CODE_OF_CONDUCT.md,*.pem,.git,./tmp,./bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt,man,vcr_cassettes,vendor,.venv
+skip=CODE_OF_CONDUCT.md,*.pem,.git,./tmp,./lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt,man,vcr_cassettes,vendor,.venv

.gitattributes

@@ -2,4 +2,4 @@
 *.rb diff=ruby
 *.gemspec diff=ruby
 bin/* diff=ruby
-bundler/exe/* diff=ruby
+exe/* diff=ruby

.github/workflows/bundler.yml

@@ -87,7 +87,7 @@ jobs:
           ruby-version: ${{ matrix.ruby.value }}
           bundler: none
       - name: Simulate a release version by stripping .dev
-        run: ruby -i -pe 'sub(/^(\s*VERSION = ")(\d+\.\d+\.\d+)\.dev/, "\\1\\2")' lib/rubygems.rb bundler/lib/bundler/version.rb
+        run: ruby -i -pe 'sub(/^(\s*VERSION = ")(\d+\.\d+\.\d+)\.dev/, "\\1\\2")' lib/rubygems.rb lib/bundler/version.rb
         if: matrix.strip_dev
       - name: Restore gem caches
         uses: actions/cache/restore@v5

.github/workflows/install-rubygems.yml

@@ -91,13 +91,10 @@ jobs:
           test ! -s errors.txt || (cat errors.txt && exit 1)
       - name: Build bundler
         run: gem build bundler.gemspec
-        working-directory: ./bundler
       - name: Install built bundler
         run: gem install bundler-*.gem --verbose --backtrace > output.txt
-        working-directory: ./bundler
       - name: Check bundler install didn't hit the network
         run: if grep -q 'GET http' output.txt; then false; else true; fi
-        working-directory: ./bundler
       - name: Resolve tsort dependency for Ruby 3.2
         run: gem install tsort
         if: matrix.ruby.name == '3.2'
@@ -177,16 +174,8 @@ jobs:
         with:
           ruby-version: 3.2
           bundler: none
-      - name: Save system RubyGems version to ENV
-        run: |
-          RGV=$(ruby -e 'puts Gem::VERSION.split(".")[0..2].join(".")')
-          echo "RGV=v$RGV" >> $GITHUB_ENV
-        if: matrix.rubygems == 'system'
-      - name: Set dev RubyGems version
-        run: |
-          RGV=..
-          echo "RGV=v$RGV" >> $GITHUB_ENV
-        if: matrix.rubygems == 'dev'
+      - name: Use the worktree RubyGems
+        run: echo "RGV=." >> $GITHUB_ENV
       - name: Setup app depending on psych with initial Ruby
         run: mkdir foo && cd foo && ../bin/bundle init && ../bin/bundle add psych -v 5.1.2
         shell: bash
@@ -234,7 +223,7 @@ jobs:
       - name: Check binstubs can run
         run: |
           gem install rake
-          RUBYOPT=-Ibundler/lib rake -T
+          RUBYOPT=-Ilib rake -T
       - name: Check binstubs can handle nested bundle exec
         run: |
           echo "source 'https://rubygems.org'" > Gemfile

.github/workflows/read-only.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Basic usage on a read-only filesystem
-        run: docker run --mount type=bind,source=.,target=/rubygems --rm --read-only ruby:${{ matrix.ruby.value }} ruby -I/rubygems/bundler/lib -r'bundler/inline' -e 'gemfile {}; puts :ok'
+        run: docker run --mount type=bind,source=.,target=/rubygems --rm --read-only ruby:${{ matrix.ruby.value }} ruby -I/rubygems/lib -r'bundler/inline' -e 'gemfile {}; puts :ok'
 
     timeout-minutes: 15
 

.github/workflows/ruby-core.yml

@@ -62,6 +62,14 @@ jobs:
           sed -i 's|\["bundler/bin/#{binstub}", "spec/bin/#{binstub}"\]|["bin/#{binstub}", "spec/bin/#{binstub}"]|' tool/sync_default_gems.rb
           sed -i 's|/bundler/spec"|/spec"|g' tool/sync_default_gems.rb
           sed -i 's|/bundler/bin/|/bin/|g' tool/sync_default_gems.rb
+          sed -i 's|\["bundler/lib/bundler.rb", "lib/bundler.rb"\]|["lib/bundler.rb", "lib/bundler.rb"]|' tool/sync_default_gems.rb
+          sed -i 's|\["bundler/lib/bundler", "lib/bundler"\]|["lib/bundler", "lib/bundler"]|' tool/sync_default_gems.rb
+          sed -i 's|\["bundler/exe/bundle", "libexec/bundle"\]|["exe/bundle", "libexec/bundle"]|' tool/sync_default_gems.rb
+          sed -i 's|\["bundler/exe/bundler", "libexec/bundler"\]|["exe/bundler", "libexec/bundler"]|' tool/sync_default_gems.rb
+          sed -i 's|\["bundler/bundler.gemspec", "lib/bundler/bundler.gemspec"\]|["bundler.gemspec", "lib/bundler/bundler.gemspec"]|' tool/sync_default_gems.rb
+          sed -i 's|upstream}/bundler/lib/|upstream}/lib/|g' tool/sync_default_gems.rb
+          sed -i 's|upstream}/bundler/exe/|upstream}/exe/|g' tool/sync_default_gems.rb
+          sed -i 's|upstream}/bundler/bundler.gemspec|upstream}/bundler.gemspec|g' tool/sync_default_gems.rb
           ruby tool/sync_default_gems.rb rubygems
           mv spec/bundler/support/bundle spec/bin/bundle 2>/dev/null || true
         working-directory: ruby/ruby

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

@@ -61,6 +61,6 @@ jobs:
           persist-credentials: false
       - name: Run Rubygems Requirement tests against local bundler, to make sure bundler monkeypatches preserve the behaviour
         run: |
-          ruby -I../../bundler/lib:lib:test test/rubygems/test_gem_requirement.rb
+          ruby -Ilib:../../lib:test test/rubygems/test_gem_requirement.rb
         working-directory: ./tmp/rubygems
     timeout-minutes: 60

.github/workflows/ubuntu-lint.yml

@@ -127,16 +127,16 @@ jobs:
           bundler: none
       - name: Simulate a release version by stripping .dev
         run: |
-          ruby -i -pe 'sub(/^(\s*VERSION = ")(\d+\.\d+\.\d+)\.dev/, "\\1\\2")' lib/rubygems.rb bundler/lib/bundler/version.rb
+          ruby -i -pe 'sub(/^(\s*VERSION = ")(\d+\.\d+\.\d+)\.dev/, "\\1\\2")' lib/rubygems.rb lib/bundler/version.rb
           bin/rake dev:deps version:update_locked_bundler
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git commit -am "Simulate release version"
       - name: Check lockfiles do not depend on the local gem cache
         run: |
-          version=$(ruby -Ibundler/lib -rbundler/version -e 'puts Bundler::VERSION')
+          version=$(ruby -Ilib -rbundler/version -e 'puts Bundler::VERSION')
           mkdir -p cache
-          (cd bundler && gem build bundler.gemspec --output "../cache/bundler-${version}.gem")
+          gem build bundler.gemspec --output "cache/bundler-${version}.gem"
           echo "cache/" >> .git/info/exclude
           bin/rake version:check dev:frozen_deps
     timeout-minutes: 15

.rspec

@@ -1,6 +1,6 @@
 --color
 --warnings
 --backtrace
--I bundler/lib
+-I lib
 --require spec_helper
 --order random

.rubocop.yml

@@ -7,7 +7,7 @@ AllCops:
     - pkg/**/*
     - tmp/**/*
     - lib/rubygems/vendor/**/*
-    - bundler/lib/bundler/vendor/**/*
+    - lib/bundler/vendor/**/*
   CacheRootDirectory: tmp/rubocop
   MaxFilesInCache: 5000
 
@@ -19,13 +19,13 @@ AllCops:
 Naming/ConstantName:
   Enabled: true
   Exclude:
-    - lib/**/*
+    - lib/rubygems/**/*
     - test/**/*
 
 Naming/MethodName:
   Enabled: true
   Exclude:
-    - lib/**/*
+    - lib/rubygems/**/*
     - test/**/*
 
 Naming/VariableName:
@@ -34,7 +34,7 @@ Naming/VariableName:
 Naming/VariableNumber:
   Enabled: true
   Exclude:
-    - lib/**/*
+    - lib/rubygems/**/*
     - test/**/*
     - tool/**/*
 
@@ -43,7 +43,7 @@ Naming/VariableNumber:
 Style/ClassVars:
   Enabled: true
   Exclude:
-    - lib/**/*
+    - lib/rubygems/**/*
     - test/**/*
 
 Style/FormatString:
@@ -230,7 +230,7 @@ Lint/SafeNavigationConsistency:
 Lint/ScriptPermission:
   Enabled: true
   Exclude:
-    - bundler/lib/bundler/templates/Executable
+    - lib/bundler/templates/Executable
 
 Lint/ShadowedArgument:
   Enabled: true
@@ -397,8 +397,8 @@ Layout/SpaceInsideBlockBraces:
   Enabled: true
   SpaceBeforeBlockParameters: false
   Exclude:
-    - bundler/lib/bundler/templates/Gemfile
-    - bundler/lib/bundler/templates/gems.rb
+    - lib/bundler/templates/Gemfile
+    - lib/bundler/templates/gems.rb
 
 Layout/SpaceInsideHashLiteralBraces:
   Enabled: true