rb_sys 0.9.127 → 0.9.129

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfc10236ea19ee031b7296523be78667b5ae90408c4111180a12c29e93ae1586
-  data.tar.gz: cb8d43340e414462a3d446181a8ed16c49a998967098e8ed7a84b09e27ba3571
+  metadata.gz: 82ca808ba001224b45263763167b562faad29ce575bf8b490845cf85e555bc26
+  data.tar.gz: ef1ab354b5451ad6e815eebd65e9863a58e9cb73d0dd13732b2ffaa0db1e48ed
 SHA512:
-  metadata.gz: 7e9d5c929ca44955127ec55a288f7ceefe6222dd0035cb9b730557150d90175dca62e09c06baed60a6fd11ac234212727076241170b5d370b5cf300f388c30ff
-  data.tar.gz: 58ec6c8e410ccb5a52be1b671c984dbad5c369b456715f06fb27614f00fbd9cbfbe25ca9e0c1d0dada496f48de6b6e282d882e69d2e64e6d5446fcf8196b0a7f
+  metadata.gz: 062cc26ba140d61fc252b877446601287cd4098be9e7bbf3d8b464d2f3c08439bf749d8dc548fd44c38f33f7627f33ec908f1ff7e6e6db07fccb9e7ded30aaf6
+  data.tar.gz: 6b65c7ba433bf42579a13b43874155528fff7e1967e64f83cb304dc07223a7d3bd3f9c219ee8109edeb57ec511112421677ab09976c1d8508ee91553ea0c4e6c

checksums.yaml.gz.sig

@@ -1 +1,4 @@
-��~!`���A[�WA�FG࣊#ɋקp{6�� 9w鯳��Z"�R�ӝ��� �!a �?�a^���n�Z����q̘2�`
�|q��]�LQ�u�R����9j;�)�C�A��86<��͗�p�QJ�y���E���nV�R�=���1H)�K9l���.��[L"v�Jx��u���U-�2.��j��.܎fsȈ�ݡ�'�S�'pK�ێ.^wr��10�E�� Q*Y��
+�'�*����ft1�xmG[Lԡ�u�����v�#��^mA���aBbiC�p�M��΀�̈́�
$L�?T�����[O��|!M������ӯ�!6�Mr'���
+
����BS�%�\�8%o��pT�k}:W݈���P��3;�p��wn��
+X��fP�D#��X�2,Ϟ9Z�8�
+�H�L���H\"���<���֬c!���~LL����*d�

data/exe/rb-sys-dock

@@ -339,7 +339,7 @@ def default_command_to_run(input_args)
   input_cmd = input_args.empty? ? "true" : input_args.join(" ")
 
   if OPTIONS[:build]
-    with_bundle = +"test -f Gemfile && bundle install && #{input_cmd} && bundle exec rake native:$RUBY_TARGET gem"
+    with_bundle = "test -f Gemfile && bundle install && #{input_cmd} && bundle exec rake native:$RUBY_TARGET gem"
     without_bundle = "#{input_cmd} && rake native:$RUBY_TARGET gem"
     logger.info("Running default build command (rake native:#{ruby_platform} gem)")
     "bash -c '(#{with_bundle}) || (#{without_bundle})'"

data/lib/rb_sys/cargo/config.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module RbSys
+  module Cargo
+    # Reads Cargo configuration files to extract build settings.
+    module Config
+      class << self
+        # Returns the build target from Cargo configuration files.
+        # Searches from start_dir up to root, then checks CARGO_HOME.
+        #
+        # @param start_dir [String] the directory to start searching from
+        # @return [String, nil] the target triple, or nil if not configured
+        def build_target(start_dir: Dir.pwd)
+          find_in_hierarchy(start_dir) || find_in_home
+        end
+
+        private
+
+        def find_in_hierarchy(dir)
+          dir = File.expand_path(dir)
+          while (parent = File.dirname(dir)) != dir
+            target = read_build_target(File.join(dir, ".cargo"))
+            return target if target
+            dir = parent
+          end
+          nil
+        end
+
+        def find_in_home
+          cargo_home = ENV["CARGO_HOME"] || File.join(Dir.home, ".cargo")
+          read_build_target(cargo_home)
+        rescue ArgumentError
+          # Dir.home can raise if HOME is not set
+          nil
+        end
+
+        def read_build_target(cargo_dir)
+          # Version without `.toml` is for cargo < 1.39
+          %w[config.toml config].each do |name|
+            path = File.join(cargo_dir, name)
+            next unless File.exist?(path)
+            target = parse_build_target(File.read(path))
+            return target if target
+          rescue Errno::EACCES, Errno::ENOENT
+            next
+          end
+          nil
+        end
+
+        def parse_build_target(content)
+          # That is a hacky way to avoid pulling a proper toml parser as a dependency
+          current_section = nil
+          content.each_line do |line|
+            line = line.sub(/#.*/, "").strip
+            next if line.empty?
+
+            if line =~ /^\["?([^\]"]+)"?\]/
+              current_section = $1.strip
+            elsif current_section.nil? && line =~ /^"?build"?\."?target"?\s*=\s*["']([^"']+)["']/
+              return $1
+            elsif current_section.nil? && line =~ /^"?build"?\s*=\s*\{[^}]*"?target"?\s*=\s*["']([^"']+)["']/
+              return $1
+            elsif current_section == "build" && line =~ /^"?target"?\s*=\s*["']([^"']+)["']/
+              return $1
+            end
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/rb_sys/cargo_builder.rb

@@ -1,6 +1,7 @@
 require "rubygems/ext"
 require "rubygems/ext/builder"
 require_relative "cargo_builder/link_flag_converter"
+require_relative "cargo/config"
 
 module RbSys
   # A class to build a Ruby gem Cargo. Extracted from `rubygems` gem, with some modifications.
@@ -21,7 +22,7 @@ module RbSys
       @profile = ENV.fetch("RB_SYS_CARGO_PROFILE", :release).to_sym
       @env = {}
       @features = []
-      @target = ENV["CARGO_BUILD_TARGET"] || ENV["RUST_TARGET"]
+      @target = ENV["CARGO_BUILD_TARGET"] || ENV["RUST_TARGET"] || Cargo::Config.build_target
       @extra_rustc_args = []
       @extra_cargo_args = []
       @dry_run = true

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

@@ -56,7 +56,7 @@ module RbSys
       # global_rustflags << "--cfg=rb_sys_gem" unless builder.use_cargo_build
       global_rustflags << "--cfg=rb_sys_use_stable_api_compiled_fallback" if builder.use_stable_api_compiled_fallback?
 
-      make_install = +<<~MAKE
+      make_install = <<~MAKE
         #{conditional_assign("RB_SYS_BUILD_DIR", File.join(Dir.pwd, ".rb-sys"))}
         #{conditional_assign("CARGO", "cargo")}
         #{conditional_assign("CARGO_BUILD_TARGET", builder.target)}
@@ -150,7 +150,7 @@ module RbSys
         all: #{$extout ? "install" : "$(DLLIB)"}
       MAKE
 
-      gsub_cargo_command!(make_install, builder: builder)
+      make_install = gsub_cargo_command!(make_install.dup, builder: builder)
 
       File.write("Makefile", make_install)
     end
@@ -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)
@@ -334,7 +334,7 @@ module RbSys
 
     def conditional_assign(a, b, export: false, indent: 0)
       if $nmake
-        result = +"!IFNDEF #{a}\n#{a} = #{b}\n!ENDIF\n"
+        result = "!IFNDEF #{a}\n#{a} = #{b}\n!ENDIF\n"
         result << export_env(a, b) if export
         result
       else

data/lib/rb_sys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbSys
-  VERSION = "0.9.127"
+  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.127
+  version: 0.9.129
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -60,6 +60,7 @@ files:
 - exe/rb-sys-dock
 - lib/rb_sys.rb
 - lib/rb_sys/cargo.rb
+- lib/rb_sys/cargo/config.rb
 - lib/rb_sys/cargo/metadata.rb
 - lib/rb_sys/cargo_builder.rb
 - lib/rb_sys/cargo_builder/link_flag_converter.rb