rake-compiler-dock 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9d812c3d58c67858e89228862019e7414399f0a
-  data.tar.gz: a49c40cc58b5687fac2b5b7d9f9fbeb50ab4cd5b
+  metadata.gz: baf177d3bb521223da3b6c4813223e8d061e4692
+  data.tar.gz: 28cd1acc6452ed7eab4b897c7b2dacbf88460f37
 SHA512:
-  metadata.gz: 63a62025d40a77e6ea621119b2103e4e6a3290e8f5556fc73daa2a2f4bce1c4c3eae57f3f1b9719a105b6c276098887c9a0fb8aab5d5e50d25d3ea9343da4445
-  data.tar.gz: cd2f86c14498ae4cfcd54f739a1f007c1bcf4a5e3a9bf6a1bfced80bc9420468e29f25269aab8a1e03952cb11b073a633758c028b27acfa2570aa781de8e73d6
+  metadata.gz: 4cf5327994d25b154d26021fc291fa719a33b4c4304b1376128d692b3557d9e6061b2a556ecd94796a82001a81b37c1debcd7b8e9c052824fc85e581de86ce31
+  data.tar.gz: 247e9649bf95c6ebaaca46bed11eb0b6896f957524a3abf2f99e2325598f554be03560ed993cc6e16733a2c26d40d7d9de6942b77b33f8a2fd51917b3eafc184

data/Dockerfile

@@ -6,14 +6,12 @@ RUN apt-get -y update && \
 RUN mkdir -p /opt/mingw && \
     curl -SL http://sunet.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/rubenvb/gcc-4.7-release/i686-w64-mingw32-gcc-4.7.2-release-linux64_rubenvb.tar.xz | \
     tar -xJC /opt/mingw && \
-    echo "export PATH=\$PATH:/opt/mingw/mingw32/bin" >> /etc/rubybashrc && \
-    ln -s /opt/mingw/mingw32/bin/* /usr/local/bin/
+    echo "export PATH=\$PATH:/opt/mingw/mingw32/bin" >> /etc/rubybashrc
 
 RUN mkdir -p /opt/mingw && \
     curl -SL http://softlayer-ams.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/rubenvb/gcc-4.7-release/x86_64-w64-mingw32-gcc-4.7.2-release-linux64_rubenvb.tar.xz | \
     tar -xJC /opt/mingw && \
-    echo "export PATH=\$PATH:/opt/mingw/mingw64/bin" >> /etc/rubybashrc && \
-    ln -s /opt/mingw/mingw64/bin/* /usr/local/bin/
+    echo "export PATH=\$PATH:/opt/mingw/mingw64/bin" >> /etc/rubybashrc
 
 # 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 && \
@@ -86,9 +84,11 @@ RUN bash -c " \
 
 USER root
 
-# Fix paths in rake-compiler/config.yml and add rvm to the global bashrc
+# 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
+    echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc && \
+    echo "export PATH=\$PATH:/opt/mingw/mingw32/bin" >> /etc/bash.bashrc && \
+    echo "export PATH=\$PATH:/opt/mingw/mingw64/bin" >> /etc/bash.bashrc
 
 # Install wrappers for strip commands as a workaround for "Protocol error" in boot2docker.
 ADD src/strip_wrapper /root/

data/History.md

@@ -1,3 +1,10 @@
+0.3.0 / 2015-06-17
+------------------
+* Workaround an issue with broken DLLs when building on Windows.
+* Print docker command line based on verbose flag of rake.
+* Add check for docker and instructions for install.
+
+
 0.2.0 / 2015-06-08
 ------------------
 * Add a simple API for running commands within the rake-compiler-dock environment.

data/README.md

@@ -1,9 +1,12 @@
 # rake-compiler-dock
 
-Easy to use Docker based cross compiler environment for building binary windows gems.
+Easy to use Docker based cross compiler environment for building binary Windows gems.
 
-This is similar to [rake-compiler-dev-box](https://github.com/tjschuck/rake-compiler-dev-box) but is based on lightweight Docker containers and is wrapped as a gem for easier usage and integration.
+It provides cross compilers and Ruby environments for all versions of the [RubyInstaller](http://rubyinstaller.org/) .
+They are prepared for use with [rake-compiler](https://github.com/rake-compiler/rake-compiler) .
 
+This is similar to [rake-compiler-dev-box](https://github.com/tjschuck/rake-compiler-dev-box) but is based on lightweight Docker containers and is wrapped as a gem for easier setup, usage and integration.
+It is also a bit more reliable, since the underlying docker images are versioned and kept unchanged while building.
 
 ## Installation
 
@@ -32,7 +35,7 @@ All commands are executed with the current user and group of the host.
 `rake-compiler-dock` without arguments starts an interactive shell session.
 You can choose between different ruby versions by `rvm use <version>` .
 All changes within the current working directory are shared with the host.
-But note, that all other changes to the file system are dropped at the end of the session.
+But note, that all other changes to the file system are dropped at the end of the session - the docker image is stateless.
 
 `rake-compiler-dock` can also take the build command(s) from STDIN or as command arguments.
 

data/bin/rake-compiler-dock

@@ -3,6 +3,10 @@
 require 'rake_compiler_dock'
 
 args = ARGV.empty? ? ['bash'] : ARGV
-RakeCompilerDock.exec(*args) do |ok, res|
-  exit(res.exitstatus)
+begin
+  RakeCompilerDock.exec(*args) do |ok, res|
+    exit(res.exitstatus)
+  end
+rescue RakeCompilerDock::DockerIsNotAvailable
+  exit(-1)
 end

data/lib/rake_compiler_dock.rb

@@ -1,23 +1,33 @@
+require "shellwords"
 require "rake_compiler_dock/version"
 
 module RakeCompilerDock
+  class DockerIsNotAvailable < RuntimeError
+  end
+
   # Run the command cmd within a fresh rake-compiler-dock container and within a shell.
   #
   # If a block is given, upon command completion the block is called with an OK flag (true on a zero exit status) and a Process::Status object.
   # Without a block a RuntimeError is raised when the command exits non-zero.
   #
+  # Option +:verbose+ can be set to enable printing of the command line.
+  # If not set, the rake verbose_flag is used.
+  #
   # Examples:
   #
   #   RakeCompilerDock.sh 'bundle && rake cross native gem'
   #
   #   # check exit status after command runs
-  #   sh %{bundle && rake cross native gem} do |ok, res|
+  #   sh %{bundle && rake cross native gem}, verbose: true do |ok, res|
   #     if ! ok
   #       puts "windows cross build failed (status = #{res.exitstatus})"
   #     end
   #   end
-  def sh(cmd, &block)
-    exec('bash', '-c', cmd, &block)
+  def sh(cmd, options={}, &block)
+    if verbose_flag(options)
+      $stderr.puts "rake-compiler-dock bash -c #{ cmd.inspect }"
+    end
+    exec('bash', '-c', cmd, options, &block)
   end
 
   def image_name
@@ -30,10 +40,18 @@ module RakeCompilerDock
   # If a block is given, upon command completion the block is called with an OK flag (true on a zero exit status) and a Process::Status object.
   # Without a block a RuntimeError is raised when the command exits non-zero.
   #
+  # Option +:verbose+ can be set to enable printing of the command line.
+  # If not set, the rake verbose_flag is used.
+  # Option +:check_docker+ can be set to false to disable the docker check.
+  #
   # Examples:
   #
   #   RakeCompilerDock.exec 'bash', '-c', 'echo $RUBY_CC_VERSION'
   def exec(*args)
+    options = (Hash === args.last) ? args.pop : {}
+
+    check_docker if options.fetch(:check_docker){ true }
+
     if RUBY_PLATFORM =~ /mingw|mswin/
       # Change Path from "C:\Path" to "/c/Path" as used by boot2docker
       pwd = Dir.pwd.gsub(/^([a-z]):/i){ "/#{$1.downcase}" }
@@ -60,15 +78,63 @@ module RakeCompilerDock
           image_name,
           "sigfw", "runas", *args]
 
+    cmdline = Shellwords.join(cmd)
+    if verbose_flag(options) == true
+      $stderr.puts cmdline
+    end
+
     ok = system(*cmd)
     if block_given?
       yield(ok, $?)
     elsif !ok
-      show_command = cmd.join(" ")
       fail "Command failed with status (#{$?.exitstatus}): " +
-        "[#{show_command}]"
+        "[#{cmdline}]"
+    end
+  end
+
+  def verbose_flag(options)
+    verbose = options.fetch(:verbose) do
+      Object.const_defined?(:Rake) && Rake.const_defined?(:FileUtilsExt) ? Rake::FileUtilsExt.verbose_flag : false
+    end
+  end
+
+  @@docker_checked = false
+
+  def check_docker
+    return if @@docker_checked
+
+    version_text = `docker version` rescue SystemCallError
+    if $?.exitstatus == 0 && version_text.to_s =~ /version/
+      @@docker_checked = true
+    else
+      case RUBY_PLATFORM
+      when /mingw|mswin/
+        $stderr.puts "Docker is not available. Please download and install boot2docker:"
+        $stderr.puts "   https://github.com/boot2docker/windows-installer/releases"
+        $stderr.puts
+        $stderr.puts "Then execute 'boot2docker start' and follow the instuctions"
+      when /linux/
+        $stderr.puts "Docker is not available."
+        $stderr.puts
+        $stderr.puts "Install on Ubuntu/Debian:"
+        $stderr.puts "   sudo apt-get install docker.io"
+        $stderr.puts
+        $stderr.puts "Install on Fedora/Centos/RHEL"
+        $stderr.puts "   sudo yum install docker"
+        $stderr.puts "   sudo systemctl start docker"
+        $stderr.puts
+        $stderr.puts "Install on SuSE"
+        $stderr.puts "   sudo zypper install docker"
+        $stderr.puts "   sudo systemctl start docker"
+      when /darwin/
+        $stderr.puts "Docker is not available. Please download and install boot2docker:"
+        $stderr.puts "   https://github.com/boot2docker/osx-installer/releases"
+      else
+        $stderr.puts "Docker is not available."
+      end
+      raise DockerIsNotAvailable, "Docker is not available"
     end
   end
 
-  module_function :exec, :sh, :image_name
+  module_function :exec, :sh, :image_name, :verbose_flag, :check_docker
 end

data/lib/rake_compiler_dock/version.rb

@@ -1,3 +1,3 @@
 module RakeCompilerDock
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/src/strip_wrapper

@@ -10,6 +10,7 @@ strip = "#{File.basename($0)}.bin"
 
 files = ARGV.reject{|f| f=~/^-/ }.map do |arg|
   tmp = Tempfile.new 'strip'
+  tmp.close
   FileUtils.cp arg, tmp.path
   [tmp, arg]
 end
@@ -17,12 +18,12 @@ end
 options = ARGV.select{|f| f=~/^-/ } + files.map{|t,o| t.path }
 
 unless system( strip, *options )
-  puts "unable to execute #{strip}"
   exit 127
 end
 code = $?.exitstatus
 
 files.each do |tmp, orig|
+  FileUtils.rm orig
   FileUtils.cp tmp.path, orig
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Lars Kanis
@@ -10,26 +10,26 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPDCCAiSgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBEMQ0wCwYDVQQDDARsYXJz
-  MR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZImiZPyLGQB
-  GRYCZGUwHhcNMTUwMzEzMjAzMjExWhcNMTYwMzEyMjAzMjExWjBEMQ0wCwYDVQQD
-  DARsYXJzMR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZIm
-  iZPyLGQBGRYCZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZb4Uv
-  RFJfRu/VEWiy3psh2jinETjiuBrL0NeRFGf8H7iU9+gx/DI/FFhfHGLrDeIskrJx
-  YIWDMmEjVO10UUdj7wu4ZhmU++0Cd7Kq9/TyP/shIP3IjqHjVLCnJ3P6f1cl5rxZ
-  gqo+d3BAoDrmPk0rtaf6QopwUw9RBiF8V4HqvpiY+ruJotP5UQDP4/lVOKvA8PI9
-  P0GmVbFBrbc7Zt5h78N3UyOK0u+nvOC23BvyHXzCtcFsXCoEkt+Wwh0RFqVZdnjM
-  LMO2vULHKKHDdX54K/sbVCj9pN9h1aotNzrEyo55zxn0G9PHg/G3P8nMvAXPkUTe
-  brhXrfCwWRvOXA4TAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0G
-  A1UdDgQWBBRAHK81igrXodaDj8a8/BIKsaZrETANBgkqhkiG9w0BAQUFAAOCAQEA
-  MSeqyuvnysrcVerV+iQHfW1k53W8sl0pA8f8t/VFp7fUfKXJ9K7AGby4y9xOsqII
-  AeHuFrYoCxgoJL2k088/IKdu5bsuJ4FWzDpIV70uSOZsPKhlBiLqDLvccFnB/XBe
-  3qSVN9x1I/lkVT4j55MqKjvvkn5GCfKz6JLPHgwEihiV0qmgsX2uZnxU4JbAbI5R
-  4NX+7Dq+AuZUp5MtQslByeESOalT3SBfXSQ8QkZPwMVstsRm2h+0kVRu/AQHiGwJ
-  6jkDey5mE3jQb893U6ihl55uLkVQwxZZTq/flNWjTIcbbvKKafEGdGv5uOlB+KRL
-  PRtgPFlA2jDgUr1EPAIH1Q==
+  MIIDLjCCAhagAwIBAgIBAzANBgkqhkiG9w0BAQUFADA9MQ4wDAYDVQQDDAVrYW5p
+  czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
+  Fw0xNTAyMjYxNDIyNDRaFw0xNjAyMjYxNDIyNDRaMD0xDjAMBgNVBAMMBWthbmlz
+  MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
+  HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
+  9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn
+  lJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn
+  Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
+  L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
+  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
+  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQEFBQADggEBAE4pDPwv7zV/guo2ZETn
+  V+oVXMvEtUv7lPLpUYTM/g1qHP+mue4vZrhHTZbqEgxZEv03noz/4yIHizMQljED
+  6aUw0DSCQiOtK39LeHE2SfVPnpJdl6R9WX6ObdhNvN3Q9bJL2Ng3TTPidj9on2jO
+  6SevWmI9NMDsupzXOjeuNKbUivcCKgIsp3+qjw1gGURF6eITEM+kxV+u4eC5ah/f
+  iV4wuwAX30bHxaaOA2owy1BJBOHwTl5XBJFKWBf+HlTIGL6yrOjTb+rB+/rSTttv
+  1i6jssufMLmyDB9b1ss72d7xQQpCHH7oizgt84wKAcsV8b83kGbAhtoszY3TgGiJ
+  rww=
   -----END CERTIFICATE-----
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,4 +110,3 @@ signing_key:
 specification_version: 4
 summary: Docker based cross compiler environment for building binary windows gems.
 test_files: []
-has_rdoc: