rake-compiler-dock 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf177d3bb521223da3b6c4813223e8d061e4692
-  data.tar.gz: 28cd1acc6452ed7eab4b897c7b2dacbf88460f37
+  metadata.gz: c26ea0c9a2f101595eacf69df6bd46dfb781da9e
+  data.tar.gz: eba33956622fdc4ebd756cfead1f91f58f9294f2
 SHA512:
-  metadata.gz: 4cf5327994d25b154d26021fc291fa719a33b4c4304b1376128d692b3557d9e6061b2a556ecd94796a82001a81b37c1debcd7b8e9c052824fc85e581de86ce31
-  data.tar.gz: 247e9649bf95c6ebaaca46bed11eb0b6896f957524a3abf2f99e2325598f554be03560ed993cc6e16733a2c26d40d7d9de6942b77b33f8a2fd51917b3eafc184
+  metadata.gz: 557cee7a6e0b484bb1b41f23ca4474db5383464722057cf7a33c21a8caa2e455b72782f11c61524bad843503c2274b4f0843d6ee40cb72ee9f349a11bd8cab1b
+  data.tar.gz: c0cae01e38a66d568a80fa7a11541782235bb10aca925da6ea0be4c0a071c23544c2c31b6b51fde8a5e0a1d518666cd7715e45ecd4720fef0be54a4604d99cc4

data/Dockerfile

@@ -4,12 +4,12 @@ RUN apt-get -y update && \
     apt-get install -y curl git-core mingw32 xz-utils build-essential wget
 
 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 | \
+    curl -SL http://downloads.sourceforge.net/mingw-w64/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
 
 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 | \
+    curl -SL http://downloads.sourceforge.net/mingw-w64/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
 
@@ -25,13 +25,14 @@ RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3 && \
         source /etc/rubybashrc && \
         rvmsudo rvm cleanup all "
 
+ADD 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 1.8.7-p374 1.9.3 2.2.2 ; do \
-        rvm install \$v; \
+        rvm install \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
     done && \
     rvm cleanup all && \
     find /usr/local/rvm -type d | sudo xargs chmod g+sw "
@@ -63,7 +64,7 @@ RUN bash -c "rvm use 1.8.7-p374 && \
 
 RUN bash -c "rvm use 1.9.3 && \
     export CFLAGS='-s -O1 -fno-omit-frame-pointer -fno-fast-math' && \
-    rake-compiler cross-ruby VERSION=1.9.3-p550 HOST=i586-mingw32msvc && \
+    rake-compiler cross-ruby VERSION=1.9.3-p551 HOST=i586-mingw32msvc && \
     rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources"
 
 RUN bash -c "rvm use 2.2.2 --default && \

data/History.md

@@ -1,3 +1,10 @@
+0.3.1 / 2015-06-24
+------------------
+* Add :sigfw and :runas options.
+* Don't stop the container on Ctrl-C when running interactively.
+* Workaround an issue with sendfile() leading to broken files when using boot2docker on Windows.
+
+
 0.3.0 / 2015-06-17
 ------------------
 * Workaround an issue with broken DLLs when building on Windows.

data/README.md

@@ -28,16 +28,14 @@ Install rake-compiler-dock as a gem. The docker image is downloaded later on dem
 
 ## Usage
 
-`rake-compiler-dock` can be used to issue commands within the docker image.
-It mounts the current working directory into the docker environment.
+Rake-compiler-dock offers the shell command `rake-compiler-dock` and a [ruby API for issuing commands within the docker image](http://www.rubydoc.info/gems/rake-compiler-dock/RakeCompilerDock).
+Both mount the current working directory into the docker environment.
 All commands are executed with the current user and group of the host.
+This is done by copying account data into the container and sudo to it.
 
 `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 - the docker image is stateless.
-
-`rake-compiler-dock` can also take the build command(s) from STDIN or as command arguments.
+All changes below the current working directory are shared with the host.
+But note, that all other changes to the file system of the contanier 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.
 
 To build x86- and x64 Windows (Mingw) binary gems, it is typically called like this:
 
@@ -48,12 +46,14 @@ The installed cross rubies can be listed like this:
 
     $ rake-compiler-dock bash -c 'rvmsudo rake-compiler update-config'
 
-The environment variable `RUBY_CC_VERSION` is predefined and includes all these versions:
+The environment variable `RUBY_CC_VERSION` is predefined and includes all these cross ruby versions:
 
     $ rake-compiler-dock bash -c 'echo $RUBY_CC_VERSION'    # =>  1.8.7:1.9.3:2.0.0:2.1.6:2.2.2
 
 Overwrite `RUBY_CC_VERSION`, if your gem does not support all available versions.
 
+You can also choose between different executable ruby versions by `rvm use <version>` . Current default is 2.2.
+
 ### Add to your Rakefile
 
 Rake-compiler-dock can be easily integrated into your Rakefile like this:
@@ -63,7 +63,7 @@ Rake-compiler-dock can be easily integrated into your Rakefile like this:
       RakeCompilerDock.sh "bundle && rake cross native gem"
     end
 
-See [the wiki](https://github.com/larskanis/rake-compiler-dock/wiki/Projects-using-rake-compiler) for projects which use rake-compiler-dock.
+See [the wiki](https://github.com/larskanis/rake-compiler-dock/wiki/Projects-using-rake-compiler-dock) for projects which use rake-compiler-dock.
 
 ## Contributing
 

data/bin/rake-compiler-dock

@@ -2,7 +2,7 @@
 
 require 'rake_compiler_dock'
 
-args = ARGV.empty? ? ['bash'] : ARGV
+args = ARGV.empty? ? ['bash', {:sigfw => false}] : ARGV
 begin
   RakeCompilerDock.exec(*args) do |ok, res|
     exit(res.exitstatus)

data/lib/rake_compiler_dock.rb

@@ -11,14 +11,15 @@ module RakeCompilerDock
   # 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.
+  # If not set, rake's verbose flag is used.
   #
   # Examples:
   #
   #   RakeCompilerDock.sh 'bundle && rake cross native gem'
   #
-  #   # check exit status after command runs
-  #   sh %{bundle && rake cross native gem}, verbose: true do |ok, res|
+  # Check exit status after command runs:
+  #
+  #   sh %{bundle && rake cross native gem}, verbose: false do |ok, res|
   #     if ! ok
   #       puts "windows cross build failed (status = #{res.exitstatus})"
   #     end
@@ -40,17 +41,22 @@ 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.
+  # * Option +:verbose+ can be set to enable printing of the command line.
+  #   If not set, rake's verbose flag is used.
+  # * Option +:check_docker+ can be set to false to disable the docker check.
+  # * Option +:sigfw+ can be set to false to not stop the container on Ctrl-C.
+  # * Option +:runas+ can be set to false to execute the command as user root.
   #
   # Examples:
   #
   #   RakeCompilerDock.exec 'bash', '-c', 'echo $RUBY_CC_VERSION'
   def exec(*args)
     options = (Hash === args.last) ? args.pop : {}
+    runargs = args.dup
 
     check_docker if options.fetch(:check_docker){ true }
+    runargs.unshift("sigfw") if options.fetch(:sigfw){ true }
+    runargs.unshift("runas") if options.fetch(:runas){ true }
 
     if RUBY_PLATFORM =~ /mingw|mswin/
       # Change Path from "C:\Path" to "/c/Path" as used by boot2docker
@@ -76,7 +82,7 @@ module RakeCompilerDock
           "-e", "https_proxy=#{ENV['https_proxy']}",
           "-w", pwd,
           image_name,
-          "sigfw", "runas", *args]
+          *runargs]
 
     cmdline = Shellwords.join(cmd)
     if verbose_flag(options) == true
@@ -107,30 +113,33 @@ module RakeCompilerDock
     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"
+      at_exit do
         $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."
+        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
       end
       raise DockerIsNotAvailable, "Docker is not available"
     end

data/lib/rake_compiler_dock/version.rb

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

data/patches/ruby-1.8.7-p374/nop.patch

@@ -0,0 +1,2 @@
+diff --git a/configure b/configure
+index 55157af..6630eba 100755

data/patches/ruby-1.9.3/no_sendfile.patch

@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 898730c..cfe6253 100755
+--- a/configure
++++ b/configure
+@@ -14695,7 +14695,7 @@ for ac_func in fmod killpg wait4 waitpid fork spawnv syscall __syscall chroot ge
+ 	      setsid telldir seekdir fchmod cosh sinh tanh log2 round\
+ 	      setuid setgid daemon select_large_fdset setenv unsetenv\
+               mktime timegm gmtime_r clock_gettime gettimeofday poll ppoll\
+-              pread sendfile shutdown sigaltstack dl_iterate_phdr
++              pread shutdown sigaltstack dl_iterate_phdr
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

data/patches/ruby-1.9.3/nop.patch

@@ -0,0 +1,2 @@
+diff --git a/configure b/configure
+index 55157af..6630eba 100755

data/patches/ruby-2.2.2/no_sendfile.patch

@@ -0,0 +1,12 @@
+diff --git a/configure b/configure
+index 55157af..6630eba 100755
+--- a/configure
++++ b/configure
+@@ -18676,7 +18676,6 @@ do :
+   ac_fn_c_check_func "$LINENO" "sendfile" "ac_cv_func_sendfile"
+ if test "x$ac_cv_func_sendfile" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define HAVE_SENDFILE 1
+ _ACEOF
+ 
+ fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Lars Kanis
@@ -29,7 +29,7 @@ cert_chain:
   1i6jssufMLmyDB9b1ss72d7xQQpCHH7oizgt84wKAcsV8b83kGbAhtoszY3TgGiJ
   rww=
   -----END CERTIFICATE-----
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,6 +79,10 @@ files:
 - bin/rake-compiler-dock
 - lib/rake_compiler_dock.rb
 - lib/rake_compiler_dock/version.rb
+- patches/ruby-1.8.7-p374/nop.patch
+- patches/ruby-1.9.3/no_sendfile.patch
+- patches/ruby-1.9.3/nop.patch
+- patches/ruby-2.2.2/no_sendfile.patch
 - rake-compiler-dock.gemspec
 - src/rake-compiler-without-exts.diff
 - src/runas