rb_sys 0.9.116 → 0.9.118

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c10ec40aea0259f407e51f708633296c4594cc105bed6b072473af1c19d2e74e
-  data.tar.gz: b9555c70c5fde2b91c93c44bb8b0cc05d3797883b1ed6630a23ff7aa83373673
+  metadata.gz: a7769c6390c96fd8779a22b6397e5dbf747b1f4c00c2ff1bdd522c7bcdcde736
+  data.tar.gz: 9ec86176519b61b5babbb4506ea0bb9d0484de6c57f5a45b7fd95645ff7043d9
 SHA512:
-  metadata.gz: '09ad40c08c1fe156c51dc8788c705474917741af95afa6cc3f76011f5a407d6ad4934779878cbe70abb7ab2571167f609ef711ea388f229ea756faba4e539493'
-  data.tar.gz: 2510debc3f63a22c98c6d769af4906b194923b47c02f08e4febecfe0a91c5b5370107814b4f4cfbbe886320f3e7ab7aaa5cf41fb4cc943c790f3f4766de8f95e
+  metadata.gz: 370581d111056bffbb17a8d51ec4a5c6d5d779106cc3935de24e69dbe9a74132fbd52a21e768e872f453ae6d2ce9e6cf0e615aa9a26afb1b2b7f913cab69654f
+  data.tar.gz: f246f16238c74858ca6290dfe81e76312f8294698bce68e362e8be29e4f5cc55e15dd206c12eabcbd0e7eaa14266a55be631ee142ab2aa0faa7523a15dd8c05f

data/exe/rb-sys-dock

@@ -14,7 +14,7 @@ require "tmpdir"
 
 OPTIONS = {
   docker_platform: "linux/amd64",
-  version: RbSys::VERSION,
+  version: ENV["RCD_IMAGE_VERSION"] || RbSys::VERSION,
   directory: Dir.pwd
 }
 
@@ -99,28 +99,30 @@ OptionParser.new do |opts|
     OPTIONS[:toolchain_info] = toolchain_info
   end
 
-  opts.on("-r", "--ruby-versions LIST", "List all supported Ruby versions") do |arg|
-    vers = arg.split(/[^0-9.]+/).map do |v|
-      override = RakeCompilerDock.cross_rubies[v]
+  opts.on("-r", "--ruby-versions LIST", "Comma- or colon-separated Ruby requirements (e.g., '3.4,~> 3.1')") do |arg|
+    requirements = arg.tr(":", ",").split(",").map(&:strip).reject(&:empty?)
 
-      next override if override
-
-      parts = v.split(".")
-      parts[2] = "0" if parts[2].nil?
-      parts.join(".")
+    begin
+      resolved = RakeCompilerDock.ruby_cc_version(*requirements)
+    rescue => error
+      logger.error("Could not resolve requested Ruby versions: #{error.message}")
+      exit(1)
     end
 
-    OPTIONS[:ruby_versions] = vers
+    resolved_versions = resolved.split(":")
+    OPTIONS[:ruby_version_requirements] = requirements
+    OPTIONS[:ruby_versions] = resolved_versions
 
-    logger.info("Building for Ruby requested versions: #{vers}")
+    logger.info("Building for Ruby requested versions: #{resolved_versions.join(":")}")
 
-    ENV["RUBY_CC_VERSION"] = vers.join(":")
+    RakeCompilerDock.set_ruby_cc_version(*requirements)
   end
 
   opts.on("--tag TAG", "Use a specific version of the Docker image") do |tag|
     logger.info("Using version #{tag} of the Docker image")
     OPTIONS[:version] = tag
     OPTIONS[:no_cache] = tag == "latest"
+    ENV["RCD_IMAGE_VERSION"] = tag
   end
 
   opts.on("--list-platforms", "--list", "List all supported platforms") do
@@ -445,7 +447,9 @@ def log_some_useful_info
 end
 
 def set_env
-  ENV["RCD_IMAGE"] ||= "rbsys/#{ruby_platform}:#{OPTIONS[:version]}"
+  ENV["RCD_IMAGE_VERSION"] ||= OPTIONS[:version]
+  version = ENV.fetch("RCD_IMAGE_VERSION")
+  ENV["RCD_IMAGE"] ||= "rbsys/#{ruby_platform}:#{version}"
 end
 
 def lint_rb_sys

data/lib/rb_sys/cargo_builder.rb

@@ -110,6 +110,10 @@ module RbSys
       end
     end
 
+    def rubygems_invoked?
+      ENV.key?("SOURCE_DATE_EPOCH") && ENV["RB_SYS_TEST"] != "1" && !ENV.key?("NIX_STORE")
+    end
+
     private
 
     def rb_config_env
@@ -342,10 +346,6 @@ module RbSys
       end
     end
 
-    def rubygems_invoked?
-      ENV.key?("SOURCE_DATE_EPOCH") && ENV["RB_SYS_TEST"] != "1"
-    end
-
     def musl?
       RbConfig::CONFIG["target_os"] == "linux-musl" || RbConfig::CONFIG["CC"]&.include?("musl-gcc")
     end

data/lib/rb_sys/error.rb

@@ -8,8 +8,8 @@ module RbSys
   class PackageNotFoundError < Error
     def initialize(name)
       msg = <<~MSG.chomp.tr("\n", " ")
-        Could not find Cargo package metadata for #{@name.inspect}. Please
-        check that #{@name.inspect} matches the crate name in your
+        Could not find Cargo package metadata for #{name.inspect}. Please
+        check that #{name.inspect} matches the crate name in your
         Cargo.toml."
       MSG
 

data/lib/rb_sys/mkmf/config.rb

@@ -55,12 +55,16 @@ module RbSys
         @builder.respond_to?(name) || super
       end
 
-      # Seems to be the only way to reliably know if we were invoked by Rubygems.
-      # We want to know this so we can cleanup the target directory after an
-      # install, to remove bloat.
-      # @api private
+      # Unfortunate, but this seems to be the only way to reliably know if we
+      # were invoked by Rubygems. We want to know this so we can cleanup the
+      # target directory after an install, to remove bloat.
+      #
+      # Note: we avoid nix environments so we do not force recompilation in
+      # development, and accept that the "clean" task will not automatically
+      # run.
+      #
       def rubygems_invoked?
-        ENV.key?("SOURCE_DATE_EPOCH") && ENV["RB_SYS_TEST"] != "1"
+        ENV.key?("SOURCE_DATE_EPOCH") && ENV["RB_SYS_TEST"] != "1" && !ENV.key?("NIX_STORE")
       end
 
       def use_stable_api_compiled_fallback?

data/lib/rb_sys/mkmf.rb

@@ -286,9 +286,18 @@ module RbSys
     end
 
     def fixup_libnames
-      return unless find_executable("install_name_tool")
+      # Try to find install_name_tool, checking multiple possible names:
+      # 1. Native macOS install_name_tool
+      # 2. Target-prefixed version from osxcross (e.g., aarch64-apple-darwin-install_name_tool)
+      tool = if find_executable("install_name_tool")
+        "install_name_tool"
+      elsif find_executable("$(CARGO_BUILD_TARGET)-install_name_tool")
+        "$(CARGO_BUILD_TARGET)-install_name_tool"
+      else
+        return
+      end
 
-      '$(Q) install_name_tool -id "" $(DLLIB)'
+      %($(Q) #{tool} -id "" $(DLLIB))
     end
 
     def if_eq_stmt(a, b)

data/lib/rb_sys/toolchain_info/data.rb

@@ -5,6 +5,6 @@
 module RbSys
   class ToolchainInfo
     # @private
-    DATA = {"arm-linux" => {"rust-target" => "arm-unknown-linux-gnueabihf", "rake-compiler-dock" => {"cc" => "arm-linux-gnueabihf-gcc"}, "docker-platform" => "linux/arm/v7", "supported" => true}, "aarch64-linux" => {"aliases" => ["aarch64-linux-gnu", "aarch64-unknown-linux-gnu"], "rust-target" => "aarch64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "aarch64-linux-gnu-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "aarch64-linux-musl" => {"rust-target" => "aarch64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "aarch64-linux-musl-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "arm64-darwin" => {"rust-target" => "aarch64-apple-darwin", "rake-compiler-dock" => {"cc" => "aarch64-apple-darwin-clang"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "x64-mingw-ucrt" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x64-mingw32" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86-linux" => {"rust-target" => "i686-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "i686-redhat-linux-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86-mingw32" => {"rust-target" => "i686-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "i686-w64-mingw32-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86_64-darwin" => {"rust-target" => "x86_64-apple-darwin", "rake-compiler-dock" => {"cc" => "x86_64-apple-darwin-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux" => {"aliases" => ["x86_64-linux-gnu", "x86_64-unknown-linux-gnu"], "rust-target" => "x86_64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "x86_64-redhat-linux-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux-musl" => {"rust-target" => "x86_64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "x86_64-unknown-linux-musl-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}}
+    DATA = {"arm-linux" => {"rust-target" => "arm-unknown-linux-gnueabihf", "rake-compiler-dock" => {"cc" => "arm-linux-gnueabihf-gcc"}, "docker-platform" => "linux/arm/v7", "supported" => true}, "aarch64-linux" => {"aliases" => ["aarch64-linux-gnu", "aarch64-unknown-linux-gnu"], "rust-target" => "aarch64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "aarch64-linux-gnu-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "aarch64-linux-musl" => {"rust-target" => "aarch64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "aarch64-linux-musl-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "arm64-darwin" => {"rust-target" => "aarch64-apple-darwin", "rake-compiler-dock" => {"cc" => "aarch64-apple-darwin-clang"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "x64-mingw-ucrt" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "aarch64-mingw-ucrt" => {"rust-target" => "aarch64-pc-windows-gnullvm", "rake-compiler-dock" => {"cc" => "aarch64-w64-mingw32-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x64-mingw32" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86-linux" => {"rust-target" => "i686-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "i686-redhat-linux-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86-mingw32" => {"rust-target" => "i686-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "i686-w64-mingw32-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86_64-darwin" => {"rust-target" => "x86_64-apple-darwin", "rake-compiler-dock" => {"cc" => "x86_64-apple-darwin-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux" => {"aliases" => ["x86_64-linux-gnu", "x86_64-unknown-linux-gnu"], "rust-target" => "x86_64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "x86_64-redhat-linux-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux-musl" => {"rust-target" => "x86_64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "x86_64-unknown-linux-musl-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}}
   end
 end

data/lib/rb_sys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbSys
-  VERSION = "0.9.116"
+  VERSION = "0.9.118"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.116
+  version: 0.9.118
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -29,7 +29,7 @@ cert_chain:
   C/k2s4tlFwg7XEtz7wjSnVeiNP9EOK50WgVr4muWx1rhvOFhpxypONCCANJUILGk
   1JUZhXwcbcst
   -----END CERTIFICATE-----
-date: 2025-06-02 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.10.0
 email:
 - i.kerseymer@gmail.com
 executables:
@@ -86,14 +86,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Helpers for compiling Rust extensions for ruby
 test_files: []