diff --git a/Gemfile b/Gemfile index 213c967..ca74d0f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "boxen", "~> 1.4" +gem "boxen", "~> 1.5" gem "open4", "~> 1.3" group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 22d75de..cd04180 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ GEM json (~> 1.4) nokogiri (>= 1.4.4) uuidtools (~> 2.1) - boxen (1.4.2) + boxen (1.5.2) ansi (~> 1.4) hiera (~> 1.0) highline (~> 1.6) @@ -43,10 +43,10 @@ GEM multi_json (~> 1.3) netrc (~> 0.7.7) open4 (1.3.0) - puppet (3.2.2) + puppet (3.2.3) facter (~> 1.6) hiera (~> 1.0) - rgen (~> 0.6) + rgen (~> 0.6.5) rbvmomi (1.6.0) builder nokogiri (>= 1.4.1) @@ -61,7 +61,7 @@ PLATFORMS DEPENDENCIES aws-sdk - boxen (~> 1.4) + boxen (~> 1.5) net-ssh open4 (~> 1.3) rbvmomi diff --git a/Puppetfile b/Puppetfile index 1efa42d..b7975d4 100644 --- a/Puppetfile +++ b/Puppetfile @@ -13,7 +13,7 @@ end # Includes many of our custom types and providers, as well as global # config. Required. -github "boxen", "2.3.6" +github "boxen", "3.0.1" # Core modules for a basic development environment. You can replace # some/most of these if you want, but it's not recommended. @@ -22,8 +22,8 @@ github "autoconf", "1.0.0" github "dnsmasq", "1.0.0" github "gcc", "2.0.1" github "git", "1.2.5" -github "homebrew", "1.2.1" -github "hub", "1.0.0" +github "homebrew", "1.4.1" +github "hub", "1.0.3" github "inifile", "1.0.0", :repo => "puppetlabs/puppetlabs-inifile" github "nginx", "1.4.2" github "nodejs", "3.2.8" diff --git a/Puppetfile.lock b/Puppetfile.lock index be957bf..a43cbc1 100644 --- a/Puppetfile.lock +++ b/Puppetfile.lock @@ -6,7 +6,7 @@ GITHUBTARBALL GITHUBTARBALL remote: boxen/puppet-boxen specs: - boxen (2.3.6) + boxen (3.0.1) GITHUBTARBALL remote: boxen/puppet-dnsmasq @@ -26,12 +26,12 @@ GITHUBTARBALL GITHUBTARBALL remote: boxen/puppet-homebrew specs: - homebrew (1.2.1) + homebrew (1.4.1) GITHUBTARBALL remote: boxen/puppet-hub specs: - hub (1.0.0) + hub (1.0.3) GITHUBTARBALL remote: boxen/puppet-nginx @@ -80,12 +80,12 @@ GITHUBTARBALL DEPENDENCIES autoconf (= 1.0.0) - boxen (= 2.3.6) + boxen (= 3.0.1) dnsmasq (= 1.0.0) gcc (= 2.0.1) git (= 1.2.5) - homebrew (= 1.2.1) - hub (= 1.0.0) + homebrew (= 1.4.1) + hub (= 1.0.3) inifile (= 1.0.0) nginx (= 1.4.2) nodejs (= 3.2.8) diff --git a/manifests/site.pp b/manifests/site.pp index 20b79ea..411b7af 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -5,7 +5,7 @@ require gcc Exec { group => 'staff', logoutput => on_failure, - user => $luser, + user => $boxen_user, path => [ "${boxen::config::home}/rbenv/shims", @@ -20,13 +20,13 @@ Exec { environment => [ "HOMEBREW_CACHE=${homebrew::config::cachedir}", - "HOME=/Users/${::luser}" + "HOME=/Users/${::boxen_user}" ] } File { group => 'staff', - owner => $luser + owner => $boxen_user } Package { diff --git a/modules/people/README.md b/modules/people/README.md index 4afcedf..f1a0c6e 100644 --- a/modules/people/README.md +++ b/modules/people/README.md @@ -8,7 +8,7 @@ class people::jbarnette { include emacs # requires emacs module in Puppetfile include sparrow # requires sparrow module in Puppetfile - $home = "/Users/${::luser}" + $home = "/Users/${::boxen_user}" $my = "${home}/my" $dotfiles = "${my}/dotfiles" diff --git a/vendor/cache/boxen-1.4.2.gem b/vendor/cache/boxen-1.4.2.gem deleted file mode 100644 index dd5b4fb..0000000 Binary files a/vendor/cache/boxen-1.4.2.gem and /dev/null differ diff --git a/vendor/cache/boxen-1.5.2.gem b/vendor/cache/boxen-1.5.2.gem new file mode 100644 index 0000000..91636ec Binary files /dev/null and b/vendor/cache/boxen-1.5.2.gem differ diff --git a/vendor/cache/puppet-3.2.2.gem b/vendor/cache/puppet-3.2.2.gem deleted file mode 100644 index 2db3701..0000000 Binary files a/vendor/cache/puppet-3.2.2.gem and /dev/null differ diff --git a/vendor/cache/puppet-3.2.3.gem b/vendor/cache/puppet-3.2.3.gem new file mode 100644 index 0000000..69d1479 Binary files /dev/null and b/vendor/cache/puppet-3.2.3.gem differ diff --git a/vendor/puppet/cache/boxen-puppet-boxen-2.3.6.tar.gz b/vendor/puppet/cache/boxen-puppet-boxen-2.3.6.tar.gz deleted file mode 100644 index 993f2f2..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-boxen-2.3.6.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-boxen-3.0.1.tar.gz b/vendor/puppet/cache/boxen-puppet-boxen-3.0.1.tar.gz new file mode 100644 index 0000000..c423c56 Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-boxen-3.0.1.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-homebrew-1.2.1.tar.gz b/vendor/puppet/cache/boxen-puppet-homebrew-1.2.1.tar.gz deleted file mode 100644 index 15cdafc..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-homebrew-1.2.1.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-homebrew-1.4.1.tar.gz b/vendor/puppet/cache/boxen-puppet-homebrew-1.4.1.tar.gz new file mode 100644 index 0000000..e361a59 Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-homebrew-1.4.1.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-hub-1.0.0.tar.gz b/vendor/puppet/cache/boxen-puppet-hub-1.0.0.tar.gz deleted file mode 100644 index 26cf708..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-hub-1.0.0.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-hub-1.0.3.tar.gz b/vendor/puppet/cache/boxen-puppet-hub-1.0.3.tar.gz new file mode 100644 index 0000000..d7a9dd8 Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-hub-1.0.3.tar.gz differ