rake-compiler-dock 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5326f050ab952a7641a48ab10de71a2f56933fe
-  data.tar.gz: de257ed5785395495ee8e11cc6aae3a5e35870c7
+  metadata.gz: 4d37fa0a52b14f6b5d7d571ba7f467a00ce4729e
+  data.tar.gz: 897c281b857e1555c0d5e22c4a04b4d8802a34ce
 SHA512:
-  metadata.gz: 9d7089a62ac4b0b6f7224791d56d152e57364e47bf989079fe03f822095f11243e5bffb18906ffa1372f0b8f370a75cb36c9470c623b1075f29a923ba38f162e
-  data.tar.gz: c7ff5593f623e88a794b341df449d0859b8f555cf515ff098881be5387f4cb65601e7dd24a0549c224fec773c84e5e699aa122ecaa6d157be2c74061659201f7
+  metadata.gz: fe68d4b5392818af317189727912b71809b702467b12360421f63ef83ac012eb98c51b30ce1cd4fae5af659f33c4d7125483d5ce02c132f8e998ea54bea5f4a5
+  data.tar.gz: 06214c0597dace18fe9e3cb9bee4ad6bfa52623dc0d45cfc62d21585c8816bacc2001355049795627357c1bfea44b22be3b8f771f10b847b803d576ab08dc6cf

data/Dockerfile

@@ -36,14 +36,14 @@ RUN bash -c " \
         rvm install \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
     done && \
     rvm cleanup all && \
-    find /usr/local/rvm -type d | sudo xargs chmod g+sw "
+    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 bundler rake-compiler hoe mini_portile rubygems-tasks && \
-        rvm 1.9.3,2.3.0 do gem install mini_portile2 && \
+        rvm all do gem install --no-document bundler rake-compiler hoe mini_portile rubygems-tasks && \
+        rvm 1.9.3,2.3.0 do gem install --no-document 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
@@ -52,9 +52,9 @@ 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
-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 ; \
+RUN cd /usr/local/rvm/gems/ruby-1.8.7-p374/gems/rake-compiler-0.9.5 && git apply /home/rvm/patches/rake-compiler-0.9.5/*.diff ; \
+    cd /usr/local/rvm/gems/ruby-1.9.3-p551/gems/rake-compiler-0.9.5 && git apply /home/rvm/patches/rake-compiler-0.9.5/*.diff ; \
+    cd /usr/local/rvm/gems/ruby-2.3.0/gems/rake-compiler-0.9.5 && git apply /home/rvm/patches/rake-compiler-0.9.5/*.diff ; \
     true
 
 RUN bash -c "rvm use 2.3.0 --default && \
@@ -68,7 +68,7 @@ RUN bash -c "rvm use 2.3.0 --default && \
     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 "
+    find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
 
 RUN bash -c "rvm use 1.9.3 && \
     export CFLAGS='-s -O1 -fno-omit-frame-pointer -fno-fast-math' && \

data/History.md

@@ -1,3 +1,9 @@
+0.5.1 / 2015-01-30
+------------------
+* Fix compatibility issue with bundler. #8
+* Add a check for the current working directory on boot2docker / docker-machine. #7
+
+
 0.5.0 / 2015-12-25
 ------------------
 * Add cross ruby version 2.3.0.

data/README.md

@@ -63,7 +63,7 @@ This is local to the running session, only:
     sudo apt-get update && sudo apt-get install your-package
 
 You can also choose between different executable ruby versions by `rvm use <version>` .
-Current default is 2.2.
+The current default is 2.3.
 
 
 ### Add to your Rakefile

data/build/patches/rake-compiler-0.9.5/compat-with-bundler.diff

@@ -0,0 +1,105 @@
+From 41f834449fc4323b2f995e8715aa5842d9fd9334 Mon Sep 17 00:00:00 2001
+From: Lars Kanis <lars@greiz-reinsdorf.de>
+Date: Sat, 30 Jan 2016 08:08:07 +0100
+Subject: [PATCH] Change the fake mechanism to be compatible with bundler.
+
+The previous fake mechanism worked by hooking onto the
+"require 'rbconfig'" call.
+This is problematic because bundler internally requires rbconfig, but doesn't
+work corretly in a faked environment.
+It then fails to load gems that are also part of the standard library, like
+json and rdoc.
+This results in issues like https://github.com/rake-compiler/rake-compiler-dock/issues/8
+
+The fake mechanism is now changed to hook onto the "require 'mkrb'" call,
+which is typically part of the extconf file, and it is where the faked platform
+values are actually needed.
+That way it is loaded after bundler/setup, so that the library paths are
+set according to the Gemfile.lock, to the native Linux libraries, before
+the fake environment is active.
+
+Please note, that the build directory of a given gem needs to be cleared,
+in order to get updated fake files. So do a "rm tmp pkg -rf".
+---
+ lib/rake/extensiontask.rb | 35 ++++++++++++++---------------------
+ 1 file changed, 14 insertions(+), 21 deletions(-)
+
+diff --git a/lib/rake/extensiontask.rb b/lib/rake/extensiontask.rb
+index 030af96..f914919 100644
+--- a/lib/rake/extensiontask.rb
++++ b/lib/rake/extensiontask.rb
+@@ -169,8 +169,8 @@ Java extension should be preferred.
+         # now add the extconf script
+         cmd << abs_extconf.relative_path_from(abs_tmp_path)
+ 
+-        # rbconfig.rb will be present if we are cross compiling
+-        if t.prerequisites.include?("#{tmp_path}/rbconfig.rb") then
++        # fake.rb will be present if we are cross compiling
++        if t.prerequisites.include?("#{tmp_path}/fake.rb") then
+           options.push(*cross_config_options(platf))
+         end
+ 
+@@ -365,39 +365,30 @@ Java extension should be preferred.
+       # define compilation tasks for cross platform!
+       define_compile_tasks(for_platform, ruby_ver)
+ 
+-      # chain fake.rb, rbconfig.rb and mkmf.rb to Makefile generation
++      # chain fake.rb and mkmf.rb to Makefile generation
+       file "#{tmp_path}/Makefile" => ["#{tmp_path}/fake.rb",
+-                                      "#{tmp_path}/rbconfig.rb",
+                                       "#{tmp_path}/mkmf.rb"]
+ 
+-      # copy the file from the cross-ruby location
+-      file "#{tmp_path}/rbconfig.rb" => [rbconfig_file] do |t|
++      # copy the rbconfig from the cross-ruby location and
++      # genearte fake.rb for different ruby versions
++      file "#{tmp_path}/fake.rb" => [rbconfig_file] do |t|
+         File.open(t.name, 'w') do |f|
+-          f.write "require 'fake.rb'\n\n"
++          f.write fake_rb(for_platform, ruby_ver)
+           f.write File.read(t.prerequisites.first)
+         end
+       end
+ 
+       # copy mkmf from cross-ruby location
+       file "#{tmp_path}/mkmf.rb" => [mkmf_file] do |t|
+-        cp t.prerequisites.first, t.name
+-        if ruby_ver < "1.9" && "1.9" <= RUBY_VERSION
+-          File.open(t.name, 'r+t') do |f|
+-            content = f.read
++        File.open(t.name, 'w') do |f|
++          content = File.read(t.prerequisites.first)
++          content.sub!(/^(require ')rbconfig(')$/, '\\1fake\\2')
++          if ruby_ver < "1.9" && "1.9" <= RUBY_VERSION
+             content.sub!(/^(      break )\*(defaults)$/, '\\1\\2.first')
+             content.sub!(/^(    return )\*(defaults)$/, '\\1\\2.first')
+             content.sub!(/^(  mfile\.)print( configuration\(srcprefix\))$/, '\\1puts\\2')
+-            f.rewind
+-            f.write content
+-            f.truncate(f.tell)
+           end
+-        end
+-      end
+-
+-      # genearte fake.rb for different ruby versions
+-      file "#{tmp_path}/fake.rb" do |t|
+-        File.open(t.name, 'w') do |f|
+-          f.write fake_rb(for_platform, ruby_ver)
++          f.write content
+         end
+       end
+ 
+@@ -495,8 +486,10 @@ Java extension should be preferred.
+         # "cannot load such file -- win32/resolv" when it is required later on.
+         # See also: https://github.com/tjschuck/rake-compiler-dev-box/issues/5
+         require 'resolv'
++        require 'rbconfig'
+ 
+         class Object
++          remove_const :RbConfig
+           remove_const :RUBY_PLATFORM
+           remove_const :RUBY_VERSION
+           remove_const :RUBY_DESCRIPTION if defined?(RUBY_DESCRIPTION)
+-- 
+2.5.0.windows.1
+

data/lib/rake_compiler_dock/docker_check.rb

@@ -6,10 +6,12 @@ module RakeCompilerDock
     include Colors
 
     attr_reader :io
+    attr_reader :pwd
     attr_accessor :machine_name
 
-    def initialize(io, machine_name="rake-compiler-dock")
+    def initialize(io, pwd, machine_name="rake-compiler-dock")
       @io = io
+      @pwd = pwd
       @machine_name = machine_name
 
       if !io.tty? || (RUBY_PLATFORM=~/mingw|mswin/ && RUBY_VERSION[/^\d+/] < '2')
@@ -55,7 +57,7 @@ module RakeCompilerDock
     end
 
     def ok?
-      @docker_version_status == 0 && @docker_version_text =~ /version/
+      @docker_version_status == 0 && @docker_version_text =~ /version/ && doma_pwd_ok?
     end
 
     def docker_client_avail?
@@ -70,12 +72,17 @@ module RakeCompilerDock
       @doma_version_status == 0 && @doma_version_text =~ /version/
     end
 
+    def add_env_options(options, names)
+      names.each do |name|
+        if (v=ENV[name]) && !v.empty?
+          options << ["--engine-env", "#{name}=#{ENV[name]}"]
+        end
+      end
+      options
+    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']}",
-      ]
+      options = add_env_options([], %w[ftp_proxy http_proxy https_proxy])
       @doma_create_text, @doma_create_status = run("docker-machine create --driver virtualbox #{options.join(" ")} #{machine_name}", cmd: :visible, output: :visible)
     end
 
@@ -151,6 +158,17 @@ module RakeCompilerDock
       @b2d_start_envset
     end
 
+    def doma_pwd_ok?
+      case RUBY_PLATFORM
+      when /mingw|mswin/
+        pwd =~ /^\/c\/users/i
+      when /linux/
+        true
+      when /darwin/
+        pwd =~ /^\/users/i
+      end
+    end
+
     def set_env(text)
       set = false
       text.scan(/(unset |Remove-Item Env:\\)(.+?)$/) do |_, key|
@@ -237,6 +255,15 @@ module RakeCompilerDock
             help << ""
             help << yellow("You might try to regenerate TLS certificates with:")
             help << "    docker-machine regenerate-certs #{machine_name}"
+        elsif !ok? && !doma_pwd_ok?
+          help << red("docker-machine can not mount the current working directory.")
+          help << ""
+          case RUBY_PLATFORM
+          when /mingw|mswin/
+            help << yellow("    Please move to a diretory below C:\\Users")
+          when /darwin/
+            help << yellow("    Please move to a diretory below /Users")
+          end
         elsif !ok?
           help << red("docker-machine is installed and started, but 'docker version' failed.")
           help << ""
@@ -262,6 +289,15 @@ module RakeCompilerDock
           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? && !doma_pwd_ok?
+          help << red("boot2docker can not mount the current working directory.")
+          help << ""
+          case RUBY_PLATFORM
+          when /mingw|mswin/
+            help << yellow("    Please move to a diretory below C:\\Users")
+          when /darwin/
+            help << yellow("    Please move to a diretory below /Users")
+          end
         elsif !ok? && b2d_start_ok?
           help << red("boot2docker is installed and started, but 'docker version' failed.")
           help << ""

data/lib/rake_compiler_dock/starter.rb

@@ -23,28 +23,18 @@ module RakeCompilerDock
         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 }
-        docker_opts = options.fetch(:options) do
-          opts = ["--rm", "-i"]
-          opts << "-t" if $stdin.tty?
-          opts
-        end
-
+	pwd = Dir.pwd
         case RUBY_PLATFORM
         when /mingw|mswin/
           # Change Path from "C:\Path" to "/c/Path" as used by boot2docker
-          pwd = Dir.pwd.gsub(/^([a-z]):/i){ "/#{$1.downcase}" }
+          pwd = pwd.gsub(/^([a-z]):/i){ "/#{$1.downcase}" }
           # Virtualbox shared folders don't care about file permissions, so we use generic ids.
           uid = 1000
           gid = 1000
         when /darwin/
-          pwd = Dir.pwd
           uid = 1000
           gid = 1000
         else
-          pwd = Dir.pwd
           # Docker mounted volumes also share file uid/gid and permissions with the host.
           # Therefore we use the same attributes inside and outside the container.
           uid = Process.uid
@@ -53,6 +43,15 @@ module RakeCompilerDock
         user = options.fetch(:username){ current_user }
         group = options.fetch(:groupname){ current_group }
 
+        check_docker(pwd) 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
+
         cmd = ["docker", "run",
             "-v", "#{pwd}:#{make_valid_path(pwd)}",
             "-e", "UID=#{uid}",
@@ -128,12 +127,12 @@ module RakeCompilerDock
         name = name.gsub(/[ ]/i, "_")
       end
 
-      @@docker_checked = nil
+      @@docker_checked = {}
 
-      def check_docker
-        return if @@docker_checked
+      def check_docker(pwd)
+        return if @@docker_checked[pwd]
 
-        check = DockerCheck.new($stderr)
+        check = DockerCheck.new($stderr, pwd)
         unless check.ok?
           at_exit do
             check.print_help_text
@@ -141,7 +140,7 @@ module RakeCompilerDock
           raise DockerIsNotAvailable, "Docker is not available"
         end
 
-        @@docker_checked = check
+        @@docker_checked[pwd] = check
       end
 
     end

data/lib/rake_compiler_dock/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Lars Kanis
@@ -29,7 +29,7 @@ cert_chain:
   6jkDey5mE3jQb893U6ihl55uLkVQwxZZTq/flNWjTIcbbvKKafEGdGv5uOlB+KRL
   PRtgPFlA2jDgUr1EPAIH1Q==
   -----END CERTIFICATE-----
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - README.md
 - Rakefile
 - bin/rake-compiler-dock
+- build/patches/rake-compiler-0.9.5/compat-with-bundler.diff
 - 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
@@ -137,3 +138,4 @@ summary: Easy to use and reliable cross compiler environment for building Window
 test_files:
 - test/test_environment_variables.rb
 - test/test_starter.rb
+has_rdoc: