rb_sys 0.9.125 → 0.9.127

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef6eda1f49b5af6411af84620f0824a2bac2e59314efc417d9aaf7d110406ea6
-  data.tar.gz: c9ae26514c8387113ef4c10fbb1303afb397d54e2dd63afa6b75c6a729c5403c
+  metadata.gz: cfc10236ea19ee031b7296523be78667b5ae90408c4111180a12c29e93ae1586
+  data.tar.gz: cb8d43340e414462a3d446181a8ed16c49a998967098e8ed7a84b09e27ba3571
 SHA512:
-  metadata.gz: 835f0b2f4ec21f80b5027881c232e16fd747afc1d466925ace319aaa9e59526fb02dcd7d0a250614808f21bd3b5d64e72123783305f6a3944c9443badbcd35cc
-  data.tar.gz: a4a80f83b4c668a58d9a8f6beb3e6df231a0a755e18018ea786df81f01355e9c1e6c62a837ee63d6711f419a45e1348e34f970b68d109c82686550446561cb67
+  metadata.gz: 7e9d5c929ca44955127ec55a288f7ceefe6222dd0035cb9b730557150d90175dca62e09c06baed60a6fd11ac234212727076241170b5d370b5cf300f388c30ff
+  data.tar.gz: 58ec6c8e410ccb5a52be1b671c984dbad5c369b456715f06fb27614f00fbd9cbfbe25ca9e0c1d0dada496f48de6b6e282d882e69d2e64e6d5446fcf8196b0a7f

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
 

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.125
+  version: 0.9.127
 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:
@@ -107,7 +93,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: []