rake-compiler-dock 0.4.2 → 0.4.3.pre1

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  data.tar.gz: 15cbe947034dfc4a02757ce326f0dc1867fbab2f
-  metadata.gz: ac2bb475e78bc2d577805c0dbe95fedeb5b70297
-SHA512: 
-  data.tar.gz: 122fd75f408b1d88d160989427ae9447ef3cbc519adb7524cc2675bc6b5f26698b66b709722ef020da285e7f8fac0e172c7972f9bd9f7c85ee4a7c36734bc3d3
-  metadata.gz: 8fba0273d71b33fde24b316ecd2bd5c4cebc7d511780a73c8bd52f7b0782a4bc6fee96b06fba08e98319fada419064d6d089ce29df56375a334648270238fed6
+---
+SHA1:
+  metadata.gz: bb7f02a748652c032e4b7f748da552f874052217
+  data.tar.gz: 29cc1e0fa7f56629c75bc3efc31fdb619bfcbf44
+SHA512:
+  metadata.gz: 536e7f50af8780fa134289dd4a6f43b7b4966bf79de088ebf2e23794a9bdfa9837fdda3df6192dccf3dd5291275174fafb8e142320ae66566027243cdb223cf0
+  data.tar.gz: 3aaf4ef59353c3b346223b8becb1530681141e0d67034093913d89bd03496c1d0ba82aac6bd0814e73e86f7922c2d2c3dc1dced22cc002944f8aac9a5dee36f3

data/Gemfile

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

data/History.md

@@ -1,3 +1,8 @@
+0.4.3 / unreleased
+------------------
+* Ensure the user and group names doesn't clash with names in the image.
+
+
 0.4.2 / 2015-07-04
 ------------------
 * Describe use of environment variables in README.

data/README.md

@@ -1,13 +1,13 @@
 # rake-compiler-dock
 
-Easy to use and reliable cross compiler environment for building Windows binary 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 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.
+It is also more reliable, since the underlying docker images are versioned and kept unchanged while building.
 
 ## Installation
 
@@ -35,7 +35,7 @@ Rake-compiler-dock offers the shell command `rake-compiler-dock` and a [ruby API
 This is best suited to try out and debug a build.
 It mounts the current working directory into the docker environment.
 All changes below the current working directory are shared with the host.
-But note, that all other changes to the file system of the container 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.
+But note, that all other changes to the file system of the container are dropped at the end of the session - the docker image is static for a given version. `rake-compiler-dock` can also take the build command(s) from STDIN or as command arguments.
 
 All commands are executed with the same user and group of the host.
 This is done by copying user account data into the container and sudo to it.
@@ -50,21 +50,25 @@ To build x86- and x64 Windows (RubyInstaller) binary gems interactively, it can
     user@host:$ ls pkg/*.gem
     your-gem-1.0.0.gem  your-gem-1.0.0-x64-mingw32.gem  your-gem-1.0.0-x86-mingw32.gem
 
-The installed cross rubies can be listed like this:
+Or non-interactive:
 
-    $ rake-compiler-dock bash -c 'rvmsudo rake-compiler update-config'
+    user@host:$ rake-compiler-dock bash -c "bundle && rake cross native gem"
 
-The environment variable `RUBY_CC_VERSION` is predefined and includes all these cross ruby versions:
+The environment variable `RUBY_CC_VERSION` is predefined as described [below](#environment-variables).
 
-    $ rake-compiler-dock bash -c 'echo $RUBY_CC_VERSION'    # =>  1.8.7:1.9.3:2.0.0:2.1.6:2.2.2
+If necessary, additional software from the Ubuntu repositories can be installed, prior to the build command.
+This is local to the running session, only:
 
-Overwrite `RUBY_CC_VERSION`, if your gem does not support all available versions.
+    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.
 
-You can also choose between different executable ruby versions by `rvm use <version>` . Current default is 2.2.
 
 ### Add to your Rakefile
 
-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:
+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'
@@ -78,13 +82,14 @@ Rake-compiler-dock uses [semantic versioning](http://semver.org/), so you should
 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
+## Environment 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.
+* `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:
 
@@ -95,7 +100,8 @@ 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.
+* `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:
 
@@ -104,7 +110,7 @@ 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) for more details.
+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)
 
 
 ## Contributing

data/Rakefile

@@ -5,6 +5,29 @@ task :build do
   sh "docker build -t larskanis/rake-compiler-dock:#{RakeCompilerDock::IMAGE_VERSION} ."
 end
 
+desc "Run tests"
 task :test do
   sh "ruby -w -W2 -I. -Ilib -e \"#{Dir["test/test_*.rb"].map{|f| "require '#{f}';"}.join}\" -- -v"
 end
+
+desc "Update predefined_user_group.rb"
+task :update_lists do
+
+  users = `rake-compiler-dock bash -c "getent passwd"`.each_line.map do |line|
+    line.chomp.split(":")[0]
+  end.compact.reject(&:empty?) - [RakeCompilerDock::Starter.make_valid_user_name(`id -nu`.chomp)]
+
+  groups = `rake-compiler-dock bash -c "getent group"`.each_line.map do |line|
+    line.chomp.split(":")[0]
+  end.compact.reject(&:empty?) - [RakeCompilerDock::Starter.make_valid_group_name(`id -ng`.chomp)]
+
+  File.open("lib/rake_compiler_dock/predefined_user_group.rb", "w") do |fd|
+    fd.puts <<-EOT
+      # DO NOT EDIT - This file is generated per 'rake update_lists'
+      module RakeCompilerDock
+        PredefinedUsers = #{users.inspect}
+        PredefinedGroups = #{groups.inspect}
+      end
+    EOT
+  end
+end

data/lib/rake_compiler_dock.rb

@@ -2,6 +2,7 @@ require "rake_compiler_dock/colors"
 require "rake_compiler_dock/docker_check"
 require "rake_compiler_dock/starter"
 require "rake_compiler_dock/version"
+require "rake_compiler_dock/predefined_user_group"
 
 module RakeCompilerDock
 

data/lib/rake_compiler_dock/predefined_user_group.rb

@@ -0,0 +1,5 @@
+      # DO NOT EDIT - This file is generated per 'rake update_lists'
+      module RakeCompilerDock
+        PredefinedUsers = ["root", "daemon", "bin", "sys", "sync", "games", "man", "lp", "mail", "news", "uucp", "proxy", "www-data", "backup", "list", "irc", "gnats", "nobody", "libuuid", "syslog", "rvm"]
+        PredefinedGroups = ["root", "daemon", "bin", "sys", "adm", "tty", "disk", "lp", "mail", "news", "uucp", "man", "proxy", "kmem", "dialout", "fax", "voice", "cdrom", "floppy", "tape", "sudo", "audio", "dip", "www-data", "backup", "operator", "list", "irc", "src", "gnats", "shadow", "utmp", "video", "sasl", "plugdev", "staff", "games", "users", "nogroup", "libuuid", "netdev", "crontab", "syslog", "ssh", "rvm"]
+      end

data/lib/rake_compiler_dock/starter.rb

@@ -49,8 +49,8 @@ module RakeCompilerDock
           uid = Process.uid
           gid = Process.gid
         end
-        user = make_valid_name(`id -nu`.chomp)
-        group = make_valid_name(`id -ng`.chomp)
+        user = make_valid_user_name(`id -nu`.chomp)
+        group = make_valid_group_name(`id -ng`.chomp)
 
         drun_args = docker_opts + [image_name] + runargs
 
@@ -97,6 +97,16 @@ module RakeCompilerDock
         name.sub( /^(.{16}).{2,}(.{15})$/ ){ $1+"-"+$2 }
       end
 
+      def make_valid_user_name(name)
+        name = make_valid_name(name)
+        PredefinedUsers.include?(name) ? make_valid_name("_#{name}") : name
+      end
+
+      def make_valid_group_name(name)
+        name = make_valid_name(name)
+        PredefinedGroups.include?(name) ? make_valid_name("_#{name}") : name
+      end
+
       def make_valid_path(name)
         # Convert problematic characters
         name = name.gsub(/[ ]/i, "_")

data/lib/rake_compiler_dock/version.rb

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

metadata

@@ -1,80 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rake-compiler-dock
-version: !ruby/object:Gem::Version 
-  version: 0.4.2
+version: !ruby/object:Gem::Version
+  version: 0.4.3.pre1
 platform: ruby
-authors: 
+authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain: 
+cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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==
+  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=
   -----END CERTIFICATE-----
-
-date: 2015-07-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-07-09 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
@@ -85,6 +94,7 @@ files:
 - 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
@@ -99,30 +109,29 @@ files:
 - 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: 
-  - &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: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 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