rake-compiler-dock 0.7.2 → 1.0.0

data/build/runas

@@ -6,6 +6,8 @@ useradd -o -g "$GID" -u "$UID" -G rvm,sudo -p "" -b /tmp/home -m "$USER"
 
 HOME=$(bash <<< "echo ~$USER")
 ln -s /usr/local/rake-compiler "$HOME"/.rake-compiler
+mkdir -p "$HOME"/.gem
+chown "$USER" "$HOME"/.gem
 
 sudo -u "$USER" --set-home \
     BASH_ENV=/etc/rubybashrc \

data/build/sudoers

@@ -1 +1 @@
-Defaults        env_keep += "http_proxy https_proxy ftp_proxy RCD_HOST_RUBY_PLATFORM RCD_HOST_RUBY_VERSION RCD_IMAGE RUBY_CC_VERSION"
+Defaults        env_keep += "http_proxy https_proxy ftp_proxy GEM_PRIVATE_KEY_PASSPHRASE RCD_HOST_RUBY_PLATFORM RCD_HOST_RUBY_VERSION RCD_IMAGE RUBY_CC_VERSION"

data/lib/rake_compiler_dock.rb

@@ -21,6 +21,16 @@ module RakeCompilerDock
   # Option +:verbose+ can be set to enable printing of the command line.
   # If not set, rake's verbose flag is used.
   #
+  # Option +:rubyvm+ can be set to +:mri+ or +:jruby+ .
+  # It selects the docker image with an appropriate toolchain.
+  #
+  # Option +:platform+ can be set to a list of space separated values.
+  # It selects the docker image(s) with an appropriate toolchain.
+  # Allowed values are +:x86-mingw32+, +x64-mingw32+, +x86-linux+ or +x86_64-linux+.
+  # If the list contains multiple values, +cmd+ is consecutively executed in each of the docker images,
+  # Option +:platform+ is ignored when +:rubyvm+ is set to +:jruby+.
+  # Default is "x86-mingw32 x64-mingw32" .
+  #
   # Examples:
   #
   #   RakeCompilerDock.sh 'bundle && rake cross native gem'

data/lib/rake_compiler_dock/docker_check.rb

@@ -8,6 +8,7 @@ module RakeCompilerDock
 
     attr_reader :io
     attr_reader :pwd
+    attr_reader :docker_command
     attr_accessor :machine_name
 
     def initialize(io, pwd, machine_name="rake-compiler-dock")
@@ -53,12 +54,17 @@ module RakeCompilerDock
       end
     end
 
+    COMMANDS = %w[docker podman]
     def docker_version
-      @docker_version_text, @docker_version_status = run("docker version")
+      COMMANDS.find do |command|
+        @docker_version_text, @docker_version_status = run("#{command} version")
+        @docker_command = command
+        @docker_version_status == 0
+      end
     end
 
     def ok?
-      @docker_version_status == 0 && @docker_version_text =~ /version/ && doma_pwd_ok?
+      @docker_version_status == 0 && @docker_version_text =~ /version/i && doma_pwd_ok?
     end
 
     def docker_client_avail?
@@ -216,16 +222,16 @@ module RakeCompilerDock
           help << yellow("Please download and install the docker-toolbox:")
           help << yellow("    https://www.docker.com/docker-toolbox")
         when /linux/
-          help << red("Docker is not available.")
+          help << red("Neither Docker nor Podman is available.")
           help << ""
-          help << yellow("Install on Ubuntu/Debian:")
+          help << yellow("Install Docker on Ubuntu/Debian:")
           help << "    sudo apt-get install docker.io"
           help << ""
-          help << yellow("Install on Fedora/Centos/RHEL")
+          help << yellow("Install Docker on Fedora/Centos/RHEL")
           help << "    sudo yum install docker"
           help << "    sudo systemctl start docker"
           help << ""
-          help << yellow("Install on SuSE")
+          help << yellow("Install Docker on SuSE")
           help << "    sudo zypper install docker"
           help << "    sudo systemctl start docker"
         when /darwin/

data/lib/rake_compiler_dock/starter.rb

@@ -1,5 +1,6 @@
 require "shellwords"
 require "etc"
+require "io/console"
 require "rake_compiler_dock/version"
 
 module RakeCompilerDock
@@ -9,15 +10,15 @@ module RakeCompilerDock
   class Starter
     class << self
       def sh(cmd, options={}, &block)
-        if verbose_flag(options)
-          $stderr.puts "rake-compiler-dock bash -c #{ cmd.inspect }"
+        begin
+          exec('bash', '-c', cmd, options, &block)
+        ensure
+          STDIN.cooked!
         end
-        exec('bash', '-c', cmd, options, &block)
       end
 
       def exec(*args)
         options = (Hash === args.last) ? args.pop : {}
-        runargs = args.dup
 
         mountdir = options.fetch(:mountdir){ ENV['RCD_MOUNTDIR'] || Dir.pwd }
         workdir = options.fetch(:workdir){ ENV['RCD_WORKDIR'] || Dir.pwd }
@@ -40,49 +41,61 @@ module RakeCompilerDock
         user = options.fetch(:username){ current_user }
         group = options.fetch(:groupname){ current_group }
         rubyvm = options.fetch(:rubyvm){ ENV['RCD_RUBYVM'] } || "mri"
-        image_name = options.fetch(:image) do
-          ENV['RCD_IMAGE'] ||
-              ENV['RAKE_COMPILER_DOCK_IMAGE'] ||
-              "larskanis/rake-compiler-dock-#{rubyvm}:#{IMAGE_VERSION}"
-        end
 
-        check_docker(mountdir) if options.fetch(:check_docker){ true }
-        runargs.unshift("sigfw") if options.fetch(:sigfw){ true }
-        runargs.unshift("runas") if options.fetch(:runas){ true }
-        docker_opts = options.fetch(:options) do
-          opts = ["--rm", "-i"]
-          opts << "-t" if $stdin.tty?
-          opts
-        end
+        platforms = options.fetch(:platform){ ENV['RCD_PLATFORM'] } || "x86-mingw32 x64-mingw32"
+        platforms.split(" ").each do |platform|
+          image_name = options.fetch(:image) do
+            platform_postfix = rubyvm.to_s == "jruby" ? "" : "-#{platform}"
+            ENV['RCD_IMAGE'] ||
+                ENV['RAKE_COMPILER_DOCK_IMAGE'] ||
+                "larskanis/rake-compiler-dock-#{rubyvm}#{platform_postfix}:#{IMAGE_VERSION}"
+          end
 
-        cmd = ["docker", "run",
-            "-v", "#{mountdir}:#{make_valid_path(mountdir)}",
-            "-e", "UID=#{uid}",
-            "-e", "GID=#{gid}",
-            "-e", "USER=#{user}",
-            "-e", "GROUP=#{group}",
-            "-e", "ftp_proxy=#{ENV['ftp_proxy']}",
-            "-e", "http_proxy=#{ENV['http_proxy']}",
-            "-e", "https_proxy=#{ENV['https_proxy']}",
-            "-e", "RCD_HOST_RUBY_PLATFORM=#{RUBY_PLATFORM}",
-            "-e", "RCD_HOST_RUBY_VERSION=#{RUBY_VERSION}",
-            "-e", "RCD_IMAGE=#{image_name}",
-            "-w", make_valid_path(workdir),
-            *docker_opts,
-            image_name,
-            *runargs]
-
-        cmdline = Shellwords.join(cmd)
-        if verbose_flag(options) == true
-          $stderr.puts cmdline
-        end
+          check = check_docker(mountdir) if options.fetch(:check_docker){ true }
+          docker_opts = options.fetch(:options) do
+            opts = ["--rm", "-i"]
+            opts << "-t" if $stdin.tty?
+            opts
+          end
+
+          if verbose_flag(options) && args.size == 3 && args[0] == "bash" && args[1] == "-c"
+            $stderr.puts "rake-compiler-dock bash -c #{ args[2].inspect }"
+          end
+
+          runargs = args.dup
+          runargs.unshift("sigfw") if options.fetch(:sigfw){ true }
+          runargs.unshift("runas") if options.fetch(:runas){ true }
+
+          cmd = [check.docker_command, "run",
+              "-v", "#{mountdir}:#{make_valid_path(mountdir)}",
+              "-e", "UID=#{uid}",
+              "-e", "GID=#{gid}",
+              "-e", "USER=#{user}",
+              "-e", "GROUP=#{group}",
+              "-e", "GEM_PRIVATE_KEY_PASSPHRASE",
+              "-e", "ftp_proxy",
+              "-e", "http_proxy",
+              "-e", "https_proxy",
+              "-e", "RCD_HOST_RUBY_PLATFORM=#{RUBY_PLATFORM}",
+              "-e", "RCD_HOST_RUBY_VERSION=#{RUBY_VERSION}",
+              "-e", "RCD_IMAGE=#{image_name}",
+              "-w", make_valid_path(workdir),
+              *docker_opts,
+              image_name,
+              *runargs]
+
+          cmdline = Shellwords.join(cmd)
+          if verbose_flag(options) == true
+            $stderr.puts cmdline
+          end
 
-        ok = system(*cmd)
-        if block_given?
-          yield(ok, $?)
-        elsif !ok
-          fail "Command failed with status (#{$?.exitstatus}): " +
-          "[#{cmdline}]"
+          ok = system(*cmd)
+          if block_given?
+            yield(ok, $?)
+          elsif !ok
+            fail "Command failed with status (#{$?.exitstatus}): " +
+            "[#{cmdline}]"
+          end
         end
       end
 
@@ -130,20 +143,22 @@ module RakeCompilerDock
         name = name.gsub(/[ ]/i, "_")
       end
 
+      @@docker_checked_lock = Mutex.new
       @@docker_checked = {}
 
       def check_docker(pwd)
-        return if @@docker_checked[pwd]
-
-        check = DockerCheck.new($stderr, pwd)
-        unless check.ok?
-          at_exit do
-            check.print_help_text
+        @@docker_checked_lock.synchronize do
+          @@docker_checked[pwd] ||= begin
+            check = DockerCheck.new($stderr, pwd)
+            unless check.ok?
+              at_exit do
+                check.print_help_text
+              end
+              raise DockerIsNotAvailable, "Docker is not available"
+            end
+            check
           end
-          raise DockerIsNotAvailable, "Docker is not available"
         end
-
-        @@docker_checked[pwd] = check
       end
 
       # Change Path from "C:\Path" to "/c/Path" as used by boot2docker

data/lib/rake_compiler_dock/version.rb

@@ -1,4 +1,4 @@
 module RakeCompilerDock
-  VERSION = "0.7.2"
-  IMAGE_VERSION = "0.7.2"
+  VERSION = "1.0.0"
+  IMAGE_VERSION = "1.0.0"
 end

data/test/test_environment_variables.rb

@@ -30,11 +30,11 @@ class TestEnvironmentVariables < Test::Unit::TestCase
   end
 
   def test_IMAGE
-    assert_equal "larskanis/rake-compiler-dock-mri:#{RakeCompilerDock::IMAGE_VERSION}", rcd_env['RCD_IMAGE']
+    assert_equal "larskanis/rake-compiler-dock-mri-x86-mingw32:#{RakeCompilerDock::IMAGE_VERSION}", rcd_env['RCD_IMAGE']
   end
 
   def test_RUBY_CC_VERSION
-    df = File.read(File.expand_path("../../Dockerfile.mri", __FILE__))
+    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

data/test/test_parallel_docker_build.rb

@@ -0,0 +1,57 @@
+require 'test/unit'
+require_relative "../build/parallel_docker_build"
+
+class TestParallelDockerBuild < Test::Unit::TestCase
+  def setup
+    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
+
+  def test_tasks
+    RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 ], task_prefix: "y")
+
+    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
+    RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 ], task_prefix: "y")
+
+    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

metadata

@@ -1,14 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPDCCAiSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADBEMQ0wCwYDVQQDDARsYXJz
+  MR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZImiZPyLGQB
+  GRYCZGUwHhcNMTkxMjMwMjIyMjAxWhcNMjAxMjI5MjIyMjAxWjBEMQ0wCwYDVQQD
+  DARsYXJzMR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZIm
+  iZPyLGQBGRYCZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZb4Uv
+  RFJfRu/VEWiy3psh2jinETjiuBrL0NeRFGf8H7iU9+gx/DI/FFhfHGLrDeIskrJx
+  YIWDMmEjVO10UUdj7wu4ZhmU++0Cd7Kq9/TyP/shIP3IjqHjVLCnJ3P6f1cl5rxZ
+  gqo+d3BAoDrmPk0rtaf6QopwUw9RBiF8V4HqvpiY+ruJotP5UQDP4/lVOKvA8PI9
+  P0GmVbFBrbc7Zt5h78N3UyOK0u+nvOC23BvyHXzCtcFsXCoEkt+Wwh0RFqVZdnjM
+  LMO2vULHKKHDdX54K/sbVCj9pN9h1aotNzrEyo55zxn0G9PHg/G3P8nMvAXPkUTe
+  brhXrfCwWRvOXA4TAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0G
+  A1UdDgQWBBRAHK81igrXodaDj8a8/BIKsaZrETANBgkqhkiG9w0BAQsFAAOCAQEA
+  aXjW/gcrSmbQsdbMtG3w1GkNWQJoLFJD10ETUI1ohCQAPOp8MYbPnn79VdaeDxrw
+  bVAbBOsMX/dGteKXTZnGI/fS5GotdfJTkFp5TmXQaYKDx25dML7D7DMRj4CLsvnZ
+  nuxL2EHH10m59/NaSpZSoFhwte9v8XMnI3MxQt1lvQUgh3X94HVhqJUO2KM/egYb
+  yU6ZEvrQtTCgrZR23W4R8wuzOzRCgMvy5ah4cRO2z1rbTSnQyajmWKbFKC6DKK+i
+  59Ghcc//WA3MsBHQVXh0+GZSt91RuOxamQO1GPlTfnfh5kT1UeypRm2Jcu7Ar5to
+  aTK5xiVwWU7P6psbEyrqkg==
+  -----END CERTIFICATE-----
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,16 +85,25 @@ extra_rdoc_files: []
 files:
 - ".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.7/no_sendfile.patch
+- build/patches/ruby-2.7.0/no_sendfile.patch
+- build/patches2/hoe-3.20.0/0001-Load-encrypted-private-key-using-ENV-GEM_PRIVATE_KEY.patch
+- build/patches2/rake-compiler-1.1.0/0001-Allow-parallel-builds-of-cross-rubies.patch
+- build/patches2/rake-compiler-1.1.0/0001-Enable-build-of-static-libruby.patch
+- build/patches2/rake-compiler-1.1.0/0001-Fix-determining-of-ruby-versions-in-rake-native-gem.patch
+- build/patches2/rake-compiler-1.1.0/0002-Extend-mingw-search-pattern-to-find-x86_64-gcc.patch
+- build/patches2/rake-compiler-1.1.0/0002-Strip-cross-built-shared-library-files-while-linking.patch
+- build/patches2/ruby-2.7.0/ruby2_keywords.patch
 - build/runas
 - build/sigfw.c
 - build/strip_wrapper
@@ -81,12 +111,12 @@ 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
 - rake-compiler-dock.gemspec
 - 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 +137,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Easy to use and reliable cross compiler environment for building Windows
   and Linux binary gems.
 test_files:
 - test/test_environment_variables.rb
+- test/test_parallel_docker_build.rb
 - test/test_starter.rb

metadata.gz.sig

@@ -0,0 +1,2 @@
+3p*��Ԗ�������Ʌ��~#��D�y@�
+����_��E�a����)���	CD�U�m&���RzT{��^y,������$ ���QsY�lgn_�k�4�����

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='
-   ]