rake-compiler-dock 1.9.0 → 1.10.0

data/lib/rake_compiler_dock.rb

@@ -73,5 +73,80 @@ module RakeCompilerDock
     Starter.exec(*args, &block)
   end
 
-  module_function :exec, :sh, :image_name
+  # Retrieve the cross-rubies that are available in the docker image. This can be used to construct
+  # a custom `RUBY_CC_VERSION` string that is valid.
+  #
+  # Returns a Hash<minor_version => corresponding_patch_version>
+  #
+  # For example:
+  #
+  #   RakeCompilerDock.cross_rubies
+  #   # => {
+  #   #      "3.4" => "3.4.5",
+  #   #      "3.3" => "3.3.9",
+  #   #      "3.2" => "3.2.9",
+  #   #      "3.1" => "3.1.7",
+  #   #      "3.0" => "3.0.7",
+  #   #      "2.7" => "2.7.8",
+  #   #    }
+  #
+  def cross_rubies
+    {
+      "3.4" => "3.4.5",
+      "3.3" => "3.3.9",
+      "3.2" => "3.2.9",
+      "3.1" => "3.1.7",
+      "3.0" => "3.0.7",
+      "2.7" => "2.7.8",
+    }
+  end
+
+  # Returns a valid RUBY_CC_VERSION string for the given requirements,
+  # where each `requirement` may be:
+  #
+  # - a String that matches the minor version exactly
+  # - a String that can be used as a Gem::Requirement constructor argument
+  # - a Gem::Requirement object
+  #
+  # Note that the returned string will contain versions sorted in descending order.
+  #
+  # For example:
+  #   RakeCompilerDock.ruby_cc_version("2.7", "3.4")
+  #   # => "3.4.5:2.7.8"
+  #
+  #   RakeCompilerDock.ruby_cc_version("~> 3.2")
+  #   # => "3.4.5:3.3.9:3.2.9"
+  #
+  #   RakeCompilerDock.ruby_cc_version(Gem::Requirement.new("~> 3.2"))
+  #   # => "3.4.5:3.3.9:3.2.9"
+  #
+  def ruby_cc_version(*requirements)
+    cross = cross_rubies
+    output = []
+
+    if requirements.empty?
+      output += cross.values
+    else
+      requirements.each do |requirement|
+        if cross[requirement]
+          output << cross[requirement]
+        else
+          requirement = Gem::Requirement.new(requirement) unless requirement.is_a?(Gem::Requirement)
+          versions = cross.values.find_all { |v| requirement.satisfied_by?(Gem::Version.new(v)) }
+          raise("No matching ruby version for requirement: #{requirement.inspect}") if versions.empty?
+          output += versions
+        end
+      end
+    end
+
+    output.uniq.sort.reverse.join(":")
+  end
+
+  # Set the environment variable `RUBY_CC_VERSION` to the value returned by `ruby_cc_version`,
+  # for the given requirements.
+  def set_ruby_cc_version(*requirements)
+    ENV["RUBY_CC_VERSION"] = ruby_cc_version(*requirements)
+  end
+
+  module_function :exec, :sh, :image_name, :cross_rubies, :ruby_cc_version, :set_ruby_cc_version
 end

data/mingw64-ucrt/README.md

@@ -12,47 +12,3 @@ They are built by the following command:
 ```sh
 docker buildx build . -t larskanis/mingw64-ucrt:20.04 --platform linux/arm64,linux/amd64 --push
 ```
-
-
-Create builder instance for two architectures
-------------------
-
-Building with qemu emulation fails currently with a segfault, so that it must be built by a builder instance with at least one remote node for the other architecture.
-Building on native hardware is also much faster (~30 minutes) than on qemu.
-A two-nodes builder requires obviously a ARM and a Intel/AMD device.
-It can be created like this:
-
-```sh
-# Make sure the remote instance can be connected
-$ docker -H ssh://isa info
-
-# Create a new builder with the local instance
-$ docker buildx create --name isayoga
-
-# Add the remote instance
-$ docker buildx create --name isayoga --append ssh://isa
-
-# They are inactive from the start
-$ docker buildx ls
-NAME/NODE      DRIVER/ENDPOINT                   STATUS     BUILDKIT   PLATFORMS
-isayoga        docker-container
- \_ isayoga0    \_ unix:///var/run/docker.sock   inactive
- \_ isayoga1    \_ ssh://isa                     inactive
-default*       docker
- \_ default     \_ default                       running    v0.13.2    linux/arm64
-
-# Bootstrap the instances
-$ docker buildx inspect --bootstrap --builder isayoga
-
-# Set the new builder as default
-$ docker buildx use isayoga
-
-# Now it should be default and in state "running"
-$ docker buildx ls
-NAME/NODE      DRIVER/ENDPOINT                   STATUS    BUILDKIT   PLATFORMS
-isayoga*       docker-container
- \_ isayoga0    \_ unix:///var/run/docker.sock   running   v0.18.2    linux/arm64
- \_ isayoga1    \_ ssh://isa                     running   v0.18.2    linux/amd64, linux/amd64/v2, linux/amd64/v3, linux/386
-default        docker
- \_ default     \_ default                       running   v0.13.2    linux/arm64
-```

data/test/env/Dockerfile.alpine

@@ -2,7 +2,7 @@ ARG from_image
 FROM ${from_image}
 
 RUN uname -a
-RUN apk add ruby ruby-etc ruby-rake git
+RUN apk add ruby ruby-rake git
 
 RUN ruby --version
 RUN gem env

data/test/fixtures/mig_test_rpc.defs

@@ -0,0 +1,8 @@
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+subsystem mig_test_ipc 1;
+
+routine mig_test_call(
+                                server_port     : mach_port_t;
+                out             returnvalue     : int);

data/test/rcd_test/Rakefile

@@ -22,6 +22,7 @@ else
       aarch64-linux
       aarch64-linux-gnu
       aarch64-linux-musl
+      aarch64-mingw-ucrt
       arm-linux
       arm-linux-gnu
       arm-linux-musl

data/test/rcd_test/ext/mri/extconf.rb

@@ -18,6 +18,8 @@ else
   puts "cc --version: #{ %x[#{CONFIG['CC']} --version].lines.first}"
   puts "-"*70
 
+  $CFLAGS << " -Wall -Werror"
+
   have_func('rb_thread_call_without_gvl', 'ruby/thread.h') ||
       raise("rb_thread_call_without_gvl() not found")
 

data/test/rcd_test/rcd_test.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "C extension for testing rake-compiler-dock"
   spec.description   = "This gem has no real use other than testing builds of binary gems."
   spec.homepage      = "https://github.com/rake-compiler/rake-compiler-dock"
-  spec.required_ruby_version = ">= 2.0.0"
+  spec.required_ruby_version = ">= 2.7.0"
   spec.license = "MIT"
 
   spec.files = [

data/test/rcd_test/test/test_basic.rb

@@ -35,4 +35,15 @@ class TestBasic < Minitest::Test
     is_linux = RUBY_PLATFORM.include?("linux")
     assert_equal(is_linux, RcdTest.largefile_op_removed_from_musl)
   end
+
+  def test_disabled_rpath
+    skip("jruby uses jar files without rpath") if RUBY_ENGINE == "jruby"
+
+    cext_fname = $LOADED_FEATURES.grep(/rcd_test_ext/).first
+    refute_nil(cext_fname, "the C-ext should be loaded")
+    cext_text = File.binread(cext_fname)
+    assert_match(/Init_rcd_test_ext/, cext_text, "C-ext shoud contain the init function")
+    refute_match(/usr\/local/, cext_text, "there should be no rpath to /usr/local/rake-compiler/ruby/x86_64-unknown-linux-musl/ruby-3.4.5/lib or so")
+    refute_match(/home\//, cext_text, "there should be no path to /home/ or so")
+  end
 end

data/test/test_environment_variables.rb

@@ -34,6 +34,8 @@ class TestEnvironmentVariables
         df = File.read(File.expand_path("../../Dockerfile.mri.erb", __FILE__))
         df =~ /^ENV RUBY_CC_VERSION=(.*)$/
         assert_equal $1, rcd_env['RUBY_CC_VERSION']
+
+        assert_equal RakeCompilerDock.ruby_cc_version, rcd_env['RUBY_CC_VERSION']
       end
 
       def test_RAKE_EXTENSION_TASK_NO_NATIVE
@@ -83,6 +85,19 @@ class TestEnvironmentVariables
     end
   end
 
+  class UsingWrapperSpecifyingRuby < UsingWrapper
+    include Common
+
+    def invocation(command)
+      idir = File.join(File.dirname(__FILE__), '../lib')
+      "RCD_RUBY_VERSION=3.1.6 RCD_PLATFORM=#{TEST_PLATFORM} RCD_RUBYVM=#{IS_JRUBY ? 'jruby' : 'mri'} #{RbConfig::CONFIG['RUBY_INSTALL_NAME']} -I#{idir.inspect} bin/rake-compiler-dock bash -c '#{command}'"
+    end
+
+    def test_RUBY_VERSION
+      assert_equal "3.1.6", rcd_env['RBENV_VERSION']
+    end
+  end
+
   class AsIfContinuousIntegration < Test::Unit::TestCase
     include Common
 

data/test/test_mig.rb

@@ -0,0 +1,18 @@
+require 'rake_compiler_dock'
+require 'test/unit'
+
+class TestMigCompile < Test::Unit::TestCase
+  TEST_PLATFORM = ENV["TEST_PLATFORM"] || 'arm64-darwin'
+
+  def test_mig_compile
+    omit "only on darwin platform" unless TEST_PLATFORM =~ /darwin/
+
+    RakeCompilerDock::Starter.sh "mig -header tmp/mig_test_rpc.h -user tmp/mig_test_rpc.c -sheader /dev/null -server /dev/null -I. test/fixtures/mig_test_rpc.defs ", platform: TEST_PLATFORM, verbose: false
+
+    h_file = File.read("tmp/mig_test_rpc.h")
+    assert_match /Request_mig_test_call/, h_file
+
+    c_file = File.read("tmp/mig_test_rpc.c")
+    assert_match /Reply__mig_test_call/, c_file
+  end
+end

data/test/test_starter.rb

@@ -38,6 +38,12 @@ class TestStarter < Test::Unit::TestCase
     with_env({"RAKE_COMPILER_DOCK_IMAGE" => "env-var-value"}) do
       assert_equal("env-var-value", Starter.container_image_name)
     end
+    with_env({"CONTAINER_REGISTRY" => "env-var-value"}) do
+      assert_match(/env-var-value\//, Starter.container_image_name(platform: "x64-mingw-ucrt"))
+    end
+    with_env({"RCD_IMAGE_VERSION" => "env-var-value"}) do
+      assert_match(/:env-var-value-/, Starter.container_image_name(platform: "x64-mingw-ucrt"))
+    end
 
     # with image option
     assert_equal("option-value", Starter.container_image_name({:image => "option-value"}))

data/test/test_versions.rb

@@ -0,0 +1,82 @@
+require 'rake_compiler_dock'
+require 'rbconfig'
+require 'test/unit'
+
+class TestVersions < Test::Unit::TestCase
+  def test_cross_rubies
+    cross = RakeCompilerDock.cross_rubies
+    assert_operator(cross, :is_a?, Hash)
+    cross.each do |minor, patch|
+      assert_match(/^\d+\.\d+$/, minor)
+      assert_match(/^\d+\.\d+\.\d+$/, patch)
+    end
+  end
+
+  def test_ruby_cc_versions_no_args
+    cross = RakeCompilerDock.cross_rubies
+    expected = cross.values.sort.reverse.join(":")
+
+    assert_equal(expected, RakeCompilerDock.ruby_cc_version)
+  end
+
+  def test_ruby_cc_versions_strings
+    cross = RakeCompilerDock.cross_rubies
+
+    expected = cross["3.4"]
+    assert_equal(expected, RakeCompilerDock.ruby_cc_version("3.4"))
+
+    expected = [cross["3.4"], cross["3.2"]].join(":")
+    assert_equal(expected, RakeCompilerDock.ruby_cc_version("3.4", "3.2"))
+
+    expected = [cross["3.4"], cross["3.2"]].join(":")
+    assert_equal(expected, RakeCompilerDock.ruby_cc_version("3.2", "3.4"))
+
+    assert_raises do
+      RakeCompilerDock.ruby_cc_version("9.8")
+    end
+
+    assert_raises do
+      RakeCompilerDock.ruby_cc_version("foo")
+    end
+  end
+
+  def test_ruby_cc_versions_requirements
+    cross = RakeCompilerDock.cross_rubies
+
+    expected = cross["3.4"]
+    assert_equal(expected, RakeCompilerDock.ruby_cc_version("~> 3.4"))
+    assert_equal(expected, RakeCompilerDock.ruby_cc_version(Gem::Requirement.new("~> 3.4")))
+
+    expected = [cross["3.4"], cross["3.3"], cross["3.2"]].join(":")
+    assert_equal(expected, RakeCompilerDock.ruby_cc_version("~> 3.2"))
+    assert_equal(expected, RakeCompilerDock.ruby_cc_version(Gem::Requirement.new("~> 3.2")))
+
+    expected = [cross["3.4"], cross["3.2"]].join(":")
+    assert_equal(expected, RakeCompilerDock.ruby_cc_version("~> 3.2.0", "~> 3.4.0"))
+    assert_equal(expected, RakeCompilerDock.ruby_cc_version(Gem::Requirement.new("~> 3.2.0"), Gem::Requirement.new("~> 3.4.0")))
+
+    expected = [cross["3.4"], cross["3.3"], cross["3.2"]].join(":")
+    assert_equal(expected, RakeCompilerDock.ruby_cc_version(">= 3.2"))
+    assert_equal(expected, RakeCompilerDock.ruby_cc_version(Gem::Requirement.new(">= 3.2")))
+
+    assert_raises do
+      RakeCompilerDock.ruby_cc_version(Gem::Requirement.new("> 9.8"))
+    end
+  end
+
+  def test_set_ruby_cc_versions
+    original_ruby_cc_versions = ENV["RUBY_CC_VERSION"]
+    cross = RakeCompilerDock.cross_rubies
+
+    RakeCompilerDock.set_ruby_cc_version(Gem::Requirement.new("~> 3.2.0"), Gem::Requirement.new("~> 3.4.0"))
+    assert_equal([cross["3.4"], cross["3.2"]].join(":"), ENV["RUBY_CC_VERSION"])
+
+    RakeCompilerDock.set_ruby_cc_version("~> 3.2.0", "~> 3.4.0")
+    assert_equal([cross["3.4"], cross["3.2"]].join(":"), ENV["RUBY_CC_VERSION"])
+
+    RakeCompilerDock.set_ruby_cc_version("~> 3.1")
+    assert_equal([cross["3.4"], cross["3.3"], cross["3.2"], cross["3.1"]].join(":"), ENV["RUBY_CC_VERSION"])
+  ensure
+    ENV["RUBY_CC_VERSION"] = original_ruby_cc_versions
+  end
+end

data.tar.gz.sig

@@ -0,0 +1,3 @@
+N���X�|��+����"�x��둴2�M[L퉺��
+g��7����$,#�F�K$��ME!r{����>)
l-Z?���hR�1��lƄ^�;�1Ѹ�44�ux�����~k�>��L������K�5=����|�إ-�$���p��pQE�K��ʊe�>�[��Qo��W�(��U�z^�ԉA}>���@�d�'�| ���1���$�
+��h���

metadata

@@ -1,13 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Lars Kanis
 bindir: bin
-cert_chain: []
-date: 2025-01-19 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEBDCCAmygAwIBAgIBAzANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
+  L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yNDEyMjkxOTU2NTZaFw0yNTEy
+  MjkxOTU2NTZaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
+  PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/
+  mZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN
+  eSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/
+  8nBMvR0mHo77kIkapHc26UzVq/G0nKLfDsIHXVylto3PjzOumjG6GhmFN4r3cP6e
+  SDfl1FSeRYVpt4kmQULz/zdSaOH3AjAq7PM2Z91iGwQvoUXMANH2v89OWjQO/NHe
+  JMNDFsmHK/6Ji4Kk48Z3TyscHQnipAID5GhS1oD21/WePdj7GhmbF5gBzkV5uepd
+  eJQPgWGwrQW/Z2oPjRuJrRofzWfrMWqbOahj9uth6WSxhNexUtbjk6P8emmXOJi5
+  chQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg
+  9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjOTA3MAkG
+  A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ4h1tIyvdUWtMI739xMzTR
+  7EfMFzANBgkqhkiG9w0BAQsFAAOCAYEAoZZWzNV2XXaoSmvyamSSN+Wt/Ia+DNrU
+  2pc3kMEqykH6l1WiVPszr6HavQ//2I2UcSRSS5AGDdiSXcfyFmHtMBdtJHhTPcn7
+  4DLliB0szpvwG+ltGD8PI8eWkLaTQeFzs+0QCTavgKV+Zw56Q0J5zZvHHUMrLkUD
+  qhwKjdTdkrRTn9Sqi0BrIRRZGTUDdrt8qoWm35aES5arKZzytgrRD/kXfFW2LCg0
+  FzgTKibR4/3g8ph94kQLg/D2SMlVPkQ3ECi036mZxDC2n8V6u3rDkG5923wmrRZB
+  J6cqz475Q8HYORQCB68OPzkWMfC7mBo3vpSsIqRoNs1FE4FJu4FGwZG8fBSrDC4H
+  bZe+GtyS3e2SMjgT65zp35gLO9I7MquzYN9P6V2u1iBpTycchk5z9R1ghxzZSBT8
+  DrkJ9tVlPQtJB0LqT0tvBap4upnwT1xYq721b5dwH6AF4Pi6iz/dc5vnq1/MH8bV
+  8VbbBzzeE7MsvgkP3sHlLmY8PtuyViJ8
+  -----END CERTIFICATE-----
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,15 +97,16 @@ files:
 - ".github/workflows/publish-images.yml"
 - ".github/workflows/release-images.yml"
 - ".gitignore"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Dockerfile.jruby
 - Dockerfile.mri.erb
 - Gemfile
-- History.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/rake-compiler-dock
+- build/buildkitd.toml
 - build/gem_helper.rb
 - build/mk_i686.rb
 - build/mk_musl_cross.sh
@@ -108,8 +134,8 @@ files:
 - mingw64-ucrt/mingw-w64-enable-ucrt.patch
 - rake-compiler-dock.gemspec
 - test/env/Dockerfile.alpine
-- test/env/Dockerfile.centos
 - test/env/Dockerfile.debian
+- test/fixtures/mig_test_rpc.defs
 - test/rcd_test/Gemfile
 - test/rcd_test/Rakefile
 - test/rcd_test/ext/java/RcdTestExtService.java
@@ -121,8 +147,10 @@ files:
 - test/rcd_test/rcd_test.gemspec
 - test/rcd_test/test/test_basic.rb
 - test/test_environment_variables.rb
+- test/test_mig.rb
 - test/test_parallel_docker_build.rb
 - test/test_starter.rb
+- test/test_versions.rb
 homepage: https://github.com/rake-compiler/rake-compiler-dock
 licenses:
 - MIT
@@ -141,14 +169,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Easy to use and reliable cross compiler environment for building Windows
   and Linux binary gems.
 test_files:
 - test/env/Dockerfile.alpine
-- test/env/Dockerfile.centos
 - test/env/Dockerfile.debian
+- test/fixtures/mig_test_rpc.defs
 - test/rcd_test/Gemfile
 - test/rcd_test/Rakefile
 - test/rcd_test/ext/java/RcdTestExtService.java
@@ -160,5 +188,7 @@ test_files:
 - test/rcd_test/rcd_test.gemspec
 - test/rcd_test/test/test_basic.rb
 - test/test_environment_variables.rb
+- test/test_mig.rb
 - test/test_parallel_docker_build.rb
 - test/test_starter.rb
+- test/test_versions.rb

data/test/env/Dockerfile.centos

@@ -1,24 +0,0 @@
-ARG from_image
-FROM ${from_image}
-
-RUN uname -a
-
-# Change download address of Centos-8 which is EOL
-RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
-RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
-
-RUN yum install -y ruby git
-
-RUN ruby --version
-RUN gem env
-
-# centos-8 comes with Ruby 2.5, and this is the last version of bundler that supports it
-RUN gem install bundler -v2.2.28
-
-WORKDIR /build
-
-CMD ruby -e "puts Gem::Platform.local.to_s" && \
-  gem install --local *.gem --verbose --no-document && \
-  cd test/rcd_test/ && \
-  bundle install && \
-  rake test