Skip to content
Permalink
Browse files

Merge with upstream

  • Loading branch information...
kieran-bamforth committed Feb 19, 2015
2 parents 9f0e3bb + 2f643f5 commit ce44e80a991e1fb801c9a60dde212911b244bb2a
Showing with 465 additions and 175 deletions.
  1. +2 −3 Gemfile
  2. +24 −27 Gemfile.lock
  3. +12 −11 Puppetfile
  4. +27 −19 Puppetfile.lock
  5. +12 −2 docs/faq.md
  6. +56 −0 docs/updates.md
  7. +7 −0 facts.d/example.yaml
  8. +26 −0 hiera/users/README.md
  9. +73 −17 script/bootstrap
  10. +120 −35 script/boxen
  11. +106 −61 script/sync
  12. BIN vendor/cache/aws-sdk-1.48.1.gem
  13. BIN vendor/cache/aws-sdk-core-2.0.11.gem
  14. BIN vendor/cache/facter-2.2.0-universal-darwin.gem
  15. BIN vendor/cache/facter-2.3.0-universal-darwin.gem
  16. BIN vendor/cache/jmespath-1.0.1.gem
  17. BIN vendor/cache/librarian-puppet-1.0.5.gem
  18. BIN vendor/cache/librarian-puppet-1.0.9.gem
  19. BIN vendor/cache/mini_portile-0.6.0.gem
  20. BIN vendor/cache/multi_json-1.10.1.gem
  21. BIN vendor/cache/multi_xml-0.5.5.gem
  22. BIN vendor/cache/nokogiri-1.6.3.1.gem
  23. BIN vendor/cache/rbvmomi-1.8.1.gem
  24. BIN vendor/cache/rspec-3.0.0.gem
  25. BIN vendor/cache/rspec-3.1.0.gem
  26. BIN vendor/cache/rspec-core-3.0.3.gem
  27. BIN vendor/cache/rspec-core-3.1.7.gem
  28. BIN vendor/cache/rspec-expectations-3.0.3.gem
  29. BIN vendor/cache/rspec-expectations-3.1.2.gem
  30. BIN vendor/cache/rspec-mocks-3.0.3.gem
  31. BIN vendor/cache/rspec-mocks-3.1.3.gem
  32. BIN vendor/cache/rspec-support-3.0.3.gem
  33. BIN vendor/cache/rspec-support-3.1.2.gem
  34. BIN vendor/cache/trollop-2.0.gem
  35. BIN vendor/puppet/cache/boxen-puppet-boxen-3.10.1.tar.gz
  36. BIN vendor/puppet/cache/boxen-puppet-boxen-3.7.0.tar.gz
  37. BIN vendor/puppet/cache/boxen-puppet-brewcask-0.0.4.tar.gz
  38. BIN vendor/puppet/cache/boxen-puppet-dnsmasq-2.0.0.tar.gz
  39. BIN vendor/puppet/cache/boxen-puppet-dnsmasq-2.0.1.tar.gz
  40. BIN vendor/puppet/cache/boxen-puppet-git-2.5.0.tar.gz
  41. BIN vendor/puppet/cache/boxen-puppet-git-2.7.1.tar.gz
  42. BIN vendor/puppet/cache/boxen-puppet-go-1.1.0.tar.gz
  43. BIN vendor/puppet/cache/boxen-puppet-go-2.1.0.tar.gz
  44. BIN vendor/puppet/cache/boxen-puppet-homebrew-1.11.2.tar.gz
  45. BIN vendor/puppet/cache/boxen-puppet-homebrew-1.9.5.tar.gz
  46. BIN vendor/puppet/cache/boxen-puppet-hub-1.3.0.tar.gz
  47. BIN vendor/puppet/cache/boxen-puppet-hub-1.4.0.tar.gz
  48. BIN vendor/puppet/cache/boxen-puppet-nginx-1.4.3.tar.gz
  49. BIN vendor/puppet/cache/boxen-puppet-nginx-1.4.4.tar.gz
  50. BIN vendor/puppet/cache/boxen-puppet-nodejs-3.8.1.tar.gz
  51. BIN vendor/puppet/cache/boxen-puppet-nodejs-4.0.0.tar.gz
  52. BIN vendor/puppet/cache/boxen-puppet-ruby-8.1.4.tar.gz
  53. BIN vendor/puppet/cache/boxen-puppet-ruby-8.1.7.tar.gz
@@ -2,7 +2,7 @@ source "https://rubygems.org"

gem "boxen", "~> 2.7.0"
gem "hiera", "~> 1.3.3"
gem "librarian-puppet", "~> 1.0.5"
gem "librarian-puppet", "~> 1.0.9"
gem "puppet", "3.7.1"
gem "puppet-lint", "0.3.2"
gem "puppetlabs_spec_helper", "0.4.1"
@@ -12,7 +12,6 @@ gem "rspec-puppet", "1.0.1"
gem "deep_merge", "~> 1.0"

group :development do
gem "aws-sdk", "~> 1.42"
gem "aws-sdk-core", "~> 2.0.11"
gem "net-ssh"
gem "rbvmomi"
end
@@ -4,9 +4,11 @@ GEM
CFPropertyList (2.2.8)
addressable (2.3.6)
ansi (1.4.3)
aws-sdk (1.48.1)
json (~> 1.4)
nokogiri (>= 1.4.4)
aws-sdk-core (2.0.11)
builder (~> 3.0)
jmespath (~> 1.0)
multi_json (~> 1.0)
multi_xml (~> 0.5)
boxen (2.7.0)
ansi (~> 1.4)
hiera (~> 1.0)
@@ -18,29 +20,30 @@ GEM
builder (3.2.2)
deep_merge (1.0.1)
diff-lcs (1.2.5)
facter (2.2.0)
facter (2.3.0)
CFPropertyList (~> 2.2.6)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
hiera (1.3.4)
json_pure
highline (1.6.21)
jmespath (1.0.1)
multi_json (~> 1.0)
json (1.8.1)
json_pure (1.8.1)
librarian (0.1.2)
highline
thor (~> 0.15)
librarian-puppet (1.0.5)
librarian-puppet (1.0.9)
json
librarian (>= 0.1.2)
metaclass (0.0.4)
mini_portile (0.6.0)
mocha (1.1.0)
metaclass (~> 0.0.1)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
net-ssh (2.9.1)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
octokit (2.7.2)
sawyer (~> 0.5.2)
open4 (1.3.4)
@@ -55,44 +58,38 @@ GEM
rspec (>= 2.9.0)
rspec-puppet (>= 0.1.1)
rake (10.3.2)
rbvmomi (1.8.1)
builder
nokogiri (>= 1.4.1)
trollop
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)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.3)
rspec-support (~> 3.0.0)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-puppet (1.0.1)
rspec
rspec-support (3.0.3)
rspec-support (3.1.2)
sawyer (0.5.5)
addressable (~> 2.3.5)
faraday (~> 0.8, < 0.10)
thor (0.19.1)
trollop (2.0)

PLATFORMS
ruby

DEPENDENCIES
aws-sdk (~> 1.42)
aws-sdk-core (~> 2.0.11)
boxen (~> 2.7.0)
deep_merge (~> 1.0)
hiera (~> 1.3.3)
librarian-puppet (~> 1.0.5)
librarian-puppet (~> 1.0.9)
net-ssh
open4 (~> 1.3.4)
puppet (= 3.7.1)
puppet-lint (= 0.3.2)
puppetlabs_spec_helper (= 0.4.1)
rake (= 10.3.2)
rbvmomi
rspec-puppet (= 1.0.1)
@@ -23,13 +23,13 @@ end

# Shortcut for a module under development
def dev(name, *args)
mod name, :path => "#{ENV['HOME']}/src/boxen/puppet-#{name}"
mod "puppet-#{name}", :path => "#{ENV['HOME']}/src/boxen/puppet-#{name}"
end

# Includes many of our custom types and providers, as well as global
# config. Required.

github "boxen", "3.7.0"
github "boxen", "3.10.1"

# Support for default hiera data in modules

@@ -38,21 +38,22 @@ 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", "2.0.0"
github "brewcask", "0.0.4"
github "dnsmasq", "2.0.1"
github "foreman", "1.2.0"
github "gcc", "2.2.0"
github "git", "2.5.0"
github "go", "1.1.0"
github "homebrew", "1.9.5"
github "hub", "1.3.0"
github "git", "2.7.1"
github "go", "2.1.0"
github "homebrew", "1.11.2"
github "hub", "1.4.0"
github "inifile", "1.1.1", :repo => "puppetlabs/puppetlabs-inifile"
github "nginx", "1.4.3"
github "nodejs", "3.8.1"
github "nginx", "1.4.4"
github "nodejs", "4.0.0"
github "openssl", "1.0.0"
github "phantomjs", "2.3.0"
github "pkgconfig", "1.0.0"
github "repository", "2.3.0"
github "ruby", "8.1.4"
github "ruby", "8.1.7"
github "stdlib", "4.2.1", :repo => "puppetlabs/puppetlabs-stdlib"
github "sudo", "1.0.0"
github "xquartz", "1.2.1"
@@ -95,4 +96,4 @@ github "evernote", "2.0.6", :repo => "jasonamyers/puppet-evernote"
github "induction", "1.0.0"
github "firefox", "1.2.1"
github "vagrant_manager","0.0.1"
github "vim", "1.0.5"
github "vim", "1.0.5"
@@ -11,7 +11,13 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-boxen
specs:
boxen (3.7.0)
boxen (3.10.1)

GITHUBTARBALL
remote: boxen/puppet-brewcask
specs:
brewcask (0.0.4)


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

GITHUBTARBALL
remote: boxen/puppet-dropbox
@@ -56,7 +62,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-git
specs:
git (2.5.0)
git (2.7.1)

GITHUBTARBALL
remote: boxen/puppet-gitx
@@ -66,7 +72,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-go
specs:
go (1.1.0)
go (2.1.0)

GITHUBTARBALL
remote: boxen/puppet-harvest
@@ -76,12 +82,12 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-homebrew
specs:
homebrew (1.9.5)
homebrew (1.11.2)

GITHUBTARBALL
remote: boxen/puppet-hub
specs:
hub (1.3.0)
hub (1.4.0)

GITHUBTARBALL
remote: boxen/puppet-induction
@@ -116,12 +122,12 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-nginx
specs:
nginx (1.4.3)
nginx (1.4.4)

GITHUBTARBALL
remote: boxen/puppet-nodejs
specs:
nodejs (3.8.1)
nodejs (4.0.0)

GITHUBTARBALL
remote: boxen/puppet-onepassword
@@ -166,7 +172,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-ruby
specs:
ruby (8.1.4)
ruby (8.1.7)

GITHUBTARBALL
remote: boxen/puppet-sequel_pro
@@ -276,22 +282,24 @@ GITHUBTARBALL
DEPENDENCIES
alfred (= 1.1.8)
autoconf (= 1.0.0)
boxen (= 3.7.0)
chrome (= 1.1.2)
boxen (= 3.10.1)
brewcask (= 0.0.4)
chrome (= 1.1.2)

dash (= 1.0.0)
dnsmasq (= 2.0.0)
dnsmasq (= 2.0.1)
dropbox (= 1.2.0)
evernote (= 2.0.6)
firefox (= 1.2.1)
flux (= 1.0.1)
foreman (= 1.2.0)
gcc (= 2.2.0)
git (= 2.5.0)
git (= 2.7.1)
gitx (= 1.2.0)
go (= 1.1.0)
go (= 2.1.0)
harvest (= 1.0.2)
homebrew (= 1.9.5)
hub (= 1.3.0)
homebrew (= 1.11.2)
hub (= 1.4.0)
induction (= 1.0.0)
inifile (= 1.1.1)
iterm2 (= 1.0.4)
@@ -300,8 +308,8 @@ DEPENDENCIES
module_data (= 0.0.3)
mou (= 1.1)
mysql (= 1.2.0)
nginx (= 1.4.3)
nodejs (= 3.8.1)
nginx (= 1.4.4)
nodejs (= 4.0.0)
onepassword (= 1.1.0)
openssl (= 1.0.0)
osx (= 2.5.0)
@@ -313,7 +321,7 @@ DEPENDENCIES
pkgconfig (= 1.0.0)
python (= 2.0.1)
repository (= 2.3.0)
ruby (= 8.1.4)
ruby (= 8.1.7)
sequel_pro (= 1.0.1)
shortcat (= 1.0.6)
skype (= 1.0.8)
@@ -2,6 +2,16 @@

Below you can find common questions and answers.

### Q: Boxen Keychain Helper: Encountered error code: -25308
If you run `boxen` in a session without GUI (e.g. via SSH), you will most likely need to unlock the keychain manually.

```
security create-keychain -p $your_password $keychain_name
security default-keychain -d user -s $keychain_name
# if necessary..
security unlock-keychain -p $your_password # unlocks the default keychain, which boxen will use to store the token
```

### Q: How do you uninstall an application and get it to reinstall in the application folder with boxen?

When removing applications make sure to remove the corresponding `/var/db/.puppet_appdmg_installed_application` so that boxen will reinstall it.
@@ -42,7 +52,7 @@ The next step is to update your Puppet modules and RubyGems. First delete Puppet

```bash
rm Puppetfile.lock Gemfile.lock
bundle install --no-deployment --without development
bundle install --no-deployment --without development --path .bundle
bundle exec librarian-puppet install --clean
```

@@ -52,7 +62,7 @@ bundle exec librarian-puppet install --clean
One approach is to delete the Gemfile.lock and Puppetfile.lock and run:

# Regenerates Gemfile.lock and installs new Gems
bundle install --without development
bundle install --without development --path .bundle

# Regenerates Puppetfile.lock and caches tarballs
bundle exec librarian-puppet install --clean

0 comments on commit ce44e80

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