rb_sys 0.9.91 → 0.9.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5f116217a0a284e2e0bcb56b6b582604f1152b065f3425eb294785d8cfc4c2e
-  data.tar.gz: e7f23fad1b06f140b11cd6f5e6d5f931ce420c2ecf03f95bdcf634d3f88ce446
+  metadata.gz: ab6cc75cd0019c1ef5776fce1f1356f89402d1121ecf249d7be13611bd48f2c1
+  data.tar.gz: fdb898fe8c841369fe4d028fb560c528c21c340aff5acaf174d9900b2f22f187
 SHA512:
-  metadata.gz: '09caae7450fd9ba3ffd00d3eb5250061fc75cdf0d0bbdd15028fc19a874308602ed86759defe64304200f7e7eed93ee997e0a2bc5dc70c1879967c196fb8bc6e'
-  data.tar.gz: f3ebb2d447253c49531df6f42a6264cc57d32dd195d4eff088166be8da9264c528b37e4b19e6bb4c378a7e626ba1af4726128eb5d1cc2b5a3e05e663aadb9897
+  metadata.gz: 98635ea2f6c932672ada8830c5cfebda6c4ee8c401b7caa2479bc958f3aed2b329c75c063937eebdc23e1478828a4bdcc5f5f98aae7a7dec5ac151b034d53f5d
+  data.tar.gz: eccaf0a36185ba534a16500a1e75149ff77ee2819381c3754e0c816caeb4c02f41f6c0d073a6a3da7e2a0c4c70e400e08c6452a66a4944938e0204793b5a48a2

data/certs/ianks.pem

@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQsFADBCMRQwEgYDVQQDDAtpLmtl
+MIIDODCCAiCgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBCMRQwEgYDVQQDDAtpLmtl
 cnNleW1lcjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYD
-Y29tMB4XDTIzMDQxNDEzMzYxNVoXDTI0MDQxMzEzMzYxNVowQjEUMBIGA1UEAwwL
+Y29tMB4XDTI0MDQxODA1MzY0N1oXDTI1MDQxODA1MzY0N1owQjEUMBIGA1UEAwwL
 aS5rZXJzZXltZXIxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixk
 ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJ2pG+er4cP
 PasxsMIKL9/tmLL4gh80EMuF3SCS0qZoh+Oo8dkvRYxW8NXdwEIcp3cCNgE+5G+J
@@ -9,13 +9,12 @@ TCMOVF8S15n1Z1P7xxXiXxa/BIofKKbtatVRngm14uR/6pjdkvLXqlrWdS57bNwv
 7LtpzYVfDHfsl/qRWaEi4jq00PNCRSWjcva8teqswjBg8KlwGtyygpezPbVSWP8Y
 vzWZmVF7fqRBXU78Ah0+pNOhslBXDTvI3xJdN4hQ3H7rLjpD/qxKWq/8o+Qvx6cX
 dNZ3ugH/Pr3BAsqt4JFLXin9AK7PO9GDMH5JXJrUb+hAt2VNIZqpz9VlKA6BA0jN
-eWGea+yCZkECAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
-BBYEFOkrF6hsocaIMOjR/K3JBzyXCLJPMCAGA1UdEQQZMBeBFWkua2Vyc2V5bWVy
-QGdtYWlsLmNvbTAgBgNVHRIEGTAXgRVpLmtlcnNleW1lckBnbWFpbC5jb20wDQYJ
-KoZIhvcNAQELBQADggEBAMAohCl0cdVlYrJl9viGtzbEyLV/Krn0ZD/LM9d2cIRj
-WBu7HRkP6AfYVzhZwdgUgDYw67d715kOMpLNGeWQw3QGEHFqbVzRML64jL8IxuTz
-J8ttZVqM8f4GrHyISJnL92u6iP4WzdbVqx89EFjrrHd14OJXK+ZpdRh0YvnN/vMJ
-t2EcDweRHkN/MEdrwbH+PbYjELnKcTIEZqcCWTk8pgssGrNyjkMhxGSsSUo9qTz0
-DIZ6NVmpBvohJVCCCDxQQxFKLXZp1ivoxjN+m7eJSW7yzIz062pH4u8pPNQsiVSb
-I5rgRPbDr2rAFGXKoQ0+u6CLkRxqrVsITl/OPfZhBQI=
+eWGea+yCZkECAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+BBYEFOkrF6hsocaIMOjR/K3JBzyXCLJPMA0GCSqGSIb3DQEBCwUAA4IBAQARHgco
+yCxWUqN+HBGewmSB7T4oq6YS2FtU62K+GuWWCTqjl5byLKMXQW8HPDja9TC1My1m
+2r0uDshtUvUjuB/Vfe9jVMTjnPBspHZYo0MRuMPc7owJaahjkqD3l7w9aa8Ci5aC
+YU4Aj71Sc8s7YIxgHn/yIUdCe1yu6cC0+h+Ss9r/Yjr53NNXwjGQlDmH1eHcVQGZ
+mEoVcZO1uWNtRPPsn1gfvKLPjRe5pclXQnGviS5DiH0Du+8QMxQGBJnYz2zSMW7G
+Lvd35BNvZkhFzs9xfykhurpkT2TiP2F3ZFn9dwLXMFe41pwrtEYLIWhYi8mUG4Ek
+6aR8M/tqIpChVV39
 -----END CERTIFICATE-----

data/exe/rb-sys-dock

@@ -18,7 +18,13 @@ OPTIONS = {
 }
 
 def cargo_metadata
-  @cargo_metadata ||= RbSys::Cargo::Metadata.new("rb-sys-dock", deps: true)
+  return @cargo_metadata if defined?(@cargo_metadata)
+
+  @cargo_metadata = begin
+    RbSys::Cargo::Metadata.inferred(deps: true)
+  rescue
+    nil
+  end
 end
 
 def logger
@@ -172,9 +178,9 @@ end
 
 def determine_cache_dir
   return ENV["RB_SYS_DOCK_CACHE_DIR"] if ENV["RB_SYS_DOCK_CACHE_DIR"]
-  return File.join(ENV["XDG_CACHE_HOME"], "rb-sys-dock") if ENV["XDG_CACHE_HOME"]
+  return File.join(ENV["XDG_CACHE_HOME"], "rb-sys") if ENV["XDG_CACHE_HOME"]
 
-  File.join(ENV["HOME"], ".cache", "rb-sys-dock")
+  File.join(ENV["HOME"], ".cache", "rb-sys")
 end
 
 def docker_tmp
@@ -359,7 +365,7 @@ def rcd(input_args)
   cmd = <<~SH
     #{default_docker_command} run \
       --platform #{OPTIONS.fetch(:docker_platform)} \
-      -v #{working_directory}:#{working_directory} \
+      -v $(pwd):$(pwd) \
       #{mount_tmp_dir} \
       #{mount_target_dir} \
       #{mount_cargo_registry} \
@@ -421,7 +427,7 @@ def set_env
 end
 
 def lint_rb_sys
-  cargo_version = cargo_metadata.rb_sys_version
+  cargo_version = cargo_metadata&.rb_sys_version || RbSys::VERSION
   return if cargo_version == RbSys::VERSION
   logger.warn("Cargo rb-sys version (#{cargo_version}) does not match Ruby gem version (#{RbSys::VERSION})")
 rescue => e

data/lib/rb_sys/cargo/metadata.rb

@@ -9,6 +9,26 @@ module RbSys
     class Metadata
       attr_reader :name
 
+      class << self
+        # Infers the Cargo project's name from the Cargo.toml file.
+        #
+        # @return [RbSys::Cargo::Metadata]
+        def inferred(deps: false)
+          new(File.read("Cargo.toml").match(/^name = "(.*)"/)[1], deps: deps)
+        rescue
+          new(File.basename(Dir.pwd), deps: deps)
+        end
+
+        # Initializes a new Cargo::Metadata instance or infers the Cargo project's name.
+        #
+        # @param name [String] the name of the Cargo project
+        def new_or_inferred(name, deps: false)
+          new(name, deps: deps).load!
+        rescue CargoMetadataError
+          inferred
+        end
+      end
+
       # Initializes a new Cargo::Metadata instance.
       #
       # @param name [String] the name of the Cargo project
@@ -92,12 +112,22 @@ module RbSys
       end
 
       # Returns the rb-sys version, if any.
+      #
+      # @return [String]
       def rb_sys_version
         pkg = packages.find { |p| p.fetch("name") == "rb-sys" }
         return unless pkg
         pkg["version"]
       end
 
+      # Eagerly run `cargo metadata`, raising a RbSys::CargoCargoMetadataError` if it fails.
+      #
+      # @return [RbSys::Cargo::Metadata]
+      def load!
+        cargo_metadata
+        self
+      end
+
       private
 
       def package_metadata

data/lib/rb_sys/cargo_builder.rb

@@ -148,6 +148,10 @@ module RbSys
         flags += ["-C", "link-arg=#{dl_flag}"] unless makefile_config("DLDFLAGS")&.include?(dl_flag)
       end
 
+      if musl?
+        flags += ["-C", "target-feature=-crt-static"]
+      end
+
       flags
     end
 
@@ -337,6 +341,10 @@ module RbSys
       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
+
     # Error raised when no cdylib artifact was created
     class DylibNotFoundError < StandardError
       def initialize(dir)

data/lib/rb_sys/extensiontask.rb

@@ -57,7 +57,7 @@ module RbSys
     end
 
     def cargo_metadata
-      @cargo_metadata ||= Cargo::Metadata.new(@name)
+      @cargo_metadata ||= Cargo::Metadata.new_or_inferred(@name)
     end
 
     def extconf

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.91
+  version: 0.9.97
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -10,9 +10,9 @@ bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQsFADBCMRQwEgYDVQQDDAtpLmtl
+  MIIDODCCAiCgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBCMRQwEgYDVQQDDAtpLmtl
   cnNleW1lcjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTIzMDQxNDEzMzYxNVoXDTI0MDQxMzEzMzYxNVowQjEUMBIGA1UEAwwL
+  Y29tMB4XDTI0MDQxODA1MzY0N1oXDTI1MDQxODA1MzY0N1owQjEUMBIGA1UEAwwL
   aS5rZXJzZXltZXIxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixk
   ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJ2pG+er4cP
   PasxsMIKL9/tmLL4gh80EMuF3SCS0qZoh+Oo8dkvRYxW8NXdwEIcp3cCNgE+5G+J
@@ -20,17 +20,16 @@ cert_chain:
   7LtpzYVfDHfsl/qRWaEi4jq00PNCRSWjcva8teqswjBg8KlwGtyygpezPbVSWP8Y
   vzWZmVF7fqRBXU78Ah0+pNOhslBXDTvI3xJdN4hQ3H7rLjpD/qxKWq/8o+Qvx6cX
   dNZ3ugH/Pr3BAsqt4JFLXin9AK7PO9GDMH5JXJrUb+hAt2VNIZqpz9VlKA6BA0jN
-  eWGea+yCZkECAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
-  BBYEFOkrF6hsocaIMOjR/K3JBzyXCLJPMCAGA1UdEQQZMBeBFWkua2Vyc2V5bWVy
-  QGdtYWlsLmNvbTAgBgNVHRIEGTAXgRVpLmtlcnNleW1lckBnbWFpbC5jb20wDQYJ
-  KoZIhvcNAQELBQADggEBAMAohCl0cdVlYrJl9viGtzbEyLV/Krn0ZD/LM9d2cIRj
-  WBu7HRkP6AfYVzhZwdgUgDYw67d715kOMpLNGeWQw3QGEHFqbVzRML64jL8IxuTz
-  J8ttZVqM8f4GrHyISJnL92u6iP4WzdbVqx89EFjrrHd14OJXK+ZpdRh0YvnN/vMJ
-  t2EcDweRHkN/MEdrwbH+PbYjELnKcTIEZqcCWTk8pgssGrNyjkMhxGSsSUo9qTz0
-  DIZ6NVmpBvohJVCCCDxQQxFKLXZp1ivoxjN+m7eJSW7yzIz062pH4u8pPNQsiVSb
-  I5rgRPbDr2rAFGXKoQ0+u6CLkRxqrVsITl/OPfZhBQI=
+  eWGea+yCZkECAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFOkrF6hsocaIMOjR/K3JBzyXCLJPMA0GCSqGSIb3DQEBCwUAA4IBAQARHgco
+  yCxWUqN+HBGewmSB7T4oq6YS2FtU62K+GuWWCTqjl5byLKMXQW8HPDja9TC1My1m
+  2r0uDshtUvUjuB/Vfe9jVMTjnPBspHZYo0MRuMPc7owJaahjkqD3l7w9aa8Ci5aC
+  YU4Aj71Sc8s7YIxgHn/yIUdCe1yu6cC0+h+Ss9r/Yjr53NNXwjGQlDmH1eHcVQGZ
+  mEoVcZO1uWNtRPPsn1gfvKLPjRe5pclXQnGviS5DiH0Du+8QMxQGBJnYz2zSMW7G
+  Lvd35BNvZkhFzs9xfykhurpkT2TiP2F3ZFn9dwLXMFe41pwrtEYLIWhYi8mUG4Ek
+  6aR8M/tqIpChVV39
   -----END CERTIFICATE-----
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-04-20 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -75,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="