Restore environment after launching bundled Ruby. This allows us to run Ruby sub-processes from the Runfile without interference.

Author: schmich

runx.rb

@@ -103,6 +103,34 @@ def run(*args, &block)
   attr_accessor :tasks
 end
 
+def restore_env
+  map = {
+    'LD_LIBRARY_PATH' => 'RUNX_LD_LIBRARY_PATH',
+    'DYLD_LIBRARY_PATH' => 'RUNX_DYLD_LIBRARY_PATH',
+    'TERMINFO' => 'RUNX_TERMINFO',
+    'SSL_CERT_DIR' => 'RUNX_SSL_CERT_DIR',
+    'SSL_CERT_FILE' => 'RUNX_SSL_CERT_FILE',
+    'RUBYOPT' => 'RUNX_RUBYOPT',
+    'RUBYLIB' => 'RUNX_RUBYLIB',
+    'DYLD_LIBRARY_PATH' => 'RUNX_DYLD_LIBRARY_PATH',
+    'GEM_HOME' => 'RUNX_GEM_HOME',
+    'GEM_PATH' => 'RUNX_GEM_PATH'
+  }
+
+  map.each do |real, temp|
+    orig = ENV[temp]
+    if orig.nil? || orig.strip.empty?
+      ENV.delete(real)
+    else
+      ENV[real] = orig.strip
+    end
+  end
+
+  map.values.each do |temp|
+    ENV.delete(temp)
+  end
+end
+
 def find_runfile
   Pathname.getwd.ascend do |path|
     runfile = File.join(path.to_s, 'Runfile')
@@ -114,6 +142,9 @@ def find_runfile
   return nil
 end
 
+# Restore environment to match original.
+restore_env
+
 runfile = find_runfile
 if runfile.nil?
   $stderr.puts '[runx] No Runfile found.'

setup_darwin.go

@@ -13,12 +13,14 @@ func setupRuntime(dir string) string {
   version := "2.1.0"
   arch := "x86_64-darwin13.0"
 
-  os.Setenv("ORIG_DYLD_LIBRARY_PATH", os.Getenv("LD_LIBRARY_PATH"))
-  os.Setenv("ORIG_TERMINFO", os.Getenv("TERMINFO"))
-  os.Setenv("ORIG_SSL_CERT_DIR", os.Getenv("SSL_CERT_DIR"))
-  os.Setenv("ORIG_SSL_CERT_FILE", os.Getenv("SSL_CERT_FILE"))
-  os.Setenv("ORIG_RUBYOPT", os.Getenv("RUBYOPT"))
-  os.Setenv("ORIG_RUBYLIB", os.Getenv("RUBYLIB"))
+  os.Setenv("RUNX_DYLD_LIBRARY_PATH", os.Getenv("DYLD_LIBRARY_PATH"))
+  os.Setenv("RUNX_TERMINFO", os.Getenv("TERMINFO"))
+  os.Setenv("RUNX_SSL_CERT_DIR", os.Getenv("SSL_CERT_DIR"))
+  os.Setenv("RUNX_SSL_CERT_FILE", os.Getenv("SSL_CERT_FILE"))
+  os.Setenv("RUNX_RUBYOPT", os.Getenv("RUBYOPT"))
+  os.Setenv("RUNX_RUBYLIB", os.Getenv("RUBYLIB"))
+  os.Setenv("RUNX_GEM_HOME", os.Getenv("GEM_HOME"))
+  os.Setenv("RUNX_GEM_PATH", os.Getenv("GEM_PATH"))
   os.Unsetenv("DYLD_LIBRARY_PATH")
   os.Setenv("TERMINFO", "/usr/share/terminfo")
   os.Unsetenv("SSL_CERT_DIR")

setup_linux.go

@@ -13,11 +13,13 @@ func setupRuntime(dir string) string {
   version := "2.1.0"
   arch := "x86_64-linux"
 
-  os.Setenv("ORIG_LD_LIBRARY_PATH", os.Getenv("LD_LIBRARY_PATH"))
-  os.Setenv("ORIG_SSL_CERT_DIR", os.Getenv("SSL_CERT_DIR"))
-  os.Setenv("ORIG_SSL_CERT_FILE", os.Getenv("SSL_CERT_FILE"))
-  os.Setenv("ORIG_RUBYOPT", os.Getenv("RUBYOPT"))
-  os.Setenv("ORIG_RUBYLIB", os.Getenv("RUBYLIB"))
+  os.Setenv("RUNX_LD_LIBRARY_PATH", os.Getenv("LD_LIBRARY_PATH"))
+  os.Setenv("RUNX_SSL_CERT_DIR", os.Getenv("SSL_CERT_DIR"))
+  os.Setenv("RUNX_SSL_CERT_FILE", os.Getenv("SSL_CERT_FILE"))
+  os.Setenv("RUNX_RUBYOPT", os.Getenv("RUBYOPT"))
+  os.Setenv("RUNX_RUBYLIB", os.Getenv("RUBYLIB"))
+  os.Setenv("RUNX_GEM_HOME", os.Getenv("GEM_HOME"))
+  os.Setenv("RUNX_GEM_PATH", os.Getenv("GEM_PATH"))
   os.Setenv("LD_LIBRARY_PATH", os.Getenv("LD_LIBRARY_PATH") + ":" + path.Join(root, "lib"))
   os.Unsetenv("SSL_CERT_DIR")
   os.Setenv("SSL_CERT_FILE", path.Join(root, "lib", "ca-bundle.crt"))

setup_windows.go

@@ -13,6 +13,8 @@ func setupRuntime(dir string) string {
   version := "2.1.0"
   arch := "i386-mingw32"
 
+  os.Setenv("RUNX_RUBYLIB", os.Getenv("RUBYLIB"))
+
   rubyLib := strings.Join([]string{
     path.Join(root, "lib", "ruby", "site_ruby", version),
     path.Join(root, "lib", "ruby", "site_ruby", version, arch),