rb_sys 0.9.51 → 0.9.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ddfeaef1982ecc7adb1ffe2875637d009553c46a283d01db8bf55decc5c8a09
-  data.tar.gz: 682b1a33bb6eb4e3ecc6b98514ff165ab562eae52903183c00654604d2f568ac
+  metadata.gz: 28dd4004edc786adedca1a62a05510881875c6ec30b8a0513c109a619e5034db
+  data.tar.gz: 84f5e07b271ff931636ba8e5ea9a5a438604898e27695039ed9f36ea8018cd48
 SHA512:
-  metadata.gz: cedf35c9746e0f41baf8c518ef314689e4d3c579558a026bdcff03edff072c0b77f0d8b907649308792af170f7d838f7588d72c04c6f3e4f1f5c8d4a89c22186
-  data.tar.gz: b5c80c63eae32b9a97d33d5800270b54323257f596041dcebc169f760fae253250fe09edc4b51057c27f72e8bd08f79a1345f8422754a968f3df96d01ab695b7
+  metadata.gz: 50bbc9b84dbf72f86f380fbff63a88e10b7d9214c12d54d536ceb53740d1449ec398c53d3b4fc94c441853c3d142b490f46c2fa1ccb53dcd43661eb7492f2269
+  data.tar.gz: 49e918700f006a122cd7bcc1010d460416b265c4debc38e14f0d005a2404e7d8b7be197e9907c2c6952d209b5c41414c94dad567d4fa5a4bd5234ec148e03922

data/exe/rb-sys-dock

@@ -38,6 +38,42 @@ def log(level, message, emoji: true, io: $stderr)
   io.puts "#{shellcode}#{emoji_opt}#{escaped}\e[0m"
 end
 
+def default_docker_command
+  return @default_docker_command if defined?(@default_docker_command)
+
+  @default_docker_command = ENV.fetch("DOCKER", "docker")
+end
+
+def run_command!(cmd)
+  log(:trace, "Running command: $ #{cmd}")
+  stdout, stderr, status = Open3.capture3(cmd)
+
+  if status.success?
+    stdout
+  else
+    log(:error, "Error running command: $ #{cmd}")
+    warn(stderr)
+    exit(status.exitstatus)
+  end
+end
+
+def docker(cmd)
+  require "open3"
+
+  run_command!("#{default_docker_command} #{cmd}")
+rescue Errno::ENOENT
+  log(:trace, "Could not find docker command, trying podman")
+
+  begin
+    stdout = run_command!("podman #{cmd}")
+    @default_docker_command = "podman"
+    stdout
+  rescue Errno::ENOENT
+    log(:error, "Could not find docker or podman command, please install one of them")
+    exit(1)
+  end
+end
+
 OptionParser.new do |opts|
   opts.banner = "Usage: rb-sys-dock --platform PLATFORM [COMMAND]"
 
@@ -156,7 +192,7 @@ def rcd(input_args, options)
   run_command = input_args.empty? ? "bash" : input_args.join(" ")
 
   cmd = <<~SH
-    #{docker_command} run \
+    #{default_docker_command} run \
       -v #{Dir.pwd}:#{Dir.pwd} \
       #{mount_target_dir(options, extra_env)} \
       #{mount_cargo_registry} \
@@ -183,24 +219,18 @@ def rcd(input_args, options)
       #{run_command}
   SH
 
-  log(:trace, "Running command: \n$ #{cmd}")
+  log(:trace, "Running command: $ #{cmd}")
 
   exec(cmd)
 end
 
-def docker_command
-  return @docker_command if defined?(@docker_command)
-
-  @docker_command = ENV.fetch("DOCKER", "docker")
-end
-
 def download_image(_options)
   image = ENV.fetch("RCD_IMAGE")
 
-  if `#{docker_command} images -q #{image}`.strip.empty?
+  if docker("images -q #{image}").strip.empty?
     # Nicely formatted message that we are downloading the image which might take awhile
     log(:notice, "Downloading container #{image.inspect}, this might take awhile...")
-    system("#{docker_command} pull #{image} --quiet > /dev/null")
+    docker("pull #{image} --quiet > /dev/null")
   end
 end
 

data/lib/rb_sys/cargo_builder/link_flag_converter.rb

@@ -22,14 +22,12 @@ module RbSys
           ["-L", "native=#{$1}"]
         when /^--library=(\w+\S+)$/, /^-l\s*(\w+\S+)$/
           ["-l", $1]
-        when /^-l\s*:lib(\S+).a$/
-          ["-l", "static=#{$1}"]
         when /^-l\s*:lib(\S+).(so|dylib|dll)$/
           ["-l", "dylib=#{$1}"]
         when /^-F\s*(.*)$/
           ["-l", "framework=#{$1}"]
         else
-          ["-C", "link_arg=#{arg}"]
+          ["-C", "link-arg=#{arg}"]
         end
       end
     end

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.51
+  version: 0.9.52
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -30,7 +30,7 @@ cert_chain:
   Rl+ASkq2/1i07TkBpCf+2hq66+h/hx+/Y/KrUzXfe0jtvil0WESkJT2kqRqHWNhD
   9GKBxaQlXokNDtWCm1/gl6cD8WRZ0N5S4ZGJT1FLLsA=
   -----END CERTIFICATE-----
-date: 2022-12-15 00:00:00.000000000 Z
+date: 2022-12-17 00:00:00.000000000 Z
 dependencies: []
 description:
 email:

metadata.gz.sig

@@ -1 +1,2 @@
-����q�R���i���36n,�����2`�O�Joq��l����-��ܻ��k`l;j��d�V��&'p�@2�f�l�8:L��kU<��E�X���Qm����Pnte��w��@:�^����__��2�׾�!dӍ]�cNz{m�O����`�\�'V|��e|�9��x����9�K"�ҷ��짪E-��e��[*���秢�"��Qv�8��6͌�z�$�]J;7�ﳁ�إ����7��7S
C�`U��
'{m
+��ZU�R'��XAW��m�6����H���V�1\3�r�8�Ѽ�ױ������12p�8v:ݴ�h#o���)��S�E���i?}�:(E�3�{�"�
+C�"yԆ~���h����{A���W�5'�6��֪�jXO�\y��-��	�]�?���B�������2�S��~���H�d���1�$�o٧��0ȥ(�.��ѕ��qU�=�Cq&�'���F�~�=��	�|r�1���Pw�6�53�zasŹ%ك��