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

Conflicts:
	Puppetfile

.gitignore

@@ -1,9 +1,11 @@
 /.bundle
+/.librarian
+/.tmp
 /bin
 /config/local.rb
 /log
 /tmp
 /vendor/cache
-/.tmp/
-/modules/
-/.librarian/
+/vendor/puppet/cache
+/shared/*
+!/shared/README.md

Gemfile

@@ -1,6 +1,4 @@
 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"

Gemfile.lock

@@ -1,18 +1,14 @@
-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,5 +41,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  boxen (= 0.0.0)!
-  librarian-puppet (= 0.9.5)
+  boxen (~> 0.0)
+  librarian-puppet (~> 0.9)

Puppetfile

@@ -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.

Puppetfile.lock

@@ -1,68 +1,2 @@
-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)
 

manifests/site.pp

@@ -1,43 +1,43 @@
-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
+# }

script/bootstrap

@@ -1,6 +1,8 @@
 #!/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,3 +20,7 @@ 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

shared/README.md

@@ -0,0 +1,3 @@
+# Shared Puppet Modules
+
+This module directory is managed by librarian-puppet.