rake-compiler-dock 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c62efef1a82d18b2fd09f02ba508c683693b306
-  data.tar.gz: c6908768b4f5af935e1080fad7f2f08d5942cfe4
+  metadata.gz: d972c1947e89297809fcea04b48cf9044de9f248
+  data.tar.gz: 83f36b3533e6940d3b37efda8290b17a72475e3c
 SHA512:
-  metadata.gz: cba0c38a91c5325e7bfc9137f7b197da46064db824cb6f425b84854993a7dfcd4b5bf7e066f427b6205e72732f69fb43ce3da0d613062df07b100cc1d251e43b
-  data.tar.gz: efed7ff1813b06cce9b396b208843146a19b4e0ed0f6a6def118655099ad378ce2bb3ceb2e64875ae21d3ee185ce99c4017420981edaaf185518c763ebe16fa5
+  metadata.gz: 86dc09c161ee24cb22087eb4753493a867c4ab3c431c3e62c1d386469b6a8cff628aa195f799bfcdc69d657d1d5469a7c89e4a9f0fb49b6e5e7793763c3ab37b
+  data.tar.gz: 0a380df5a0fe45293fd54c7f769a1997ae0d51bcf1299004054057ba8b53d1788b99d6fa17da035926ef18bf81692da8a3ca70411d1d95e8c9c53339d451b1ed

data.tar.gz.sig

@@ -1,2 +1 @@
-K�cݗ`�Уw�.=_���hc�v��t�d��W:E�`�4�.�?��'_�כ3E]0���҃I������5�6��v�&����ß�Gћ�����j��Y���K���ĻO�MC���
ްR��D�˫����l��w���鄍�|�TP庅���?��{�W�bȑA��09�\V�t�
-,�m1ә���rwN)ZT0�z���*O|�U�e9�H�h��Us����r�lgcR&v������۔��
+Y?�?m��f�ce���l��t�1�+f���3�_

data/History.md

@@ -1,3 +1,10 @@
+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.
+* Use separate VERSION and IMAGE_VERSION, to avoid unnecessary image downloads.
+* Finetune help texts and add FAQ links.
+
+
 0.4.0 / 2015-06-29
 ------------------
 * Add support for OS-X.

data/Rakefile

@@ -2,5 +2,5 @@ require "bundler/gem_tasks"
 require "rake_compiler_dock"
 
 task :build do
-  sh "docker build -t larskanis/rake-compiler-dock:#{RakeCompilerDock::VERSION} ."
+  sh "docker build -t larskanis/rake-compiler-dock:#{RakeCompilerDock::IMAGE_VERSION} ."
 end

data/bin/rake-compiler-dock

@@ -6,7 +6,7 @@ args = ARGV.empty? ? ['bash'] : ARGV.dup
 
 if $stdin.tty?
   # An interactive session should not leave the container on Ctrl-C
-  args << {sigfw: false}
+  args << {:sigfw => false}
 end
 
 begin

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

@@ -67,23 +67,33 @@ module RakeCompilerDock
     def b2d_start
       @b2d_start_text = `boot2docker start` rescue SystemCallError
       @b2d_start_status = $?.exitstatus
+      @b2d_start_envset = false
 
       if @b2d_start_status == 0
-        @b2d_start_text.scan(/(unset |Remove-Item Env:\\)(?<key>.+?)$/) do |r, |
-          io.puts "    #{$&}"
+        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:)(?<key>.+?)(=| = ")(?<val>.*?)(|\")$/) do |key, val|
-          io.puts "    #{$&}"
+        @b2d_start_text.scan(/(export |\$Env:)(.+?)(=| = ")(.*?)(|\")$/) do |_, key, _, val, _|
           ENV[key] = val
+          @b2d_start_envset = true
         end
       end
+
+      if @b2d_start_envset
+        io.puts yellow("Using above environment variables for starting rake-compiler-dock.")
+      end
     end
 
     def b2d_start_ok?
       @b2d_start_status == 0
     end
 
+    def b2d_start_has_env?
+      @b2d_start_envset
+    end
+
     def help_text
       help = []
       if !ok? && docker_client_avail? && !b2d_avail?
@@ -103,9 +113,11 @@ module RakeCompilerDock
           help << yellow("On SuSE")
           help << "   sudo systemctl start docker"
           help << ""
-          help << yellow("And re-check with '") + white("docker version") + yellow("'")
+          help << yellow("Then re-check with '") + white("docker version") + yellow("'")
+          help << yellow("or have a look at the FAQs: http://git.io/vtD2Z")
         else
-          help << yellow("    Please check why '") + white("docker version") + yellow("' fails.")
+          help << yellow("    Please check why '") + white("docker version") + yellow("' fails")
+          help << yellow("    or have a look at the FAQs: http://git.io/vtD2Z")
         end
       elsif !ok? && !b2d_avail?
         case RUBY_PLATFORM
@@ -136,17 +148,25 @@ module RakeCompilerDock
       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("    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("    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 << ""
-        help << yellow("    Please check why '") + white("docker version") + yellow("' fails.")
-        help << yellow("    You might need to re-init with '") + white("boot2docker delete") + yellow("'.")
+        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 the FAQs: http://git.io/vtDBH")
       end
 
       help.join("\n")

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:#{VERSION}"
+        ENV['RAKE_COMPILER_DOCK_IMAGE'] || "larskanis/rake-compiler-dock:#{IMAGE_VERSION}"
       end
 
       def exec(*args)
@@ -52,6 +52,8 @@ module RakeCompilerDock
         user = make_valid_name(`id -nu`.chomp)
         group = make_valid_name(`id -ng`.chomp)
 
+        drun_args = docker_opts + [image_name] + runargs
+
         cmd = ["docker", "run",
             "-v", "#{pwd}:#{make_valid_path(pwd)}",
             "-e", "UID=#{uid}",
@@ -62,9 +64,7 @@ module RakeCompilerDock
             "-e", "http_proxy=#{ENV['http_proxy']}",
             "-e", "https_proxy=#{ENV['https_proxy']}",
             "-w", make_valid_path(pwd),
-            *docker_opts,
-            image_name,
-            *runargs]
+            *drun_args]
 
         cmdline = Shellwords.join(cmd)
         if verbose_flag(options) == true
@@ -107,7 +107,6 @@ module RakeCompilerDock
         check = DockerCheck.new($stderr)
         unless check.ok?
           at_exit do
-            $stderr.puts
             check.print_help_text
           end
           raise DockerIsNotAvailable, "Docker is not available"

data/lib/rake_compiler_dock/version.rb

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

data/rake-compiler-dock.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |spec|
 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"
-  spec.required_ruby_version = '>= 1.9.3'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 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-06-29 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -117,3 +117,4 @@ signing_key:
 specification_version: 4
 summary: Docker based cross compiler environment for building binary windows gems.
 test_files: []
+has_rdoc: 

metadata.gz.sig

@@ -1,3 +1,2 @@
-\
-P)m���%�����:�Y��U�����5���ɰ�o���I-Ȃ�is��	��B���xx��}n�����'��으�'�q���	-i�u��AB�;
ƆfLs�\���"��ތ$�;� M�U��17�pZ��Mx���b蹄�[��o�W�*�0	�;����� ak�L d�W<S;!.N(���
-h׀"�I�-�6
�z
+G��0	���{��n��L�\�d�����δ�[`�{����i,�31����#`Ȇp���c��y+t�A�l��W��SڎS>��s�?E0�7{\_ׯ-l��-�yX�����خT�^�@�R��簫����En�)T <N����oHN���c	}R`�ſ{�!?X�F�x�I���&,�Bm�x��J�~���T�^�0�T�h���
+��3�dz!1,�	[�eLJ��v�w�8�y��Ԍ��1IHGQ�s�����lӝ