rake-compiler-dock 0.7.2 → 1.2.0

data/test/test_environment_variables.rb

@@ -6,49 +6,74 @@ begin
 rescue LoadError
 end
 
-class TestEnvironmentVariables < Test::Unit::TestCase
-  @@rcd_env = nil
+class TestEnvironmentVariables
+  module Common
+    IMAGE_NAME = "larskanis/rake-compiler-dock-mri-x86-mingw32:#{RakeCompilerDock::IMAGE_VERSION}"
 
-  def setup
-    @@rcd_env ||= begin
-      args = "bash -c 'set'"
-      idir = File.join(File.dirname(__FILE__), '../lib')
-      cmd = "#{RbConfig::CONFIG['RUBY_INSTALL_NAME']} -I#{idir.inspect} bin/rake-compiler-dock #{args}"
-      output = `#{cmd}`
+    def rcd_env
+      self.class.instance_variable_get("@rcd_env") || begin
+        command = "env"
+        output = %x(#{invocation(command)})
 
-      output.split("\n").inject({}) do |hash, line|
-        if line =~ /\A(\w+)=(.*)\z/
-          hash[$1] = $2.chomp
+        env = output.split("\n").each_with_object({}) do |line, hash|
+          hash[Regexp.last_match(1)] = Regexp.last_match(2).chomp if line =~ /\A(\w+)=(.*)\z/
         end
-        hash
+
+        self.class.instance_variable_set("@rcd_env", env)
       end
     end
-  end
 
-  def rcd_env
-    @@rcd_env
-  end
+    def test_RUBY_CC_VERSION
+      df = File.read(File.expand_path("../../Dockerfile.mri.erb", __FILE__))
+      df =~ /^ENV RUBY_CC_VERSION\s+(.*)\s+$/
+      assert_equal $1, rcd_env['RUBY_CC_VERSION']
+    end
 
-  def test_IMAGE
-    assert_equal "larskanis/rake-compiler-dock-mri:#{RakeCompilerDock::IMAGE_VERSION}", rcd_env['RCD_IMAGE']
-  end
+    def test_RAKE_EXTENSION_TASK_NO_NATIVE
+      assert_equal "true", rcd_env['RAKE_EXTENSION_TASK_NO_NATIVE']
+    end
 
-  def test_RUBY_CC_VERSION
-    df = File.read(File.expand_path("../../Dockerfile.mri", __FILE__))
-    df =~ /^ENV RUBY_CC_VERSION\s+(.*)\s+$/
-    assert_equal $1, rcd_env['RUBY_CC_VERSION']
-  end
+    def test_symlink_rake_compiler
+      cmd = invocation("if test -h $HOME/.rake-compiler ; then echo yes ; else echo no ; fi")
+      assert_equal("yes", %x(#{cmd}).strip)
+    end
 
-  def test_HOST_RUBY_PLATFORM
-    assert_equal RUBY_PLATFORM, rcd_env['RCD_HOST_RUBY_PLATFORM']
+    def test_gem_directory
+      cmd = invocation("if test -d $HOME/.gem ; then echo yes ; else echo no ; fi")
+      assert_equal("yes", %x(#{cmd}).strip)
+    end
   end
 
-  def test_HOST_RUBY_VERSION
-    assert_equal RUBY_VERSION, rcd_env['RCD_HOST_RUBY_VERSION']
-  end
+  class UsingWrapper < Test::Unit::TestCase
+    include Common
+
+    def invocation(command)
+      idir = File.join(File.dirname(__FILE__), '../lib')
+      "#{RbConfig::CONFIG['RUBY_INSTALL_NAME']} -I#{idir.inspect} bin/rake-compiler-dock bash -c '#{command}'"
+    end
+
+    def test_HOST_RUBY_PLATFORM
+      assert_equal RUBY_PLATFORM, rcd_env['RCD_HOST_RUBY_PLATFORM']
+    end
+
+    def test_HOST_RUBY_VERSION
+      assert_equal RUBY_VERSION, rcd_env['RCD_HOST_RUBY_VERSION']
+    end
 
-  def test_PWD
-    assert_equal Dir.pwd, rcd_env['PWD']
+    def test_IMAGE
+      assert_equal IMAGE_NAME, rcd_env['RCD_IMAGE']
+    end
+
+    def test_PWD
+      assert_equal Dir.pwd, rcd_env['PWD']
+    end
   end
 
+  class AsIfContinuousIntegration < Test::Unit::TestCase
+    include Common
+
+    def invocation(command)
+      "docker run -it #{IMAGE_NAME} bash -c '#{command}'"
+    end
+  end
 end

data/test/test_parallel_docker_build.rb

@@ -0,0 +1,70 @@
+require 'test/unit'
+require_relative "../build/parallel_docker_build"
+require "tmpdir"
+
+class TestParallelDockerBuild < Test::Unit::TestCase
+  def setup
+    @tmpdir ||= Dir.mktmpdir
+
+    Dir.chdir(@tmpdir) do
+      File.write "File0", <<-EOT
+      FROM a
+      RUN a
+      RUN d
+    EOT
+      File.write "File1", <<-EOT
+      FROM a
+      RUN a
+      RUN d
+      RUN f \\
+          g
+    EOT
+      File.write "File2", <<-EOT
+      FROM a
+      RUN b
+      RUN c
+      RUN d
+    EOT
+      File.write "File3", <<-EOT
+      FROM a
+      RUN b
+      RUN c
+      RUN d
+    EOT
+    end
+  end
+
+  def teardown
+    FileUtils.rm_rf @tmpdir
+  end
+
+  def test_tasks
+    Dir.chdir(@tmpdir) do
+      RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 ], task_prefix: "y")
+    end
+
+    assert_operator Rake::Task["File0"].prerequisites, :include?, "yFile0File1"
+    assert_operator Rake::Task["File1"].prerequisites, :include?, "yFile1"
+    assert_operator Rake::Task["yFile1"].prerequisites, :include?, "yFile0File1"
+    assert_operator Rake::Task["yFile0File1"].prerequisites, :include?, "yFile0File1File2File3"
+
+    assert_operator Rake::Task["File2"].prerequisites, :include?, "yFile2File3"
+    assert_operator Rake::Task["File3"].prerequisites, :include?, "yFile2File3"
+    assert_operator Rake::Task["yFile2File3"].prerequisites, :include?, "yFile0File1File2File3"
+  end
+
+  def test_common_files
+    Dir.chdir(@tmpdir) do
+      RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 ], task_prefix: "y")
+    end
+
+    assert_equal "FROM a\nRUN a\nRUN d\nRUN f \\\ng\n", read_df("yFile1")
+    assert_equal "FROM a\nRUN a\nRUN d\n", read_df("yFile0File1")
+    assert_equal "FROM a\nRUN b\nRUN c\nRUN d\n", read_df("yFile2File3")
+    assert_equal "FROM a\n", read_df("yFile0File1File2File3")
+  end
+
+  def read_df(fn)
+    File.read("tmp/docker/#{fn}").each_line.map(&:lstrip).join
+  end
+end

data.tar.gz.sig

@@ -0,0 +1 @@
+s���)Րd!���k�wHKm�Dn	�n���J�o�:�0�CW���l�wX�@��ݾ�׬�+>�J���'_��dR量�/�&���~�c�ꪽI&>�ym>&H�g��8�vM,��]t����b�u�8����m#9��
),TsO$'b�Ėm�p��P h�-2D�ݧ�!�E\�� y)��1��fX����bD�"J�4X��D�?W9C�醐^��3��n*��)�1���H5��@�Ť��W ��������lHt��Ky���M��	�1���5p�

metadata

@@ -1,43 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIETTCCArWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
+  L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yMTAzMTAyMDIxNDBaFw0yMjAz
+  MTAyMDIxNDBaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
+  PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAoJSMECFMhBiOcic1
+  y1cPjgrfxw/R7wK81sQbiilecqw7zcTRZKzhy7sFQzEF0Wbiy2WmStbktq8cXmet
+  44ZEQI5LtyDhkGl7AFMSows5eMu1ChBdOr45OJsHaidrZfVU2vkkohu2+ZJmcqCB
+  TmjBIxTrKpSjMbL1TFd/C491L/SyKhJq90QMs3OfA12SUBD5wlgdfkQ5ZDi1LNTY
+  rKCOqGaa/zkr7/5BWpsgYcC6ziaA956ktyuQFVUgZgyJTzYStRuYjbDmaZv2sldW
+  zwx3Z2YTEItsdGAoZGbiLNuULmzzwyu8yGaWycpK8l8Al+vMpPaa/dgKUFUkAPjy
+  neRjP+N6qWW0hxt0acdw3nXN5ITxo618dQmMzWdLw94wxsWzSUMGldLfNfu9hFnV
+  zLrh1bFBYdXk6Mg1OnejZFBc2YlzF1u8Us+NNydHR8dMfRcAhp7sPeHOEKH8V6z2
+  VgCHlzf1xq+P+FR8svIqGEBVPHuidr1GguIEqJe7enbjrF2ZAgMBAAGjgYEwfzAJ
+  BgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUZT8nEztzNp6aQDDOuZHX
+  K9PjoW0wIgYDVR0RBBswGYEXbGFyc0BncmVpei1yZWluc2RvcmYuZGUwIgYDVR0S
+  BBswGYEXbGFyc0BncmVpei1yZWluc2RvcmYuZGUwDQYJKoZIhvcNAQELBQADggGB
+  AHZW9LEmp+sptD9VhxGbMSacFwlf03IdkEfmd+7MGzS4nQCQJvs/B5JGTm6q20ML
+  IJXpCnjBPjwnAflyV9rSr9DL2ShuAIJVNWuWs0uhUtz5HEOuV/fVSAFgLHpXP1yV
+  weeoJfLmVeXhRUNo/mH0sjpuRm+C1EVb8QuKFItVa5VBf111Zgn7cFXuOjAtflQ2
+  n3EGZATdVzduNvUENzg6l1Ba+q/nRKKHq5CnG6+1YzOhdzYKFOwlYMi6jLQK33aV
+  aLvq6jWUIpNbL/95ZdOR8Cd6KsCmK5Zvxd5FMMjrQCsZD6OgReshsok5r6tSiNXc
+  YgnBIIAFeoeGz8q+dsm6hPtkii/zr25MPRPmKnbRV7bV/zlbmwpIPxhso95lq3R5
+  H5q2yo7qMajDFkxRffqQO8ONvDLGecxbuv1QEyzNBdehVt4I7UedIfxyOvKd9cg2
+  d5T9wAD7jW/0seVujw+76/YOJWO3Dft+FQmMBbdd8s3J47HbN9R2mDt6fl6he+X/
+  gw==
+  -----END CERTIFICATE-----
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -62,18 +95,23 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - Dockerfile.jruby
-- Dockerfile.mri
+- Dockerfile.mri.erb
 - Gemfile
 - History.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/rake-compiler-dock
+- build/gem_helper.rb
 - build/mk_i686.rb
-- build/patches/rake-compiler-1.0.7/enable-static.diff
-- build/patches/ruby-2.5.3/no_sendfile.patch
+- build/parallel_docker_build.rb
+- build/patches/ruby-2.5.9/no_sendfile.patch
+- build/patches/ruby-3.1.0/no_sendfile.patch
+- build/patches2/rake-compiler-1.1.6/0004-Enable-build-of-static-libruby.patch
+- build/rcd-env.sh
 - build/runas
 - build/sigfw.c
 - build/strip_wrapper
@@ -81,12 +119,29 @@ files:
 - lib/rake_compiler_dock.rb
 - lib/rake_compiler_dock/colors.rb
 - lib/rake_compiler_dock/docker_check.rb
-- lib/rake_compiler_dock/gem_helper.rb
 - lib/rake_compiler_dock/predefined_user_group.rb
 - lib/rake_compiler_dock/starter.rb
 - lib/rake_compiler_dock/version.rb
+- mingw64-ucrt/Dockerfile
+- mingw64-ucrt/binutils-mingw-w64-ignore-check-errors.patch
+- mingw64-ucrt/gcc-mingw-w64-only-c-c++.patch
+- mingw64-ucrt/mingw-w64-enable-ucrt.patch
 - rake-compiler-dock.gemspec
+- test/env/Dockerfile.alpine
+- test/env/Dockerfile.centos
+- test/env/Dockerfile.debian
+- test/rcd_test/Gemfile
+- test/rcd_test/Rakefile
+- test/rcd_test/ext/java/RcdTestExtService.java
+- test/rcd_test/ext/java/RubyRcdTest.java
+- test/rcd_test/ext/mri/extconf.rb
+- test/rcd_test/ext/mri/rcd_test_ext.c
+- test/rcd_test/ext/mri/rcd_test_ext.h
+- test/rcd_test/lib/rcd_test.rb
+- test/rcd_test/rcd_test.gemspec
+- test/rcd_test/test/test_basic.rb
 - test/test_environment_variables.rb
+- test/test_parallel_docker_build.rb
 - test/test_starter.rb
 homepage: https://github.com/rake-compiler/rake-compiler-dock
 licenses:
@@ -107,11 +162,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.2.22
 signing_key: 
 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/rcd_test/Gemfile
+- test/rcd_test/Rakefile
+- test/rcd_test/ext/java/RcdTestExtService.java
+- test/rcd_test/ext/java/RubyRcdTest.java
+- test/rcd_test/ext/mri/extconf.rb
+- test/rcd_test/ext/mri/rcd_test_ext.c
+- test/rcd_test/ext/mri/rcd_test_ext.h
+- test/rcd_test/lib/rcd_test.rb
+- test/rcd_test/rcd_test.gemspec
+- test/rcd_test/test/test_basic.rb
 - test/test_environment_variables.rb
+- test/test_parallel_docker_build.rb
 - test/test_starter.rb

data/Dockerfile.mri

@@ -1,122 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get -y update && \
-    apt-get install -y curl git-core xz-utils build-essential wget unzip sudo gnupg2 dirmngr
-
-# Add "rvm" as system group, to avoid conflicts with host GIDs typically starting with 1000
-RUN groupadd -r rvm && useradd -r -g rvm -G sudo -p "" --create-home rvm && \
-    echo "source /etc/profile.d/rvm.sh" >> /etc/rubybashrc
-USER rvm
-
-# install rvm, RVM 1.26.0+ has signed releases, source rvm for usage outside of package scripts
-RUN gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
-    (curl -L http://get.rvm.io | sudo bash -s stable) && \
-    bash -c " \
-        source /etc/rubybashrc && \
-        rvmsudo rvm cleanup all "
-
-# Import patch files for ruby and gems
-COPY build/patches /home/rvm/patches/
-ENV BASH_ENV /etc/rubybashrc
-
-# install rubies and fix permissions on
-RUN bash -c " \
-    export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
-    for v in 2.5.3 ; do \
-        rvm install \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
-    done && \
-    rvm cleanup all && \
-    find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
-
-# Install rake-compiler and typical gems in all Rubies
-# do not generate documentation for gems
-RUN echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \
-    bash -c " \
-        rvm all do gem install --no-document bundler 'bundler:~>1.16' rake-compiler hoe mini_portile rubygems-tasks mini_portile2 && \
-        find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
-
-# Install rake-compiler's cross rubies in global dir instead of /root
-RUN sudo mkdir -p /usr/local/rake-compiler && \
-    sudo chown rvm.rvm /usr/local/rake-compiler && \
-    ln -s /usr/local/rake-compiler ~/.rake-compiler
-
-# Add cross compilers for Windows and Linux
-USER root
-RUN apt-get -y update && \
-    apt-get install -y gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-x86-64 g++-mingw-w64-i686 \
-        gcc-multilib moreutils
-
-# Create dev tools i686-linux-gnu-*
-COPY build/mk_i686.rb /root/
-RUN bash -c " \
-        rvm alias create default 2.5.3 && \
-        rvm use default && \
-        ruby /root/mk_i686.rb "
-
-USER rvm
-
-# Patch rake-compiler to build and install static libraries for Linux rubies
-RUN cd /usr/local/rvm/gems/ruby-2.5.3/gems/rake-compiler-1.0.7 && \
-    ( git apply /home/rvm/patches/rake-compiler-1.0.7/*.diff || true )
-
-ENV XRUBIES 2.6.0 2.5.0 2.4.0 2.3.0 2.2.2
-
-# First do downloads sequentially since they can not run in parallel
-# Then build all xruby versions in parallel
-# Then cleanup all build artifacts
-RUN for rv in $XRUBIES; do \
-        bash -c "rake-compiler /home/rvm/.rake-compiler/sources/ruby-$rv/Makefile.in VERSION=$rv HOST=x86_64-linux-gnu"; \
-    done; \
-    for rv in $XRUBIES; do \
-        for host in i686-linux-gnu x86_64-linux-gnu i686-w64-mingw32 x86_64-w64-mingw32; do \
-            echo -n "'rake-compiler cross-ruby VERSION=$rv HOST=$host' " >> ~/xbuild_rubies; \
-        done; \
-    done && \
-    cat ~/xbuild_rubies; \
-    bash -c " \
-    export CFLAGS='-s -O1 -fno-omit-frame-pointer -fno-fast-math' && \
-    parallel -- $( cat ~/xbuild_rubies ) && \
-    rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources && \
-    find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
-
-# Avoid linking against libruby shared object.
-# See also https://github.com/rake-compiler/rake-compiler-dock/issues/13
-RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby.so | xargs rm
-RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby-static.a | while read f ; do cp $f `echo $f | sed s/-static//` ; done
-RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby.a | while read f ; do ar t $f | xargs ar d $f ; done
-RUN find /usr/local/rake-compiler/ruby/*linux*/ -name mkmf.rb | while read f ; do sed -i ':a;N;$!ba;s/TRY_LINK = [^\n]*\n[^\n]*\n[^\n]*LOCAL_LIBS)/& -lruby-static/' $f ; done
-
-# RubyInstaller doesn't install libgcc -> link it static.
-RUN find /usr/local/rake-compiler/ruby/*mingw*/ -name rbconfig.rb | while read f ; do sed -i 's/."LDFLAGS". = "/&-static-libgcc /' $f ; done
-
-USER root
-
-# Add more libraries and tools to support cross build
-RUN dpkg --add-architecture i386 && \
-    apt-get -y update && \
-    apt-get install -y libc6-dev:i386 libudev-dev libudev-dev:i386 cmake
-
-# Fix paths in rake-compiler/config.yml and add rvm and mingw-tools to the global bashrc
-RUN sed -i -- "s:/root/.rake-compiler:/usr/local/rake-compiler:g" /usr/local/rake-compiler/config.yml && \
-    echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc
-
-# # Install wrappers for strip commands as a workaround for "Protocol error" in boot2docker.
-COPY build/strip_wrapper /root/
-RUN mv /usr/bin/i686-w64-mingw32-strip /usr/bin/i686-w64-mingw32-strip.bin && \
-    mv /usr/bin/x86_64-w64-mingw32-strip /usr/bin/x86_64-w64-mingw32-strip.bin && \
-    ln /root/strip_wrapper /usr/bin/i686-w64-mingw32-strip && \
-    ln /root/strip_wrapper /usr/bin/x86_64-w64-mingw32-strip
-
-# Install SIGINT forwarder
-COPY build/sigfw.c /root/
-RUN gcc $HOME/sigfw.c -o /usr/local/bin/sigfw
-
-# Install user mapper
-COPY build/runas /usr/local/bin/
-
-# Install sudoers configuration
-COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
-
-ENV RUBY_CC_VERSION 2.6.0:2.5.0:2.4.0:2.3.0:2.2.2
-
-CMD bash

data/build/patches/rake-compiler-1.0.7/enable-static.diff

@@ -1,13 +0,0 @@
-diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
-index 6230799..3a69f13 100644
---- a/tasks/bin/cross-ruby.rake
-+++ b/tasks/bin/cross-ruby.rake
-@@ -134,6 +134,8 @@ file "#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}/Makefile" => ["#{USER
-     "--target=#{MINGW_TARGET}",
-     "--build=#{RUBY_BUILD}",
-     '--enable-shared',
-+    '--enable-static',
-+    '--enable-install-static-library',
-     '--disable-install-doc',
-     '--with-ext='
-   ]