Merge branch 'master' of https://github.com/boxen/our-boxen

Conflicts: Puppetfile

Merge branch 'master' of https://github.com/boxen/our-boxen
Conflicts: Puppetfile
Will Farrington
2 parents 0dd5e5f37b 57e5649ce8
Showing 20 changed files Side-by-side Diff
.gitignore
Gemfile
Gemfile.lock
Puppetfile
Puppetfile.lock
manifests/site.pp
script/bootstrap
shared/README.md
vendor/puppet/cache/boxen-puppet-boxen-0.0.1.1.tar.gz
vendor/puppet/cache/boxen-puppet-boxen-0.0.1.tar.gz
vendor/puppet/cache/boxen-puppet-git-0.0.1.tar.gz
vendor/puppet/cache/boxen-puppet-homebrew-0.0.1.tar.gz
vendor/puppet/cache/boxen-puppet-hub-0.0.1.tar.gz
vendor/puppet/cache/boxen-puppet-inifile-0.0.1.tar.gz
vendor/puppet/cache/boxen-puppet-nodejs-0.0.1.tar.gz
vendor/puppet/cache/boxen-puppet-nvm-0.0.1.tar.gz
vendor/puppet/cache/boxen-puppet-rbenv-0.0.1.tar.gz
vendor/puppet/cache/boxen-puppet-ruby-0.0.1.tar.gz
vendor/puppet/cache/boxen-puppet-sudo-0.0.1.tar.gz
vendor/puppet/cache/boxen-puppet-xcode-0.0.1.tar.gz
 /.bundle
+/.librarian
+/.tmp
 /bin
 /config/local.rb
 /log
 /tmp
 /vendor/cache
-/.tmp/
-/modules/
-/.librarian/
+/vendor/puppet/cache
+/shared/*
+!/shared/README.md
 source "http://rubygems.org"
  
-gem "boxen", "0.0.0", # FIX: just during extraction/porting
-  :path => File.expand_path("../../boxen", __FILE__)
-
-gem "librarian-puppet", "0.9.5"
+gem "boxen",            "~> 0.0"
+gem "librarian-puppet", "~> 0.9"
-PATH
-  remote: /Users/wfarr/boxen/boxen
-  specs:
-    boxen (0.0.0)
-      ansi
-      highline
-      json_pure
-      octokit
-      puppet
-
 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)
@@ -45,6 +41,6 @@
   ruby
  
 DEPENDENCIES
-  boxen (= 0.0.0)!
-  librarian-puppet (= 0.9.5)
+  boxen (~> 0.0)
+  librarian-puppet (~> 0.9)
@@ -5,13 +5,13 @@
  
 # 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"
+#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.
-%w(ruby rbenv nvm nodejs git hub inifile sudo homebrew xcode).each do |modulename|
-  mod modulename, "0.0.1", :github_tarball => "boxen/puppet-#{modulename}"
-end
+#%w(ruby rbenv nvm nodejs git hub inifile sudo homebrew xcode).each do |modulename|
+#  mod modulename, "0.0.1", :github_tarball => "boxen/puppet-#{modulename}"
+#end
  
 # Add your custom modules here.
 # There are tons available at https://github.com/boxen.
-GITHUBTARBALL
-  remote: boxen/puppet-boxen
-  specs:
-    boxen (0.0.1.1)
-
-GITHUBTARBALL
-  remote: boxen/puppet-git
-  specs:
-    git (0.0.1)
-
-GITHUBTARBALL
-  remote: boxen/puppet-homebrew
-  specs:
-    homebrew (0.0.1)
-
-GITHUBTARBALL
-  remote: boxen/puppet-hub
-  specs:
-    hub (0.0.1)
-
-GITHUBTARBALL
-  remote: boxen/puppet-inifile
-  specs:
-    inifile (0.0.1)
-
-GITHUBTARBALL
-  remote: boxen/puppet-nodejs
-  specs:
-    nodejs (0.0.1)
-
-GITHUBTARBALL
-  remote: boxen/puppet-nvm
-  specs:
-    nvm (0.0.1)
-
-GITHUBTARBALL
-  remote: boxen/puppet-rbenv
-  specs:
-    rbenv (0.0.1)
-
-GITHUBTARBALL
-  remote: boxen/puppet-ruby
-  specs:
-    ruby (0.0.1)
-
-GITHUBTARBALL
-  remote: boxen/puppet-sudo
-  specs:
-    sudo (0.0.1)
-
-GITHUBTARBALL
-  remote: boxen/puppet-xcode
-  specs:
-    xcode (0.0.1)
-
 DEPENDENCIES
-  boxen (= 0.0.1.1)
-  git (= 0.0.1)
-  homebrew (= 0.0.1)
-  hub (= 0.0.1)
-  inifile (= 0.0.1)
-  nodejs (= 0.0.1)
-  nvm (= 0.0.1)
-  rbenv (= 0.0.1)
-  ruby (= 0.0.1)
-  sudo (= 0.0.1)
-  xcode (= 0.0.1)
-require boxen::environment
-require homebrew::repo
+# require boxen::environment
+# require homebrew::repo
  
-Exec {
-  group       => 'staff',
-  logoutput   => on_failure,
-  user        => $luser,
+# Exec {
+#   group       => 'staff',
+#   logoutput   => on_failure,
+#   user        => $luser,
  
-  path => [
-    "${boxen::config::home}/rbenv/shims",
-    "${boxen::config::home}/homebrew/bin",
-    '/usr/bin',
-    '/bin',
-    '/usr/sbin',
-    '/sbin'
-  ]
-}
+#   path => [
+#     "${boxen::config::home}/rbenv/shims",
+#     "${boxen::config::home}/homebrew/bin",
+#     '/usr/bin',
+#     '/bin',
+#     '/usr/sbin',
+#     '/sbin'
+#   ]
+# }
  
-File {
-  group => 'staff',
-  owner => $luser
-}
+# File {
+#   group => 'staff',
+#   owner => $luser
+# }
  
-Package {
-  provider => homebrew,
-  require  => Class['homebrew']
-}
+# Package {
+#   provider => homebrew,
+#   require  => Class['homebrew']
+# }
  
-Repository {
-  provider => git,
-  extra    => [
-    '--recurse-submodules'
-  ],
-  require  => Class['git']
-}
+# Repository {
+#   provider => git,
+#   extra    => [
+#     '--recurse-submodules'
+#   ],
+#   require  => Class['git']
+# }
  
-Service {
-  provider => ghlaunchd
-}
+# Service {
+#   provider => ghlaunchd
+# }
  
-node default {
-  include git
-}
+# node default {
+#   include git
+# }
 #!/bin/sh
 # Make sure all our local dependencies are available.
  
+set -e
+
 # FIX: only sudo if gem home isn't writable
  
 (gem spec bundler -v '~> 1.2.0' > /dev/null 2>&1) ||
@@ -9,6 +11,7 @@
 # We don't want old config hanging around.
  
 rm -rf .bundle/config
+rm -rf .librarian/puppet/config
  
 # Export CC to explicitly set the compiler used for cexts.
  
@@ -17,4 +20,8 @@
 # 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
+# Shared Puppet Modules
+
+This module directory is managed by librarian-puppet.
1	1	/.bundle
	2	+/.librarian
	3	+/.tmp
2	4	/bin
3	5	/config/local.rb
4	6	/log
5	7	/tmp
6	8	/vendor/cache
7		-/.tmp/
8		-/modules/
9		-/.librarian/
	9	+/vendor/puppet/cache
	10	+/shared/*
	11	+!/shared/README.md
1	1	source "http://rubygems.org"
2	2
3		-gem "boxen", "0.0.0", # FIX: just during extraction/porting
4		- :path => File.expand_path("../../boxen", __FILE__)
5		-
6		-gem "librarian-puppet", "0.9.5"
	3	+gem "boxen", "~> 0.0"
	4	+gem "librarian-puppet", "~> 0.9"
1		-PATH
2		- remote: /Users/wfarr/boxen/boxen
3		- specs:
4		- boxen (0.0.0)
5		- ansi
6		- highline
7		- json_pure
8		- octokit
9		- puppet
10		-
11	1	GEM
12	2	remote: http://rubygems.org/
13	3	specs:
14	4	addressable (2.3.2)
15	5	ansi (1.4.3)
	6	+ boxen (0.0.0)
	7	+ ansi (~> 1.4)
	8	+ highline (~> 1.6)
	9	+ json_pure (~> 1.7)
	10	+ octokit (~> 1.15)
	11	+ puppet (~> 3.0)
16	12	facter (1.6.12)
17	13	faraday (0.8.4)
18	14	multipart-post (~> 1.1)
...	...	@@ -45,6 +41,6 @@
45	41	ruby
46	42
47	43	DEPENDENCIES
48		- boxen (= 0.0.0)!
49		- librarian-puppet (= 0.9.5)
	44	+ boxen (~> 0.0)
	45	+ librarian-puppet (~> 0.9)
...	...	@@ -5,13 +5,13 @@
5	5
6	6	# Includes many of our custom types and providers, as well as global config.
7	7	# Required.
8		-mod "boxen", "0.0.1.1", :github_tarball => "boxen/puppet-boxen"
	8	+#mod "boxen", "0.0.1.1", :github_tarball => "boxen/puppet-boxen"
9	9
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		-%w(ruby rbenv nvm nodejs git hub inifile sudo homebrew xcode).each do \|modulename\|
13		- mod modulename, "0.0.1", :github_tarball => "boxen/puppet-#{modulename}"
14		-end
	12	+#%w(ruby rbenv nvm nodejs git hub inifile sudo homebrew xcode).each do \|modulename\|
	13	+# mod modulename, "0.0.1", :github_tarball => "boxen/puppet-#{modulename}"
	14	+#end
15	15
16	16	# Add your custom modules here.
17	17	# There are tons available at https://github.com/boxen.
1		-GITHUBTARBALL
2		- remote: boxen/puppet-boxen
3		- specs:
4		- boxen (0.0.1.1)
5		-
6		-GITHUBTARBALL
7		- remote: boxen/puppet-git
8		- specs:
9		- git (0.0.1)
10		-
11		-GITHUBTARBALL
12		- remote: boxen/puppet-homebrew
13		- specs:
14		- homebrew (0.0.1)
15		-
16		-GITHUBTARBALL
17		- remote: boxen/puppet-hub
18		- specs:
19		- hub (0.0.1)
20		-
21		-GITHUBTARBALL
22		- remote: boxen/puppet-inifile
23		- specs:
24		- inifile (0.0.1)
25		-
26		-GITHUBTARBALL
27		- remote: boxen/puppet-nodejs
28		- specs:
29		- nodejs (0.0.1)
30		-
31		-GITHUBTARBALL
32		- remote: boxen/puppet-nvm
33		- specs:
34		- nvm (0.0.1)
35		-
36		-GITHUBTARBALL
37		- remote: boxen/puppet-rbenv
38		- specs:
39		- rbenv (0.0.1)
40		-
41		-GITHUBTARBALL
42		- remote: boxen/puppet-ruby
43		- specs:
44		- ruby (0.0.1)
45		-
46		-GITHUBTARBALL
47		- remote: boxen/puppet-sudo
48		- specs:
49		- sudo (0.0.1)
50		-
51		-GITHUBTARBALL
52		- remote: boxen/puppet-xcode
53		- specs:
54		- xcode (0.0.1)
55		-
56	1	DEPENDENCIES
57		- boxen (= 0.0.1.1)
58		- git (= 0.0.1)
59		- homebrew (= 0.0.1)
60		- hub (= 0.0.1)
61		- inifile (= 0.0.1)
62		- nodejs (= 0.0.1)
63		- nvm (= 0.0.1)
64		- rbenv (= 0.0.1)
65		- ruby (= 0.0.1)
66		- sudo (= 0.0.1)
67		- xcode (= 0.0.1)
1		-require boxen::environment
2		-require homebrew::repo
	1	+# require boxen::environment
	2	+# require homebrew::repo
3	3
4		-Exec {
5		- group => 'staff',
6		- logoutput => on_failure,
7		- user => $luser,
	4	+# Exec {
	5	+# group => 'staff',
	6	+# logoutput => on_failure,
	7	+# user => $luser,
8	8
9		- path => [
10		- "${boxen::config::home}/rbenv/shims",
11		- "${boxen::config::home}/homebrew/bin",
12		- '/usr/bin',
13		- '/bin',
14		- '/usr/sbin',
15		- '/sbin'
16		- ]
17		-}
	9	+# path => [
	10	+# "${boxen::config::home}/rbenv/shims",
	11	+# "${boxen::config::home}/homebrew/bin",
	12	+# '/usr/bin',
	13	+# '/bin',
	14	+# '/usr/sbin',
	15	+# '/sbin'
	16	+# ]
	17	+# }
18	18
19		-File {
20		- group => 'staff',
21		- owner => $luser
22		-}
	19	+# File {
	20	+# group => 'staff',
	21	+# owner => $luser
	22	+# }
23	23
24		-Package {
25		- provider => homebrew,
26		- require => Class['homebrew']
27		-}
	24	+# Package {
	25	+# provider => homebrew,
	26	+# require => Class['homebrew']
	27	+# }
28	28
29		-Repository {
30		- provider => git,
31		- extra => [
32		- '--recurse-submodules'
33		- ],
34		- require => Class['git']
35		-}
	29	+# Repository {
	30	+# provider => git,
	31	+# extra => [
	32	+# '--recurse-submodules'
	33	+# ],
	34	+# require => Class['git']
	35	+# }
36	36
37		-Service {
38		- provider => ghlaunchd
39		-}
	37	+# Service {
	38	+# provider => ghlaunchd
	39	+# }
40	40
41		-node default {
42		- include git
43		-}
	41	+# node default {
	42	+# include git
	43	+# }
1	1	#!/bin/sh
2	2	# Make sure all our local dependencies are available.
3	3
	4	+set -e
	5	+
4	6	# FIX: only sudo if gem home isn't writable
5	7
6	8	(gem spec bundler -v '~> 1.2.0' > /dev/null 2>&1) \|\|
...	...	@@ -9,6 +11,7 @@
9	11	# We don't want old config hanging around.
10	12
11	13	rm -rf .bundle/config
	14	+rm -rf .librarian/puppet/config
12	15
13	16	# Export CC to explicitly set the compiler used for cexts.
14	17
...	...	@@ -17,4 +20,8 @@
17	20	# Bundle install unless we're already up to date.
18	21
19	22	bundle install --binstubs bin --path .bundle --quiet "$@"
	23	+
	24	+# Install all our Puppet dependencies.
	25	+
	26	+bin/librarian-puppet install --path=shared
	1	+# Shared Puppet Modules
	2	+
	3	+This module directory is managed by librarian-puppet.