From a756d9b1df0fc757b7aefa50fc85e964bd3c5e61 Mon Sep 17 00:00:00 2001
From: Fabio Rehm <fgrehm@gmail.com>
Date: Mon, 25 Feb 2013 20:49:33 -0300
Subject: [PATCH] Use bundler 1.2.5

---
 dev/Gemfile           | 6 +++++-
 setup-vagrant-dev-box | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev/Gemfile b/dev/Gemfile
index 1e5dc57..c572628 100644
--- a/dev/Gemfile
+++ b/dev/Gemfile
@@ -1,4 +1,8 @@
-# A sample Gemfile
+unless ENV['USER'] == 'vagrant'
+  puts 'This Gemfile is meant to be used from the dev box'
+  exit 1
+end
+
 source "https://rubygems.org"
 
 gem 'vagrant',     github: 'mitchellh/vagrant'
diff --git a/setup-vagrant-dev-box b/setup-vagrant-dev-box
index 17c7e89..3757cc3 100755
--- a/setup-vagrant-dev-box
+++ b/setup-vagrant-dev-box
@@ -81,7 +81,7 @@ vagrant_ssh "sudo apt-get update && sudo apt-get upgrade -y"
 sh 'vagrant reload'
 
 # Install dependencies
-vagrant_ssh "sudo apt-get install lxc rinetd libffi-dev libffi-ruby ruby1.9.1-dev htop git virtualbox virtualbox-ose-dkms linux-headers-generic linux-headers-3.5.0-17-generic -y && sudo gem install bundler --no-ri --no-rdoc"
+vagrant_ssh "sudo apt-get install lxc rinetd libffi-dev libffi-ruby ruby1.9.1-dev htop git virtualbox virtualbox-ose-dkms linux-headers-generic linux-headers-3.5.0-17-generic -y && sudo gem install bundler --no-ri --no-rdoc -v 1.2.5"
 vagrant_ssh "sudo dkms install virtualbox/4.1.18"
 vagrant_ssh "sudo service virtualbox start"