Use CompactIndexV2API in CompactIndexCooldownBadCreatedAt

Author: jenshenny

spec/install/cooldown_spec.rb

@@ -217,31 +217,31 @@ def gemrc_cooldown(days)
       it "applies it when bundler configures none of its own" do
         gemrc_cooldown 7
 
-        bundle "install", artifice: "compact_index_cooldown"
+        bundle "install", artifice: "compact_index_v2"
 
         expect(the_bundle).to include_gems("ripe_gem 1.0.0")
       end
 
       it "takes the longer of the two settings" do
         gemrc_cooldown 7
 
-        bundle "install", env: { "BUNDLE_COOLDOWN" => "1" }, artifice: "compact_index_cooldown"
+        bundle "install", env: { "BUNDLE_COOLDOWN" => "1" }, artifice: "compact_index_v2"
 
         expect(the_bundle).to include_gems("ripe_gem 1.0.0")
       end
 
       it "counts a bundler-side 0 as a value rather than as unset" do
         gemrc_cooldown 7
 
-        bundle "install", env: { "BUNDLE_COOLDOWN" => "0" }, artifice: "compact_index_cooldown"
+        bundle "install", env: { "BUNDLE_COOLDOWN" => "0" }, artifice: "compact_index_v2"
 
         expect(the_bundle).to include_gems("ripe_gem 1.0.0")
       end
 
       it "counts a gemrc 0 as a value rather than as unset" do
         gemrc_cooldown 0
 
-        bundle "install", env: { "BUNDLE_COOLDOWN" => "7" }, artifice: "compact_index_cooldown"
+        bundle "install", env: { "BUNDLE_COOLDOWN" => "7" }, artifice: "compact_index_v2"
 
         expect(the_bundle).to include_gems("ripe_gem 1.0.0")
       end
@@ -254,23 +254,23 @@ def gemrc_cooldown(days)
           gem "ripe_gem"
         G
 
-        bundle "install", artifice: "compact_index_cooldown"
+        bundle "install", artifice: "compact_index_v2"
 
         expect(the_bundle).to include_gems("ripe_gem 1.0.0")
       end
 
       it "lets --cooldown 0 bypass it" do
         gemrc_cooldown 7
 
-        bundle "install --cooldown 0", artifice: "compact_index_cooldown"
+        bundle "install --cooldown 0", artifice: "compact_index_v2"
 
         expect(the_bundle).to include_gems("ripe_gem 2.0.0")
       end
 
       it "warns and ignores it when it is not a number" do
         gemrc_cooldown "seven"
 
-        bundle "install", artifice: "compact_index_cooldown"
+        bundle "install", artifice: "compact_index_v2"
 
         expect(err).to include('Invalid cooldown value "seven" in the gemrc file, so it is ignored.')
         expect(the_bundle).to include_gems("ripe_gem 2.0.0")

spec/support/artifice/compact_index_cooldown_bad_created_at.rb

@@ -1,14 +1,19 @@
 # frozen_string_literal: true
 
-require_relative "helpers/compact_index_cooldown"
+require_relative "helpers/compact_index_v2"
 
 # Serves every version with a created_at year that Time.iso8601 accepts but
 # whose distance from now overflows Float.
-class CompactIndexCooldownBadCreatedAt < CompactIndexCooldownAPI
+class CompactIndexCooldownBadCreatedAt < CompactIndexV2API
   helpers do
     def build_gem_version(spec, deps, checksum)
-      CompactIndex::GemVersionV2.new(spec.version.version, spec.platform.to_s, checksum, nil,
-        deps, spec.required_ruby_version.to_s, spec.required_rubygems_version.to_s, "#{"9" * 400}-01-01T00:00:00Z")
+      # The system-RubyGems jobs run this artifice against a Gem::Specification
+      # that predates the content-addressable accessors.
+      ruby_abi = spec.ruby_abi if spec.respond_to?(:ruby_abi)
+      content_address = spec.content_address if spec.respond_to?(:content_address)
+      VendoredCompactIndex::GemVersionV2.new(spec.version.version, spec.platform.to_s, checksum, nil,
+        deps, spec.required_ruby_version.to_s, spec.required_rubygems_version.to_s, "#{"9" * 400}-01-01T00:00:00Z",
+        ruby_abi, content_address)
     end
   end
 end