Make rake-compiler-dock compatible to ruby-1.8.

Not too much changes, so it might be better than checking the ruby version.

Author: larskanis

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

lib/rake_compiler_dock.rb

@@ -1,10 +1,3 @@
-
-# We do ruby version check at runtime, so this file should be kept ruby-1.8 compatible.
-if (m=RUBY_VERSION.match(/^(\d+)\.(\d+)\.(\d+)/)) &&
-    m.captures.map(&:to_i).pack("N*") < [1,9,2].pack("N*")
-  raise "rake-compiler-dock requires at least RUBY_VERSION >= 1.9.2"
-end
-
 require "rake_compiler_dock/colors"
 require "rake_compiler_dock/docker_check"
 require "rake_compiler_dock/starter"

lib/rake_compiler_dock/colors.rb

@@ -7,14 +7,14 @@ module Colors
     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|

lib/rake_compiler_dock/docker_check.rb

@@ -70,20 +70,19 @@ def b2d_start
       @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 environment variables for further commands.")
+        io.puts yellow("Using above environment variables for starting rake-compiler-dock.")
       end
     end
 

lib/rake_compiler_dock/starter.rb

@@ -52,6 +52,8 @@ def exec(*args)
         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 @@ def exec(*args)
             "-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 @@ def check_docker
         check = DockerCheck.new($stderr)
         unless check.ok?
           at_exit do
-            $stderr.puts
             check.print_help_text
           end
           raise DockerIsNotAvailable, "Docker is not available"

rake-compiler-dock.gemspec

@@ -13,9 +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"
-#  We do not set a ruby version in the gemspec, to allow addition to the Gemfile of gems that still support ruby-1.8.
-#  However we do the version check at runtime.
-#  spec.required_ruby_version = '>= 1.9.2'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }