rb_sys 0.9.41 → 0.9.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b9a04958062964619c9e9baaf9c88869cd61120cd548a8e1380753ff01397c3
-  data.tar.gz: 325671f0009fedba3f542dcfc72c773c794fdf7f75b5dfba0a1c7b67fdd9ff40
+  metadata.gz: abede1c651510cc3d4995a424e634a9ce4afcccf1a83f85151c737ad7b578463
+  data.tar.gz: 17d3ea227ca871ae8fb1fc19a6964d57101747a8de0564b95caeda4b042ee8df
 SHA512:
-  metadata.gz: cf525485f77731be93525e7d4ff418bc8fbb89b8d921e508868604d65f77feee59c42afc927e2f8c36a4de815196e327cb04f603e66fa75b2e7eb576ab286732
-  data.tar.gz: cd52ca8c09a63580d0a294a9f1bdf0b8eb5a4b7c9b9d178729118b6c677cc204445ab0f445ba44caef8b654d6d82104387bfef00cbf0540f1ced071280af0c26
+  metadata.gz: fbbc55012efc13e0eb0ba2c3c578a96e1cca965cc8a8691e8c3e48b008c5603df73d80fbe493b6653582a0461fb7d9b3fbeb4fa8bcbe711c33468714631883de
+  data.tar.gz: e12945fed0147192dfdc4c8cbbaa01a34a734c358c3766970e285b563bf4b866216bb489a3075e89ab4f3860d5dce078db0ab291df126006de7718c156a7a280

checksums.yaml.gz.sig

@@ -1 +1 @@
-7
+�9��㼫:

data/lib/rb_sys/cargo_builder.rb

@@ -1,6 +1,8 @@
 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, :profile, :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
+    attr_writer :profile
 
     def initialize(spec)
       require "rubygems/command"
@@ -18,6 +20,12 @@ module RbSys
       @extra_rustflags = []
     end
 
+    def profile
+      return :release if rubygems_invoked?
+
+      @profile
+    end
+
     def build(_extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd)
       require "fileutils"
       require "shellwords"
@@ -323,6 +331,10 @@ module RbSys
       end
     end
 
+    def rubygems_invoked?
+      ENV.key?("SOURCE_DATE_EPOCH")
+    end
+
     # Error raised when no cdylib artifact was created
     class DylibNotFoundError < StandardError
       def initialize(dir)

data/lib/rb_sys/mkmf/config.rb

@@ -4,14 +4,19 @@ module RbSys
   module Mkmf
     # Config that delegates to CargoBuilder if needded
     class Config
-      attr_accessor :force_install_rust_toolchain, :clean_after_install
+      attr_accessor :force_install_rust_toolchain, :clean_after_install, :target_dir, :auto_install_rust_toolchain
 
       def initialize(builder)
         @builder = builder
         @force_install_rust_toolchain = false
+        @auto_install_rust_toolchain = true
         @clean_after_install = rubygems_invoked?
       end
 
+      def cross_compiling?
+        RbConfig::CONFIG["CROSS_COMPILING"] == "yes"
+      end
+
       def method_missing(name, *args, &blk)
         @builder.send(name, *args, &blk)
       end
@@ -20,8 +25,6 @@ module RbSys
         @builder.respond_to?(name) || super
       end
 
-      private
-
       # Seems to be the only way to reliably know if we were invoked by Rubygems.
       # We want to know this so we can cleanup the target directory after an
       # install, to remove bloat.

data/lib/rb_sys/mkmf.rb

@@ -18,20 +18,22 @@ module RbSys
     #
     # @example Basic
     #   require 'mkmf'
-    # . require 'rb_sys/mkmf'
+    #   require 'rb_sys/mkmf'
     #
-    # . create_rust_makefile("my_extension") #=> Generate a Makefile in the current directory
+    #   create_rust_makefile("my_extension") #=> Generate a Makefile in the current directory
     #
     # @example Configure a custom build profile
     #   require 'mkmf'
-    # . require 'rb_sys/mkmf'
+    #   require 'rb_sys/mkmf'
     #
-    # . create_rust_makefile("my_extension") do |r|
-    # .   # All of these are optional
-    # .   r.env = { 'FOO' => 'bar' }
-    # .   r.profile = ENV.fetch('RB_SYS_CARGO_PROFILE', :dev).to_sym
-    # .   r.features = %w[some_cargo_feature]
-    # . end
+    #   create_rust_makefile("my_extension") do |r|
+    #     # All of these are optional
+    #     r.env = { 'FOO' => 'bar' }
+    #     r.profile = ENV.fetch('RB_SYS_CARGO_PROFILE', :dev).to_sym
+    #     r.features = %w[some_cargo_feature]
+    #     r.rustflags = %w[--cfg=foo]
+    #     r.target_dir = "some/target/dir"
+    #   end
     def create_rust_makefile(target, &blk)
       if target.include?("/")
         target_prefix, target = File.split(target)
@@ -62,7 +64,7 @@ module RbSys
         #{conditional_assign("SOEXT_PREFIX", "lib", indent: 1)}
         #{endif_stmt}
 
-        #{conditional_assign("RB_SYS_CARGO_PROFILE", builder.profile)}
+        #{set_cargo_profile(builder)}
         #{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(" "))}
@@ -82,27 +84,30 @@ module RbSys
         #{endif_stmt}
 
         # Account for sub-directories when using `--target` argument with Cargo
+        #{conditional_assign("RB_SYS_CARGO_TARGET_DIR", "target")}
         #{if_neq_stmt("$(CARGO_BUILD_TARGET)", "")}
-        #{assign_stmt("RB_SYS_CARGO_BUILD_TARGET_DIR", "target/$(CARGO_BUILD_TARGET)", indent: 1)}
+        #{assign_stmt("RB_SYS_FULL_TARGET_DIR", "$(RB_SYS_CARGO_TARGET_DIR)/$(CARGO_BUILD_TARGET)", indent: 1)}
         #{else_stmt}
-        #{assign_stmt("RB_SYS_CARGO_BUILD_TARGET_DIR", "target", indent: 1)}
+        #{assign_stmt("RB_SYS_FULL_TARGET_DIR", "$(RB_SYS_CARGO_TARGET_DIR)", indent: 1)}
         #{endif_stmt}
 
         target_prefix = #{target_prefix}
         TARGET_NAME = #{target[/\A\w+/]}
         TARGET_ENTRY = #{RbConfig::CONFIG["EXPORT_PREFIX"]}Init_$(TARGET_NAME)
-        RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+        RUBYARCHDIR = $(sitearchdir)$(target_prefix)
         TARGET = #{target}
         DLLIB = $(TARGET).#{RbConfig::CONFIG["DLEXT"]}
-        TARGET_DIR = #{Dir.pwd}/$(RB_SYS_CARGO_BUILD_TARGET_DIR)/$(RB_SYS_CARGO_PROFILE_DIR)
-        RUSTLIB = $(TARGET_DIR)/$(SOEXT_PREFIX)$(TARGET_NAME).$(SOEXT)
+        RUSTLIBDIR = $(RB_SYS_FULL_TARGET_DIR)/$(RB_SYS_CARGO_PROFILE_DIR)
+        RUSTLIB = $(RUSTLIBDIR)/$(SOEXT_PREFIX)$(TARGET_NAME).$(SOEXT)
 
-        CLEANOBJS = $(TARGET_DIR)/.fingerprint $(TARGET_DIR)/incremental $(TARGET_DIR)/examples $(TARGET_DIR)/deps $(TARGET_DIR)/build $(TARGET_DIR)/.cargo-lock $(TARGET_DIR)/*.d $(TARGET_DIR)/*.rlib $(RB_SYS_BUILD_DIR)
-        DEFFILE = $(TARGET_DIR)/$(TARGET)-$(arch).def
+        CLEANOBJS = $(RUSTLIBDIR) $(RB_SYS_BUILD_DIR)
+        DEFFILE = $(RUSTLIBDIR)/$(TARGET)-$(arch).def
         CLEANLIBS = $(DLLIB) $(RUSTLIB) $(DEFFILE)
 
         #{base_makefile(srcdir)}
 
+        .PHONY: gemclean
+
         #{if_neq_stmt("$(RB_SYS_VERBOSE)", "")}
         #{assign_stmt("Q", "$(0=@)", indent: 1)}
         #{endif_stmt}
@@ -112,9 +117,9 @@ module RbSys
 
         FORCE: ;
 
-        $(TARGET_DIR):
+        $(RUSTLIBDIR):
         \t$(ECHO) creating target directory \\($(@)\\)
-        \t$(Q) $(MAKEDIRS) $(TARGET_DIR)
+        \t$(Q) $(MAKEDIRS) $(RUSTLIBDIR)
 
         #{deffile_definition}
 
@@ -122,7 +127,7 @@ module RbSys
 
         $(RUSTLIB): #{deffile_definition ? "$(DEFFILE) " : nil}FORCE
         \t$(ECHO) generating $(@) \\("$(RB_SYS_CARGO_PROFILE)"\\)
-        \t$(Q) #{full_cargo_command}
+        \t#{full_cargo_command}
 
         $(DLLIB): $(RUSTLIB)
         \t$(Q) $(COPY) "$(RUSTLIB)" $@
@@ -132,7 +137,10 @@ module RbSys
         \t$(Q) $(MAKEDIRS) $(RUBYARCHDIR)
         \t$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 
-        install: #{builder.clean_after_install ? "install-so realclean" : "install-so"}
+        gemclean:
+        \t-$(Q)$(RM_RF) $(CLEANOBJS) $(CLEANFILES) 2> /dev/null || true
+
+        install: #{builder.clean_after_install ? "install-so gemclean" : "install-so"}
 
         all: #{$extout ? "install" : "$(DLLIB)"}
       MAKE
@@ -153,7 +161,7 @@ module RbSys
 
     def cargo_command(cargo_dir, builder)
       builder.ext_dir = cargo_dir
-      dest_path = File.join(Dir.pwd, "target")
+      dest_path = builder.target_dir || File.join(Dir.pwd, "target")
       args = ARGV.dup
       args.shift if args.first == "--"
       cargo_cmd = builder.cargo_command(dest_path, args)
@@ -181,8 +189,7 @@ module RbSys
       cargo_command.gsub!(/--profile \w+/, "$(RB_SYS_CARGO_PROFILE_FLAG)")
       cargo_command.gsub!(%r{--features \S+}, "--features $(RB_SYS_CARGO_FEATURES)")
       cargo_command.gsub!(%r{--target \S+}, "--target $(CARGO_BUILD_TARGET)")
-      target_dir = "target/#{builder.target}".chomp("/")
-      cargo_command.gsub!(%r{/#{target_dir}/[^/]+}, "/$(RB_SYS_CARGO_BUILD_TARGET_DIR)/$(RB_SYS_CARGO_PROFILE_DIR)")
+      cargo_command.gsub!(/--target-dir (?:(?!--).)+/, "--target-dir $(RB_SYS_CARGO_TARGET_DIR) ")
       cargo_command
     end
 
@@ -192,18 +199,14 @@ module RbSys
       return unless defined?(EXPORT_PREFIX) && EXPORT_PREFIX
 
       @deffile_definition ||= <<~MAKE
-        $(DEFFILE): $(TARGET_DIR)
+        $(DEFFILE): $(RUSTLIBDIR)
         \t$(ECHO) generating $(@)
         \t$(Q) ($(COPY) $(srcdir)/$(TARGET).def $@ 2> /dev/null) || (echo EXPORTS && echo $(TARGET_ENTRY)) > $@
       MAKE
     end
 
-    def optional_rust_toolchain(builder)
+    def rust_toolchain_env(builder)
       <<~MAKE
-        #{conditional_assign("RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN", builder.force_install_rust_toolchain)}
-
-        # Only run if the we are told to explicitly install the Rust toolchain
-        #{if_neq_stmt("$(RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN)", "false")}
         #{conditional_assign("RB_SYS_RUSTUP_PROFILE", "minimal")}
 
         # If the user passed true, we assume stable Rust. Otherwise, use what
@@ -227,18 +230,36 @@ module RbSys
         #{export_env("PATH", "$(CARGO_HOME)/bin:$(RUSTUP_HOME)/bin:$(PATH)")}
         #{export_env("RUSTUP_TOOLCHAIN", "$(RB_SYS_DEFAULT_TOOLCHAIN)")}
         #{export_env("CARGO", "$(CARGO_HOME)/bin/cargo")}
+      MAKE
+    end
+
+    def optional_rust_toolchain(builder)
+      <<~MAKE
+        #{conditional_assign("RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN", force_install_rust_toolchain?(builder))}
+
+        # Only run if the we are told to explicitly install the Rust toolchain
+        #{if_neq_stmt("$(RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN)", "false")}
+        #{rust_toolchain_env(builder)}
 
         $(CARGO):
         \t$(Q) $(MAKEDIRS) $(CARGO_HOME) $(RUSTUP_HOME)
-        \tcurl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --no-modify-path --profile $(RB_SYS_RUSTUP_PROFILE) --default-toolchain none -y
-        \trustup toolchain install $(RB_SYS_DEFAULT_TOOLCHAIN) --profile $(RB_SYS_RUSTUP_PROFILE)
-        \trustup default $(RB_SYS_DEFAULT_TOOLCHAIN)
+        \t$(Q) curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --no-modify-path --profile $(RB_SYS_RUSTUP_PROFILE) --default-toolchain none -y
+        \t$(Q) rustup toolchain install $(RB_SYS_DEFAULT_TOOLCHAIN) --profile $(RB_SYS_RUSTUP_PROFILE)
+        \t$(Q) rustup default $(RB_SYS_DEFAULT_TOOLCHAIN)
+        \t$(Q) rustup component add rustfmt
 
         $(RUSTLIB): $(CARGO)
         #{endif_stmt}
       MAKE
     end
 
+    def force_install_rust_toolchain?(builder)
+      return builder.force_install_rust_toolchain if builder.force_install_rust_toolchain
+      return false unless builder.rubygems_invoked? && builder.auto_install_rust_toolchain
+
+      find_executable("cargo").nil?
+    end
+
     def if_eq_stmt(a, b)
       if $nmake
         "!IF #{a.inspect} == #{b.inspect}"
@@ -296,6 +317,12 @@ module RbSys
         "export #{k} := #{v}"
       end
     end
+
+    def set_cargo_profile(builder)
+      return assign_stmt("RB_SYS_CARGO_PROFILE", "release") if builder.rubygems_invoked?
+
+      conditional_assign("RB_SYS_CARGO_PROFILE", builder.profile)
+    end
   end
 end
 # rubocop:enable Style/GlobalVars

data/lib/rb_sys/toolchain_info.rb

@@ -3,6 +3,13 @@
 require_relative "toolchain_info/data"
 
 module RbSys
+  # A class to get information about the Rust toolchains, and how they map to
+  # Ruby platforms.
+  #
+  # @example
+  #   RbSys::ToolchainInfo.new("x86_64-unknown-linux-gnu").ruby_platform # => "x86_64-linux"
+  #   RbSys::ToolchainInfo.new("x86_64-unknown-linux-gnu").supported? # => true
+  #   RbSys::ToolchainInfo.new("x86_64-unknown-linux-gnu")
   class ToolchainInfo
     attr_reader :platform, :gem_platform, :rust_target, :rake_compiler_dock_cc, :supported, :rake_compiler_dock_image, :docker_platform
 

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.41
+  version: 0.9.43
 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-11-13 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Helpers for compiling Rust extensions for ruby