rake-compiler-dock 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 826e842d110c43f9b333aaf07ee5ee2dc86aeb97
-  data.tar.gz: 062e38a137965df768c35e2455acc45c24be0651
+  metadata.gz: a9d812c3d58c67858e89228862019e7414399f0a
+  data.tar.gz: a49c40cc58b5687fac2b5b7d9f9fbeb50ab4cd5b
 SHA512:
-  metadata.gz: 0f109af320b70531b5a2885e9259d43d7fa223ed3ca3238add01b012d00f77279e40021db6325aaf6351ac02411e76efd0eca59d46ada60f4f16f092ac7bcc86
-  data.tar.gz: 4fae5e1bea609687d558bc8433e5666224fc74e3141fec6dc2ac66f3b23b26820704efa4b994f521440202e1556b9a12a4147265e65a1065413335ff6dda4aab
+  metadata.gz: 63a62025d40a77e6ea621119b2103e4e6a3290e8f5556fc73daa2a2f4bce1c4c3eae57f3f1b9719a105b6c276098887c9a0fb8aab5d5e50d25d3ea9343da4445
+  data.tar.gz: cd2f86c14498ae4cfcd54f739a1f007c1bcf4a5e3a9bf6a1bfced80bc9420468e29f25269aab8a1e03952cb11b073a633758c028b27acfa2570aa781de8e73d6

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
+    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 | \
@@ -106,4 +106,7 @@ RUN gcc $HOME/sigfw.c -o /usr/local/bin/sigfw
 # Install user mapper
 ADD src/runas /usr/local/bin/
 
+# Install sudoers configuration
+ADD src/sudoers /etc/sudoers.d/rake-compiler-dock
+
 CMD bash

data/History.md

@@ -1,3 +1,10 @@
+0.2.0 / 2015-06-08
+------------------
+* Add a simple API for running commands within the rake-compiler-dock environment.
+* Respect ftp, http and https_proxy settings from the host.
+* Add wget to the image
+
+
 0.1.0 / 2015-05-27
 ------------------
 * first public release

data/README.md

@@ -1,8 +1,8 @@
 # rake-compiler-dock
 
-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.
+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.
 
 
 ## Installation
@@ -11,9 +11,9 @@ Install docker natively on Linux:
 
     $ sudo apt-get install docker.io
 
-... or use the installer on Windows: [boot2docker](https://docs.docker.com/installation/windows)
+... or install 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. This will download the docker image at the first run:
+Install rake-compiler-dock as a gem. The docker image is downloaded later on demand:
 
     $ gem install rake-compiler-dock
 
@@ -32,7 +32,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 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.
 
 `rake-compiler-dock` can also take the build command(s) from STDIN or as command arguments.
 
@@ -49,7 +49,18 @@ The environment variable `RUBY_CC_VERSION` is predefined and includes all these
 
     $ 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 it, if the given gem does not support all of them.
+Overwrite `RUBY_CC_VERSION`, if your gem does not support all available versions.
+
+### Add to your Rakefile
+
+Rake-compiler-dock can be easily integrated into your Rakefile 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) for projects which use rake-compiler-dock.
 
 ## Contributing
 

data/bin/rake-compiler-dock

@@ -2,31 +2,7 @@
 
 require 'rake_compiler_dock'
 
-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}" }
-  uid = 1000
-  gid = 1000
-else
-  pwd = Dir.pwd
-  uid = Process.uid
-  gid = Process.gid
-end
-user = `id -nu`.chomp
-group = `id -ng`.chomp
 args = ARGV.empty? ? ['bash'] : ARGV
-image = ENV['RAKE_COMPILER_DOCK_IMAGE'] || "larskanis/rake-compiler-dock:#{RakeCompilerDock::VERSION}"
-
-cmd = ["docker", "run", "--rm", "-i", "-t",
-       "-v", "#{pwd}:#{pwd}",
-       "-e", "UID=#{uid}",
-       "-e", "GID=#{gid}",
-       "-e", "USER=#{user}",
-       "-e", "GROUP=#{group}",
-       "-w", pwd,
-       image,
-       "sigfw", "runas", *args]
-
-puts cmd.join(" ")
-system(*cmd)
-exit $?.exitstatus
+RakeCompilerDock.exec(*args) do |ok, res|
+  exit(res.exitstatus)
+end

data/lib/rake_compiler_dock.rb

@@ -1,5 +1,74 @@
 require "rake_compiler_dock/version"
 
 module RakeCompilerDock
-  # Your code goes here...
+  # 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.
+  #
+  # Examples:
+  #
+  #   RakeCompilerDock.sh 'bundle && rake cross native gem'
+  #
+  #   # check exit status after command runs
+  #   sh %{bundle && rake cross native gem} do |ok, res|
+  #     if ! ok
+  #       puts "windows cross build failed (status = #{res.exitstatus})"
+  #     end
+  #   end
+  def sh(cmd, &block)
+    exec('bash', '-c', cmd, &block)
+  end
+
+  def image_name
+    ENV['RAKE_COMPILER_DOCK_IMAGE'] || "larskanis/rake-compiler-dock:#{VERSION}"
+  end
+
+  # Run the command cmd within a fresh rake-compiler-dock container.
+  # The command is run directly, without the 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.
+  #
+  # Examples:
+  #
+  #   RakeCompilerDock.exec 'bash', '-c', 'echo $RUBY_CC_VERSION'
+  def exec(*args)
+    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}" }
+      uid = 1000
+      gid = 1000
+    else
+      pwd = Dir.pwd
+      uid = Process.uid
+      gid = Process.gid
+    end
+    user = `id -nu`.chomp
+    group = `id -ng`.chomp
+
+    cmd = ["docker", "run", "--rm", "-i", "-t",
+          "-v", "#{pwd}:#{pwd}",
+          "-e", "UID=#{uid}",
+          "-e", "GID=#{gid}",
+          "-e", "USER=#{user}",
+          "-e", "GROUP=#{group}",
+          "-e", "ftp_proxy=#{ENV['ftp_proxy']}",
+          "-e", "http_proxy=#{ENV['http_proxy']}",
+          "-e", "https_proxy=#{ENV['https_proxy']}",
+          "-w", pwd,
+          image_name,
+          "sigfw", "runas", *args]
+
+    ok = system(*cmd)
+    if block_given?
+      yield(ok, $?)
+    elsif !ok
+      show_command = cmd.join(" ")
+      fail "Command failed with status (#{$?.exitstatus}): " +
+        "[#{show_command}]"
+    end
+  end
+
+  module_function :exec, :sh, :image_name
 end

data/lib/rake_compiler_dock/version.rb

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

data/rake-compiler-dock.gemspec

@@ -9,7 +9,8 @@ Gem::Specification.new do |spec|
   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{Use rake-compiler-dock to enter an interactive shell session.}
+  spec.description   = %q{Easy to use Docker based cross compiler environment for building binary windows 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"
 

data/src/rake-compiler-without-exts.diff

@@ -2,11 +2,13 @@ diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
 index 6acc816..6aa2a49 100644
 --- a/tasks/bin/cross-ruby.rake
 +++ b/tasks/bin/cross-ruby.rake
-@@ -135,6 +135,7 @@ file "#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}/Makefile" => ["#{USER
+@@ -135,8 +135,7 @@ file "#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}/Makefile" => ["#{USER
      "--build=#{RUBY_BUILD}",
      '--enable-shared',
      '--disable-install-doc',
-+    '--with-ext=',
-     '--without-tk',
-     '--without-tcl'
+-    '--without-tk',
+-    '--without-tcl'
++    '--with-ext='
    ]
+
+   # Force Winsock2 for Ruby 1.8, 1.9 defaults to it

data/src/sudoers

@@ -0,0 +1 @@
+Defaults        env_keep += "http_proxy https_proxy ftp_proxy"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Lars Kanis
@@ -10,26 +10,26 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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=
+  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==
   -----END CERTIFICATE-----
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,7 +59,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Use rake-compiler-dock to enter an interactive shell session.
+description: |-
+  Easy to use Docker based cross compiler environment for building binary windows gems.
+  Use rake-compiler-dock to enter an interactive shell session or add a task to your Rakefile to automate your cross build.
 email:
 - lars@greiz-reinsdorf.de
 executables:
@@ -82,6 +84,7 @@ files:
 - src/runas
 - src/sigfw.c
 - src/strip_wrapper
+- src/sudoers
 homepage: https://github.com/larskanis/rake-compiler-dock
 licenses:
 - MIT
@@ -107,3 +110,4 @@ signing_key:
 specification_version: 4
 summary: Docker based cross compiler environment for building binary windows gems.
 test_files: []
+has_rdoc: