rb_sys 0.9.96 → 0.9.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3275545b3a80cee96756629512637f75ec7282bd1b420fe051be2ba97196e119
-  data.tar.gz: fd350de2bcbddec4425eaf424928fdb9df3cc743f8a1d1e1786c698b7402987b
+  metadata.gz: ab6cc75cd0019c1ef5776fce1f1356f89402d1121ecf249d7be13611bd48f2c1
+  data.tar.gz: fdb898fe8c841369fe4d028fb560c528c21c340aff5acaf174d9900b2f22f187
 SHA512:
-  metadata.gz: 8e86c79218d9b9adad76c2ce893d688562c4a224121dfb758d7a5dbd762761057816cb895793b7be6a1d2ccb30aaa7ff935411f5fe85e6cb9e418d09919edbbd
-  data.tar.gz: ced60783c5403e69839607083ccf4042554e419f40b18c7d70d2ec91c623145f783a0c87d66ca2dfe8360ef70b959f6d72f8bfe494db75518de218ceb60d53ed
+  metadata.gz: 98635ea2f6c932672ada8830c5cfebda6c4ee8c401b7caa2479bc958f3aed2b329c75c063937eebdc23e1478828a4bdcc5f5f98aae7a7dec5ac151b034d53f5d
+  data.tar.gz: eccaf0a36185ba534a16500a1e75149ff77ee2819381c3754e0c816caeb4c02f41f6c0d073a6a3da7e2a0c4c70e400e08c6452a66a4944938e0204793b5a48a2

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
@@ -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/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.96"
+  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.96
+  version: 0.9.97
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -29,7 +29,7 @@ cert_chain:
   Lvd35BNvZkhFzs9xfykhurpkT2TiP2F3ZFn9dwLXMFe41pwrtEYLIWhYi8mUG4Ek
   6aR8M/tqIpChVV39
   -----END CERTIFICATE-----
-date: 2024-04-18 00:00:00.000000000 Z
+date: 2024-04-20 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -74,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:
   - - ">="