Support ABI-scoped specification dirs in bundle clean

Assisted-By: devx/9c2464e2-74cd-4d36-a6c0-50aef8c2ad01

Author: jenshenny

lib/bundler/runtime.rb

@@ -166,7 +166,9 @@ def clean(dry_run = false)
       git_cache_dirs       = SharedHelpers.glob_files_in_dir("cache/bundler/git/*", Gem.dir)
       gem_dirs             = SharedHelpers.glob_files_in_dir("gems/*", Gem.dir)
       gem_files            = SharedHelpers.glob_files_in_dir("cache/*.gem", Gem.dir)
-      gemspec_files        = SharedHelpers.glob_files_in_dir("specifications/*.gemspec", Gem.dir)
+      gemspec_files        = Gem::SpecificationRecord.dirs_from([Gem.dir]).flat_map do |dir|
+        SharedHelpers.glob_files_in_dir("*.gemspec", dir)
+      end
       extension_dirs       = SharedHelpers.glob_files_in_dir("extensions/*/*/*", Gem.dir) + SharedHelpers.glob_files_in_dir("bundler/gems/extensions/*/*/*", Gem.dir)
       spec_gem_paths       = []
       # need to keep git sources around

spec/commands/clean_spec.rb

@@ -391,6 +391,58 @@ def should_not_have_gems(*gems)
     expect(vendored_gems("bin/myrackup")).not_to exist
   end
 
+  it "removes orphaned gemspecs from ABI-scoped specification dirs", rubygems: ">= 4.1.0.dev" do
+    gemfile <<-G
+      source "https://gem.repo1"
+
+      gem "foo"
+    G
+
+    bundle_config "path vendor/bundle"
+    bundle "install"
+
+    abi_dir = vendored_gems("specifications/#{Gem.ruby_abi}")
+    FileUtils.mkdir_p(abi_dir)
+    orphaned_gemspec = File.join(abi_dir, "orphaned-1.0-deadbeef.gemspec")
+    File.write(orphaned_gemspec, "orphaned")
+
+    bundle :clean
+
+    expect(File.exist?(orphaned_gemspec)).to be false
+    should_have_gems "foo-1.0"
+  end
+
+  it "does not remove gemspecs for content-addressed gems in the bundle", :compact_index, rubygems: ">= 4.1.0.dev" do
+    skip "Gem::ContentAddress not available" if ruby_core?
+
+    simulate_platform "x86_64-linux" do
+      build_repo2 do
+        build_gem "mygem", "1.0" do |s|
+          s.platform = Gem::Platform.new("x86_64-linux")
+          s.write "lib/mygem.rb", "MYGEM = '1.0 not_content_addressed'"
+        end
+      end
+
+      build_gem "mygem", "1.0", ruby_abi: Gem.ruby_abi, path: gem_repo2("gems") do |s|
+        s.platform = Gem::Platform.new("x86_64-linux")
+        s.required_ruby_version = "~> #{Gem.ruby_abi}.0"
+        s.write "lib/mygem.rb", "MYGEM = '1.0 content_addressed'"
+      end
+
+      bundle_config "path vendor/bundle"
+      install_gemfile <<~G, artifice: "compact_index_v2", env: { "BUNDLER_SPEC_GEM_REPO" => gem_repo2.to_s }
+        source "https://gem.repo2"
+
+        gem "mygem"
+      G
+
+      bundle :clean
+
+      abi_gemspecs = Dir.glob(vendored_gems("specifications/#{Gem.ruby_abi}/*.gemspec").to_s)
+      expect(abi_gemspecs.size).to eq(1), "expected content-addressed gemspec to be preserved, found: #{abi_gemspecs}"
+    end
+  end
+
   it "does not call clean automatically when using system gems" do
     bundle_config "path.system true"