backport a ton from github

Will Farrington
1 parent 1700876d9e
Showing 12 changed files with 18 additions and 8 deletions Side-by-side Diff
Gemfile.lock
Puppetfile
Puppetfile.lock
manifests/site.pp
vendor/cache/boxen-0.4.0.gem
vendor/cache/boxen-0.4.1.gem
vendor/cache/librarian-puppet-0.9.6.gem
vendor/cache/librarian-puppet-0.9.7.gem
vendor/puppet/cache/boxen-puppet-boxen-0.0.26.tar.gz
vendor/puppet/cache/boxen-puppet-boxen-0.0.27.tar.gz
vendor/puppet/cache/boxen-puppet-homebrew-0.0.14.tar.gz
vendor/puppet/cache/boxen-puppet-homebrew-0.0.9.tar.gz
@@ -8,7 +8,7 @@
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    boxen (0.4.0)
+    boxen (0.4.1)
       ansi (~> 1.4)
       hiera (~> 1.0.0)
       highline (~> 1.6)
@@ -29,7 +29,7 @@
       multi_xml
     json (1.7.5)
     json_pure (1.7.5)
-    librarian-puppet (0.9.6)
+    librarian-puppet (0.9.7)
       json_pure
       puppet
       thor (~> 0.15)
@@ -10,11 +10,11 @@
 # Core modules for a basic development environment.
 # You can replace some/most of those if you want, but it's not recommended.
  
-mod "boxen",    "0.0.26",  :github_tarball => "boxen/puppet-boxen"
+mod "boxen",    "0.0.27",  :github_tarball => "boxen/puppet-boxen"
 mod "dnsmasq",  "0.0.1",   :github_tarball => "boxen/puppet-dnsmasq"
 mod "git",      "0.0.2.4", :github_tarball => "boxen/puppet-git"
 mod "hub",      "0.0.1",   :github_tarball => "boxen/puppet-hub"
-mod "homebrew", "0.0.9",   :github_tarball => "boxen/puppet-homebrew"
+mod "homebrew", "0.0.14",  :github_tarball => "boxen/puppet-homebrew"
 mod "inifile",  "0.0.1",   :github_tarball => "boxen/puppet-inifile"
 mod "nginx",    "0.0.2",   :github_tarball => "boxen/puppet-nginx"
 mod "nodejs",   "0.0.2",   :github_tarball => "boxen/puppet-nodejs"
 GITHUBTARBALL
   remote: boxen/puppet-boxen
   specs:
-    boxen (0.0.26)
+    boxen (0.0.27)
  
 GITHUBTARBALL
   remote: boxen/puppet-dnsmasq
@@ -16,7 +16,7 @@
 GITHUBTARBALL
   remote: boxen/puppet-homebrew
   specs:
-    homebrew (0.0.9)
+    homebrew (0.0.14)
  
 GITHUBTARBALL
   remote: boxen/puppet-hub
  
@@ -64,10 +64,10 @@
     stdlib (3.0.0)
  
 DEPENDENCIES
-  boxen (= 0.0.26)
+  boxen (= 0.0.27)
   dnsmasq (= 0.0.1)
   git (= 0.0.2.4)
-  homebrew (= 0.0.9)
+  homebrew (= 0.0.14)
   hub (= 0.0.1)
   inifile (= 0.0.1)
   nginx (= 0.0.2)
@@ -14,6 +14,11 @@
     '/usr/sbin',
     '/sbin'
   ]
+
+  environment => [
+    "HOMEBREW_CACHE=${homebrew::cachedir}",
+    "HOME=/Users/${::luser}"
+  ]
 }
  
 File {
@@ -69,6 +74,11 @@
       'findutils',
       'gnu-tar'
     ]:
+  }
+
+  file { "${boxen::config::srcdir}/our-boxen":
+    ensure => link,
+    target => $boxen::config::repodir
   }
 }
...	...	@@ -8,7 +8,7 @@
8	8	json (~> 1.4)
9	9	nokogiri (>= 1.4.4)
10	10	uuidtools (~> 2.1)
11		- boxen (0.4.0)
	11	+ boxen (0.4.1)
12	12	ansi (~> 1.4)
13	13	hiera (~> 1.0.0)
14	14	highline (~> 1.6)
...	...	@@ -29,7 +29,7 @@
29	29	multi_xml
30	30	json (1.7.5)
31	31	json_pure (1.7.5)
32		- librarian-puppet (0.9.6)
	32	+ librarian-puppet (0.9.7)
33	33	json_pure
34	34	puppet
35	35	thor (~> 0.15)
...	...	@@ -10,11 +10,11 @@
10	10	# Core modules for a basic development environment.
11	11	# You can replace some/most of those if you want, but it's not recommended.
12	12
13		-mod "boxen", "0.0.26", :github_tarball => "boxen/puppet-boxen"
	13	+mod "boxen", "0.0.27", :github_tarball => "boxen/puppet-boxen"
14	14	mod "dnsmasq", "0.0.1", :github_tarball => "boxen/puppet-dnsmasq"
15	15	mod "git", "0.0.2.4", :github_tarball => "boxen/puppet-git"
16	16	mod "hub", "0.0.1", :github_tarball => "boxen/puppet-hub"
17		-mod "homebrew", "0.0.9", :github_tarball => "boxen/puppet-homebrew"
	17	+mod "homebrew", "0.0.14", :github_tarball => "boxen/puppet-homebrew"
18	18	mod "inifile", "0.0.1", :github_tarball => "boxen/puppet-inifile"
19	19	mod "nginx", "0.0.2", :github_tarball => "boxen/puppet-nginx"
20	20	mod "nodejs", "0.0.2", :github_tarball => "boxen/puppet-nodejs"
1	1	GITHUBTARBALL
2	2	remote: boxen/puppet-boxen
3	3	specs:
4		- boxen (0.0.26)
	4	+ boxen (0.0.27)
5	5
6	6	GITHUBTARBALL
7	7	remote: boxen/puppet-dnsmasq
...	...	@@ -16,7 +16,7 @@
16	16	GITHUBTARBALL
17	17	remote: boxen/puppet-homebrew
18	18	specs:
19		- homebrew (0.0.9)
	19	+ homebrew (0.0.14)
20	20
21	21	GITHUBTARBALL
22	22	remote: boxen/puppet-hub
23	23
...	...	@@ -64,10 +64,10 @@
64	64	stdlib (3.0.0)
65	65
66	66	DEPENDENCIES
67		- boxen (= 0.0.26)
	67	+ boxen (= 0.0.27)
68	68	dnsmasq (= 0.0.1)
69	69	git (= 0.0.2.4)
70		- homebrew (= 0.0.9)
	70	+ homebrew (= 0.0.14)
71	71	hub (= 0.0.1)
72	72	inifile (= 0.0.1)
73	73	nginx (= 0.0.2)
...	...	@@ -14,6 +14,11 @@
14	14	'/usr/sbin',
15	15	'/sbin'
16	16	]
	17	+
	18	+ environment => [
	19	+ "HOMEBREW_CACHE=${homebrew::cachedir}",
	20	+ "HOME=/Users/${::luser}"
	21	+ ]
17	22	}
18	23
19	24	File {
...	...	@@ -69,6 +74,11 @@
69	74	'findutils',
70	75	'gnu-tar'
71	76	]:
	77	+ }
	78	+
	79	+ file { "${boxen::config::srcdir}/our-boxen":
	80	+ ensure => link,
	81	+ target => $boxen::config::repodir
72	82	}
73	83	}