rb_sys 0.9.48 → 0.9.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c20a93e6f901cd93729c524f5637ea642504062393f119c5972ccc198f5c431
-  data.tar.gz: 7c3ac7ce3e4085eaadbba8a546ce6a8aabbb61ef8f4b79a47604a8876644bfcc
+  metadata.gz: 3b74d52f8db6d2d17f777a1eda0222ea8ad9960475fed697afacdd35f8e7ae79
+  data.tar.gz: fb24cccae1c2a1ae04e1dad6764c7c454e8e87e5f3d1cddbc118fd9d28281447
 SHA512:
-  metadata.gz: a39231d9b950fcc2e5b589ef64e7309c76247cc199feaa4eedaba5137fbdb6cb77daba429990b2a91a5fc3c173c6d677e17a59c573ab680b83d40d4c5c38ede7
-  data.tar.gz: 21ac41ec59a49f655a12315066f720036bac026ed086fd410a0562cf3f75c1620992346f33d7d106c50b0d7e9b7f7cb001186fe8f8f9425450dfde0687ccc882
+  metadata.gz: b6273e7a26eaff960d8e0f95f8d2d3601b70a438ac48969588299336f97fae8a8d80c7be2de4d4b32e8054b048da608f397c32e2b0bc810adec4c05b65b7a967
+  data.tar.gz: 111dc76d283d514786da3661ec73753c6cabf9aaf6e62e14b8b9b27d5e93943c7b1881457adf2058227cb17cfda0ed4066344b87a51c6d2ff42eaa60d3acea41

data/exe/rb-sys-dock

@@ -3,6 +3,7 @@
 require "optparse"
 require "rb_sys/version"
 require "rb_sys/toolchain_info"
+require "fileutils"
 
 options = {
   version: RbSys::VERSION
@@ -18,6 +19,10 @@ def log(level, message, emoji: true, io: $stderr)
     ["ℹ️", "\e[1;37m"]
   when :notice
     ["🐳", "\e[1;34m"]
+  when :trace
+    return unless ENV["LOG_LEVEL"] == "trace"
+
+    ["🔍", "\e[1;2m"]
   else raise "Unknown log level: #{level.inspect}"
   end
 
@@ -27,7 +32,10 @@ def log(level, message, emoji: true, io: $stderr)
     emoji_opt + " "
   end
 
-  io.puts "#{shellcode}#{emoji_opt}#{message}\e[0m"
+  # Escape the message for bash shell codes (e.g. \e[1;31m)
+  escaped = message.gsub("\\", "\\\\\\").gsub("\e", "\\e")
+
+  io.puts "#{shellcode}#{emoji_opt}#{escaped}\e[0m"
 end
 
 OptionParser.new do |opts|
@@ -73,37 +81,126 @@ OptionParser.new do |opts|
     puts opts
     exit
   end
-end.parse!
 
-def rcd(input_args)
-  begin
-    require "rake_compiler_dock"
-  rescue LoadError
-    abort "rake-compiler-dock is not installed. Please run `gem install rake-compiler-dock` to use this command."
+  opts.on("-V", "--verbose", "Prints verbose output") do
+    ENV["LOG_LEVEL"] = "trace"
+    ENV["VERBOSE"] = "1"
+    options[:verbose] = true
   end
+end.parse!
 
-  args = input_args.empty? ? ["bash"] : input_args.dup
+def determine_cache_dir
+  return ENV["RB_SYS_DOCK_CACHE_DIR"] if ENV["RB_SYS_DOCK_CACHE_DIR"]
+  return File.join(ENV["XDG_CACHE_HOME"], "rb-sys-dock") if ENV["XDG_CACHE_HOME"]
 
-  if $stdin.tty?
-    # An interactive session should not leave the container on Ctrl-C
-    args << {sigfw: false}
-  end
+  File.join(ENV["HOME"], ".cache", "rb-sys-dock")
+end
 
-  begin
-    RakeCompilerDock.exec(*args) do |ok, res|
-      exit(res.exitstatus)
-    end
-  rescue RakeCompilerDock::DockerIsNotAvailable
-    exit(-1)
+def docker_tmp
+  @docker_tmp ||= "/tmp/rb-sys-dock"
+end
+
+def cache_dir
+  return @cache_dir if defined?(@cache_dir)
+
+  @cache_dir = determine_cache_dir
+  FileUtils.mkdir_p(@cache_dir)
+  @cache_dir
+end
+
+def mount_cargo_registry
+  local_registry_dir = if ENV["CARGO_HOME"]
+    ENV["CARGO_HOME"]
+  elsif File.exist?(cargo_home = File.join(ENV["HOME"], ".cargo"))
+    cargo_home
+  else
+    File.join(cache_dir, "cargo")
   end
+
+  dir = File.join("registry")
+  log(:trace, "Mounting cargo registry dir: #{dir}")
+  FileUtils.mkdir_p(dir)
+
+  "--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}")
+  "-v #{dir}:#{File.join(docker_tmp, "bundle")}"
+end
+
+def mount_target_dir(options, _extra_env)
+  tmp_target_dir = File.join(Dir.pwd, "tmp", "rb-sys-dock", options[:platform], "target")
+  FileUtils.mkdir_p(tmp_target_dir)
+  "-v #{tmp_target_dir}:#{File.join(Dir.pwd, "target")}"
+end
+
+def mount_command_history(options)
+  return unless $stdin.tty?
+
+  history_dir = File.join(cache_dir, options.fetch(:platform), "commandhistory")
+  "-v #{history_dir}:#{File.join(docker_tmp, "commandhistory")}"
+end
+
+def rcd(input_args, options)
+  wrapper_command = []
+  wrapper_command << "sigfw" unless $stdin.tty?
+  wrapper_command << "runas"
+
+  extra_env = []
+
+  docker_options = []
+  docker_options << "--tty" if $stdin.tty?
+  run_command = input_args.empty? ? "bash" : input_args.join(" ")
+
+  cmd = <<~SH
+    #{docker_command} run \
+      -v #{Dir.pwd}:#{Dir.pwd} \
+      #{mount_target_dir(options, extra_env)} \
+      #{mount_cargo_registry} \
+      #{mount_bundle_cache(options, extra_env)} \
+      #{mount_command_history(options)} \
+      -e UID=#{ENV.fetch("RB_SYS_DOCK_UID", "1000")} \
+      -e GID=#{ENV.fetch("RB_SYS_DOCK_GID", "1000")} \
+      -e USER=rb-sys-dock \
+      -e GROUP=_staff \
+      -e GEM_PRIVATE_KEY_PASSPHRASE \
+      -e ftp_proxy \
+      -e http_proxy \
+      -e https_proxy \
+      -e RCD_HOST_RUBY_PLATFORM=#{RbConfig::CONFIG["arch"]} \
+      -e RCD_HOST_RUBY_VERSION=#{RUBY_VERSION} \
+      -e RCD_IMAGE \
+      -e TERM \
+      -w #{Dir.pwd} \
+      --rm \
+      --interactive \
+      #{docker_options.join(" ")} \
+      #{ENV.fetch("RCD_IMAGE")} \
+      #{wrapper_command.join(" ")} \
+      #{run_command}
+  SH
+
+  log(:trace, "Running command: \n$ #{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 images -q #{image}`.strip.empty?
+
+  if `#{docker_command} 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 pull #{image} --quiet > /dev/null")
+    system("#{docker_command} pull #{image} --quiet > /dev/null")
   end
 end
 
@@ -116,10 +213,10 @@ 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)
 download_image(options)
 log_some_useful_info(options)
-rcd(ARGV)
+rcd(ARGV, 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.48"
+  VERSION = "0.9.50"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.48
+  version: 0.9.50
 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-13 00:00:00.000000000 Z
 dependencies: []
 description:
 email: