rake-compiler-dock 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: d972c1947e89297809fcea04b48cf9044de9f248
-  data.tar.gz: 83f36b3533e6940d3b37efda8290b17a72475e3c
-SHA512:
-  metadata.gz: 86dc09c161ee24cb22087eb4753493a867c4ab3c431c3e62c1d386469b6a8cff628aa195f799bfcdc69d657d1d5469a7c89e4a9f0fb49b6e5e7793763c3ab37b
-  data.tar.gz: 0a380df5a0fe45293fd54c7f769a1997ae0d51bcf1299004054057ba8b53d1788b99d6fa17da035926ef18bf81692da8a3ca70411d1d95e8c9c53339d451b1ed
+--- 
+SHA1: 
+  data.tar.gz: 15cbe947034dfc4a02757ce326f0dc1867fbab2f
+  metadata.gz: ac2bb475e78bc2d577805c0dbe95fedeb5b70297
+SHA512: 
+  data.tar.gz: 122fd75f408b1d88d160989427ae9447ef3cbc519adb7524cc2675bc6b5f26698b66b709722ef020da285e7f8fac0e172c7972f9bd9f7c85ee4a7c36734bc3d3
+  metadata.gz: 8fba0273d71b33fde24b316ecd2bd5c4cebc7d511780a73c8bd52f7b0782a4bc6fee96b06fba08e98319fada419064d6d089ce29df56375a334648270238fed6

data/Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:14.04
 
 RUN apt-get -y update && \
-    apt-get install -y curl git-core mingw32 xz-utils build-essential wget
+    apt-get install -y curl git-core mingw32 xz-utils build-essential wget unzip
 
 RUN mkdir -p /opt/mingw && \
     curl -SL http://downloads.sourceforge.net/mingw-w64/i686-w64-mingw32-gcc-4.7.2-release-linux64_rubenvb.tar.xz | \
@@ -110,4 +110,6 @@ ADD src/runas /usr/local/bin/
 # Install sudoers configuration
 ADD src/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
+
 CMD bash

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rake-compiler-dock.gemspec
 gemspec
+
+gem "test-unit-notify", "~> 1.0", :platform => :ruby

data/History.md

@@ -1,3 +1,10 @@
+0.4.2 / 2015-07-04
+------------------
+* Describe use of environment variables in README.
+* Provide RCD_IMAGE, RCD_HOST_RUBY_PLATFORM and RCD_HOST_RUBY_VERSION to the container.
+* Add unzip tool to docker image.
+
+
 0.4.1 / 2015-07-01
 ------------------
 * Make rake-compiler-dock compatible to ruby-1.8 to ease the usage in gems still supporting 1.8.

data/README.md

@@ -1,12 +1,13 @@
 # rake-compiler-dock
 
-Easy to use Docker based cross compiler environment for building binary Windows gems.
+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) .
 
-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.
+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.
+It is also more reliable, since the underlying docker images are sematic versioned and kept unchanged while building.
 
 ## Installation
 
@@ -63,14 +64,48 @@ You can also choose between different executable ruby versions by `rvm use <vers
 
 ### Add to your Rakefile
 
-Rake-compiler-dock can be easily integrated into your Rakefile like this:
+To make the build process reproduceable for other parties, it is recommended to add rake-compiler-dock to your Rakefile. This can be done like this:
 
     task 'gem:windows' do
       require 'rake_compiler_dock'
       RakeCompilerDock.sh "bundle && rake cross native gem"
     end
 
-See [the wiki](https://github.com/larskanis/rake-compiler-dock/wiki/Projects-using-rake-compiler-dock) for projects which use rake-compiler-dock.
+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'
+
+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.
+
+
+## Variables
+
+Rake-compiler-dock makes use of several environment variables.
+
+The following variables are recognized by rake-compiler-dock:
+
+* `RCD_IMAGE` - The docker image that is downloaded and started. Defaults to "larskanis/rake-compiler-dock:IMAGE_VERSION" with an image version that is determined by the gem version.
+
+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.
+
+The following variables are provided to the running docker container:
+
+* `RCD_IMAGE` - The full docker image name the container is running on.
+* `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.
+
+Other environment variables can be set or passed through to the container like this:
+
+    RakeCompilerDock.sh "rake cross native gem OPENSSL_VERSION=#{ENV['OPENSSL_VERSION']}"
+
+
+## More information
+
+See [Frequently asked questions](https://github.com/larskanis/rake-compiler-dock/wiki/FAQ) for more details.
+
 
 ## Contributing
 

data/Rakefile

@@ -4,3 +4,7 @@ require "rake_compiler_dock"
 task :build do
   sh "docker build -t larskanis/rake-compiler-dock:#{RakeCompilerDock::IMAGE_VERSION} ."
 end
+
+task :test do
+  sh "ruby -w -W2 -I. -Ilib -e \"#{Dir["test/test_*.rb"].map{|f| "require '#{f}';"}.join}\" -- -v"
+end

data/lib/rake_compiler_dock/starter.rb

@@ -15,7 +15,7 @@ module RakeCompilerDock
       end
 
       def image_name
-        ENV['RAKE_COMPILER_DOCK_IMAGE'] || "larskanis/rake-compiler-dock:#{IMAGE_VERSION}"
+        ENV['RCD_IMAGE'] || ENV['RAKE_COMPILER_DOCK_IMAGE'] || "larskanis/rake-compiler-dock:#{IMAGE_VERSION}"
       end
 
       def exec(*args)
@@ -63,6 +63,9 @@ module RakeCompilerDock
             "-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(pwd),
             *drun_args]
 
@@ -81,7 +84,7 @@ module RakeCompilerDock
       end
 
       def verbose_flag(options)
-        verbose = options.fetch(:verbose) do
+        options.fetch(:verbose) do
           Object.const_defined?(:Rake) && Rake.const_defined?(:FileUtilsExt) ? Rake::FileUtilsExt.verbose_flag : false
         end
       end

data/lib/rake_compiler_dock/version.rb

@@ -1,4 +1,4 @@
 module RakeCompilerDock
-  VERSION = "0.4.1"
-  IMAGE_VERSION = "0.4.0"
+  VERSION = "0.4.2"
+  IMAGE_VERSION = "0.4.2"
 end

data/rake-compiler-dock.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = RakeCompilerDock::VERSION
   spec.authors       = ["Lars Kanis"]
   spec.email         = ["lars@greiz-reinsdorf.de"]
-  spec.summary       = %q{Docker based cross compiler environment for building binary windows gems.}
-  spec.description   = %q{Easy to use Docker based cross compiler environment for building binary windows gems.
+  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.license       = "MIT"
@@ -21,4 +21,5 @@ Use rake-compiler-dock to enter an interactive shell session or add a task to yo
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "test-unit", "~> 3.0"
 end

data/src/runas

@@ -9,5 +9,4 @@ ln -s /usr/local/rake-compiler "$HOME"/.rake-compiler
 
 sudo -u "$USER" --set-home \
     BASH_ENV=/etc/rubybashrc \
-    RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0:2.1.6:2.2.2 \
     -- "$@"

data/src/sudoers

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

data/test/test_environment_variables.rb

@@ -0,0 +1,50 @@
+require 'rake_compiler_dock'
+require 'rbconfig'
+require 'test/unit'
+begin
+  require 'test/unit/notify'
+rescue LoadError
+end
+
+class TestEnvironmentVariables < Test::Unit::TestCase
+  @@rcd_env = nil
+
+  def setup
+    @@rcd_env ||= begin
+      args = "bash -c 'set'"
+      idir = File.join(File.dirname(__FILE__), '../lib')
+      cmd = "#{RbConfig::CONFIG['RUBY_INSTALL_NAME']} -I#{idir.inspect} bin/rake-compiler-dock #{args}"
+      output = `#{cmd}`
+
+      output.split("\n").inject({}) do |hash, line|
+        if line =~ /\A(\w+)=(.*)\z/
+          hash[$1] = $2.chomp
+        end
+        hash
+      end
+    end
+  end
+
+  def rcd_env
+    @@rcd_env
+  end
+
+  def test_IMAGE
+    assert_equal RakeCompilerDock.image_name, rcd_env['RCD_IMAGE']
+  end
+
+  def test_RUBY_CC_VERSION
+    df = File.read(File.expand_path("../../Dockerfile", __FILE__))
+    df =~ /^ENV RUBY_CC_VERSION\s+(.*)\s+$/
+    assert_equal $1, rcd_env['RUBY_CC_VERSION']
+  end
+
+  def test_HOST_RUBY_PLATFORM
+    assert_equal RUBY_PLATFORM, rcd_env['RCD_HOST_RUBY_PLATFORM']
+  end
+
+  def test_HOST_RUBY_VERSION
+    assert_equal RUBY_VERSION, rcd_env['RCD_HOST_RUBY_VERSION']
+  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.1
+version: !ruby/object:Gem::Version 
+  version: 0.4.2
 platform: ruby
-authors:
+authors: 
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain:
+cert_chain: 
 - |
   -----BEGIN CERTIFICATE-----
   MIIDPDCCAiSgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBEMQ0wCwYDVQQDDARsYXJz
@@ -29,47 +29,52 @@ cert_chain:
   6jkDey5mE3jQb893U6ihl55uLkVQwxZZTq/flNWjTIcbbvKKafEGdGv5uOlB+KRL
   PRtgPFlA2jDgUr1EPAIH1Q==
   -----END CERTIFICATE-----
-date: 2015-07-01 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2015-07-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.7"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
+  prerelease: false
+  requirement: &id002 !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
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3.0"
+  type: :development
+  version_requirements: *id003
 description: |-
-  Easy to use Docker based cross compiler environment for building binary windows gems.
+  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
@@ -92,29 +97,32 @@ files:
 - src/sigfw.c
 - src/strip_wrapper
 - src/sudoers
+- test/test_environment_variables.rb
 homepage: https://github.com/larskanis/rake-compiler-dock
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-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'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id004 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id004
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Docker based cross compiler environment for building binary windows gems.
-test_files: []
-has_rdoc: 
+summary: Easy to use and reliable cross compiler environment for building Windows binary gems.
+test_files: 
+- test/test_environment_variables.rb