Add OSX support.

Author: schmich

.gitignore

@@ -1,3 +1,4 @@
 bindata.go
 runx.exe
 runx
+runtime/

Runfile

@@ -1,7 +1,3 @@
-composer:
-  install:
-    command: docker-compose -f docker-compose.yml -f docker-utils.yml run composer install
-    help: Install Composer dependencies.
-  update:
-    command: docker-compose -f docker-compose.yml -f docker-utils.yml run composer update
-    help: Update Composer dependencies.
+run :ls do
+  puts 'okay ls!'
+end

build-osx.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -x
+
+if [ ! -d runtime ]; then
+  mkdir -p runtime/lib/ruby
+  mkdir -p runtime/lib/app
+  curl -L --fail https://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-20141215-2.1.5-osx.tar.gz | tar -zxv -C runtime/lib/ruby
+fi
+
+cp runx.rb runtime/lib/app/runx.rb
+go-bindata runtime/...
+go build

main.go

@@ -11,6 +11,7 @@ import (
   "hash/fnv"
   "encoding/hex"
   "github.com/kardianos/osext"
+  "github.com/mitchellh/go-homedir"
 )
 
 func selfDigest() (string, error) {
@@ -30,7 +31,7 @@ func selfDigest() (string, error) {
   if _, err := io.Copy(hash, file); err != nil {
     return "", err
   }
-  
+
   result = hash.Sum(result)
   digest := hex.EncodeToString(result)
 
@@ -43,13 +44,17 @@ func deployRuntime() (string, error) {
     return "", err
   }
 
-  runxDir := "runx-" + digest
-  dir := path.Join(os.TempDir(), runxDir)
+  home, err := homedir.Dir()
+  if err != nil {
+    return "", err
+  }
+
+  dir := path.Join(home, ".runx", digest)
   err = os.Mkdir(dir, 0700)
   if os.IsExist(err) {
     return dir, nil
   } else {
-    err = RestoreAssets(dir, "win32")
+    err = RestoreAssets(dir, "runtime")
     if err != nil {
       return "", err
     }
@@ -58,30 +63,73 @@ func deployRuntime() (string, error) {
   }
 }
 
+func setupWin32(dir string) string {
+  root := path.Join(dir, "runtime", "lib", "ruby")
+  ruby := path.Join(root, "bin.real", "ruby.exe")
+
+  version := "2.1.0"
+  arch := "i386-mingw32"
+
+  rubyLib := strings.Join([]string{
+    path.Join(root, "lib", "ruby", "site_ruby", version),
+    path.Join(root, "lib", "ruby", "site_ruby", version, arch),
+    path.Join(root, "lib", "ruby", "site_ruby"),
+    path.Join(root, "lib", "ruby", "vendor_ruby", version),
+    path.Join(root, "lib", "ruby", "vendor_ruby", version, arch),
+    path.Join(root, "lib", "ruby", "vendor_ruby"),
+    path.Join(root, "lib", "ruby", version),
+    path.Join(root, "lib", "ruby", version, arch),
+  }, ";")
+  os.Setenv("RUBYLIB", rubyLib)
+
+  return ruby
+}
+
+func setupOsx(dir string) string {
+  root := path.Join(dir, "runtime", "lib", "ruby")
+  ruby := path.Join(root, "bin.real", "ruby")
+
+  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.Unsetenv("DYLD_LIBRARY_PATH")
+  os.Setenv("TERMINFO", "/usr/share/terminfo")
+  os.Unsetenv("SSL_CERT_DIR")
+  os.Setenv("SSL_CERT_FILE", path.Join(root, "lib", "ca-bundle.crt"))
+  os.Setenv("RUBYOPT", "-r" + path.Join(root, "lib", "restore_environment"))
+  os.Setenv("GEM_HOME", path.Join(root, "lib", "ruby", "gems", version))
+  os.Setenv("GEM_PATH", path.Join(root, "lib", "ruby", "gems", version))
+
+  rubyLib := strings.Join([]string{
+    path.Join(root, "lib", "ruby", "site_ruby", version),
+    path.Join(root, "lib", "ruby", "site_ruby", version, arch),
+    path.Join(root, "lib", "ruby", "site_ruby"),
+    path.Join(root, "lib", "ruby", "vendor_ruby", version),
+    path.Join(root, "lib", "ruby", "vendor_ruby", version, arch),
+    path.Join(root, "lib", "ruby", "vendor_ruby"),
+    path.Join(root, "lib", "ruby", version),
+    path.Join(root, "lib", "ruby", version, arch),
+  }, ":")
+  os.Setenv("RUBYLIB", rubyLib)
+
+  return ruby
+}
+
 func main() {
   dir, err := deployRuntime()
   if err != nil {
     log.Fatal(err)
     return
   }
 
-  ruby := path.Join(dir, "win32", "lib", "ruby", "bin.real", "ruby.exe")
-  script := path.Join(dir, "win32", "lib", "app", "runx.rb")
-
-  version := "2.1.0"
-  arch := "i386-mingw32"
-
-  rubyLib := strings.Join([]string{
-    path.Join(dir, "win32", "lib", "ruby", "lib", "ruby", "site_ruby", version),
-    path.Join(dir, "win32", "lib", "ruby", "lib", "ruby", "site_ruby", version, arch),
-    path.Join(dir, "win32", "lib", "ruby", "lib", "ruby", "site_ruby"),
-    path.Join(dir, "win32", "lib", "ruby", "lib", "ruby", "vendor_ruby", version),
-    path.Join(dir, "win32", "lib", "ruby", "lib", "ruby", "vendor_ruby", version, arch),
-    path.Join(dir, "win32", "lib", "ruby", "lib", "ruby", "vendor_ruby"),
-    path.Join(dir, "win32", "lib", "ruby", "lib", "ruby", version),
-    path.Join(dir, "win32", "lib", "ruby", "lib", "ruby", version, arch),
-  }, ";")
-  os.Setenv("RUBYLIB", rubyLib) 
+  ruby := setupOsx(dir)
+  script := path.Join(dir, "runtime", "lib", "app", "runx.rb")
 
   // We want to run "ruby runx.rb [args...]".
   // We exclude the first argument to this process since it's just self.

runx.rb

@@ -35,7 +35,7 @@ def find_runfile
   dir = Dir.pwd
   while dir != previous
     runfile = File.join(dir, 'Runfile')
-    return runfile.gsub(File::SEPARATOR, File::ALT_SEPARATOR) if File.exist?(runfile)
+    return runfile.gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR) if File.exist?(runfile)
     previous = dir
     dir = File.expand_path(File.join(dir, '..'))
   end