Update template with latest starter kit

Will Farrington
1 parent fc70b4b0a7
Showing 16 changed files with 95 additions and 18 deletions Side-by-side Diff
Gemfile.lock
Puppetfile
Puppetfile.lock
manifests/site.pp
script/boxen
script/boxen-bootstrap
script/boxen-my-config
script/nuke
vendor/cache/aws-sdk-1.6.9.gem
vendor/cache/aws-sdk-1.7.1.gem
vendor/puppet/cache/boxen-puppet-boxen-0.0.28.tar.gz
vendor/puppet/cache/boxen-puppet-boxen-0.1.8.tar.gz
vendor/puppet/cache/boxen-puppet-homebrew-0.0.15.tar.gz
vendor/puppet/cache/boxen-puppet-homebrew-0.0.17.tar.gz
vendor/puppet/cache/boxen-puppet-ruby-0.2.0.tar.gz
vendor/puppet/cache/boxen-puppet-ruby-0.4.0.tar.gz
@@ -3,7 +3,7 @@
   specs:
     addressable (2.3.2)
     ansi (1.4.3)
-    aws-sdk (1.6.9)
+    aws-sdk (1.7.1)
       httparty (~> 0.7)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -10,17 +10,16 @@
 # 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.28", :github_tarball => "boxen/puppet-boxen"
+mod "boxen",    "0.1.8",  :github_tarball => "boxen/puppet-boxen"
 mod "dnsmasq",  "0.0.1",  :github_tarball => "boxen/puppet-dnsmasq"
 mod "git",      "0.0.3",  :github_tarball => "boxen/puppet-git"
 mod "hub",      "0.0.1",  :github_tarball => "boxen/puppet-hub"
-mod "homebrew", "0.0.15", :github_tarball => "boxen/puppet-homebrew"
+mod "homebrew", "0.0.17", :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"
 mod "nvm",      "0.0.5",  :github_tarball => "boxen/puppet-nvm"
-mod "rbenv",    "0.1.0",  :github_tarball => "boxen/puppet-rbenv"
-mod "ruby",     "0.2.0",  :github_tarball => "boxen/puppet-ruby"
+mod "ruby",     "0.4.0",  :github_tarball => "boxen/puppet-ruby"
 mod "stdlib",   "3.0.0",  :github_tarball => "puppetlabs/puppetlabs-stdlib"
 mod "sudo",     "0.0.1",  :github_tarball => "boxen/puppet-sudo"
  
 GITHUBTARBALL
   remote: boxen/puppet-boxen
   specs:
-    boxen (0.0.28)
+    boxen (0.1.8)
  
 GITHUBTARBALL
   remote: boxen/puppet-dnsmasq
@@ -16,7 +16,7 @@
 GITHUBTARBALL
   remote: boxen/puppet-homebrew
   specs:
-    homebrew (0.0.15)
+    homebrew (0.0.17)
  
 GITHUBTARBALL
   remote: boxen/puppet-hub
  
@@ -44,14 +44,9 @@
     nvm (0.0.5)
  
 GITHUBTARBALL
-  remote: boxen/puppet-rbenv
-  specs:
-    rbenv (0.1.0)
-
-GITHUBTARBALL
   remote: boxen/puppet-ruby
   specs:
-    ruby (0.2.0)
+    ruby (0.4.0)
  
 GITHUBTARBALL
   remote: boxen/puppet-sudo
  
  
@@ -64,17 +59,16 @@
     stdlib (3.0.0)
  
 DEPENDENCIES
-  boxen (= 0.0.28)
+  boxen (= 0.1.8)
   dnsmasq (= 0.0.1)
   git (= 0.0.3)
-  homebrew (= 0.0.15)
+  homebrew (= 0.0.17)
   hub (= 0.0.1)
   inifile (= 0.0.1)
   nginx (= 0.0.2)
   nodejs (= 0.0.2)
   nvm (= 0.0.5)
-  rbenv (= 0.1.0)
-  ruby (= 0.2.0)
+  ruby (= 0.4.0)
   stdlib (= 3.0.0)
   sudo (= 0.0.1)
@@ -50,7 +50,7 @@
   include hub
   include nginx
   include nvm
-  include rbenv
+  include ruby
  
   # fail if FDE is not enabled
   if $::root_encrypted == false {
@@ -32,6 +32,9 @@
     master = `git symbolic-ref HEAD`.chomp == "refs/heads/master"
     no_new_commits = system('git diff --exit-code --quiet origin/master master')
  
+    warn "Cannot auto-update due to unclean tree!" unless clean
+    warn "Cannot auto-update due to unpushed commits on master!" unless no_new_commits
+
     if clean && master && no_new_commits
       quietly = "> /dev/null 2>&1"
       fetch   = "(git fetch origin #{quietly})"
+#!/usr/bin/env ruby
+# Make sure a project's deps are up-to-date.
+
+if File.executable? "script/bootstrap"
+  exec "script/bootstrap", *ARGV
+end
+#!/usr/bin/env ruby
+# Show the path to your manifest in Boxen, creating if necessary.
+
+user = ENV["GH_LOGIN"]
+
+unless user
+  abort "GH_LOGIN is not defined. Please re-run Boxen."
+end
+
+editor = ENV["VISUAL"] || ENV["EDITOR"]
+home   = ENV["BOXEN_HOME"] + "/repo"
+user   = user.downcase
+path   = "#{home}/modules/people/manifests/#{user}.pp"
+
+unless File.exist? path
+  File.open path, "wb" do |f|
+    f.puts "class people::#{user} {"
+    f.puts "}"
+  end
+end
+
+exec(editor, path) if editor && system("tty -s")
+
+puts path
+#!/usr/bin/ruby
+
+require "optparse"
+
+unless ENV["USER"] == "root"
+  exec "sudo", $0, *ARGV
+end
+
+all      = false
+force    = false
+opt      = false
+services = false
+
+OptionParser.new do |o|
+  o.banner = "Remove most traces of Boxen from your machine."
+
+  o.on("--all",      "Remove everything possible.") { all      = true }
+  o.on("--force",    "Actually do it.")             { force    = true }
+  o.on("--help",     "Show this help.")             { abort o.to_s    }
+  o.on("--opt",      "Remove /opt/boxen.")          { opt      = true }
+  o.on("--services", "Remove and unload services.") { services = true }
+
+  o.parse!
+
+  abort o.to_s unless all || opt || services
+end
+
+unless force
+  warn "** I won't actually do anything unless you pass --force."
+end
+
+if all || services
+  boxen_services = []
+  boxen_services << Dir["/Library/Launch*/com.boxen.*.plist"]
+
+  boxen_services.flatten.each do |plist|
+    warn "-> Removing #{plist}."
+
+    if force
+      system "launchctl", "unload", "-w", plist
+      system "rm", "-f", plist
+    end
+  end
+
+  system "rm", "-f", "/etc/resolver/dev"
+end
+
+if all || opt
+  warn "-> Removing /opt/boxen."
+  system "rm", "-rf", "/opt/boxen" if force
+end
...	...	@@ -3,7 +3,7 @@
3	3	specs:
4	4	addressable (2.3.2)
5	5	ansi (1.4.3)
6		- aws-sdk (1.6.9)
	6	+ aws-sdk (1.7.1)
7	7	httparty (~> 0.7)
8	8	json (~> 1.4)
9	9	nokogiri (>= 1.4.4)
...	...	@@ -10,17 +10,16 @@
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.28", :github_tarball => "boxen/puppet-boxen"
	13	+mod "boxen", "0.1.8", :github_tarball => "boxen/puppet-boxen"
14	14	mod "dnsmasq", "0.0.1", :github_tarball => "boxen/puppet-dnsmasq"
15	15	mod "git", "0.0.3", :github_tarball => "boxen/puppet-git"
16	16	mod "hub", "0.0.1", :github_tarball => "boxen/puppet-hub"
17		-mod "homebrew", "0.0.15", :github_tarball => "boxen/puppet-homebrew"
	17	+mod "homebrew", "0.0.17", :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"
21	21	mod "nvm", "0.0.5", :github_tarball => "boxen/puppet-nvm"
22		-mod "rbenv", "0.1.0", :github_tarball => "boxen/puppet-rbenv"
23		-mod "ruby", "0.2.0", :github_tarball => "boxen/puppet-ruby"
	22	+mod "ruby", "0.4.0", :github_tarball => "boxen/puppet-ruby"
24	23	mod "stdlib", "3.0.0", :github_tarball => "puppetlabs/puppetlabs-stdlib"
25	24	mod "sudo", "0.0.1", :github_tarball => "boxen/puppet-sudo"
26	25
1	1	GITHUBTARBALL
2	2	remote: boxen/puppet-boxen
3	3	specs:
4		- boxen (0.0.28)
	4	+ boxen (0.1.8)
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.15)
	19	+ homebrew (0.0.17)
20	20
21	21	GITHUBTARBALL
22	22	remote: boxen/puppet-hub
23	23
...	...	@@ -44,14 +44,9 @@
44	44	nvm (0.0.5)
45	45
46	46	GITHUBTARBALL
47		- remote: boxen/puppet-rbenv
48		- specs:
49		- rbenv (0.1.0)
50		-
51		-GITHUBTARBALL
52	47	remote: boxen/puppet-ruby
53	48	specs:
54		- ruby (0.2.0)
	49	+ ruby (0.4.0)
55	50
56	51	GITHUBTARBALL
57	52	remote: boxen/puppet-sudo
58	53
59	54
...	...	@@ -64,17 +59,16 @@
64	59	stdlib (3.0.0)
65	60
66	61	DEPENDENCIES
67		- boxen (= 0.0.28)
	62	+ boxen (= 0.1.8)
68	63	dnsmasq (= 0.0.1)
69	64	git (= 0.0.3)
70		- homebrew (= 0.0.15)
	65	+ homebrew (= 0.0.17)
71	66	hub (= 0.0.1)
72	67	inifile (= 0.0.1)
73	68	nginx (= 0.0.2)
74	69	nodejs (= 0.0.2)
75	70	nvm (= 0.0.5)
76		- rbenv (= 0.1.0)
77		- ruby (= 0.2.0)
	71	+ ruby (= 0.4.0)
78	72	stdlib (= 3.0.0)
79	73	sudo (= 0.0.1)
...	...	@@ -50,7 +50,7 @@
50	50	include hub
51	51	include nginx
52	52	include nvm
53		- include rbenv
	53	+ include ruby
54	54
55	55	# fail if FDE is not enabled
56	56	if $::root_encrypted == false {
...	...	@@ -32,6 +32,9 @@
32	32	master = `git symbolic-ref HEAD`.chomp == "refs/heads/master"
33	33	no_new_commits = system('git diff --exit-code --quiet origin/master master')
34	34
	35	+ warn "Cannot auto-update due to unclean tree!" unless clean
	36	+ warn "Cannot auto-update due to unpushed commits on master!" unless no_new_commits
	37	+
35	38	if clean && master && no_new_commits
36	39	quietly = "> /dev/null 2>&1"
37	40	fetch = "(git fetch origin #{quietly})"
	1	+#!/usr/bin/env ruby
	2	+# Make sure a project's deps are up-to-date.
	3	+
	4	+if File.executable? "script/bootstrap"
	5	+ exec "script/bootstrap", *ARGV
	6	+end
	1	+#!/usr/bin/env ruby
	2	+# Show the path to your manifest in Boxen, creating if necessary.
	3	+
	4	+user = ENV["GH_LOGIN"]
	5	+
	6	+unless user
	7	+ abort "GH_LOGIN is not defined. Please re-run Boxen."
	8	+end
	9	+
	10	+editor = ENV["VISUAL"] \|\| ENV["EDITOR"]
	11	+home = ENV["BOXEN_HOME"] + "/repo"
	12	+user = user.downcase
	13	+path = "#{home}/modules/people/manifests/#{user}.pp"
	14	+
	15	+unless File.exist? path
	16	+ File.open path, "wb" do \|f\|
	17	+ f.puts "class people::#{user} {"
	18	+ f.puts "}"
	19	+ end
	20	+end
	21	+
	22	+exec(editor, path) if editor && system("tty -s")
	23	+
	24	+puts path
	1	+#!/usr/bin/ruby
	2	+
	3	+require "optparse"
	4	+
	5	+unless ENV["USER"] == "root"
	6	+ exec "sudo", $0, *ARGV
	7	+end
	8	+
	9	+all = false
	10	+force = false
	11	+opt = false
	12	+services = false
	13	+
	14	+OptionParser.new do \|o\|
	15	+ o.banner = "Remove most traces of Boxen from your machine."
	16	+
	17	+ o.on("--all", "Remove everything possible.") { all = true }
	18	+ o.on("--force", "Actually do it.") { force = true }
	19	+ o.on("--help", "Show this help.") { abort o.to_s }
	20	+ o.on("--opt", "Remove /opt/boxen.") { opt = true }
	21	+ o.on("--services", "Remove and unload services.") { services = true }
	22	+
	23	+ o.parse!
	24	+
	25	+ abort o.to_s unless all \|\| opt \|\| services
	26	+end
	27	+
	28	+unless force
	29	+ warn "** I won't actually do anything unless you pass --force."
	30	+end
	31	+
	32	+if all \|\| services
	33	+ boxen_services = []
	34	+ boxen_services << Dir["/Library/Launch/com.boxen..plist"]
	35	+
	36	+ boxen_services.flatten.each do \|plist\|
	37	+ warn "-> Removing #{plist}."
	38	+
	39	+ if force
	40	+ system "launchctl", "unload", "-w", plist
	41	+ system "rm", "-f", plist
	42	+ end
	43	+ end
	44	+
	45	+ system "rm", "-f", "/etc/resolver/dev"
	46	+end
	47	+
	48	+if all \|\| opt
	49	+ warn "-> Removing /opt/boxen."
	50	+ system "rm", "-rf", "/opt/boxen" if force
	51	+end