From e7885ed5a41a9ed96bd58a7b21a35437bc19e9a8 Mon Sep 17 00:00:00 2001
From: John Barnette <jbarnette@github.com>
Date: Wed, 3 Oct 2012 13:47:13 -0700
Subject: [PATCH] Update for Boxen 0.1.0 development

---
 Gemfile          |  3 +--
 Gemfile.lock     | 21 +++++++++++++--------
 Puppetfile       | 12 +++++++-----
 Puppetfile.lock  |  8 +++++++-
 script/bootstrap |  4 ----
 script/boxen     |  4 ----
 6 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/Gemfile b/Gemfile
index 73e712f..3571d7a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-gem "boxen",            "~> 0.0"
-gem "librarian-puppet", "~> 0.9"
+gem "boxen", "~> 0.1", :git => "https://github.com/boxen/boxen"
diff --git a/Gemfile.lock b/Gemfile.lock
index 19d0264..5b6dc56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,20 @@
+GIT
+  remote: https://github.com/boxen/boxen
+  revision: 8bde53257faeeb444987a251ada9e40f5d927168
+  specs:
+    boxen (0.1.0)
+      ansi (~> 1.4)
+      highline (~> 1.6)
+      json_pure (~> 1.7)
+      librarian-puppet (~> 0.9)
+      octokit (~> 1.15)
+      puppet (~> 3.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.2)
     ansi (1.4.3)
-    boxen (0.0.0)
-      ansi (~> 1.4)
-      highline (~> 1.6)
-      json_pure (~> 1.7)
-      octokit (~> 1.15)
-      puppet (~> 3.0)
     facter (1.6.12)
     faraday (0.8.4)
       multipart-post (~> 1.1)
@@ -41,5 +47,4 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  boxen (~> 0.0)
-  librarian-puppet (~> 0.9)
+  boxen (~> 0.1)!
diff --git a/Puppetfile b/Puppetfile
index 1540e5a..d830009 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -1,11 +1,13 @@
 # This file manages Puppet module dependencies.
 #
-# It works a lot like Bundler. We provide some core modules by default.
-# This ensures at least the ability to construct a basic environment.
+# It works a lot like Bundler. We provide some core modules by
+# default. This ensures at least the ability to construct a basic
+# environment.
 
-# Includes many of our custom types and providers, as well as global config.
-# Required.
-#mod "boxen", "0.0.1.1", :github_tarball => "boxen/puppet-boxen"
+# Includes many of our custom types and providers, as well as global
+# config. Required.
+
+mod "boxen", "0.0.1.1", :github_tarball => "boxen/puppet-boxen"
 
 # Core modules for a basic development environment.
 # You can replace some/most of those if you want, but it's not recommended.
diff --git a/Puppetfile.lock b/Puppetfile.lock
index 51949ef..45681e6 100644
--- a/Puppetfile.lock
+++ b/Puppetfile.lock
@@ -1,2 +1,8 @@
-DEPENDENCIES
+GITHUBTARBALL
+  remote: boxen/puppet-boxen
+  specs:
+    boxen (0.0.1.1)
+
+DEPENDENCIES
+  boxen (= 0.0.1.1)
 
diff --git a/script/bootstrap b/script/bootstrap
index 4a2c3c5..6fac744 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -20,7 +20,3 @@ export CC=gcc
 # Bundle install unless we're already up to date.
 
 bundle install --binstubs bin --path .bundle --quiet "$@"
-
-# Install all our Puppet dependencies.
-
-bin/librarian-puppet install --path=shared
diff --git a/script/boxen b/script/boxen
index fd68db0..e90eb39 100755
--- a/script/boxen
+++ b/script/boxen
@@ -23,10 +23,6 @@ at_exit { myself.flock File::LOCK_UN }
 
 Dir.chdir Pathname.new(__FILE__).realpath + "../.."
 
-# FIX: temporarily set BOXEN_HOME to `./tmp/home` during porting.
-
-ENV["BOXEN_HOME"] = File.expand_path("tmp/home")
-
 # Auto-update code. This is done as early as possible so that changes
 # to boxen support code or dependencies can be grabbed.