rb_sys 0.9.126 → 0.9.128

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e09c34d5c5b869948ee426e9d31c74a78ae8be25bb6df07899089cddf15f00
-  data.tar.gz: 16a6269705d76fc42702ea69c6f18f69be09736f419210865ee4a66f21798eab
+  metadata.gz: 4907306eece620077a2b68e2b6f33a13a4e7c310e8937d1655229ff4cbc62605
+  data.tar.gz: bcca23169c98229da0467fffe834ac6de098261cea82fb7e90c6cb0273c048b8
 SHA512:
-  metadata.gz: 1485a6d17ae171bf93978b65828a112021fcc3bdf67b037757618781723c4118dc3bbfa5010b8d334377a372a5086c419bdd6a69ba075b8c0ae2467a48eb86fd
-  data.tar.gz: d392c3a4a80770ccce97d71535dc44e2d7107217243817497558dd67aa552662749b85c08ca39be6c7bf0775dfff023a0c4f3f4ea9e538e460a2aba99d2f1b4c
+  metadata.gz: 89690dc28b0a42302744554a4e9aac8c0573c88a016ffc67e4aed3873de3fad862947613403e46e711650eebf055751542473db0a64ce60b5c73134ac7ef9162
+  data.tar.gz: 10d2bd2e67bd9e937b300c5deb451c8d5fbdf88d39399815b6b7f7cdeb3c69a140048ed6c57b6d7a82a7a840fc47b66f04379a9c1273be200af383ee2f4923a0

data/exe/rb-sys-dock

@@ -154,17 +154,42 @@ OptionParser.new do |opts|
   end
 end.parse!
 
+def find_executable(name)
+  executable_file = ->(path) {
+    stat = begin
+      File.stat(path)
+    rescue
+      nil
+    end
+    path if stat&.file? && stat.executable?
+  }
+
+  # On Windows, PATHEXT lists the extensions that make a file executable
+  exts = ENV["PATHEXT"]&.split(File::PATH_SEPARATOR)&.map(&:downcase)
+
+  try_path = ->(path) {
+    executable_file.call(path) || exts&.lazy&.filter_map { |ext| executable_file.call(path + ext) }&.first
+  }
+
+  # Handle absolute/explicit paths without a PATH search
+  return try_path.call(name) if File.expand_path(name) == name
+
+  path_dirs = ENV.fetch("PATH", "/usr/local/bin:/usr/bin:/bin").split(File::PATH_SEPARATOR)
+  path_dirs.each do |dir|
+    dir = dir.sub(/\A"(.*)"\z/m, '\1') if /mswin|mingw/i.match?(RbConfig::CONFIG["host_os"])
+    found = try_path.call(File.join(dir, name))
+    return found if found
+  end
+  nil
+end
+
 def default_docker_command
   return @default_docker_command if defined?(@default_docker_command)
 
   @default_docker_command = ENV.fetch("DOCKER") do
-    if !(docker = `which docker`).empty?
-      docker.strip
-    elsif !(podman = `which podman`).empty?
-      podman.strip
-    else
+    find_executable("docker") ||
+      find_executable("podman") ||
       logger.fatal("Could not find docker or podman command, please install one of them")
-    end
   end
 end
 
@@ -314,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/metadata.rb

@@ -145,6 +145,7 @@ module RbSys
         args = ["metadata", "--format-version", "1"]
         args << "--no-deps" unless @deps
         out, stderr, status = Open3.capture3(cargo, *args)
+        out.force_encoding(Encoding::UTF_8)
         raise "exited with non-zero status (#{status})" unless status.success?
         data = JSON.parse(out)
         raise "metadata must be a Hash" unless data.is_a?(Hash)

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/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
@@ -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.126"
+  VERSION = "0.9.128"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.126
+  version: 0.9.128
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -31,34 +31,20 @@ cert_chain:
   -----END CERTIFICATE-----
 date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 email:
 - i.kerseymer@gmail.com
 executables:
@@ -74,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
@@ -107,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Helpers for compiling Rust extensions for ruby
 test_files: []