Skip to content
Permalink
Browse files

Big update with upstream.

  • Loading branch information...
kieran-bamforth committed Sep 30, 2014
2 parents b408a45 + 2f40e6d commit 47f6e64bf1ae9e963bd38df3f3c468661c970e76
Showing with 83 additions and 78 deletions.
  1. +7 −7 Gemfile
  2. +34 −29 Gemfile.lock
  3. +11 −12 Puppetfile
  4. +22 −22 Puppetfile.lock
  5. +5 −4 README.md
  6. +1 −1 docs/faq.md
  7. +2 −2 manifests/site.pp
  8. +1 −1 script/boxen-git-credential
  9. BIN vendor/cache/CFPropertyList-2.2.8.gem
  10. BIN vendor/cache/aws-sdk-1.48.1.gem
  11. BIN vendor/cache/boxen-2.5.0.gem
  12. BIN vendor/cache/boxen-2.7.0.gem
  13. BIN vendor/cache/facter-1.7.5.gem
  14. BIN vendor/cache/facter-2.2.0-universal-darwin.gem
  15. BIN vendor/cache/hiera-1.3.4.gem
  16. BIN vendor/cache/librarian-puppet-1.0.5.gem
  17. BIN vendor/cache/mini_portile-0.6.0.gem
  18. BIN vendor/cache/net-ssh-2.9.1.gem
  19. BIN vendor/cache/nokogiri-1.6.3.1.gem
  20. BIN vendor/cache/puppet-3.4.3.gem
  21. BIN vendor/cache/puppet-3.7.1.gem
  22. BIN vendor/cache/rake-10.1.1.gem
  23. BIN vendor/cache/rake-10.3.2.gem
  24. BIN vendor/cache/rgen-0.6.6.gem
  25. BIN vendor/cache/rspec-2.14.1.gem
  26. BIN vendor/cache/rspec-3.0.0.gem
  27. BIN vendor/cache/rspec-core-2.14.8.gem
  28. BIN vendor/cache/rspec-core-3.0.3.gem
  29. BIN vendor/cache/rspec-expectations-2.14.5.gem
  30. BIN vendor/cache/rspec-expectations-3.0.3.gem
  31. BIN vendor/cache/rspec-mocks-2.14.6.gem
  32. BIN vendor/cache/rspec-mocks-3.0.3.gem
  33. BIN vendor/cache/rspec-support-3.0.3.gem
  34. BIN vendor/cache/sawyer-0.5.4.gem
  35. BIN vendor/cache/sawyer-0.5.5.gem
  36. BIN vendor/puppet/cache/boxen-puppet-boxen-3.4.2.tar.gz
  37. BIN vendor/puppet/cache/boxen-puppet-boxen-3.7.0.tar.gz
  38. BIN vendor/puppet/cache/boxen-puppet-dnsmasq-1.0.1.tar.gz
  39. BIN vendor/puppet/cache/boxen-puppet-dnsmasq-2.0.0.tar.gz
  40. BIN vendor/puppet/cache/boxen-puppet-gcc-2.0.100.tar.gz
  41. BIN vendor/puppet/cache/boxen-puppet-gcc-2.2.0.tar.gz
  42. BIN vendor/puppet/cache/boxen-puppet-git-2.3.1.tar.gz
  43. BIN vendor/puppet/cache/boxen-puppet-git-2.5.0.tar.gz
  44. BIN vendor/puppet/cache/boxen-puppet-homebrew-1.6.2.tar.gz
  45. BIN vendor/puppet/cache/boxen-puppet-homebrew-1.9.5.tar.gz
  46. BIN vendor/puppet/cache/boxen-puppet-nodejs-3.7.0.tar.gz
  47. BIN vendor/puppet/cache/boxen-puppet-nodejs-3.8.1.tar.gz
  48. BIN vendor/puppet/cache/boxen-puppet-ruby-8.1.4.tar.gz
  49. BIN vendor/puppet/cache/boxen-puppet-xquartz-1.1.1.tar.gz
  50. BIN vendor/puppet/cache/boxen-puppet-xquartz-1.2.1.tar.gz
  51. BIN vendor/puppet/cache/puppetlabs-puppetlabs-inifile-1.0.3.tar.gz
  52. BIN vendor/puppet/cache/puppetlabs-puppetlabs-inifile-1.1.1.tar.gz
  53. BIN vendor/puppet/cache/puppetlabs-puppetlabs-stdlib-4.1.0.tar.gz
  54. BIN vendor/puppet/cache/puppetlabs-puppetlabs-stdlib-4.2.1.tar.gz
14 Gemfile
@@ -1,18 +1,18 @@
source "https://rubygems.org"

gem "boxen", "~> 2.5"
gem "hiera", "~> 1.3.2"
gem "librarian-puppet", "~> 0.9.14"
gem "puppet", "3.4.3"
gem "boxen", "~> 2.7.0"
gem "hiera", "~> 1.3.3"
gem "librarian-puppet", "~> 1.0.5"
gem "puppet", "3.7.1"
gem "puppet-lint", "0.3.2"
gem "puppetlabs_spec_helper", "0.4.1"
gem "open4", "~> 1.3.3"
gem "rake", "10.1.1"
gem "open4", "~> 1.3.4"
gem "rake", "10.3.2"
gem "rspec-puppet", "1.0.1"
gem "deep_merge", "~> 1.0"

group :development do
gem "aws-sdk", "~> 1.37"
gem "aws-sdk", "~> 1.42"
gem "net-ssh"
gem "rbvmomi"
end
@@ -1,34 +1,36 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.2.8)
addressable (2.3.6)
ansi (1.4.3)
aws-sdk (1.42.0)
aws-sdk (1.48.1)
json (~> 1.4)
nokogiri (>= 1.4.4)
boxen (2.5.0)
boxen (2.7.0)
ansi (~> 1.4)
hiera (~> 1.0)
highline (~> 1.6)
json_pure (>= 1.7.7, < 2.0)
librarian-puppet (~> 0.9.10)
librarian-puppet (~> 1.0.0)
octokit (~> 2.7, >= 2.7.1)
puppet (~> 3.0)
puppet (~> 3.7)
builder (3.2.2)
deep_merge (1.0.1)
diff-lcs (1.2.5)
facter (1.7.5)
facter (2.2.0)
CFPropertyList (~> 2.2.6)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
hiera (1.3.3)
hiera (1.3.4)
json_pure
highline (1.6.21)
json (1.8.1)
json_pure (1.8.1)
librarian (0.1.2)
highline
thor (~> 0.15)
librarian-puppet (0.9.17)
librarian-puppet (1.0.5)
json
librarian (>= 0.1.2)
metaclass (0.0.4)
@@ -37,38 +39,41 @@ GEM
metaclass (~> 0.0.1)
multipart-post (2.0.0)
net-ssh (2.9.1)
nokogiri (1.6.2.1)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
octokit (2.7.2)
sawyer (~> 0.5.2)
open4 (1.3.4)
puppet (3.4.3)
facter (~> 1.6)
puppet (3.7.1)
facter (> 1.6, < 3)
hiera (~> 1.0)
rgen (~> 0.6.5)
json_pure
puppet-lint (0.3.2)
puppetlabs_spec_helper (0.4.1)
mocha (>= 0.10.5)
rake
rspec (>= 2.9.0)
rspec-puppet (>= 0.1.1)
rake (10.1.1)
rake (10.3.2)
rbvmomi (1.8.1)
builder
nokogiri (>= 1.4.1)
trollop
rgen (0.6.6)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.6)
rspec (3.0.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-core (3.0.3)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.3)
rspec-support (~> 3.0.0)
rspec-puppet (1.0.1)
rspec
sawyer (0.5.4)
rspec-support (3.0.3)
sawyer (0.5.5)
addressable (~> 2.3.5)
faraday (~> 0.8, < 0.10)
thor (0.19.1)
@@ -78,16 +83,16 @@ PLATFORMS
ruby

DEPENDENCIES
aws-sdk (~> 1.37)
boxen (~> 2.5)
aws-sdk (~> 1.42)
boxen (~> 2.7.0)
deep_merge (~> 1.0)
hiera (~> 1.3.2)
librarian-puppet (~> 0.9.14)
hiera (~> 1.3.3)
librarian-puppet (~> 1.0.5)
net-ssh
open4 (~> 1.3.3)
puppet (= 3.4.3)
open4 (~> 1.3.4)
puppet (= 3.7.1)
puppet-lint (= 0.3.2)
puppetlabs_spec_helper (= 0.4.1)
rake (= 10.1.1)
rake (= 10.3.2)
rbvmomi
rspec-puppet (= 1.0.1)
@@ -29,34 +29,33 @@ end
# Includes many of our custom types and providers, as well as global
# config. Required.

github "boxen", "3.4.2"
github "boxen", "3.7.0"

# Support for default hiera data in modules

github "module-data", "0.0.3", :repo => "ripienaar/puppet-module-data"
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.1"
github "dnsmasq", "2.0.0"
github "foreman", "1.2.0"
github "gcc", "2.0.100"
github "git", "2.3.1"
github "gcc", "2.2.0"
github "git", "2.5.0"
github "go", "1.1.0"
github "homebrew", "1.9.2"
github "homebrew", "1.9.5"
github "hub", "1.3.0"
github "inifile", "1.0.3", :repo => "puppetlabs/puppetlabs-inifile"
github "inifile", "1.1.1", :repo => "puppetlabs/puppetlabs-inifile"
github "nginx", "1.4.3"
github "nodejs", "3.7.0"
github "nodejs", "3.8.1"
github "openssl", "1.0.0"
github "phantomjs", "2.3.0"
github "pkgconfig", "1.0.0"
github "repository", "2.3.0"
github "ruby", "8.1.2"
github "stdlib", "4.1.0", :repo => "puppetlabs/puppetlabs-stdlib"
github "ruby", "8.1.4"
github "stdlib", "4.2.1", :repo => "puppetlabs/puppetlabs-stdlib"
github "sudo", "1.0.0"
github "xquartz", "1.1.1"

github "xquartz", "1.2.1"

# Optional/custom modules. There are tons available at
# https://github.com/boxen.
@@ -11,7 +11,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-boxen
specs:
boxen (3.4.2)
boxen (3.7.0)

GITHUBTARBALL
remote: boxen/puppet-chrome
@@ -26,7 +26,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-dnsmasq
specs:
dnsmasq (1.0.1)
dnsmasq (2.0.0)

GITHUBTARBALL
remote: boxen/puppet-dropbox
@@ -51,12 +51,12 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-gcc
specs:
gcc (2.0.100)
gcc (2.2.0)

GITHUBTARBALL
remote: boxen/puppet-git
specs:
git (2.3.1)
git (2.5.0)

GITHUBTARBALL
remote: boxen/puppet-gitx
@@ -76,7 +76,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-homebrew
specs:
homebrew (1.9.2)
homebrew (1.9.5)

GITHUBTARBALL
remote: boxen/puppet-hub
@@ -121,7 +121,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-nodejs
specs:
nodejs (3.7.0)
nodejs (3.8.1)

GITHUBTARBALL
remote: boxen/puppet-onepassword
@@ -171,7 +171,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-ruby
specs:
ruby (8.1.2)
ruby (8.1.4)

GITHUBTARBALL
remote: boxen/puppet-sequel_pro
@@ -226,7 +226,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-xquartz
specs:
xquartz (1.1.1)
xquartz (1.2.1)

GITHUBTARBALL
remote: boxen/puppet-zsh
@@ -251,47 +251,47 @@ GITHUBTARBALL
GITHUBTARBALL
remote: puppetlabs/puppetlabs-inifile
specs:
inifile (1.0.3)
inifile (1.1.1)

GITHUBTARBALL
remote: puppetlabs/puppetlabs-stdlib
specs:
stdlib (4.1.0)
stdlib (4.2.1)

GITHUBTARBALL
remote: ripienaar/puppet-module-data
specs:
module-data (0.0.3)
module_data (0.0.3)

DEPENDENCIES
alfred (= 1.1.8)
autoconf (= 1.0.0)
boxen (= 3.4.2)
boxen (= 3.7.0)
chrome (= 1.1.2)
dash (= 1.0.0)
dnsmasq (= 1.0.1)
dnsmasq (= 2.0.0)
dropbox (= 1.2.0)
evernote (= 2.0.6)
firefox (= 1.2.1)
flux (= 1.0.1)
foreman (= 1.2.0)
gcc (= 2.0.100)
git (= 2.3.1)
gcc (= 2.2.0)
git (= 2.5.0)
gitx (= 1.2.0)
go (= 1.1.0)
harvest (= 1.0.2)
homebrew (= 1.9.2)
homebrew (= 1.9.5)
hub (= 1.3.0)
induction (= 1.0.0)
inifile (= 1.0.3)
inifile (= 1.1.1)
iterm2 (= 1.0.4)
libpng (= 1.0.0)
libtool (= 1.0.0)
module-data (= 0.0.3)
module_data (= 0.0.3)
mou (= 1.1)
mysql (= 1.2.0)
nginx (= 1.4.3)
nodejs (= 3.7.0)
nodejs (= 3.8.1)
onepassword (= 1.1.0)
openssl (= 1.0.0)
osx (= 2.5.0)
@@ -303,19 +303,19 @@ DEPENDENCIES
pkgconfig (= 1.0.0)
python (= 2.0.1)
repository (= 2.3.0)
ruby (= 8.1.2)
ruby (= 8.1.4)
sequel_pro (= 1.0.1)
shortcat (= 1.0.6)
skype (= 1.0.8)
slack (= 1.0.5)
spotify (= 1.0.1)
stdlib (= 4.1.0)
stdlib (= 4.2.1)
sublime_text_2 (= 1.1.2)
sudo (= 1.0.0)
tmux (= 1.0.5)
vagrant (= 3.0.9)
virtualbox (= 1.0.11)
wget (= 1.0.1)
xquartz (= 1.1.1)
xquartz (= 1.2.1)
zsh (= 1.0.0)

@@ -138,6 +138,7 @@ This template project provides the following by default:
* Ruby 2.0.0
* Ruby 2.1.0
* Ruby 2.1.1
* Ruby 2.1.2
* ack
* Findutils
* GNU tar
@@ -174,11 +175,11 @@ boxen repo (ex. /path/to/your-boxen/Puppetfile):
# Optional/custom modules. There are tons available at
# https://github.com/boxen.

github "java", "1.1.0"
github "java", "1.6.0"

In the above snippet of a customized Puppetfile, the bottom line
includes the Java module from Github using the tag "1.1.0" from the github repository
"boxen/puppet-java". The function "github" is defined at the top of the Puppetfile
includes the Java module from Github using the tag "1.6.0" from the github repository
"[boxen/puppet-java/releases](https://github.com/boxen/puppet-java/releases)". The function "github" is defined at the top of the Puppetfile
and takes the name of the module, the version, and optional repo location:

def github(name, version, options = nil)
@@ -190,7 +191,7 @@ and takes the name of the module, the version, and optional repo location:
Now Puppet knows where to download the module from when you include it in your site.pp or mypersonal.pp file:

# include the java module referenced in my Puppetfile with the line
# github "java", "1.1.0"
# github "java", "1.6.0"
include java

### Hiera
@@ -61,7 +61,7 @@ These will generate the respective lock files suitable for committing. Hope that

### 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
We recommend you 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

0 comments on commit 47f6e64

Please sign in to comment.
You can’t perform that action at this time.