rb_sys 0.9.58 → 0.9.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90a652030d4a4a3f53dc1ddfcfcae46d3f46508c7911308ef75a818e82682e35
-  data.tar.gz: 5e08a0ffdb50841e50d876e242b7e7c22424a31920da80494ae22e2343c49f71
+  metadata.gz: 84546ca4af298b39d45c6c8b931d59671a1e04900a8e2b86a852c9921475442d
+  data.tar.gz: 6ea6cde3068e5fa49eed2c9fbedc676eb48bb6932922d986f6d691f5a25eb7a4
 SHA512:
-  metadata.gz: 5907903b2ad6b8d2bb2415d5d0b4dff44e42c91f4e1ff4ce664746d1f772321984b96a7201226116136fee6448105ba733fc76fe9bcaef5e5751521e0146c0bd
-  data.tar.gz: 1acfbea1fb82441f241e4b6c325d6f984ba58cee320957605ba5b0f43b5109c207b1cd5ddc8a15ad0e125cb335df886d12ecd306ebcafd45deff733447010860
+  metadata.gz: a9f6f0bbe1a74b1bd994217d7d25c89abce2df9b10b44dad0b656d906b02edc3aec1b142c927a57e773ea9e6764cb90f59657700a232775515717c450f42bf7d
+  data.tar.gz: c17a3fda12f884ab3577c1b9ee16f1aada070fc2935421b36fa7888cbd521a6c0c5d20848642829fe337e1da88f298941d3ab0409587d778668e175115ec6019

data/exe/rb-sys-dock

@@ -4,6 +4,7 @@ require "optparse"
 require "rb_sys/version"
 require "rb_sys/toolchain_info"
 require "fileutils"
+require "tmpdir"
 
 options = {
   version: RbSys::VERSION
@@ -101,6 +102,7 @@ OptionParser.new do |opts|
   opts.on("--latest", "Use the latest version of the Docker image") do
     log(:notice, "Using latest version of the Docker image", emoji: "🆕")
     options[:version] = "latest"
+    options[:no_cache] = true
   end
 
   opts.on("--list-platforms", "--list", "List all supported platforms") do
@@ -123,6 +125,10 @@ OptionParser.new do |opts|
     ENV["VERBOSE"] = "1"
     options[:verbose] = true
   end
+
+  opts.on("--build", "Build the Docker image") do
+    options[:build] = true
+  end
 end.parse!
 
 def determine_cache_dir
@@ -160,48 +166,113 @@ def mount_cargo_registry
   "--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")
+def volume(src, dest, mode: "rw")
+  "--volume #{src}:#{dest}:rw"
+end
+
+def mount_bundle_cache(options)
+  unless File.exist?(File.join(Dir.pwd, "Gemfile"))
+    log(:trace, "Ignoring bundler config")
+    return
+  end
+
+  dir = File.join(cache_dir, options.fetch(:toolchain_info).platform, "bundle")
+  bundle_path = File.join(docker_tmp, "bundle")
   FileUtils.mkdir_p(dir)
   log(:trace, "Mounting bundle cache: #{dir}")
-  "-v #{dir}:#{File.join(docker_tmp, "bundle")}"
+  bundle_config = gen_bundle_config_file(bundle_path)
+  bundle_dir = File.dirname(bundle_config)
+
+  "#{volume(dir, bundle_path)} -v #{bundle_dir}:#{File.join(Dir.pwd, ".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")}"
+def tmp_target_dir(options)
+  return @tmp_target_dir if defined?(@tmp_target_dir)
+
+  dir = File.join(Dir.pwd, "tmp", "rb-sys-dock", options.fetch(:toolchain_info).platform, "target")
+  FileUtils.mkdir_p(dir)
+  @tmp_target_dir = dir
+end
+
+def mount_target_dir(options)
+  "-v #{tmp_target_dir(options)}:#{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")
+  FileUtils.mkdir_p(history_dir)
   "-v #{history_dir}:#{File.join(docker_tmp, "commandhistory")}"
 end
 
+def default_command_to_run(input_args, options)
+  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"
+    without_bundle = "#{input_cmd} && rake native:$RUBY_TARGET gem"
+
+    log(:notice, "Running default build command:")
+    log(:notice, "    $ rake native:#{options[:toolchain_info].platform} gem")
+    cargo_env = "export RB_SYS_CARGO_TARGET_DIR=#{tmp_target_dir(options)}"
+    "bash -c '#{cargo_env}; (#{with_bundle}) || (#{without_bundle})'"
+  else
+    input_args.empty? ? "bash" : "bash -c '#{input_args.join(" ")}'"
+  end
+end
+
+def uid_gid
+  if /darwin/.match?(RbConfig::CONFIG["host_os"])
+    ["1000", "1000"]
+  else
+    [Process.uid, Process.gid]
+  end
+end
+
+def user_mapping
+  uid, gid = uid_gid
+  "-e UID=#{uid} -e GID=#{gid} -e GROUP=_staff -e USER=rb-sys-dock"
+end
+
+def interactive?(input_args)
+  $stdin.tty?
+end
+
+def gen_bundle_config_file(path)
+  dir = Dir.mktmpdir("rb-sys-dock")
+  file = File.join(dir, "config")
+  File.write(file, <<~YAML)
+    ---
+    BUNDLE_JOBS: "4"
+    BUNDLE_RETRY: "4"
+    BUNDLE_PATH: #{path.inspect}
+  YAML
+
+  file
+end
+
+def mount_tmp_dir(options)
+  "--mount type=bind,source=#{Dir.mktmpdir},destination=#{Dir.pwd}/tmp/#{options.fetch(:toolchain_info).platform},readonly=false"
+end
+
 def rcd(input_args, options)
   wrapper_command = []
-  wrapper_command << "sigfw" unless $stdin.tty?
+  wrapper_command << "sigfw" unless interactive?(input_args)
   wrapper_command << "runas"
 
-  extra_env = []
-
   docker_options = []
-  docker_options << "--tty" if $stdin.tty?
-  cmd = input_args.empty? ? "bash" : "bash -c '#{input_args.join(" ")}'"
+  docker_options << "--tty" if interactive?(input_args)
 
   cmd = <<~SH
     #{default_docker_command} run \
       -v #{Dir.pwd}:#{Dir.pwd} \
-      #{mount_target_dir(options, extra_env)} \
+      #{mount_tmp_dir(options)} \
+      #{mount_target_dir(options)} \
       #{mount_cargo_registry} \
-      #{mount_bundle_cache(options, extra_env)} \
+      #{mount_bundle_cache(options)} \
       #{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 \
+      #{user_mapping} \
       -e GEM_PRIVATE_KEY_PASSPHRASE \
       -e ftp_proxy \
       -e http_proxy \
@@ -216,7 +287,7 @@ def rcd(input_args, options)
       #{docker_options.join(" ")} \
       #{ENV.fetch("RCD_IMAGE")} \
       #{wrapper_command.join(" ")} \
-      #{cmd}
+      #{default_command_to_run(input_args, options)}
   SH
 
   log(:trace, "Running command: $ #{cmd}")
@@ -224,10 +295,10 @@ def rcd(input_args, options)
   exec(cmd)
 end
 
-def download_image(_options)
+def download_image(options)
   image = ENV.fetch("RCD_IMAGE")
 
-  if docker("images -q #{image}").strip.empty?
+  if docker("images -q #{image}").strip.empty? || options[:no_cache]
     # Nicely formatted message that we are downloading the image which might take awhile
     log(:notice, "Downloading container #{image.inspect}, this might take awhile...")
     docker("pull #{image} --quiet > /dev/null")

data/lib/rb_sys/cargo_builder.rb

@@ -1,9 +1,12 @@
+require "rubygems/ext"
+require "rubygems/ext/builder"
 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
-    attr_accessor :spec, :runner, :env, :features, :target, :extra_rustc_args, :dry_run, :ext_dir, :extra_rustflags
+    attr_accessor :spec, :runner, :env, :features, :target, :extra_rustc_args, :dry_run, :ext_dir, :extra_rustflags,
+      :extra_cargo_args
     attr_writer :profile
 
     def initialize(spec)
@@ -17,6 +20,7 @@ module RbSys
       @features = []
       @target = ENV["CARGO_BUILD_TARGET"] || ENV["RUST_TARGET"]
       @extra_rustc_args = []
+      @extra_cargo_args = []
       @dry_run = true
       @ext_dir = nil
       @extra_rustflags = []
@@ -55,10 +59,9 @@ module RbSys
 
     def cargo_command(dest_path, args = [])
       manifest = File.join(ext_dir, "Cargo.toml")
-      cargo = ENV.fetch("CARGO", "cargo")
 
       cmd = []
-      cmd += [cargo, "rustc"]
+      cmd += ["cargo", "rustc"]
       cmd += ["--target", target] if target
       cmd += ["--target-dir", dest_path]
       cmd += ["--features", features.join(",")] unless features.empty?
@@ -68,7 +71,7 @@ module RbSys
       cmd += Gem::Command.build_args
       cmd += args
       cmd += ["--"]
-      cmd += [*cargo_rustc_args(dest_path)]
+      cmd += [*rustc_args(dest_path)]
       cmd += extra_rustc_args
       cmd
     end
@@ -105,7 +108,7 @@ module RbSys
       result
     end
 
-    def cargo_rustc_args(dest_dir)
+    def rustc_args(dest_dir)
       [
         *linker_args,
         *mkmf_libpath,

data/lib/rb_sys/mkmf.rb

@@ -68,6 +68,7 @@ module RbSys
         #{conditional_assign("RB_SYS_CARGO_FEATURES", builder.features.join(","))}
         #{conditional_assign("RB_SYS_GLOBAL_RUSTFLAGS", GLOBAL_RUSTFLAGS.join(" "))}
         #{conditional_assign("RB_SYS_EXTRA_RUSTFLAGS", builder.extra_rustflags.join(" "))}
+        #{conditional_assign("RB_SYS_EXTRA_CARGO_ARGS", builder.extra_cargo_args.join(" "))}
 
         # Set dirname for the profile, since the profiles do not directly map to target dir (i.e. dev -> debug)
         #{if_eq_stmt("$(RB_SYS_CARGO_PROFILE)", "dev")}
@@ -163,7 +164,11 @@ module RbSys
       args = ARGV.dup
       args.shift if args.first == "--"
       cargo_cmd = builder.cargo_command(dest_path, args)
-      Shellwords.join(cargo_cmd).gsub("\\=", "=").gsub(/\Acargo/, "$(CARGO)").gsub(/-v=\d/, "")
+      cmd = Shellwords.join(cargo_cmd)
+      cmd.gsub!("\\=", "=")
+      cmd.gsub!(/\Acargo rustc/, "$(CARGO) rustc $(RB_SYS_EXTRA_CARGO_ARGS)")
+      cmd.gsub!(/-v=\d/, "")
+      cmd
     end
 
     def env_vars(builder)

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.58
+  version: 0.9.60
 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: 2023-01-22 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies: []
 description:
 email: