rake-compiler-dock 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 1e983c94653b1f0957be5369aea68c1f36b08d98
-  data.tar.gz: 7c0cd46e926a975dfd6e6bf42b00ee6686e50d86
-SHA512: 
-  metadata.gz: 93f1cc24bf695392c2c3224f822631102a17208b48ccc394859860a152c77c855eff35e20158d84064d1b4a01e20cc7fe4e00c076386ef7eec8e7159d6abce79
-  data.tar.gz: 598ba57c29cd9cf4ac07a9456813850fd6e7ec35c124deb9240d95dbdb6b910e8b1873c3a9e495ea1d6a67fabb14e4031022aa2064f86634b9be9adde0353dc9
+---
+SHA1:
+  metadata.gz: e5326f050ab952a7641a48ab10de71a2f56933fe
+  data.tar.gz: de257ed5785395495ee8e11cc6aae3a5e35870c7
+SHA512:
+  metadata.gz: 9d7089a62ac4b0b6f7224791d56d152e57364e47bf989079fe03f822095f11243e5bffb18906ffa1372f0b8f370a75cb36c9470c623b1075f29a923ba38f162e
+  data.tar.gz: c7ff5593f623e88a794b341df449d0859b8f555cf515ff098881be5387f4cb65601e7dd24a0549c224fec773c84e5e699aa122ecaa6d157be2c74061659201f7

data/Dockerfile

@@ -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
+# 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 1.8.7-p374 1.9.3 2.2.2 ; do \
+    for v in 2.3.0 1.9.3 1.8.7-p374 ; do \
         rvm install \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
     done && \
     rvm cleanup all && \
@@ -42,7 +43,8 @@ RUN bash -c " \
 RUN echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \
     bash -c " \
         rvm all do gem install bundler rake-compiler hoe mini_portile rubygems-tasks && \
-        find /usr/local/rvm -type d | sudo xargs chmod g+sw "
+        rvm 1.9.3,2.3.0 do gem install 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 && \
@@ -50,38 +52,40 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
     ln -s /usr/local/rake-compiler ~/.rake-compiler
 
 # Patch rake-compiler to avoid build of ruby extensions
-ADD src/rake-compiler-without-exts.diff /home/rvm/
-RUN cd /usr/local/rvm/gems/ruby-1.8.7-p374/gems/rake-compiler-0.9.5 && patch -p1 < /home/rvm/rake-compiler-without-exts.diff && \
-    cd /usr/local/rvm/gems/ruby-1.9.3-p551/gems/rake-compiler-0.9.5 && patch -p1 < /home/rvm/rake-compiler-without-exts.diff && \
-    cd /usr/local/rvm/gems/ruby-2.2.2/gems/rake-compiler-0.9.5 && patch -p1 < /home/rvm/rake-compiler-without-exts.diff
+RUN cd /usr/local/rvm/gems/ruby-1.8.7-p374/gems/rake-compiler-0.9.5 && patch -p1 < /home/rvm/patches/rake-compiler-0.9.5/without-exts.diff ; \
+    cd /usr/local/rvm/gems/ruby-1.9.3-p551/gems/rake-compiler-0.9.5 && patch -p1 < /home/rvm/patches/rake-compiler-0.9.5/without-exts.diff ; \
+    cd /usr/local/rvm/gems/ruby-2.3.0/gems/rake-compiler-0.9.5 && patch -p1 < /home/rvm/patches/rake-compiler-0.9.5/without-exts.diff ; \
+    true
 
-# Build 1.8.7 with mingw32 compiler (GCC 4.2)
-# Use just one CPU for building 1.8.7 and 1.9.3
-RUN bash -c "rvm use 1.8.7-p374 && \
-    export CFLAGS='-s -O1 -fno-omit-frame-pointer -fno-fast-math' && \
-    rake-compiler cross-ruby VERSION=1.8.7-p374 HOST=i586-mingw32msvc && \
-    rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources"
+RUN bash -c "rvm use 2.3.0 --default && \
+    export MAKE=\"make -j`nproc`\" CFLAGS='-s -O1 -fno-omit-frame-pointer -fno-fast-math' && \
+    rake-compiler cross-ruby VERSION=2.3.0 HOST=i686-w64-mingw32 && \
+    rake-compiler cross-ruby VERSION=2.3.0 HOST=x86_64-w64-mingw32 && \
+    rake-compiler cross-ruby VERSION=2.2.2 HOST=i686-w64-mingw32 && \
+    rake-compiler cross-ruby VERSION=2.2.2 HOST=x86_64-w64-mingw32 && \
+    rake-compiler cross-ruby VERSION=2.1.6 HOST=i686-w64-mingw32 && \
+    rake-compiler cross-ruby VERSION=2.1.6 HOST=x86_64-w64-mingw32 && \
+    rake-compiler cross-ruby VERSION=2.0.0-p645 HOST=i686-w64-mingw32 && \
+    rake-compiler cross-ruby VERSION=2.0.0-p645 HOST=x86_64-w64-mingw32 && \
+    rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources && \
+    find /usr/local/rvm -type d | sudo xargs chmod g+sw "
 
 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-p551 HOST=i586-mingw32msvc && \
     rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources"
 
-RUN bash -c "rvm use 2.2.2 --default && \
-    export MAKE=\"make -j`nproc`\" CFLAGS='-s -O1 -fno-omit-frame-pointer -fno-fast-math' && \
-    rake-compiler cross-ruby VERSION=2.0.0-p645 HOST=i686-w64-mingw32 && \
-    rake-compiler cross-ruby VERSION=2.0.0-p645 HOST=x86_64-w64-mingw32 && \
-    rake-compiler cross-ruby VERSION=2.1.6 HOST=i686-w64-mingw32 && \
-    rake-compiler cross-ruby VERSION=2.1.6 HOST=x86_64-w64-mingw32 && \
-    rake-compiler cross-ruby VERSION=2.2.2 HOST=i686-w64-mingw32 && \
-    rake-compiler cross-ruby VERSION=2.2.2 HOST=x86_64-w64-mingw32 && \
-    rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources && \
-    find /usr/local/rvm -type d | sudo xargs chmod g+sw "
+# Build 1.8.7 with mingw32 compiler (GCC 4.2)
+# Use just one CPU for building 1.8.7 and 1.9.3
+RUN bash -c "rvm use 1.8.7-p374 && \
+    export CFLAGS='-s -O1 -fno-omit-frame-pointer -fno-fast-math' && \
+    rake-compiler cross-ruby VERSION=1.8.7-p374 HOST=i586-mingw32msvc && \
+    rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources"
 
 RUN bash -c " \
-    rvm alias create 1.8 1.8.7-p374 && \
+    rvm alias create 2.3 2.3.0 && \
     rvm alias create 1.9 1.9.3 && \
-    rvm alias create 2.2 2.2.2 "
+    rvm alias create 1.8 1.8.7-p374 "
 
 USER root
 
@@ -92,7 +96,7 @@ RUN sed -i -- "s:/root/.rake-compiler:/usr/local/rake-compiler:g" /usr/local/rak
     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/
+COPY build/strip_wrapper /root/
 RUN mv /opt/mingw/mingw32/bin/i686-w64-mingw32-strip /opt/mingw/mingw32/bin/i686-w64-mingw32-strip.bin && \
     mv /opt/mingw/mingw64/bin/x86_64-w64-mingw32-strip /opt/mingw/mingw64/bin/x86_64-w64-mingw32-strip.bin && \
     mv /usr/bin/i586-mingw32msvc-strip /usr/bin/i586-mingw32msvc-strip.bin && \
@@ -101,15 +105,15 @@ RUN mv /opt/mingw/mingw32/bin/i686-w64-mingw32-strip /opt/mingw/mingw32/bin/i686
     ln /root/strip_wrapper /usr/bin/i586-mingw32msvc-strip
 
 # Install SIGINT forwarder
-ADD src/sigfw.c /root/
+COPY build/sigfw.c /root/
 RUN gcc $HOME/sigfw.c -o /usr/local/bin/sigfw
 
 # Install user mapper
-ADD src/runas /usr/local/bin/
+COPY build/runas /usr/local/bin/
 
 # Install sudoers configuration
-ADD src/sudoers /etc/sudoers.d/rake-compiler-dock
+COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
 
-ENV RUBY_CC_VERSION 1.8.7:1.9.3:2.0.0:2.1.6:2.2.2
+ENV RUBY_CC_VERSION 2.3.0:2.2.2:2.1.6:2.0.0:1.9.3:1.8.7
 
 CMD bash

data/History.md

@@ -1,3 +1,11 @@
+0.5.0 / 2015-12-25
+------------------
+* Add cross ruby version 2.3.0.
+* Replace RVM ruby version 2.2.2 with 2.3.0 and set it as default.
+* Add support for docker-machine in addition to deprecated boot2docker.
+* Drop runtime support for ruby-1.8. Cross build for 1.8 is still supported.
+
+
 0.4.3 / 2015-07-09
 ------------------
 * Ensure the user and group names doesn't clash with names in the image.

data/README.md

@@ -2,8 +2,9 @@
 
 **Easy to use and reliable cross compiler environment for building Windows binary gems.**
 
-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) .
+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).
+It is used by [many gems with C-extentions](https://github.com/rake-compiler/rake-compiler-dock/wiki/Projects-using-rake-compiler-dock).
 
 This is kind of successor of [rake-compiler-dev-box](https://github.com/tjschuck/rake-compiler-dev-box).
 It is wrapped as a gem for easier setup, usage and integration and is based on lightweight Docker containers.
@@ -15,7 +16,7 @@ Install docker natively on Linux:
 
     $ sudo apt-get install docker.io
 
-... or install boot2docker on [Windows](https://github.com/boot2docker/windows-installer/releases) or [OS X](https://github.com/boot2docker/osx-installer/releases) .
+... or install [docker-toolbox for Windows and OSX](https://www.docker.com/docker-toolbox) or boot2docker on [Windows](https://github.com/boot2docker/windows-installer/releases) or [OS X](https://github.com/boot2docker/osx-installer/releases) .
 
 Install rake-compiler-dock as a gem. The docker image is downloaded later on demand:
 
@@ -23,7 +24,7 @@ Install rake-compiler-dock as a gem. The docker image is downloaded later on dem
 
 ... or build your own gem and docker image:
 
-    $ git clone https://github.com/larskanis/rake-compiler-dock
+    $ git clone https://github.com/rake-compiler/rake-compiler-dock
     $ rake install
 
 
@@ -77,9 +78,9 @@ This can be done like this:
 
 Rake-compiler-dock uses [semantic versioning](http://semver.org/), so you should add it into your Gemfile, to make sure, that future changes will not break your build.
 
-    gem 'rake-compiler-dock', '~> 0.4.0'
+    gem 'rake-compiler-dock', '~> 0.5.0'
 
-See [the wiki](https://github.com/larskanis/rake-compiler-dock/wiki/Projects-using-rake-compiler-dock) for projects which make use of rake-compiler-dock.
+See [the wiki](https://github.com/rake-compiler/rake-compiler-dock/wiki/Projects-using-rake-compiler-dock) for projects which make use of rake-compiler-dock.
 
 
 ## Environment Variables
@@ -93,7 +94,7 @@ The following variables are recognized by rake-compiler-dock:
 
 The following variables are passed through to the docker container without modification:
 
-* `http_proxy`, `https_proxy`, `ftp_proxy` - See [Frequently asked questions](https://github.com/larskanis/rake-compiler-dock/wiki/FAQ) for more details.
+* `http_proxy`, `https_proxy`, `ftp_proxy` - See [Frequently asked questions](https://github.com/rake-compiler/rake-compiler-dock/wiki/FAQ) for more details.
 
 The following variables are provided to the running docker container:
 
@@ -101,7 +102,7 @@ The following variables are provided to the running docker container:
 * `RCD_HOST_RUBY_PLATFORM` - The `RUBY_PLATFORM` of the host ruby.
 * `RCD_HOST_RUBY_VERSION` - The `RUBY_VERSION` of the host ruby.
 * `RUBY_CC_VERSION` - The target ruby versions for rake-compiler.
-    The default is defined in the [Dockerfile](https://github.com/larskanis/rake-compiler-dock/blob/master/Dockerfile), but can be changed as a parameter to rake.
+    The default is defined in the [Dockerfile](https://github.com/rake-compiler/rake-compiler-dock/blob/master/Dockerfile), but can be changed as a parameter to rake.
 
 Other environment variables can be set or passed through to the container like this:
 
@@ -110,12 +111,12 @@ Other environment variables can be set or passed through to the container like t
 
 ## More information
 
-See [Frequently asked questions](https://github.com/larskanis/rake-compiler-dock/wiki/FAQ) and [![Join the chat at https://gitter.im/larskanis/rake-compiler-dock](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/larskanis/rake-compiler-dock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+See [Frequently asked questions](https://github.com/rake-compiler/rake-compiler-dock/wiki/FAQ) and [![Join the chat at https://gitter.im/larskanis/rake-compiler-dock](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/larskanis/rake-compiler-dock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 ## Contributing
 
-1. Fork it ( https://github.com/larskanis/rake-compiler-dock/fork )
+1. Fork it ( https://github.com/rake-compiler/rake-compiler-dock/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/{patches/ruby-2.2.2 → build/patches/ruby-2.3.0}/no_sendfile.patch

@@ -1,8 +1,8 @@
 diff --git a/configure b/configure
-index 55157af..6630eba 100755
+index ebe3d8c..a336b73 100755
 --- a/configure
 +++ b/configure
-@@ -18676,7 +18676,6 @@ do :
+@@ -18943,7 +18943,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

data/lib/rake_compiler_dock.rb

@@ -1,3 +1,10 @@
+
+# We do ruby version check at runtime, so this file should be kept ruby-1.8 compatible.
+if (m=RUBY_VERSION.match(/^(\d+)\.(\d+)\.(\d+)/)) &&
+    m.captures.map(&:to_i).pack("N*") < [1,9,2].pack("N*")
+  raise "rake-compiler-dock requires at least RUBY_VERSION >= 1.9.2"
+end
+
 require "rake_compiler_dock/colors"
 require "rake_compiler_dock/docker_check"
 require "rake_compiler_dock/starter"
@@ -45,6 +52,8 @@ module RakeCompilerDock
   # * 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.
   # * Option +:options+ can be an Array of additional options to the 'docker run' command.
+  # * Option +:username+ can be used to overwrite the user name in the container
+  # * Option +:groupname+ can be used to overwrite the group name in the container
   #
   # Examples:
   #

data/lib/rake_compiler_dock/colors.rb

@@ -7,14 +7,14 @@ module RakeCompilerDock
     NND = "#{ESC}0m"
 
     ColorMap = {
-      :black => 0,
-      :red => 1,
-      :green => 2,
-      :yellow => 3,
-      :blue => 4,
-      :magenta => 5,
-      :cyan => 6,
-      :white => 7,
+      black: 0,
+      red: 1,
+      green: 2,
+      yellow: 3,
+      blue: 4,
+      magenta: 5,
+      cyan: 6,
+      white: 7,
     }
 
     ColorMap.each do |color, code|

data/lib/rake_compiler_dock/docker_check.rb

@@ -1,3 +1,4 @@
+require "uri"
 require "rake_compiler_dock/colors"
 
 module RakeCompilerDock
@@ -5,9 +6,12 @@ module RakeCompilerDock
     include Colors
 
     attr_reader :io
+    attr_accessor :machine_name
 
-    def initialize(io)
+    def initialize(io, machine_name="rake-compiler-dock")
       @io = io
+      @machine_name = machine_name
+
       if !io.tty? || (RUBY_PLATFORM=~/mingw|mswin/ && RUBY_VERSION[/^\d+/] < '2')
         disable_colors
       else
@@ -17,25 +21,37 @@ module RakeCompilerDock
       docker_version
 
       unless ok?
-        b2d_version
-
-        if b2d_avail?
+        doma_version
+        if doma_avail?
           io.puts
-          io.puts yellow("boot2docker is available, but not ready to use. Trying to start.")
+          io.puts yellow("docker-machine is available, but not ready to use. Trying to start.")
 
-          b2d_init
-          if b2d_init_ok?
-            b2d_start
+          doma_create
+          if doma_create_ok?
+            doma_start
 
             docker_version
           end
+        else
+          b2d_version
+
+          if b2d_avail?
+            io.puts
+            io.puts yellow("boot2docker is available, but not ready to use. Trying to start.")
+
+            b2d_init
+            if b2d_init_ok?
+              b2d_start
+
+              docker_version
+            end
+          end
         end
       end
     end
 
     def docker_version
-      @docker_version_text = `docker version 2>&1` rescue SystemCallError
-      @docker_version_status = $?.exitstatus
+      @docker_version_text, @docker_version_status = run("docker version")
     end
 
     def ok?
@@ -46,6 +62,55 @@ module RakeCompilerDock
       @docker_version_text =~ /version/
     end
 
+    def doma_version
+      @doma_version_text, @doma_version_status = run("docker-machine --version")
+    end
+
+    def doma_avail?
+      @doma_version_status == 0 && @doma_version_text =~ /version/
+    end
+
+    def doma_create
+      options = [
+            "--engine-env", "ftp_proxy=#{ENV['ftp_proxy']}",
+            "--engine-env", "http_proxy=#{ENV['http_proxy']}",
+            "--engine-env", "https_proxy=#{ENV['https_proxy']}",
+      ]
+      @doma_create_text, @doma_create_status = run("docker-machine create --driver virtualbox #{options.join(" ")} #{machine_name}", cmd: :visible, output: :visible)
+    end
+
+    def doma_create_ok?
+      @doma_create_status == 0 || @doma_create_text =~ /already exists/
+    end
+
+    def doma_start
+      @doma_start_text, @doma_start_status = run("docker-machine start #{machine_name}", cmd: :visible, output: :visible)
+      @doma_env_set = false
+
+      if doma_start_ok?
+        @doma_env_text, @doma_env_status = run("docker-machine env #{machine_name}")
+        if @doma_env_status == 0 && set_env(@doma_env_text)
+          # We use docker-machine for a local provider only, so we shouldn't use any proxy to connect to it.
+          if host=ENV['DOCKER_HOST']
+            ENV['NO_PROXY'] = [ENV['NO_PROXY'], URI.parse(host).host].compact.join(",")
+          end
+          @doma_env_set = true
+        end
+      end
+    end
+
+    def doma_start_ok?
+      @doma_start_status == 0 || @doma_start_text =~ /already running/
+    end
+
+    def doma_env_ok?
+      @doma_env_status == 0
+    end
+
+    def doma_has_env?
+      @doma_env_set
+    end
+
     def b2d_version
       @b2d_version_text = `boot2docker version 2>&1` rescue SystemCallError
       @b2d_version_status = $?.exitstatus
@@ -71,19 +136,11 @@ module RakeCompilerDock
 
       if @b2d_start_status == 0
         io.puts @b2d_start_text
-        @b2d_start_text.scan(/(unset |Remove-Item Env:\\)(.+?)$/) do |_, key|
-          ENV.delete(key)
-          @b2d_start_envset = true
-        end
-        @b2d_start_text.scan(/(export |\$Env:)(.+?)(=| = ")(.*?)(|\")$/) do |_, key, _, val, _|
-          ENV[key] = val
+        if set_env(@b2d_start_text)
           @b2d_start_envset = true
+          io.puts yellow("Using above environment variables for starting #{machine_name}.")
         end
       end
-
-      if @b2d_start_envset
-        io.puts yellow("Using above environment variables for starting rake-compiler-dock.")
-      end
     end
 
     def b2d_start_ok?
@@ -94,9 +151,22 @@ module RakeCompilerDock
       @b2d_start_envset
     end
 
+    def set_env(text)
+      set = false
+      text.scan(/(unset |Remove-Item Env:\\)(.+?)$/) do |_, key|
+        ENV.delete(key)
+        set = true
+      end
+      text.scan(/(export |\$Env:)(.+?)(="|=| = ")(.*?)(|\")$/) do |_, key, _, val, _|
+        ENV[key] = val
+        set = true
+      end
+      set
+    end
+
     def help_text
       help = []
-      if !ok? && docker_client_avail? && !b2d_avail?
+      if !ok? && docker_client_avail? && !doma_avail? && !b2d_avail?
         help << red("Docker client tools work, but connection to the local docker server failed.")
         case RUBY_PLATFORM
         when /linux/
@@ -114,17 +184,17 @@ module RakeCompilerDock
           help << "   sudo systemctl start docker"
           help << ""
           help << yellow("Then re-check with '") + white("docker version") + yellow("'")
-          help << yellow("or have a look at the FAQs: http://git.io/vtD2Z")
+          help << yellow("or have a look at our FAQs: http://git.io/vm8AL")
         else
           help << yellow("    Please check why '") + white("docker version") + yellow("' fails")
-          help << yellow("    or have a look at the FAQs: http://git.io/vtD2Z")
+          help << yellow("    or have a look at our FAQs: http://git.io/vm8AL")
         end
-      elsif !ok? && !b2d_avail?
+      elsif !ok? && !doma_avail? && !b2d_avail?
         case RUBY_PLATFORM
         when /mingw|mswin/
           help << red("Docker is not available.")
-          help << yellow("Please download and install boot2docker:")
-          help << yellow("    https://github.com/boot2docker/windows-installer/releases")
+          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 << ""
@@ -140,33 +210,70 @@ module RakeCompilerDock
           help << "    sudo systemctl start docker"
         when /darwin/
           help << red("Docker is not available.")
-          help << yellow("Please download and install boot2docker:")
-          help << yellow("    https://github.com/boot2docker/osx-installer/releases")
+          help << yellow("Please install docker-machine per homebrew:")
+          help << "    brew cask install virtualbox"
+          help << "    brew install docker"
+          help << "    brew install docker-machine"
+          help << ""
+          help << yellow("or download and install the official docker-toolbox:")
+          help << yellow("    https://www.docker.com/docker-toolbox")
         else
           help << red("Docker is not available.")
         end
-      elsif !ok? && !b2d_init_ok?
-        help << red("boot2docker is installed but couldn't be initialized.")
-        help << ""
-        help << yellow("    Please check why '") + white("boot2docker init") + yellow("' fails")
-        help << yellow("    or have a look at the FAQs: http://git.io/vtDBH")
-      elsif !ok? && !b2d_start_ok?
-        help << red("boot2docker is installed but couldn't be started.")
-        help << ""
-        help << yellow("    Please check why '") + white("boot2docker start") + yellow("' fails.")
-        help << yellow("    You might need to re-init with '") + white("boot2docker delete") + yellow("'")
-        help << yellow("    or have a look at the FAQs: http://git.io/vtDBH")
-      elsif !ok? && b2d_start_ok?
-        help << red("boot2docker is installed and started, but 'docker version' failed.")
-        help << ""
-        if b2d_start_has_env?
-          help << yellow("    Please copy and paste above environment variables to your terminal")
-          help << yellow("    and check why '") + white("docker version") + yellow("' fails.")
-        else
-          help << yellow("    Please check why '") + white("docker version") + yellow("' fails.")
+      elsif doma_avail?
+        if !ok? && !doma_create_ok?
+          help << red("docker-machine is installed but machine couldn't be created.")
+          help << ""
+          help << yellow("    Please check why '") + white("docker-machine create") + yellow("' fails")
+          help << yellow("    or have a look at our FAQs: http://git.io/vRzIg")
+        elsif !ok? && !doma_start_ok?
+          help << red("docker-machine is installed but couldn't be started.")
+          help << ""
+          help << yellow("    Please check why '") + white("docker-machine start") + yellow("' fails.")
+          help << yellow("    You might need to re-init with '") + white("docker-machine rm") + yellow("'")
+          help << yellow("    or have a look at our FAQs: http://git.io/vRzIg")
+        elsif !ok? && !doma_env_ok?
+            help << red("docker-machine is installed and started, but 'docker-machine env' failed.")
+            help << ""
+            help << yellow("You might try to regenerate TLS certificates with:")
+            help << "    docker-machine regenerate-certs #{machine_name}"
+        elsif !ok?
+          help << red("docker-machine is installed and started, but 'docker version' failed.")
+          help << ""
+
+          if doma_has_env?
+            help << yellow("    Please copy and paste following environment variables to your terminal")
+            help += @doma_env_text.each_line.reject{|l| l=~/\s*#/ }.map{|l| "        #{l.chomp}" }
+            help << yellow("    and check why '") + white("docker version") + yellow("' fails.")
+          else
+            help << yellow("    Please check why '") + white("docker version") + yellow("' fails.")
+          end
+          help << yellow("    You might also have a look at our FAQs: http://git.io/vRzIg")
+        end
+      elsif b2d_avail?
+        if !ok? && !b2d_init_ok?
+          help << red("boot2docker is installed but couldn't be initialized.")
+          help << ""
+          help << yellow("    Please check why '") + white("boot2docker init") + yellow("' fails")
+          help << yellow("    or have a look at our FAQs: http://git.io/vm8Nr")
+        elsif !ok? && !b2d_start_ok?
+          help << red("boot2docker is installed but couldn't be started.")
+          help << ""
+          help << yellow("    Please check why '") + white("boot2docker start") + yellow("' fails.")
+          help << yellow("    You might need to re-init with '") + white("boot2docker delete") + yellow("'")
+          help << yellow("    or have a look at our FAQs: http://git.io/vm8Nr")
+        elsif !ok? && b2d_start_ok?
+          help << red("boot2docker is installed and started, but 'docker version' failed.")
+          help << ""
+          if b2d_start_has_env?
+            help << yellow("    Please copy and paste above environment variables to your terminal")
+            help << yellow("    and check why '") + white("docker version") + yellow("' fails.")
+          else
+            help << yellow("    Please check why '") + white("docker version") + yellow("' fails.")
+          end
+          help << yellow("    You might need to re-init with '") + white("boot2docker delete") + yellow("'")
+          help << yellow("    or have a look at our FAQs: http://git.io/vm8Nr")
         end
-        help << yellow("    You might need to re-init with '") + white("boot2docker delete") + yellow("'")
-        help << yellow("    or have a look at the FAQs: http://git.io/vtDBH")
       end
 
       help.join("\n")
@@ -175,5 +282,31 @@ module RakeCompilerDock
     def print_help_text
       io.puts(help_text)
     end
+
+    private
+
+    def run(cmd, options={})
+      if options[:cmd] == :visible
+        io.puts "$ #{green(cmd)}"
+      end
+
+      if options[:output] == :visible
+        text = String.new
+        begin
+          IO.popen("#{cmd} 2>&1") do |fd|
+            while !fd.eof?
+              t = fd.read_nonblock(1024)
+              io.write t
+              text << t
+            end
+          end
+        rescue SystemCallError
+          text = nil
+        end
+      else
+        text = `#{cmd} 2>&1` rescue SystemCallError
+      end
+      [text, $?.exitstatus]
+    end
   end
 end

data/lib/rake_compiler_dock/starter.rb

@@ -1,4 +1,5 @@
 require "shellwords"
+require "etc"
 require "rake_compiler_dock/version"
 
 module RakeCompilerDock
@@ -49,10 +50,8 @@ module RakeCompilerDock
           uid = Process.uid
           gid = Process.gid
         end
-        user = make_valid_user_name(`id -nu`.chomp)
-        group = make_valid_group_name(`id -ng`.chomp)
-
-        drun_args = docker_opts + [image_name] + runargs
+        user = options.fetch(:username){ current_user }
+        group = options.fetch(:groupname){ current_group }
 
         cmd = ["docker", "run",
             "-v", "#{pwd}:#{make_valid_path(pwd)}",
@@ -67,7 +66,9 @@ module RakeCompilerDock
             "-e", "RCD_HOST_RUBY_VERSION=#{RUBY_VERSION}",
             "-e", "RCD_IMAGE=#{image_name}",
             "-w", make_valid_path(pwd),
-            *drun_args]
+            *docker_opts,
+            image_name,
+            *runargs]
 
         cmdline = Shellwords.join(cmd)
         if verbose_flag(options) == true
@@ -89,10 +90,25 @@ module RakeCompilerDock
         end
       end
 
+      def current_user
+        make_valid_user_name(Etc.getlogin)
+      end
+
+      def current_group
+        group_obj = Etc.getgrgid
+        make_valid_group_name(group_obj ? group_obj.name : "dummygroup")
+      end
+
       def make_valid_name(name)
-        name = name.downcase
+        name = name.to_s.downcase
+        name = "_" if name.empty?
         # Convert disallowed characters
-        name = name[0..0].gsub(/[^a-z_]/, "_") + name[1..-2].gsub(/[^a-z0-9_-]/, "_") + name[-1..-1].gsub(/[^a-z0-9_$-]/, "_")
+        if name.length > 1
+          name = name[0..0].gsub(/[^a-z_]/, "_") + name[1..-2].to_s.gsub(/[^a-z0-9_-]/, "_") + name[-1..-1].to_s.gsub(/[^a-z0-9_$-]/, "_")
+        else
+          name = name.gsub(/[^a-z_]/, "_")
+        end
+
         # Limit to 32 characters
         name.sub( /^(.{16}).{2,}(.{15})$/ ){ $1+"-"+$2 }
       end

data/lib/rake_compiler_dock/version.rb

@@ -1,4 +1,4 @@
 module RakeCompilerDock
-  VERSION = "0.4.3"
-  IMAGE_VERSION = "0.4.2"
+  VERSION = "0.5.0"
+  IMAGE_VERSION = "0.5.0"
 end

data/rake-compiler-dock.gemspec

@@ -11,8 +11,11 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Easy to use and reliable cross compiler environment for building Windows binary gems.}
   spec.description   = %q{Easy to use and reliable cross compiler environment for building Windows binary gems.
 Use rake-compiler-dock to enter an interactive shell session or add a task to your Rakefile to automate your cross build.}
-  spec.homepage      = "https://github.com/larskanis/rake-compiler-dock"
+  spec.homepage      = "https://github.com/rake-compiler/rake-compiler-dock"
   spec.license       = "MIT"
+#  We do not set a ruby version in the gemspec, to allow addition to the Gemfile of gems that still support ruby-1.8.
+#  However we do the version check at runtime.
+#  spec.required_ruby_version = '>= 1.9.2'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/test/test_starter.rb

@@ -0,0 +1,33 @@
+require 'rake_compiler_dock'
+require 'test/unit'
+begin
+  require 'test/unit/notify'
+rescue LoadError
+end
+
+class TestStarter < Test::Unit::TestCase
+  include RakeCompilerDock
+
+  def test_make_valid_user_name
+    assert_equal "mouse-click", Starter.make_valid_user_name("Mouse-Click")
+    assert_equal "very_very_very_l-ame_with_spaces", Starter.make_valid_user_name("Very very very long name with spaces")
+    assert_equal "_nobody", Starter.make_valid_user_name("nobody")
+    assert_equal "_rvm", Starter.make_valid_user_name("rvm")
+    assert_equal "staff", Starter.make_valid_user_name("staff")
+    assert_equal "a", Starter.make_valid_user_name("a")
+    assert_equal "_", Starter.make_valid_user_name("")
+    assert_equal "_", Starter.make_valid_user_name(nil)
+  end
+
+  def test_make_valid_group_name
+    assert_equal "mouse-click", Starter.make_valid_group_name("Mouse-Click")
+    assert_equal "very_very_very_l-ame_with_spaces", Starter.make_valid_group_name("Very very very long name with spaces")
+    assert_equal "nobody", Starter.make_valid_group_name("nobody")
+    assert_equal "_rvm", Starter.make_valid_group_name("rvm")
+    assert_equal "_staff", Starter.make_valid_group_name("staff")
+    assert_equal "a", Starter.make_valid_group_name("a")
+    assert_equal "_", Starter.make_valid_group_name("")
+    assert_equal "_", Starter.make_valid_group_name(nil)
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rake-compiler-dock
-version: !ruby/object:Gem::Version 
-  version: 0.4.3
+version: !ruby/object:Gem::Version
+  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain: 
+cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDPDCCAiSgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBEMQ0wCwYDVQQDDARsYXJz
@@ -29,52 +29,61 @@ cert_chain:
   6jkDey5mE3jQb893U6ihl55uLkVQwxZZTq/flNWjTIcbbvKKafEGdGv5uOlB+KRL
   PRtgPFlA2jDgUr1EPAIH1Q==
   -----END CERTIFICATE-----
-
-date: 2015-07-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-12-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.7"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "10.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: |-
   Easy to use and reliable cross compiler environment for building Windows binary gems.
   Use rake-compiler-dock to enter an interactive shell session or add a task to your Rakefile to automate your cross build.
-email: 
+email:
 - lars@greiz-reinsdorf.de
-executables: 
+executables:
 - rake-compiler-dock
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Dockerfile
 - Gemfile
 - History.md
@@ -82,48 +91,49 @@ files:
 - README.md
 - Rakefile
 - bin/rake-compiler-dock
+- build/patches/rake-compiler-0.9.5/without-exts.diff
+- build/patches/ruby-1.8.7-p374/nop.patch
+- build/patches/ruby-1.9.3/no_sendfile.patch
+- build/patches/ruby-1.9.3/nop.patch
+- build/patches/ruby-2.3.0/no_sendfile.patch
+- build/runas
+- build/sigfw.c
+- build/strip_wrapper
+- build/sudoers
 - lib/rake_compiler_dock.rb
 - lib/rake_compiler_dock/colors.rb
 - lib/rake_compiler_dock/docker_check.rb
 - lib/rake_compiler_dock/predefined_user_group.rb
 - lib/rake_compiler_dock/starter.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
-- src/sigfw.c
-- src/strip_wrapper
-- src/sudoers
 - test/test_environment_variables.rb
-homepage: https://github.com/larskanis/rake-compiler-dock
-licenses: 
+- test/test_starter.rb
+homepage: https://github.com/rake-compiler/rake-compiler-dock
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id004 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id004
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Easy to use and reliable cross compiler environment for building Windows binary gems.
-test_files: 
+summary: Easy to use and reliable cross compiler environment for building Windows
+  binary gems.
+test_files:
 - test/test_environment_variables.rb
+- test/test_starter.rb