Merge remote-tracking branch 'upstream/master'

Conflicts:
	Puppetfile.lock

Gemfile

@@ -1,17 +1,18 @@
 source "https://rubygems.org"
 
-gem "boxen",                  "~> 2.0.4"
-gem "hiera",                  "~> 1.1"
-gem "librarian-puppet",       "~> 0.9.9"
-gem "puppet",                 "3.3.1"
+gem "boxen",                  "~> 2.5"
+gem "hiera",                  "~> 1.3.2"
+gem "librarian-puppet",       "~> 0.9.14"
+gem "puppet",                 "3.4.3"
 gem "puppet-lint",            "0.3.2"
 gem "puppetlabs_spec_helper", "0.4.1"
-gem "open4",                  "~> 1.3"
-gem "rake",                   "10.0.3"
-gem "rspec-puppet",           "0.1.6"
+gem "open4",                  "~> 1.3.3"
+gem "rake",                   "10.1.1"
+gem "rspec-puppet",           "1.0.1"
+gem "deep_merge",             "~> 1.0"
 
 group :development do
-  gem "aws-sdk", "~> 1.21"
+  gem "aws-sdk", "~> 1.37"
   gem "net-ssh"
   gem "rbvmomi"
 end

Gemfile.lock

@@ -1,43 +1,52 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
     ansi (1.4.3)
-    aws-sdk (1.22.1)
+    aws-sdk (1.38.0)
       json (~> 1.4)
-      nokogiri (>= 1.4.4, < 1.6.0)
+      nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    boxen (2.0.4)
+    boxen (2.5.0)
       ansi (~> 1.4)
       hiera (~> 1.0)
       highline (~> 1.6)
       json_pure (>= 1.7.7, < 2.0)
-      librarian-puppet (~> 0.9.9)
-      octokit (~> 2.3.0)
+      librarian-puppet (~> 0.9.10)
+      octokit (~> 2.7, >= 2.7.1)
       puppet (~> 3.0)
-    builder (3.1.4)
-    diff-lcs (1.2.4)
-    facter (1.7.3)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    hiera (1.2.1)
+    builder (3.2.2)
+    deep_merge (1.0.1)
+    diff-lcs (1.2.5)
+    facter (1.7.5)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    hiera (1.3.2)
       json_pure
-    highline (1.6.20)
+    highline (1.6.21)
     json (1.8.1)
     json_pure (1.8.1)
-    librarian-puppet (0.9.10)
-      json
+    librarian (0.1.2)
+      highline
       thor (~> 0.15)
-    metaclass (0.0.1)
-    mocha (0.14.0)
+    librarian-puppet (0.9.15)
+      json
+      librarian (>= 0.1.2)
+      open3_backport
+    metaclass (0.0.4)
+    mini_portile (0.5.3)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
-    multipart-post (1.2.0)
-    net-ssh (2.6.5)
-    nokogiri (1.5.6)
-    octokit (2.3.1)
-      sawyer (~> 0.5.1)
-    open4 (1.3.0)
-    puppet (3.3.1)
+    multipart-post (2.0.0)
+    net-ssh (2.8.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    octokit (2.7.2)
+      sawyer (~> 0.5.2)
+    open3_backport (0.0.3)
+      open4 (~> 1.3.0)
+    open4 (1.3.3)
+    puppet (3.4.3)
       facter (~> 1.6)
       hiera (~> 1.0)
       rgen (~> 0.6.5)
@@ -47,8 +56,8 @@ GEM
       rake
       rspec (>= 2.9.0)
       rspec-puppet (>= 0.1.1)
-    rake (10.0.3)
-    rbvmomi (1.6.0)
+    rake (10.1.1)
+    rbvmomi (1.8.1)
       builder
       nokogiri (>= 1.4.1)
       trollop
@@ -57,16 +66,16 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.6)
-    rspec-expectations (2.14.3)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rspec-puppet (0.1.6)
+    rspec-mocks (2.14.6)
+    rspec-puppet (1.0.1)
       rspec
-    sawyer (0.5.1)
+    sawyer (0.5.4)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
-    thor (0.18.1)
+    thor (0.19.1)
     trollop (2.0)
     uuidtools (2.1.4)
 
@@ -74,15 +83,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-sdk (~> 1.21)
-  boxen (~> 2.0.4)
-  hiera (~> 1.1)
-  librarian-puppet (~> 0.9.9)
+  aws-sdk (~> 1.37)
+  boxen (~> 2.5)
+  deep_merge (~> 1.0)
+  hiera (~> 1.3.2)
+  librarian-puppet (~> 0.9.14)
   net-ssh
-  open4 (~> 1.3)
-  puppet (= 3.3.1)
+  open4 (~> 1.3.3)
+  puppet (= 3.4.3)
   puppet-lint (= 0.3.2)
   puppetlabs_spec_helper (= 0.4.1)
-  rake (= 10.0.3)
+  rake (= 10.1.1)
   rbvmomi
-  rspec-puppet (= 0.1.6)
+  rspec-puppet (= 1.0.1)

Puppetfile

@@ -29,29 +29,33 @@ end
 # Includes many of our custom types and providers, as well as global
 # config. Required.
 
-github "boxen", "3.3.4"
+github "boxen", "3.4.2"
+
+# Support for default hiera data in modules
+
+github "module-data", "0.0.3", :repo => "ripienaar/puppet-module-data"
 
 # Core modules for a basic development environment. You can replace
 # some/most of these if you want, but it's not recommended.
 
-github "dnsmasq",    "1.0.0"
-github "foreman",    "1.0.0"
-github "gcc",        "2.0.1"
-github "git",        "1.2.5"
-github "go",         "1.0.0"
-github "homebrew",   "1.5.1"
-github "hub",        "1.0.3"
-github "inifile",    "1.0.0", :repo => "puppetlabs/puppetlabs-inifile"
-github "nginx",      "1.4.2"
-github "nodejs",     "3.3.0"
-github "openssl",    "1.0.0"
-github "phantomjs",  "2.0.2"
-github "pkgconfig",  "1.0.0"
-github "repository", "2.2.0"
-github "ruby",       "6.7.2"
-github "stdlib",     "4.1.0", :repo => "puppetlabs/puppetlabs-stdlib"
-github "sudo",       "1.0.0"
-github "xquartz",    "1.1.0"
+github "dnsmasq",     "1.0.1"
+github "foreman",     "1.2.0"
+github "gcc",         "2.0.100"
+github "git",         "2.3.0"
+github "go",          "1.1.0"
+github "homebrew",    "1.6.2"
+github "hub",         "1.3.0"
+github "inifile",     "1.0.3", :repo => "puppetlabs/puppetlabs-inifile"
+github "nginx",       "1.4.3"
+github "nodejs",      "3.7.0"
+github "openssl",     "1.0.0"
+github "phantomjs",   "2.3.0"
+github "pkgconfig",   "1.0.0"
+github "repository",  "2.3.0"
+github "ruby",        "7.3.0"
+github "stdlib",      "4.1.0", :repo => "puppetlabs/puppetlabs-stdlib"
+github "sudo",        "1.0.0"
+github "xquartz",     "1.1.1"
 
 # Optional/custom modules. There are tons available at
 # https://github.com/boxen.

Puppetfile.lock

@@ -16,7 +16,7 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-boxen
   specs:
-    boxen (3.3.4)
+    boxen (3.4.2)
 
 GITHUBTARBALL
   remote: boxen/puppet-caffeine
@@ -31,7 +31,7 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-dnsmasq
   specs:
-    dnsmasq (1.0.0)
+    dnsmasq (1.0.1)
 
 GITHUBTARBALL
   remote: boxen/puppet-dropbox
@@ -51,22 +51,22 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-foreman
   specs:
-    foreman (1.0.0)
+    foreman (1.2.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-gcc
   specs:
-    gcc (2.0.1)
+    gcc (2.0.100)
 
 GITHUBTARBALL
   remote: boxen/puppet-git
   specs:
-    git (1.2.5)
+    git (2.3.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-go
   specs:
-    go (1.0.0)
+    go (1.1.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-heroku
@@ -76,12 +76,12 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-homebrew
   specs:
-    homebrew (1.5.1)
+    homebrew (1.6.2)
 
 GITHUBTARBALL
   remote: boxen/puppet-hub
   specs:
-    hub (1.0.3)
+    hub (1.3.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-iterm2
@@ -101,12 +101,12 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-nginx
   specs:
-    nginx (1.4.2)
+    nginx (1.4.3)
 
 GITHUBTARBALL
   remote: boxen/puppet-nodejs
   specs:
-    nodejs (3.3.0)
+    nodejs (3.7.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-openssl
@@ -121,7 +121,7 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-phantomjs
   specs:
-    phantomjs (2.0.2)
+    phantomjs (2.3.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-pkgconfig
@@ -141,12 +141,12 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-repository
   specs:
-    repository (2.2.0)
+    repository (2.3.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-ruby
   specs:
-    ruby (6.7.2)
+    ruby (7.3.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-skype
@@ -201,7 +201,7 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-xquartz
   specs:
-    xquartz (1.1.0)
+    xquartz (1.1.1)
 
 GITHUBTARBALL
   remote: boxen/puppet-zsh
@@ -211,46 +211,53 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: puppetlabs/puppetlabs-inifile
   specs:
-    inifile (1.0.0)
+    inifile (1.0.3)
 
 GITHUBTARBALL
   remote: puppetlabs/puppetlabs-stdlib
   specs:
     stdlib (4.1.0)
 
+GITHUBTARBALL
+  remote: ripienaar/puppet-module-data
+  specs:
+    module-data (0.0.3)
+
 DEPENDENCIES
+<<<<<<< HEAD
   adium (= 1.2.0)
   alfred (= 1.1.7)
-  boxen (= 3.3.4)
   caffeine (= 1.0.0)
   chrome (= 1.1.2)
-  dnsmasq (= 1.0.0)
   dropbox (= 1.2.0)
   firefox (= 1.1.5)
   flux (= 1.0.1)
-  foreman (= 1.0.0)
-  gcc (= 2.0.1)
-  git (= 1.2.5)
-  go (= 1.0.0)
   heroku (= 2.0.0)
-  homebrew (= 1.5.1)
-  hub (= 1.0.3)
-  inifile (= 1.0.0)
   iterm2 (= 1.0.4)
   league_of_legends (= 1.1.2)
   libreoffice (= 4.1.3)
-  nginx (= 1.4.2)
-  nodejs (= 3.3.0)
-  openssl (= 1.0.0)
   osx (= 2.2.0)
-  phantomjs (= 2.0.2)
-  pkgconfig (= 1.0.0)
   python (= 1.1.1)
   qt (= 1.1.0)
-  repository (= 2.2.0)
-  ruby (= 6.7.2)
   skype (= 1.0.7)
   spotify (= 1.0.1)
+  boxen (= 3.4.2)
+  dnsmasq (= 1.0.1)
+  foreman (= 1.2.0)
+  gcc (= 2.0.100)
+  git (= 2.3.0)
+  go (= 1.1.0)
+  homebrew (= 1.6.2)
+  hub (= 1.3.0)
+  inifile (= 1.0.3)
+  module-data (= 0.0.3)
+  nginx (= 1.4.3)
+  nodejs (= 3.7.0)
+  openssl (= 1.0.0)
+  phantomjs (= 2.3.0)
+  pkgconfig (= 1.0.0)
+  repository (= 2.3.0)
+  ruby (= 7.3.0)
   stdlib (= 4.1.0)
   sublime_text_2 (= 1.1.2)
   sudo (= 1.0.0)
@@ -261,6 +268,6 @@ DEPENDENCIES
   vlc (= 1.0.5)
   wget (= 1.0.0)
   whatpulse (= 0.1.1)
-  xquartz (= 1.1.0)
   zsh (= 1.0.0)
+  xquartz (= 1.1.1)
 

README.md

@@ -37,6 +37,14 @@ MacVim.
 
 How do you do it?
 
+#### OS X 10.9 (Mavericks)
+
+If you are using [`b26abd0` of boxen-web](https://github.com/boxen/boxen-web/commit/b26abd0d681129eba0b5f46ed43110d873d8fdc2)
+or newer, it will be automatically installed as part of Boxen.
+Otherwise, follow instructions below.
+
+#### OS X < 10.9
+
 1. Install Xcode from the Mac App Store.
 1. Open Xcode.
 1. Open the Preferences window (`Cmd-,`).
@@ -45,7 +53,7 @@ How do you do it?
 
 ### Bootstrapping
 
-Create a **new** git repository somewhere.
+Create a **new** git repository somewhere on the internet.
 It can be private or public -- it really doesn't matter.
 If you're making a repository on GitHub, you _may not_ want to fork this repo
 to get started.
@@ -65,6 +73,14 @@ git remote add origin <the location of my new git repository>
 git push -u origin master
 ```
 
+Now that your boxen is bootstrapped, you can run the following to
+install the default configuration from this repo:
+
+```
+cd /opt/boxen/repo
+./script/boxen
+```
+
 ### Distributing
 
 That's enough to get your boxen into a usable state on other machines,
@@ -80,14 +96,14 @@ sudo mkdir -p /opt/boxen
 sudo chown ${USER}:staff /opt/boxen
 git clone <location of my new git repository> /opt/boxen/repo
 cd /opt/boxen/repo
-script/boxen
+./script/boxen
 ```
 
 Keep in mind this requires you to encrypt your hard drive by default.
 If you do not want to do encrypt your hard drive, you can use the `--no-fde`.
 
 ```
-script/boxen --no-fde
+./script/boxen --no-fde
 ```
 
 It should run successfully, and should tell you to source a shell script
@@ -118,10 +134,10 @@ This template project provides the following by default:
 * Node.js 0.6
 * Node.js 0.8
 * Node.js 0.10
-* Ruby 1.8.7
-* Ruby 1.9.2
 * Ruby 1.9.3
 * Ruby 2.0.0
+* Ruby 2.1.0
+* Ruby 2.1.1
 * ack
 * Findutils
 * GNU tar
@@ -177,6 +193,32 @@ Now Puppet knows where to download the module from when you include it in your s
     # github "java",     "1.1.0"
     include java
 
+### Hiera
+
+Hiera is preferred mechanism to make changes to module defaults (e.g. default
+global ruby version, service ports, etc). This repository supplies a
+starting point for your Hiera configuration at `config/hiera.yml`, and an
+example data file at `hiera/common.yaml`. See those files for more details.
+
+The default `config/hiera.yml` is configured with a hierarchy that allows
+individuals to have their own hiera data file in
+`hiera/users/{github_login}.yaml` which augments and overrides
+site-wide values in `hiera/common.yaml`. This default is, as with most of the
+configuration in the example repo, a great starting point for many
+organisations, but is totally up to you. You might want to, for
+example, have a set of values that can't be overridden by adding a file to
+the top of the hierarchy, or to have values set on specific OS
+versions:
+
+```yaml
+# ...
+:hierarchy:
+  - "global-overrides.yaml"
+  - "users/%{::github_login}"
+  - "osx-%{::macosx_productversion_major}"
+  - common
+```
+
 ### Node definitions
 
 Puppet has the concept of a
@@ -218,7 +260,7 @@ everyone by default. An example of this might look like so:
 
    include projects::super-top-secret-project
  }
- ```
+```
 
  If you'd like to read more about how Puppet works, we recommend
  checking out [the official documentation](http://docs.puppetlabs.com/)

config/hiera.yaml

@@ -0,0 +1,24 @@
+---
+# This file configures the hiera "database" for Boxen. As with most files in
+# this repo, it's just an example, and you should feel free to make any
+# changes suited to your organisation.
+
+# The defaults here should give you a solid start; put global defaults in
+# a file named hiera/common.yaml, and individuals can supplement and/or override
+# them in hiera/{github_login}.yaml
+
+:backends:
+  - yaml
+:yaml:
+  :datadir: "%{::boxen_home}/repo/hiera"
+:hierarchy:
+  - "users/%{github_login}"
+  - common
+
+# Many modules make their own hiera data available through the use of
+# puppet-module-data. Some depend on the 'deeper' merge_behavior setting, so
+# remove it at your own risk!
+# ...
+# besides the modules that use it, you might want to override deeply nested hash
+# values, too!
+:merge_behavior: deeper

docs/faq.md

@@ -19,5 +19,14 @@ One approach is to delete the Gemfile.lock and Puppetfile.lock and run:
 
     # Regenerates Puppetfile.lock and caches tarballs
     bundle exec librarian-puppet install --clean
-    
+
 These will generate the respective lock files suitable for committing. Hope that helps.
+
+### Q: Should you keep the cache of the module and gem in the repository?
+
+We recommend yout to keep the files inside `vendor/cache` and `vendor/puppet/cache` inside
+the repository.
+
+It ends up adding a negligible amount of disk space in return for much faster runtimes
+for other folks on your team (since they don't have to fetch the tarballs one-by-one
+through the GitHub API any time a module version changes).

docs/puppet.md

@@ -1,4 +1,4 @@
-# wtf is a puppet?
+# What is a puppet?
 
 Puppet is configuration management tool, written in Ruby, that compiles
 and runs code written in the Puppet language.

docs/rails.md

@@ -52,8 +52,6 @@ your app best to work with Boxen.
 # config/database.yml
 
 <%
-  def boxen?; ENV['BOXEN_HOME']; end
-
   socket = [
     ENV["BOXEN_MYSQL_SOCKET"],
     "/var/run/mysql5/mysqld.sock",

hiera/common.yaml.example

@@ -0,0 +1,23 @@
+---
+# This is an example of the kinds of things that you can configure via hiera.
+# If you've left the defaults in `/hiera.yml`, you might want to copy this file
+# to `hiera/common.yaml`, or feel free to start with a blank slate!
+
+# Have a gander at some of these examples to get an idea of some of the things
+# that you can affect 'out of the box', and then customise to your
+# heart's content.
+
+# See https://github.com/boxen/puppet-ruby for docs
+ruby::global::version: "2.1.0"
+ruby::rbenv_plugins:
+  rbenv-vars:
+    ensure: v1.0.0
+    source: sstephenson/rbenv-vars
+  ruby-build:
+    ensure: v20131225.1
+    source: sstephenson/ruby-build
+ruby::version::alias:
+  2.0.0: 2.0.0-p353
+
+# See https://github.com/boxen/puppet-java for docs
+java::update_version: 51

manifests/site.pp

@@ -69,10 +69,10 @@ node default {
   include nodejs::v0_10
 
   # default ruby versions
-  include ruby::1_8_7
-  include ruby::1_9_2
-  include ruby::1_9_3
-  include ruby::2_0_0
+  ruby::version { '1.9.3': }
+  ruby::version { '2.0.0': }
+  ruby::version { '2.1.0': }
+  ruby::version { '2.1.1': }
 
   # common, useful packages
   package {

script/bootstrap

@@ -5,9 +5,9 @@ set -e
 
 # FIX: only sudo if gem home isn't writable
 
-(/usr/bin/gem list -i bundler -v '~> 1.3.0' > /dev/null) || {
-  /usr/bin/sudo -p "Need to install Bundler for system ruby, password for sudo: " \
-  /usr/bin/gem install bundler -v '~> 1.3.0' --no-rdoc --no-ri
+(/usr/bin/gem list -i bundler -v '~> 1.5.3' > /dev/null) || {
+  /usr/bin/sudo -E -p "Need to install Bundler for system ruby, password for sudo: " \
+  /usr/bin/gem install bundler -v '~> 1.5.3' --no-rdoc --no-ri
 }
 
 # We don't want old config hanging around.
@@ -23,8 +23,16 @@ if [ $? -eq 0 ]; then
 fi
 set -e
 
+CLT_VERSION=`pkgutil --pkg-info=com.apple.pkg.CLTools_Executables | grep version | cut -f 2 -d ' ' | awk ' { print $1; } '`
+
 # Bundle install unless we're already up to date.
-/usr/bin/bundle install --binstubs bin --path .bundle --quiet "$@"
+if [[ $CLT_VERSION =~ ^5\.1\.0\.0\.1\.1396320587 ]]; then
+  # Fix for LLVM that ships with Xcode 5.1
+  ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future /usr/bin/bundle install --binstubs bin --path .bundle --quiet "$@"
+else
+  /usr/bin/bundle install --binstubs bin --path .bundle --quiet "$@"
+fi
+
 
 # Fix the binstubs to use system ruby
-find bin -type f -print0 | xargs -0 sed -i '' 's|/usr/bin/env ruby|/usr/bin/ruby|g'
+find bin -not -path 'bin/\.*' -type f -print0 | xargs -0 /usr/bin/sed -i '' 's|/usr/bin/env ruby|/usr/bin/ruby|g'

script/boxen

@@ -31,7 +31,7 @@ unless ENV["BOXEN_NO_PULL"] ||
   quietly = "> /dev/null 2>&1"
 
   if system("which git > /dev/null") && File.directory?(".git") \
-    && fetch = system("git fetch -q origin")
+    && system("git fetch -q origin")
 
     clean  = `git status --porcelain`.empty?
     current_branch = `git symbolic-ref HEAD`.chomp

script/sync

@@ -88,11 +88,13 @@ end
 
 # Sync NVM nodes.
 
-Dir.chdir "#{config.homedir}/nvm" do
-  Dir["v*"].each do |dir|
+Dir.chdir "#{config.homedir}/nodenv/versions" do
+  Dir["*"].each do |dir|
+    next if File.symlink? dir
+
     version = File.basename dir
-    file    = "nvm/#{os}/#{version}.tar.bz2"
-    temp    = Tempfile.new "nvm"
+    file    = "nodenv/#{os}/#{version}.tar.bz2"
+    temp    = Tempfile.new "nodenv"
     obj     = bucket.objects[file]
 
     next if obj.exists?