rb_sys 0.9.49 → 0.9.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d65319f94ce1b79cc27ed5b42a61246d7183cb7f9616fafc6f60ce023fe3b687
-  data.tar.gz: 0e3fe62efd6b9f0f8246f182b91d6918b0161b89691f1df8ded5628fa26ad105
+  metadata.gz: 1ddfeaef1982ecc7adb1ffe2875637d009553c46a283d01db8bf55decc5c8a09
+  data.tar.gz: 682b1a33bb6eb4e3ecc6b98514ff165ab562eae52903183c00654604d2f568ac
 SHA512:
-  metadata.gz: 307b71b55f1602546201f8380b101824f2b241eb219041f36938c6316d315b0094d1fc5e1fd41412c37be90afdcc42dffa308042e6038f05f187109d80128b0e
-  data.tar.gz: 0c7162a722fdfbdfd483f342f7d737284539b5d5b3c8b303a0f55d107c2b32fd5346617a224ed15475326ae2fb474603dfcfbbf6f6840d993b8a093b40a13838
+  metadata.gz: cedf35c9746e0f41baf8c518ef314689e4d3c579558a026bdcff03edff072c0b77f0d8b907649308792af170f7d838f7588d72c04c6f3e4f1f5c8d4a89c22186
+  data.tar.gz: b5c80c63eae32b9a97d33d5800270b54323257f596041dcebc169f760fae253250fe09edc4b51057c27f72e8bd08f79a1345f8422754a968f3df96d01ab695b7

data/exe/rb-sys-dock

@@ -96,6 +96,10 @@ def determine_cache_dir
   File.join(ENV["HOME"], ".cache", "rb-sys-dock")
 end
 
+def docker_tmp
+  @docker_tmp ||= "/tmp/rb-sys-dock"
+end
+
 def cache_dir
   return @cache_dir if defined?(@cache_dir)
 
@@ -113,24 +117,18 @@ def mount_cargo_registry
     File.join(cache_dir, "cargo")
   end
 
-  dirs = []
-  dirs << File.join(local_registry_dir, "registry", "index")
-  dirs << File.join(local_registry_dir, "registry", "cache")
-  dirs << File.join(local_registry_dir, "registry", "git", "db")
+  dir = File.join("registry")
+  log(:trace, "Mounting cargo registry dir: #{dir}")
+  FileUtils.mkdir_p(dir)
 
-  dirs.each do |dir|
-    log(:trace, "Mounting cargo registry dir: #{dir}")
-    FileUtils.mkdir_p(dir)
-  end
-  dirs.map { |dir| "-v #{dir}:#{dir}" }.join(" ")
+  "--mount type=bind,source=#{File.join(local_registry_dir, dir)},target=#{File.join("/usr/local/cargo", dir)},readonly=false"
 end
 
 def mount_bundle_cache(options, extra_env)
   dir = File.join(cache_dir, options.fetch(:platform), "bundle")
   FileUtils.mkdir_p(dir)
   log(:trace, "Mounting bundle cache: #{dir}")
-  extra_env << "BUNDLE_PATH=\"/tmp/bundle\""
-  "-v #{dir}:/tmp/bundle"
+  "-v #{dir}:#{File.join(docker_tmp, "bundle")}"
 end
 
 def mount_target_dir(options, _extra_env)
@@ -143,7 +141,7 @@ def mount_command_history(options)
   return unless $stdin.tty?
 
   history_dir = File.join(cache_dir, options.fetch(:platform), "commandhistory")
-  "-v #{history_dir}:/tmp/commandhistory"
+  "-v #{history_dir}:#{File.join(docker_tmp, "commandhistory")}"
 end
 
 def rcd(input_args, options)
@@ -215,7 +213,7 @@ def log_some_useful_info(_options)
 end
 
 def set_env(options)
-  ENV["RCD_IMAGE"] = "rbsys/#{options[:toolchain_info]}:#{options[:version]}"
+  ENV["RCD_IMAGE"] ||= "rbsys/#{options[:toolchain_info].platform}:#{options[:version]}"
 end
 
 set_env(options)

data/lib/rb_sys/cargo_builder/link_flag_converter.rb

@@ -1,10 +1,22 @@
 # frozen_string_literal: true
 
+require "shellwords"
+
 module RbSys
-  class CargoBuilder
+  class CargoBuilder < Gem::Ext::Builder
     # Converts Ruby link flags into something cargo understands
     class LinkFlagConverter
-      def self.convert(arg)
+      FILTERED_PATTERNS = [
+        /compress-debug-sections/ # Not supported by all linkers, and not required for Rust
+      ]
+
+      def self.convert(args)
+        Shellwords.split(args).flat_map { |arg| convert_arg(arg) }
+      end
+
+      def self.convert_arg(arg)
+        return [] if FILTERED_PATTERNS.any? { |p| p.match?(arg) }
+
         case arg.chomp
         when /^-L\s*(.+)$/
           ["-L", "native=#{$1}"]

data/lib/rb_sys/cargo_builder.rb

@@ -1,3 +1,5 @@
+require_relative "cargo_builder/link_flag_converter"
+
 module RbSys
   # A class to build a Ruby gem Cargo. Extracted from `rubygems` gem, with some modifications.
   class CargoBuilder < Gem::Ext::Builder

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.49
+  version: 0.9.51
 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-12 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies: []
 description:
 email: