From db4f5959c2eab61ccc573bba006c6df23bad1a80 Mon Sep 17 00:00:00 2001
From: Patrick Connolly <patrick@myplanetdigital.com>
Date: Fri, 1 Feb 2013 17:19:09 -0500
Subject: [PATCH] Removed rvm-specific and librarian-related stuff from
 rakefile and moved to using vagrant-librarian plugin.

---
 Gemfile      |  1 +
 Gemfile.lock |  4 ++++
 Rakefile     | 13 -------------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 907f8cc..bb97859 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,7 @@ gem "rubygems-bundler"
 gem "ssh-forever"
 gem "vagrant", "> 1"
 gem "vagrant-hostmaster"
+gem "vagrant-librarian"
 gem "vagrant-vbguest"
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index a50d504..a718333 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,6 +117,9 @@ GEM
       net-ssh (~> 2.2.2)
     vagrant-hostmaster (0.8.1)
       vagrant (~> 1.0.3)
+    vagrant-librarian (0.1.0)
+      librarian
+      vagrant
     vagrant-vbguest (0.6.4)
       i18n (~> 0.6.0)
       log4r (~> 1.1.9)
@@ -137,4 +140,5 @@ DEPENDENCIES
   ssh-forever
   vagrant (> 1)
   vagrant-hostmaster
+  vagrant-librarian
   vagrant-vbguest
diff --git a/Rakefile b/Rakefile
index 4f505e6..317048a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -35,19 +35,6 @@ task :setup do
     conf.close
   end
 
-  p "Installing Bundler via Rubygems..."
-  BUNDLER_VERS = "1.1.4"
-  system "gem install bundler -v #{BUNDLER_VERS} --no-rdoc --no-ri"
-
-  p "Installing bundled gems via Bundler..."
-  system "bundle install"
-
-  p "Activating rubygems-bundler..." # Eff you, `bundle exec`
-  system "gem regenerate_binstubs"
-
-  p "Installing cookbooks using Librarian gem..."
-  system "librarian-chef install"
-
   p "Creating required directories:"
   rel_dirs = %w{
     tmp/apt/cache/partial