From f223b89b71a25a63dddc229d26ef165ff1dd2d62 Mon Sep 17 00:00:00 2001
From: Relevance Pair <pair@thinkrelevance.com>
Date: Wed, 18 Apr 2012 13:47:49 -0400
Subject: [PATCH 1/2] Fix scripts and update README

---
 README.md         |  7 ++-----
 launch.rb         |  7 ++++---
 scripts/bootstrap | 13 ++++++++++---
 3 files changed, 16 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 scripts/bootstrap

diff --git a/README.md b/README.md
index 6d69f3a..d6f70f8 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,7 @@ and QA environments.
 
 ## Bootstrap your environment
 
-    rvm use 1.8.7
-    rvm gemset create metron
-    gem install bundler
-    bundle install
+    ./scripts/bootstrap
 
 ## Configure for EC2
 
@@ -33,7 +30,7 @@ And so on.
 
 ## Commands
 
-scripts/launch.rb 
+./launch.rb
 Bootstrap and configure a new instance on EC2.
 
 vagrant up
diff --git a/launch.rb b/launch.rb
index 590d631..4a34605 100755
--- a/launch.rb
+++ b/launch.rb
@@ -1,5 +1,6 @@
-#! /usr/bin/env ruby -rubygems
+#!/usr/bin/env ruby
 
+require 'rubygems'
 require 'yaml'
 require 'fog'
 require 'net/sftp'
@@ -53,14 +54,14 @@ def upload(session, local, remote)
 
 Net::SSH.start( server.dns_name, 'ubuntu', :keys => [ ssh_key_file ], :paranoid => false ) do |ssh|
   puts "Uploading payload files"
-  
+
   upload(ssh, "tmp/chef-solo.tgz", "/tmp/chef-solo.tgz")
   upload(ssh, "config/solo.rb", "/home/ubuntu/solo.rb")
   upload(ssh, "config/dna.json", "/home/ubuntu/dna.json")
   upload(ssh, "config/bootstrap.sh", "/home/ubuntu/bootstrap.sh")
 
   puts "Running bootstrap"
-  
+
   ssh.exec!("sudo sh ./bootstrap.sh") do |channel, stream, data|
     puts data
   end
diff --git a/scripts/bootstrap b/scripts/bootstrap
old mode 100644
new mode 100755
index 0b4e1c6..6495988
--- a/scripts/bootstrap
+++ b/scripts/bootstrap
@@ -1,9 +1,16 @@
 #! /usr/bin/env bash
 
-[ rvm use 1.8.7 ] || ( rvm install 1.8.7 && rvm use 1.8.7 )
+source ~/.rvm/scripts/rvm
+rvm use 1.8.7
+if [[ 0 -ne $? ]]
+then
+  rvm install 1.8.7
+  rvm use 1.8.7
+fi
 
-rvm gemset create metron 
+rvm gemset create metron
+rvm gemset use metron
 
 gem install bundler
 bundle install
-
+mkdir -p tmp

From 9b9f3a0c7396a1c89cd2668ccdda1b5647fa935c Mon Sep 17 00:00:00 2001
From: Relevance Pair <pair@thinkrelevance.com>
Date: Wed, 18 Apr 2012 13:52:24 -0400
Subject: [PATCH 2/2] Update readme to account for reloading .rvmrc

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d6f70f8..073261b 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ and QA environments.
 ## Bootstrap your environment
 
     ./scripts/bootstrap
+    . .rvmrc
 
 ## Configure for EC2