Merge pull request #542 from tarebyte/master

Updating base configuration

Gemfile

@@ -1,17 +1,17 @@
 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.3.0"
+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"
 
 group :development do
-  gem "aws-sdk", "~> 1.21"
+  gem "aws-sdk", "~> 1.37"
   gem "net-ssh"
   gem "rbvmomi"
 end

Gemfile.lock

@@ -3,11 +3,11 @@ GEM
   specs:
     addressable (2.3.5)
     ansi (1.4.3)
-    aws-sdk (1.22.1)
+    aws-sdk (1.37.0)
       json (~> 1.4)
-      nokogiri (>= 1.4.4, < 1.6.0)
+      nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    boxen (2.0.4)
+    boxen (2.3.0)
       ansi (~> 1.4)
       hiera (~> 1.0)
       highline (~> 1.6)
@@ -15,29 +15,37 @@ GEM
       librarian-puppet (~> 0.9.9)
       octokit (~> 2.3.0)
       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)
+    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.14)
+      json
+      librarian (>= 0.1.2)
+      open3_backport
+    metaclass (0.0.4)
+    mini_portile (0.5.2)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
-    multipart-post (1.2.0)
-    net-ssh (2.6.5)
-    nokogiri (1.5.6)
+    multipart-post (2.0.0)
+    net-ssh (2.8.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
     octokit (2.3.1)
       sawyer (~> 0.5.1)
-    open4 (1.3.0)
-    puppet (3.3.1)
+    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 +55,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 +65,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.0)
     trollop (2.0)
     uuidtools (2.1.4)
 
@@ -74,15 +82,15 @@ 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.3.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.lock

@@ -1,7 +1,7 @@
 GITHUBTARBALL
   remote: boxen/puppet-boxen
   specs:
-    boxen (3.3.8)
+    boxen (3.4.2)
 
 GITHUBTARBALL
   remote: boxen/puppet-dnsmasq
@@ -11,27 +11,27 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-foreman
   specs:
-    foreman (1.1.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.3.7)
+    git (2.2.1)
 
 GITHUBTARBALL
   remote: boxen/puppet-go
   specs:
-    go (1.1.0)
+    go (2.0.1)
 
 GITHUBTARBALL
   remote: boxen/puppet-homebrew
   specs:
-    homebrew (1.6.0)
+    homebrew (1.6.1)
 
 GITHUBTARBALL
   remote: boxen/puppet-hub
@@ -46,7 +46,7 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-nodejs
   specs:
-    nodejs (3.5.0)
+    nodejs (3.6.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-openssl
@@ -71,7 +71,7 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: boxen/puppet-ruby
   specs:
-    ruby (7.1.6)
+    ruby (7.2.4)
 
 GITHUBTARBALL
   remote: boxen/puppet-sudo
@@ -86,7 +86,7 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: puppetlabs/puppetlabs-inifile
   specs:
-    inifile (1.0.1)
+    inifile (1.0.3)
 
 GITHUBTARBALL
   remote: puppetlabs/puppetlabs-stdlib
@@ -96,26 +96,26 @@ GITHUBTARBALL
 GITHUBTARBALL
   remote: ripienaar/puppet-module-data
   specs:
-    module-data (0.0.1)
+    module-data (0.0.3)
 
 DEPENDENCIES
-  boxen (= 3.3.8)
+  boxen (= 3.4.2)
   dnsmasq (= 1.0.1)
-  foreman (= 1.1.0)
-  gcc (= 2.0.1)
-  git (= 1.3.7)
-  go (= 1.1.0)
-  homebrew (= 1.6.0)
+  foreman (= 1.2.0)
+  gcc (= 2.0.100)
+  git (= 2.2.1)
+  go (= 2.0.1)
+  homebrew (= 1.6.1)
   hub (= 1.3.0)
-  inifile (= 1.0.1)
-  module-data (= 0.0.1)
+  inifile (= 1.0.3)
+  module-data (= 0.0.3)
   nginx (= 1.4.3)
-  nodejs (= 3.5.0)
+  nodejs (= 3.6.0)
   openssl (= 1.0.0)
   phantomjs (= 2.1.0)
   pkgconfig (= 1.0.0)
   repository (= 2.3.0)
-  ruby (= 7.1.6)
+  ruby (= 7.2.4)
   stdlib (= 4.1.0)
   sudo (= 1.0.0)
   xquartz (= 1.1.1)

README.md

@@ -81,6 +81,16 @@ cd /opt/boxen/repo
 ./script/boxen
 ```
 
+**Note**
+If you are creating a fresh install on Xcode 5.1 there is a clang issue with
+certain Ruby Gems. There is a Stackoverflow post [here](http://stackoverflow.com/questions/22352838/ruby-gem-install-json-fails-on-mavericks-and-xcode-5-1-unknown-argument-mul)
+
+To run the Boxen script follow these instructions
+```
+cd /opt/boxen/repo
+ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future ./script/boxen
+```
+
 You can also skip the above steps and <a href="#customizing">customize your
 boxen</a> before installing it.
 
@@ -138,10 +148,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

manifests/site.pp

@@ -72,6 +72,7 @@ node default {
   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/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.3.0' --no-rdoc --no-ri
+  /usr/bin/gem install bundler -v '~> 1.5.3' --no-rdoc --no-ri
 }
 
 # We don't want old config hanging around.
@@ -27,4 +27,4 @@ set -e
 /usr/bin/bundle install --binstubs bin --path .bundle --quiet "$@"
 
 # 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 -type f -print0 | xargs -0 sed -i '' 's|/usr/bin/env ruby|/usr/bin/ruby|g'