rb_sys 0.9.128 → 0.9.129

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4907306eece620077a2b68e2b6f33a13a4e7c310e8937d1655229ff4cbc62605
-  data.tar.gz: bcca23169c98229da0467fffe834ac6de098261cea82fb7e90c6cb0273c048b8
+  metadata.gz: 82ca808ba001224b45263763167b562faad29ce575bf8b490845cf85e555bc26
+  data.tar.gz: ef1ab354b5451ad6e815eebd65e9863a58e9cb73d0dd13732b2ffaa0db1e48ed
 SHA512:
-  metadata.gz: 89690dc28b0a42302744554a4e9aac8c0573c88a016ffc67e4aed3873de3fad862947613403e46e711650eebf055751542473db0a64ce60b5c73134ac7ef9162
-  data.tar.gz: 10d2bd2e67bd9e937b300c5deb451c8d5fbdf88d39399815b6b7f7cdeb3c69a140048ed6c57b6d7a82a7a840fc47b66f04379a9c1273be200af383ee2f4923a0
+  metadata.gz: 062cc26ba140d61fc252b877446601287cd4098be9e7bbf3d8b464d2f3c08439bf749d8dc548fd44c38f33f7627f33ec908f1ff7e6e6db07fccb9e7ded30aaf6
+  data.tar.gz: 6b65c7ba433bf42579a13b43874155528fff7e1967e64f83cb304dc07223a7d3bd3f9c219ee8109edeb57ec511112421677ab09976c1d8508ee91553ea0c4e6c

data/lib/rb_sys/error.rb

@@ -32,7 +32,7 @@ module RbSys
           - Make sure `cargo` is installed and in your PATH
       MSG
 
-      if !stderr.empty?
+      if stderr && !stderr.empty?
         indented_stderr = stderr.lines.map { |line| "  #{line}" }.join
         msg << "Stderr from `cargo metadata` was:\n#{indented_stderr}"
       end

data/lib/rb_sys/extensiontask.rb

@@ -29,8 +29,8 @@ module RbSys
     def init(name = nil, gem_spec = nil)
       super(name, lint_gem_spec(name, gem_spec))
 
-      @orginal_ext_dir = @ext_dir
-      @ext_dir = cargo_metadata.manifest_directory
+      @original_ext_dir = @ext_dir
+      @ext_dir = cargo_manifest_directory
       @source_pattern = nil
       @compiled_pattern = "*.{obj,so,bundle,dSYM}"
       @cross_compile = ENV.key?("RUBY_TARGET")
@@ -61,7 +61,7 @@ module RbSys
     end
 
     def extconf
-      File.join(cargo_metadata.manifest_directory, "extconf.rb")
+      File.join(ext_dir, "extconf.rb")
     end
 
     def binary(_platf)
@@ -86,6 +86,8 @@ module RbSys
     end
 
     def target_directory
+      return fallback_target_directory if @cargo_metadata_unavailable
+
       cargo_metadata.target_directory
     end
 
@@ -104,7 +106,7 @@ module RbSys
     def define_env_tasks
       task "rb_sys:env:default" do
         ENV["RB_SYS_CARGO_TARGET_DIR"] ||= target_directory
-        ENV["RB_SYS_CARGO_MANIFEST_DIR"] ||= cargo_metadata.manifest_directory
+        ENV["RB_SYS_CARGO_MANIFEST_DIR"] ||= File.expand_path(ext_dir)
         ENV["RB_SYS_CARGO_PROFILE"] ||= "release"
       end
 
@@ -129,6 +131,33 @@ module RbSys
 
     private
 
+    def cargo_manifest_directory
+      cargo_metadata.manifest_directory
+    rescue CargoMetadataError
+      raise unless force_install_rust_toolchain?
+
+      # Let the generated Makefile install Cargo before the extension is built.
+      @cargo_metadata_unavailable = true
+      File.expand_path(configured_extension_directory)
+    end
+
+    def configured_extension_directory
+      extension = @gem_spec&.extensions&.find do |path|
+        %w[Cargo.toml extconf.rb].include?(File.basename(path))
+      end
+
+      extension ? File.dirname(extension) : @original_ext_dir
+    end
+
+    def fallback_target_directory
+      File.expand_path(ENV["RB_SYS_CARGO_TARGET_DIR"] || ENV["CARGO_TARGET_DIR"] || "target")
+    end
+
+    def force_install_rust_toolchain?
+      value = ENV["RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN"]
+      value && value != "false"
+    end
+
     def lint_gem_spec(name, gs)
       gem_spec = case gs
       when :undefined

data/lib/rb_sys/mkmf.rb

@@ -297,7 +297,7 @@ module RbSys
         return
       end
 
-      %($(Q) #{tool} -id "" $(DLLIB))
+      %($(Q) #{tool} -id "$(notdir $(DLLIB))" $(DLLIB))
     end
 
     def if_eq_stmt(a, b)

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.128
+  version: 0.9.129
 platform: ruby
 authors:
 - Ian Ker-Seymer