slugrunner 0.0.1 → 0.0.2

data/Vagrantfile

@@ -0,0 +1,31 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+ROOT = File.dirname(File.expand_path(__FILE__))
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "phusion-open-ubuntu-12.04-amd64"
+  config.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/ubuntu-12.04.3-amd64-vbox.box"
+  config.ssh.forward_agent = true
+  if File.directory?("#{ROOT}/../passenger-docker")
+    config.vm.synced_folder File.expand_path("#{ROOT}/../passenger-docker"),
+      "/vagrant/passenger-docker"
+  end
+
+  config.vm.provider :vmware_fusion do |f, override|
+    override.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/ubuntu-12.04.3-amd64-vmwarefusion.box"
+    f.vmx["displayName"] = "baseimage-docker"
+  end
+
+  if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/default/*/id").empty?
+    # Add lxc-docker package
+    pkg_cmd = "wget -q -O - https://get.docker.io/gpg | apt-key add -;" \
+      "echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list;" \
+      "apt-get update -qq; apt-get install -q -y --force-yes lxc-docker; "
+    # Add vagrant user to the docker group
+    pkg_cmd << "usermod -a -G docker vagrant; "
+    config.vm.provision :shell, :inline => pkg_cmd
+  end
+end

data/lib/slugrunner/cli.rb

@@ -12,6 +12,7 @@ module Slugrunner
         opt :delayed_bind, 'Port bind allowance', default: 0
         opt :ping, 'Notify state updates', type: :string
         opt :ping_interval, 'Update interval in seconds', default: 30
+        opt :env, 'Append to environment', type: :strings
         opt :bash, 'Run interactive shell', default: false
       end
 
@@ -26,6 +27,7 @@ module Slugrunner
       end
 
       runner.shell = opts[:bash]
+      runner.extra_env = opts[:env] if opts[:env]
 
       if opts[:delayed_bind] > 0
         runner.bind_delay = opts[:delayed_bind]

data/lib/slugrunner/runner.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 
 require 'yaml'
+require 'shellwords'
 require 'tempfile'
 require 'socket'
 require 'timeout'
@@ -12,6 +13,7 @@ module Slugrunner
     attr_accessor :ping_url
     attr_accessor :ping_interval
     attr_accessor :shell
+    attr_accessor :extra_env
 
     def initialize(slug, process_type, instance_number)
       @slug = slug
@@ -22,6 +24,7 @@ module Slugrunner
       @ping_interval = 0
       @alive = false
       @shell = false
+      @extra_env = []
       @hostname = "#{@process_type}.#{instance_number}"
     end
 
@@ -52,6 +55,7 @@ module Slugrunner
       fail "Couldn't find command for process type #{@process_type}" unless proc_command
 
       command = prepare_env(proc_command)
+      puts(command)
       @child = fork { exec(command) }
       trap_signals
 
@@ -166,7 +170,7 @@ module Slugrunner
     end
 
     def prepare_env(cmd)
-      <<-eos
+      blob = <<-eos
       env - bash -c '
       cd #{@slug_dir}
       export HOME=#{@slug_dir}
@@ -176,9 +180,17 @@ module Slugrunner
       export SLUG_ENV=1
       PORT=#{ENV['PORT'] || 0}
       for file in .profile.d/*; do source $file; done
-      exec #{cmd}
-      '
       eos
+
+      @extra_env.each do |e|
+        pair = e.split(/=/, 2)
+        next unless pair.length == 2
+        escaped = pair.map { |n| Shellwords.escape(n) }
+        blob += "export #{escaped[0]}=#{escaped[1]}\n"
+      end
+
+      blob += "exec #{cmd}'"
+      blob
     end
   end
 end

data/lib/slugrunner/version.rb

@@ -1,3 +1,3 @@
 module Slugrunner
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slugrunner
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Vagrantfile
 - bin/slugrunner
 - lib/slugrunner.rb
 - lib/slugrunner/cli.rb