diff --git a/Gemfile b/Gemfile index 7b0a706..1b34f08 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "http://rubygems.org" -gem "boxen", "~> 0.5" +gem "boxen", "~> 0.7" group :development do gem "aws-sdk" diff --git a/Gemfile.lock b/Gemfile.lock index 3a15887..4ad4f3e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,12 +3,11 @@ GEM specs: addressable (2.3.2) ansi (1.4.3) - aws-sdk (1.7.1) - httparty (~> 0.7) + aws-sdk (1.8.1.2) json (~> 1.4) nokogiri (>= 1.4.4) uuidtools (~> 2.1) - boxen (0.5.2) + boxen (0.7.1) ansi (~> 1.4) hiera (~> 1.0.0) highline (~> 1.6) @@ -16,37 +15,35 @@ GEM librarian-puppet (~> 0.9) octokit (~> 1.15) puppet (~> 3.0) - facter (1.6.16) - faraday (0.8.4) + facter (1.6.17) + faraday (0.8.5) multipart-post (~> 1.1) faraday_middleware (0.9.0) faraday (>= 0.7.4, < 0.9) hashie (1.2.0) hiera (1.0.0) highline (1.6.15) - httparty (0.9.0) - multi_json (~> 1.0) - multi_xml - json (1.7.5) - json_pure (1.7.5) + json (1.7.6) + json_pure (1.7.6) librarian-puppet (0.9.7) json puppet thor (~> 0.15) - multi_json (1.4.0) - multi_xml (0.5.1) + multi_json (1.5.0) multipart-post (1.1.5) - nokogiri (1.5.5) - octokit (1.19.0) + netrc (0.7.7) + nokogiri (1.5.6) + octokit (1.22.0) addressable (~> 2.2) faraday (~> 0.8) faraday_middleware (~> 0.9) hashie (~> 1.2) multi_json (~> 1.3) - puppet (3.0.1) - facter (~> 1.6.11) - hiera (~> 1.0.0) - thor (0.16.0) + netrc (~> 0.7.7) + puppet (3.1.0) + facter (~> 1.6) + hiera (~> 1.0) + thor (0.17.0) uuidtools (2.1.3) PLATFORMS @@ -54,4 +51,4 @@ PLATFORMS DEPENDENCIES aws-sdk - boxen (~> 0.5) + boxen (~> 0.7) diff --git a/Puppetfile b/Puppetfile index 3f845d3..0eee71b 100644 --- a/Puppetfile +++ b/Puppetfile @@ -1,27 +1,36 @@ -# This file manages Puppet module dependencies. -# # It works a lot like Bundler. We provide some core modules by # default. This ensures at least the ability to construct a basic # environment. +def github(name, version, options = nil) + options ||= {} + options[:repo] ||= "boxen/puppet-#{name}" + mod name, version, :github_tarball => options[:repo] +end + +# Core modules for a basic development environment. You can replace +# some/most of those if you want, but it's not recommended. + # Includes many of our custom types and providers, as well as global # config. Required. -# Core modules for a basic development environment. -# You can replace some/most of those if you want, but it's not recommended. +github "boxen", "0.2.3" -mod "boxen", "0.1.8", :github_tarball => "boxen/puppet-boxen" -mod "dnsmasq", "0.0.1", :github_tarball => "boxen/puppet-dnsmasq" -mod "git", "0.0.3", :github_tarball => "boxen/puppet-git" -mod "hub", "0.0.1", :github_tarball => "boxen/puppet-hub" -mod "homebrew", "0.0.17", :github_tarball => "boxen/puppet-homebrew" -mod "inifile", "0.0.1", :github_tarball => "boxen/puppet-inifile" -mod "nginx", "0.0.2", :github_tarball => "boxen/puppet-nginx" -mod "nodejs", "0.0.2", :github_tarball => "boxen/puppet-nodejs" -mod "nvm", "0.0.5", :github_tarball => "boxen/puppet-nvm" -mod "ruby", "0.4.0", :github_tarball => "boxen/puppet-ruby" -mod "stdlib", "3.0.0", :github_tarball => "puppetlabs/puppetlabs-stdlib" -mod "sudo", "0.0.1", :github_tarball => "boxen/puppet-sudo" +# Core modules for a basic development environment. You can replace +# some/most of these if you want, but it's not recommended. -# Add your custom modules here. -# There are tons available at https://github.com/boxen. +github "dnsmasq", "0.2.1" +github "gcc", "0.0.2" +github "git", "0.1.0" +github "homebrew", "0.3.2" +github "hub", "0.0.1" +github "inifile", "0.9.0", :repo => "cprice-puppet/puppetlabs-inifile" +github "nginx", "0.2.1" +github "nodejs", "0.0.2" +github "nvm", "0.0.5" +github "ruby", "0.4.2" +github "stdlib", "3.0.0", :repo => "puppetlabs/puppetlabs-stdlib" +github "sudo", "0.0.1" + +# Optional/custom modules. There are tons available at +# https://github.com/boxen. diff --git a/Puppetfile.lock b/Puppetfile.lock index fd3e32a..473f06d 100644 --- a/Puppetfile.lock +++ b/Puppetfile.lock @@ -1,37 +1,37 @@ GITHUBTARBALL remote: boxen/puppet-boxen specs: - boxen (0.1.8) + boxen (0.2.3) GITHUBTARBALL remote: boxen/puppet-dnsmasq specs: - dnsmasq (0.0.1) + dnsmasq (0.2.1) + +GITHUBTARBALL + remote: boxen/puppet-gcc + specs: + gcc (0.0.2) GITHUBTARBALL remote: boxen/puppet-git specs: - git (0.0.3) + git (0.1.0) GITHUBTARBALL remote: boxen/puppet-homebrew specs: - homebrew (0.0.17) + homebrew (0.3.2) GITHUBTARBALL remote: boxen/puppet-hub specs: hub (0.0.1) -GITHUBTARBALL - remote: boxen/puppet-inifile - specs: - inifile (0.0.1) - GITHUBTARBALL remote: boxen/puppet-nginx specs: - nginx (0.0.2) + nginx (0.2.1) GITHUBTARBALL remote: boxen/puppet-nodejs @@ -46,29 +46,35 @@ GITHUBTARBALL GITHUBTARBALL remote: boxen/puppet-ruby specs: - ruby (0.4.0) + ruby (0.4.2) GITHUBTARBALL remote: boxen/puppet-sudo specs: sudo (0.0.1) +GITHUBTARBALL + remote: cprice-puppet/puppetlabs-inifile + specs: + inifile (0.9.0) + GITHUBTARBALL remote: puppetlabs/puppetlabs-stdlib specs: stdlib (3.0.0) DEPENDENCIES - boxen (= 0.1.8) - dnsmasq (= 0.0.1) - git (= 0.0.3) - homebrew (= 0.0.17) + boxen (= 0.2.3) + dnsmasq (= 0.2.1) + gcc (= 0.0.2) + git (= 0.1.0) + homebrew (= 0.3.2) hub (= 0.0.1) - inifile (= 0.0.1) - nginx (= 0.0.2) + inifile (= 0.9.0) + nginx (= 0.2.1) nodejs (= 0.0.2) nvm (= 0.0.5) - ruby (= 0.4.0) + ruby (= 0.4.2) stdlib (= 3.0.0) sudo (= 0.0.1) diff --git a/vendor/cache/aws-sdk-1.7.1.gem b/vendor/cache/aws-sdk-1.7.1.gem deleted file mode 100644 index 9780996..0000000 Binary files a/vendor/cache/aws-sdk-1.7.1.gem and /dev/null differ diff --git a/vendor/cache/aws-sdk-1.8.1.2.gem b/vendor/cache/aws-sdk-1.8.1.2.gem new file mode 100644 index 0000000..f3d3f66 Binary files /dev/null and b/vendor/cache/aws-sdk-1.8.1.2.gem differ diff --git a/vendor/cache/boxen-0.5.2.gem b/vendor/cache/boxen-0.5.2.gem deleted file mode 100644 index e0d31d3..0000000 Binary files a/vendor/cache/boxen-0.5.2.gem and /dev/null differ diff --git a/vendor/cache/boxen-0.7.1.gem b/vendor/cache/boxen-0.7.1.gem new file mode 100644 index 0000000..9a7f6c0 Binary files /dev/null and b/vendor/cache/boxen-0.7.1.gem differ diff --git a/vendor/cache/facter-1.6.16.gem b/vendor/cache/facter-1.6.16.gem deleted file mode 100644 index e10c3df..0000000 Binary files a/vendor/cache/facter-1.6.16.gem and /dev/null differ diff --git a/vendor/cache/facter-1.6.17.gem b/vendor/cache/facter-1.6.17.gem new file mode 100644 index 0000000..7cd8b93 Binary files /dev/null and b/vendor/cache/facter-1.6.17.gem differ diff --git a/vendor/cache/faraday-0.8.4.gem b/vendor/cache/faraday-0.8.4.gem deleted file mode 100644 index 0725eb8..0000000 Binary files a/vendor/cache/faraday-0.8.4.gem and /dev/null differ diff --git a/vendor/cache/faraday-0.8.5.gem b/vendor/cache/faraday-0.8.5.gem new file mode 100644 index 0000000..d041185 Binary files /dev/null and b/vendor/cache/faraday-0.8.5.gem differ diff --git a/vendor/cache/httparty-0.9.0.gem b/vendor/cache/httparty-0.9.0.gem deleted file mode 100644 index 62f851d..0000000 Binary files a/vendor/cache/httparty-0.9.0.gem and /dev/null differ diff --git a/vendor/cache/json-1.7.5.gem b/vendor/cache/json-1.7.5.gem deleted file mode 100644 index 737f5c8..0000000 Binary files a/vendor/cache/json-1.7.5.gem and /dev/null differ diff --git a/vendor/cache/json-1.7.6.gem b/vendor/cache/json-1.7.6.gem new file mode 100644 index 0000000..97a3171 Binary files /dev/null and b/vendor/cache/json-1.7.6.gem differ diff --git a/vendor/cache/json_pure-1.7.5.gem b/vendor/cache/json_pure-1.7.5.gem deleted file mode 100644 index 1360701..0000000 Binary files a/vendor/cache/json_pure-1.7.5.gem and /dev/null differ diff --git a/vendor/cache/json_pure-1.7.6.gem b/vendor/cache/json_pure-1.7.6.gem new file mode 100644 index 0000000..b9bbd6c Binary files /dev/null and b/vendor/cache/json_pure-1.7.6.gem differ diff --git a/vendor/cache/multi_json-1.4.0.gem b/vendor/cache/multi_json-1.4.0.gem deleted file mode 100644 index b5709ff..0000000 Binary files a/vendor/cache/multi_json-1.4.0.gem and /dev/null differ diff --git a/vendor/cache/multi_json-1.5.0.gem b/vendor/cache/multi_json-1.5.0.gem new file mode 100644 index 0000000..adaa5f3 Binary files /dev/null and b/vendor/cache/multi_json-1.5.0.gem differ diff --git a/vendor/cache/multi_xml-0.5.1.gem b/vendor/cache/multi_xml-0.5.1.gem deleted file mode 100644 index 27d7aa8..0000000 Binary files a/vendor/cache/multi_xml-0.5.1.gem and /dev/null differ diff --git a/vendor/cache/netrc-0.7.7.gem b/vendor/cache/netrc-0.7.7.gem new file mode 100644 index 0000000..c99f913 Binary files /dev/null and b/vendor/cache/netrc-0.7.7.gem differ diff --git a/vendor/cache/nokogiri-1.5.5.gem b/vendor/cache/nokogiri-1.5.5.gem deleted file mode 100644 index 9f556d5..0000000 Binary files a/vendor/cache/nokogiri-1.5.5.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.5.6.gem b/vendor/cache/nokogiri-1.5.6.gem new file mode 100644 index 0000000..cb13200 Binary files /dev/null and b/vendor/cache/nokogiri-1.5.6.gem differ diff --git a/vendor/cache/octokit-1.19.0.gem b/vendor/cache/octokit-1.19.0.gem deleted file mode 100644 index f60638c..0000000 Binary files a/vendor/cache/octokit-1.19.0.gem and /dev/null differ diff --git a/vendor/cache/octokit-1.22.0.gem b/vendor/cache/octokit-1.22.0.gem new file mode 100644 index 0000000..362595a Binary files /dev/null and b/vendor/cache/octokit-1.22.0.gem differ diff --git a/vendor/cache/puppet-3.0.1.gem b/vendor/cache/puppet-3.0.1.gem deleted file mode 100644 index 7afc4f9..0000000 Binary files a/vendor/cache/puppet-3.0.1.gem and /dev/null differ diff --git a/vendor/cache/puppet-3.1.0.gem b/vendor/cache/puppet-3.1.0.gem new file mode 100644 index 0000000..8ad660e Binary files /dev/null and b/vendor/cache/puppet-3.1.0.gem differ diff --git a/vendor/cache/thor-0.16.0.gem b/vendor/cache/thor-0.16.0.gem deleted file mode 100644 index 55952e8..0000000 Binary files a/vendor/cache/thor-0.16.0.gem and /dev/null differ diff --git a/vendor/cache/thor-0.17.0.gem b/vendor/cache/thor-0.17.0.gem new file mode 100644 index 0000000..6dff561 Binary files /dev/null and b/vendor/cache/thor-0.17.0.gem differ diff --git a/vendor/puppet/cache/boxen-puppet-boxen-0.1.8.tar.gz b/vendor/puppet/cache/boxen-puppet-boxen-0.1.8.tar.gz deleted file mode 100644 index 99a326a..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-boxen-0.1.8.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-boxen-0.2.3.tar.gz b/vendor/puppet/cache/boxen-puppet-boxen-0.2.3.tar.gz new file mode 100644 index 0000000..68c1f9c Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-boxen-0.2.3.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-dnsmasq-0.0.1.tar.gz b/vendor/puppet/cache/boxen-puppet-dnsmasq-0.0.1.tar.gz deleted file mode 100644 index ad96617..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-dnsmasq-0.0.1.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-dnsmasq-0.2.1.tar.gz b/vendor/puppet/cache/boxen-puppet-dnsmasq-0.2.1.tar.gz new file mode 100644 index 0000000..7726284 Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-dnsmasq-0.2.1.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-gcc-0.0.2.tar.gz b/vendor/puppet/cache/boxen-puppet-gcc-0.0.2.tar.gz new file mode 100644 index 0000000..6587043 Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-gcc-0.0.2.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-git-0.0.3.tar.gz b/vendor/puppet/cache/boxen-puppet-git-0.0.3.tar.gz deleted file mode 100644 index 17537d0..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-git-0.0.3.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-git-0.1.0.tar.gz b/vendor/puppet/cache/boxen-puppet-git-0.1.0.tar.gz new file mode 100644 index 0000000..b5412bb Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-git-0.1.0.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-homebrew-0.0.17.tar.gz b/vendor/puppet/cache/boxen-puppet-homebrew-0.0.17.tar.gz deleted file mode 100644 index 1597b46..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-homebrew-0.0.17.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-homebrew-0.3.2.tar.gz b/vendor/puppet/cache/boxen-puppet-homebrew-0.3.2.tar.gz new file mode 100644 index 0000000..ca772c1 Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-homebrew-0.3.2.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-nginx-0.0.2.tar.gz b/vendor/puppet/cache/boxen-puppet-nginx-0.0.2.tar.gz deleted file mode 100644 index 576ff9e..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-nginx-0.0.2.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-nginx-0.2.1.tar.gz b/vendor/puppet/cache/boxen-puppet-nginx-0.2.1.tar.gz new file mode 100644 index 0000000..6bdcc81 Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-nginx-0.2.1.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-ruby-0.4.0.tar.gz b/vendor/puppet/cache/boxen-puppet-ruby-0.4.0.tar.gz deleted file mode 100644 index e99f635..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-ruby-0.4.0.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-ruby-0.4.2.tar.gz b/vendor/puppet/cache/boxen-puppet-ruby-0.4.2.tar.gz new file mode 100644 index 0000000..fceff2b Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-ruby-0.4.2.tar.gz differ diff --git a/vendor/puppet/cache/cprice-puppet-puppetlabs-inifile-0.9.0.tar.gz b/vendor/puppet/cache/cprice-puppet-puppetlabs-inifile-0.9.0.tar.gz new file mode 100644 index 0000000..770591e Binary files /dev/null and b/vendor/puppet/cache/cprice-puppet-puppetlabs-inifile-0.9.0.tar.gz differ