Install content-addressable gemspecs under specifications/<ruby_abi>/

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

Author: jenshenny

lib/bundler/endpoint_specification.rb

@@ -161,7 +161,8 @@ def _remote_specification
     end
 
     def local_specification_path
-      "#{base_dir}/specifications/#{full_name}.gemspec"
+      File.join(Gem::SpecificationRecord.specification_dir_for(self, base_dir),
+                "#{full_name}.gemspec")
     end
 
     def parse_metadata(data)

lib/bundler/rubygems_ext.rb

@@ -45,6 +45,21 @@ def self.content_addressed_row?(suffix, platform, required_ruby_version = nil, v
     end
   end
 
+  # Can be removed once RubyGems 4.0.0 support is dropped
+  class SpecificationRecord
+    unless respond_to?(:specification_dir_for)
+      def self.specification_dir_for(spec, base_dir)
+        File.join(base_dir, "specifications")
+      end
+    end
+
+    unless respond_to?(:dirs_from)
+      def self.dirs_from(paths)
+        paths.map {|path| File.join(path, "specifications") }
+      end
+    end
+  end
+
   # Can be removed once RubyGems 3.5.11 support is dropped
   unless Gem.respond_to?(:freebsd_platform?)
     def self.freebsd_platform?

lib/bundler/rubygems_integration.rb

@@ -111,7 +111,7 @@ def gem_cache
 
     def spec_cache_dirs
       @spec_cache_dirs ||= begin
-        dirs = gem_path.map {|dir| File.join(dir, "specifications") }
+        dirs = gem_path.flat_map {|dir| Gem::SpecificationRecord.dirs_from([dir]) }
         dirs << Gem.spec_cache_dir
         dirs.uniq.select {|dir| File.directory? dir }
       end

lib/rubygems/commands/lock_command.rb

@@ -100,8 +100,8 @@ def execute
   end
 
   def spec_path(gem_full_name)
-    gemspecs = Gem.path.map do |path|
-      File.join path, "specifications", "#{gem_full_name}.gemspec"
+    gemspecs = Gem::SpecificationRecord.dirs_from(Gem.path).map do |spec_dir|
+      File.join spec_dir, "#{gem_full_name}.gemspec"
     end
 
     gemspecs.find {|path| File.exist? path }

lib/rubygems/content_address.rb

@@ -53,9 +53,11 @@ def self.ruby_abi_for(required_ruby_version)
     return nil if requirements.size != 1
 
     op, version = requirements.first
-    return nil if op != "~>" || version.segments.size != 3 || version.segments[2] != 0
+    segments = version.segments
+    return nil if op != "~>" || segments.size != 3 || segments[2] != 0
+    return nil unless segments[0].is_a?(Integer) && segments[1].is_a?(Integer)
 
-    version.segments[0..1].join(".")
+    segments[0..1].join(".")
   end
 
   ##

lib/rubygems/installer.rb

@@ -308,7 +308,11 @@ def install
 
     say clean_text(spec.post_install_message.to_s) if options[:post_install_message] && !spec.post_install_message.nil?
 
-    Gem::Specification.add_spec(spec) unless @install_dir
+    if incompatible_abi_install?
+      say "#{spec.full_name} is scoped to Ruby ABI #{spec.ruby_abi} and will not be visible to the running Ruby (ABI #{Gem.ruby_abi})"
+    else
+      Gem::Specification.add_spec(spec) unless @install_dir
+    end
 
     load_plugin unless options[:install_plugin] == false
 
@@ -357,9 +361,11 @@ def installed_specs
     @installed_specs ||= begin
       specs = []
 
-      Gem::Util.glob_files_in_dir("*.gemspec", File.join(gem_home, "specifications")).each do |path|
-        spec = Gem::Specification.load path
-        specs << spec if spec
+      Gem::SpecificationRecord.dirs_from([gem_home]).each do |dir|
+        Gem::Util.glob_files_in_dir("*.gemspec", dir).each do |path|
+          spec = Gem::Specification.load path
+          specs << spec if spec
+        end
       end
 
       specs
@@ -395,7 +401,7 @@ def installation_satisfies_dependency?(dependency)
   #
 
   def spec_file
-    File.join gem_home, "specifications", "#{spec.full_name}.gemspec"
+    File.join Gem::SpecificationRecord.specification_dir_for(spec, gem_home), "#{spec.full_name}.gemspec"
   end
 
   def default_spec_dir
@@ -419,7 +425,24 @@ def default_spec_file
   def write_spec
     spec.installed_by_version = Gem.rubygems_version
 
-    Gem.write_binary(spec_file, spec.to_ruby_for_cache)
+    spec_file = self.spec_file
+    spec_dir = File.dirname spec_file
+    dir_mode = options[:dir_mode]
+    content_addressed = Gem::ContentAddress.content_addressed?(spec)
+
+    if File.directory? spec_dir
+      if content_addressed && dir_mode && !File.writable?(spec_dir)
+        File.chmod(0o755, spec_dir)
+      end
+    else
+      ensure_writable_dir spec_dir
+    end
+
+    begin
+      Gem.write_binary(spec_file, spec.to_ruby_for_cache)
+    ensure
+      File.chmod(dir_mode, spec_dir) if dir_mode && content_addressed
+    end
   end
 
   ##
@@ -973,6 +996,10 @@ def ensure_writable_dir(dir) # :nodoc:
 
   private
 
+  def incompatible_abi_install?
+    Gem::ContentAddress.content_addressed?(spec) && spec.ruby_abi != Gem.ruby_abi
+  end
+
   def assign_content_address
     address = @package.content_address
     expected = options[:content_address]

lib/rubygems/package.rb

@@ -556,7 +556,7 @@ def extract_tar_gz(io, destination_dir, pattern = "*") # :nodoc:
       end
     end
 
-    if dir_mode
+    if dir_mode && !directories.empty?
       File.chmod(dir_mode, *directories)
     end
   end

lib/rubygems/request_set.rb

@@ -518,8 +518,10 @@ def specs
   end
 
   def specs_in(dir)
-    Gem::Util.glob_files_in_dir("*.gemspec", File.join(dir, "specifications")).map do |g|
-      Gem::Specification.load g
+    Gem::SpecificationRecord.dirs_from([dir]).flat_map do |spec_dir|
+      Gem::Util.glob_files_in_dir("*.gemspec", spec_dir).map do |g|
+        Gem::Specification.load g
+      end
     end
   end
 

lib/rubygems/resolver/lock_specification.rb

@@ -30,7 +30,11 @@ def initialize(set, name, version, sources, platform)
   def install(options = {})
     destination = options[:install_dir] || Gem.dir
 
-    if File.exist? File.join(destination, "specifications", spec.spec_name)
+    installed = Gem::SpecificationRecord.dirs_from([destination]).any? do |spec_dir|
+      File.exist? File.join(spec_dir, spec.spec_name)
+    end
+
+    if installed
       yield nil
       return
     end

lib/rubygems/specification.rb

@@ -1263,7 +1263,9 @@ def self.reset
   # Keeps track of all currently known specifications
 
   def self.specification_record
-    @specification_record ||= Gem::SpecificationRecord.new(dirs)
+    @specification_record ||= Gem::SpecificationRecord.new(
+      Gem::SpecificationRecord.dirs_with_abi(dirs)
+    )
   end
 
   # DOC: This method needs documented or nodoc'd
@@ -2026,13 +2028,19 @@ def initialize_copy(other_spec)
 
   def base_dir
     return Gem.dir unless loaded_from
-    @base_dir ||= if default_gem?
+    @base_dir ||= if default_gem? || loaded_from_abi_scoped_spec_dir?
       File.dirname File.dirname File.dirname loaded_from
     else
       File.dirname File.dirname loaded_from
     end
   end
 
+  def loaded_from_abi_scoped_spec_dir?
+    !loaded_from.nil? &&
+      Gem::SpecificationRecord.abi_scoped_spec_dir?(File.dirname(loaded_from))
+  end
+  private :loaded_from_abi_scoped_spec_dir?
+
   def inspect # :nodoc:
     if $DEBUG
       super
@@ -2328,11 +2336,14 @@ def source # :nodoc:
   end
 
   ##
-  # Returns the full path to the directory containing this spec's
-  # gemspec file. eg: /usr/local/lib/ruby/gems/1.8/specifications
-
+  # Full path to the directory containing this spec's gemspec file.
+  # ABI-scoped for content-addressed specs.
   def spec_dir
-    @spec_dir ||= File.join base_dir, "specifications"
+    @spec_dir ||= if loaded_from && Gem::ContentAddress.content_addressed?(self)
+      File.dirname loaded_from
+    else
+      Gem::SpecificationRecord.specification_dir_for(self, base_dir)
+    end
   end
 
   ##