rake-compiler 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49fcf758dd603f22ed6ce9a327ebf2dfed50a2b54644050fd5059ad9901d5e4e
-  data.tar.gz: 7716b914ed2965585f32119f10d052e2556e468128246a4a878815cc75ba9466
+  metadata.gz: 9cb4094b72287bf86e445b06b208331b6b9057a70677345bbe5396dd2536979b
+  data.tar.gz: 5187cb62cd90f974bcec3aa26e0d91562c961480c99ebafa549d2c3e20e79aa0
 SHA512:
-  metadata.gz: 787addff745e3330c8402da616bae6dd76233506c629f6b3a14905a5b5bec4aa3a6bb6d3cd1869f89a34d35c780aa7b1800fdfc35e5c6ad5eee2809b284a7b8b
-  data.tar.gz: 0ef3f9091f58ac37c47a662cc209b11cb4cc1c90ead30232b5a9cbf7afdf00339557773eaa7d49085f77007865bb6b806229a67c53efcc595c42c94abc22ee57
+  metadata.gz: 9a435b46290e8736a57dab44cddc8b1180b64b39575e943285525c54393f131c03b1957498aaba96f6b89d303ce66399904640858ab4e49f5f385c9193283757
+  data.tar.gz: e3a7e183a03b298caa425c1f4836227499e4203c10d90db32c615c093338cc2a255d1f85b4c55a1729dc6f7fb3e58ee7f5ad2523af3e0854a861608d765ee2e1

data/History.md

@@ -1,3 +1,16 @@
+### 1.3.2 / 2026-10-08
+
+* Improvements:
+  * GH-257: Add support for content addressable gem.
+    * Patch by Harriet Oughton
+    * Patch by Jenny Shen
+    * Patch by Gira Chawda
+
+* Thanks:
+  * Harriet Oughton
+  * Jenny Shen
+  * Gira Chawda
+
 ### 1.3.1 / 2025-05-06
 
 * Improvements:

data/README.md

@@ -247,6 +247,7 @@ end
 | cross_config_options | ExtensionTask (CRuby) | [Optional] See [Cross compilation - the future is now.](#cross-compilation---the-future-is-now) Default: `[]`. |
 | no_native            | ExtensionTask (CRuby) | [Optional] Set to true to prevent non-CRuby platforms from defining native tasks. Default: `false`. |
 | config_includes      | ExtensionTask (CRuby) | [Optional] Specify an Array of paths to include as `-I...:...` includes during compilation. Default: `['.']`. |
+| content_addressable  | ExtensionTask (CRuby) | [Optional] Set to true to also build a content addressable gem per Ruby ABI. See [Building content addressable gems](#building-content-addressable-gems). Default: `false`. |
 | classpath            | JavaExtensionTask     | [Optional] Specify additional classpath paths as an Array. Default: _Uses the current CLASSPATH._  |
 | debug                | JavaExtensionTask     | [Optional] Whether to set the debug flag during compilation. Default: `false`. |
 | source_version       | JavaExtensionTask     | [Optional] The JRE version that your source code requires to compile. Default: `1.6`. |
@@ -444,6 +445,34 @@ This approach catch the cases of provided fat binaries or gems compiled by the
 end user installing the gem. It has also been implemented successfully in
 several projects.
 
+#### Building content addressable gems
+
+RubyGems 4.1.0 or later can build gems that target a single Ruby ABI and are
+named by the hash of their contents instead of by platform. If you enable
+`content_addressable`, rake-compiler builds one of these gems for each Ruby
+version in `RUBY_CC_VERSION`, in addition to the multi ABI gem:
+
+```ruby
+Rake::ExtensionTask.new('my_extension', gem_spec) do |ext|
+  ext.cross_compile = true
+  ext.cross_platform = ['x86_64-linux', 'arm64-darwin']
+  ext.content_addressable = true
+end
+```
+
+    rake cross native gem RUBY_CC_VERSION=3.3.11:3.4.9
+
+This produces, in `pkg/`, the usual multi ABI gem plus one gem per Ruby ABI whose
+`required_ruby_version` is pinned to that ABI:
+
+    pkg/my_gem-1.0.0-x86_64-linux.gem   # multi ABI gem, Ruby >= 3.3, < 3.5.dev
+    pkg/my_gem-1.0.0-<hash>.gem         # Ruby ~> 3.3.0
+    pkg/my_gem-1.0.0-<hash>.gem         # Ruby ~> 3.4.0
+
+`rake native` and `rake native:<platform>` build the multi ABI gem and all of
+the single ABI gems. To build only the gem for one Ruby ABI, run
+`rake native:<gem name>:<platform>:<ruby abi>`.
+
 ## What are you talking about? (Give me examples)
 
 I know all the above sounds like a complete foreign language (it does even for me!).

data/lib/rake/extensiontask.rb

@@ -15,6 +15,7 @@ module Rake
     attr_writer :cross_config_options
     attr_accessor :no_native
     attr_accessor :config_includes
+    attr_accessor :content_addressable
 
     def init(name = nil, gem_spec = nil)
       super
@@ -26,6 +27,7 @@ module Rake
       @cross_compiling = nil
       @no_native = (ENV["RAKE_EXTENSION_TASK_NO_NATIVE"] == "true")
       @config_includes = []
+      @content_addressable = false
       # Default to an empty list of ruby versions for each platform
       @ruby_versions_per_platform = Hash.new { |h, k| h[k] = [] }
       @make = nil
@@ -54,6 +56,13 @@ module Rake
         warn "WARNING: rake-compiler found compiled files in '#{@ext_dir}' directory. Please remove them."
       end
 
+      if @content_addressable && !Gem::PackageTask.method_defined?(:content_addressable=)
+        warn <<~MSG
+          WARNING: content_addressable is enabled but RubyGems #{Gem::VERSION} does not support content addressable gems.
+                   Only the multi-ABI gem will be built. Upgrade RubyGems with `gem update --system`.
+        MSG
+      end
+
       # only gems with 'ruby' platforms are allowed to define native tasks
       define_native_tasks if !@no_native && (@gem_spec && @gem_spec.platform == 'ruby')
 
@@ -257,9 +266,22 @@ Java extension should be preferred.
       # Update compiled platform/version combinations
       @ruby_versions_per_platform[platf] << ruby_ver
 
+      native_task_name = "native:#{@gem_spec.name}:#{platf}"
+
+      # packaging tasks to define: task name => Ruby ABI (nil for the multi-ABI gem)
+      package_tasks = { native_task_name => nil }
+
+      # when content addressable, also build a single Ruby ABI gem per Ruby version
+      if content_addressable && Gem::PackageTask.method_defined?(:content_addressable=)
+        abi = ruby_api_version(ruby_ver)
+        package_tasks["#{native_task_name}:#{abi}"] = abi
+      end
+
       # create 'native:gem_name' and chain it to 'native' task
-      unless Rake::Task.task_defined?("native:#{@gem_spec.name}:#{platf}")
-        task "native:#{@gem_spec.name}:#{platf}" do |t|
+      package_tasks.each do |task_name, ruby_abi|
+        next if Rake::Task.task_defined?(task_name)
+
+        task task_name do |t|
           # FIXME: workaround Gem::Specification limitation around cache_file:
           # http://github.com/rubygems/rubygems/issues/78
           spec = gem_spec.dup
@@ -269,14 +291,19 @@ Java extension should be preferred.
           spec.platform = Gem::Platform.new(platf)
 
           # set ruby version constraints
-          ruby_versions = @ruby_versions_per_platform[platf]
-          sorted_ruby_versions = ruby_versions.sort_by do |ruby_version|
-            ruby_version.split(".").collect(&:to_i)
+          if ruby_abi
+            # pessimistic version requirement for a single Ruby ABI gem
+            spec.required_ruby_version = "~> #{ruby_abi}.0"
+          else
+            ruby_versions = @ruby_versions_per_platform[platf]
+            sorted_ruby_versions = ruby_versions.sort_by do |ruby_version|
+              ruby_version.split(".").collect(&:to_i)
+            end
+            spec.required_ruby_version = [
+              ">= #{ruby_api_version(sorted_ruby_versions.first)}",
+              "< #{ruby_api_version(sorted_ruby_versions.last).succ}.dev"
+            ]
           end
-          spec.required_ruby_version = [
-            ">= #{ruby_api_version(sorted_ruby_versions.first)}",
-            "< #{ruby_api_version(sorted_ruby_versions.last).succ}.dev"
-          ]
 
           # set rubygems version constraints
           if Gem::Version.new(Gem::VERSION) >= Gem::Version.new("3.3.22") &&
@@ -313,6 +340,9 @@ Java extension should be preferred.
             # Do not copy any files per PackageTask, because
             # we need the files from the staging directory
             p.package_files.clear
+            # Gem::PackageTask scopes its staging directory by Ruby ABI when
+            # content_addressable is set, so every gem still lands in `pkg/`.
+            p.content_addressable = true if ruby_abi
           end
 
           # copy other gem files to staging directory if added by the callback
@@ -343,7 +373,9 @@ Java extension should be preferred.
       end
 
       # add binaries to the dependency chain
-      task "native:#{@gem_spec.name}:#{platf}" => ["#{stage_path}/#{lib_binary_path}"]
+      package_tasks.each_key do |task_name|
+        task task_name => ["#{stage_path}/#{lib_binary_path}"]
+      end
 
       # ensure the extension get copied
       unless Rake::Task.task_defined?(lib_binary_path) then
@@ -352,12 +384,12 @@ Java extension should be preferred.
       file "#{stage_path}/#{lib_binary_path}" => ["copy:#{@name}:#{platf}:#{ruby_ver}"]
 
       # Allow segmented packaging by platform (open door for 'cross compile')
-      task "native:#{platf}" => ["native:#{@gem_spec.name}:#{platf}"]
+      task "native:#{platf}" => package_tasks.keys
 
       # Only add this extension to the compile chain if current
       # platform matches the indicated one.
       if platf == RUBY_PLATFORM then
-        task "native:#{@gem_spec.name}" => ["native:#{@gem_spec.name}:#{platf}"]
+        task "native:#{@gem_spec.name}" => package_tasks.keys
         task "native" => ["native:#{platf}"]
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Rake-based Ruby Extension (C, Java) task generator.
 test_files: []