From 820fc92aa1863b791512dd94598b4be335a4d109 Mon Sep 17 00:00:00 2001
From: Jianwei Han <hanjianwei@gmail.com>
Date: Fri, 18 Jul 2014 07:52:57 +0800
Subject: [PATCH] Install Homebrew in standard location

---
 Puppetfile        |  2 +-
 Puppetfile.lock   | 12 ++++++------
 manifests/site.pp | 11 -----------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/Puppetfile b/Puppetfile
index 19e868b..9071947 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -41,7 +41,7 @@ github "module-data", "0.0.3", :repo => "ripienaar/puppet-module-data"
 github "dnsmasq",     "1.0.1"
 github "gcc",         "2.0.101"
 github "git",         "2.4.0"
-github "homebrew",    "1.9.4"
+github "homebrew",    "1.9.5.rc",   :repo => "hanjianwei/puppet-homebrew"
 github "hub",         "1.3.0"
 github "inifile",     "1.0.3",      :repo => "puppetlabs/puppetlabs-inifile"
 github "nginx",       "1.4.3"
diff --git a/Puppetfile.lock b/Puppetfile.lock
index 48ea0b9..5ab17d9 100644
--- a/Puppetfile.lock
+++ b/Puppetfile.lock
@@ -19,11 +19,6 @@ GITHUBTARBALL
     git (2.4.0)
 
 GITHUBTARBALL
-  remote: boxen/puppet-homebrew
-  specs:
-    homebrew (1.9.4)
-
-GITHUBTARBALL
   remote: boxen/puppet-hub
   specs:
     hub (1.3.0)
@@ -89,6 +84,11 @@ GITHUBTARBALL
     dotfiles (0.0.6)
 
 GITHUBTARBALL
+  remote: hanjianwei/puppet-homebrew
+  specs:
+    homebrew (1.9.5.rc)
+
+GITHUBTARBALL
   remote: puppetlabs/puppetlabs-inifile
   specs:
     inifile (1.0.3)
@@ -110,7 +110,7 @@ DEPENDENCIES
   dotfiles (= 0.0.6)
   gcc (= 2.0.101)
   git (= 2.4.0)
-  homebrew (= 1.9.4)
+  homebrew (= 1.9.5.rc)
   hub (= 1.3.0)
   inifile (= 1.0.3)
   module-data (= 0.0.3)
diff --git a/manifests/site.pp b/manifests/site.pp
index b60bf8b..036e754 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,6 +1,5 @@
 require boxen::environment
 require homebrew
-require gcc
 
 Exec {
   group       => 'staff',
@@ -53,10 +52,8 @@ Homebrew::Formula <| |> -> Package <| |>
 
 node default {
   # core modules, needed for most things
-  include dnsmasq
   include git
   include hub
-  include nginx
 
   # fail if FDE is not enabled
   if $::root_encrypted == 'no' {
@@ -69,17 +66,9 @@ node default {
 
   # default ruby versions
   ruby::version { '1.9.3': }
-  ruby::version { '2.0.0': }
   ruby::version { '2.1.2': }
   include ruby::global
 
-  # common, useful packages
-  package {
-    [
-      'ack'
-    ]:
-  }
-
   file { "${boxen::config::srcdir}/our-boxen":
     ensure => link,
     target => $boxen::config::repodir
-- 
1.8.5.3