Merge pull request #9 from boxen/update-module

Update Module

.travis.yml

@@ -0,0 +1,5 @@
+---
+script: "./script/cibuild"
+gemfile: "this/does/not/exist"
+rvm:
+  - "1.8.7"

Gemfile.lock

@@ -1,69 +1,72 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.2)
+    addressable (2.3.5)
     ansi (1.4.3)
-    boxen (1.0.0)
+    boxen (1.5.2)
       ansi (~> 1.4)
-      hiera (~> 1.0.0)
+      hiera (~> 1.0)
       highline (~> 1.6)
       json_pure (>= 1.7.7, < 2.0)
-      librarian-puppet (~> 0.9)
+      librarian-puppet (~> 0.9.9)
       octokit (~> 1.15)
       puppet (~> 3.0)
-    cardboard (1.0.0)
+    cardboard (1.0.4)
       boxen (~> 1.0)
       puppet-lint (~> 0.3)
       puppetlabs_spec_helper (~> 0.4)
       rspec-puppet (~> 0.1)
-    diff-lcs (1.1.3)
-    facter (1.6.17)
-    faraday (0.8.5)
-      multipart-post (~> 1.1)
+    diff-lcs (1.2.4)
+    facter (1.7.2)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
-    hashie (1.2.0)
-    hiera (1.0.0)
-    highline (1.6.15)
-    json (1.7.7)
-    json_pure (1.7.7)
-    librarian-puppet (0.9.8)
+    hashie (2.0.5)
+    hiera (1.2.1)
+      json_pure
+    highline (1.6.19)
+    json (1.8.0)
+    json_pure (1.8.0)
+    librarian-puppet (0.9.9)
       json
       thor (~> 0.15)
     metaclass (0.0.1)
-    mocha (0.13.2)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.6.0)
-    multipart-post (1.1.5)
+    multi_json (1.7.9)
+    multipart-post (1.2.0)
     netrc (0.7.7)
-    octokit (1.23.0)
+    octokit (1.25.0)
       addressable (~> 2.2)
       faraday (~> 0.8)
       faraday_middleware (~> 0.9)
-      hashie (~> 1.2)
+      hashie (~> 2.0)
       multi_json (~> 1.3)
       netrc (~> 0.7.7)
-    puppet (3.1.0)
+    puppet (3.2.4)
       facter (~> 1.6)
       hiera (~> 1.0)
+      rgen (~> 0.6.5)
     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.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
+    rake (10.1.0)
+    rgen (0.6.5)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
     rspec-puppet (0.1.6)
       rspec
-    thor (0.17.0)
+    thor (0.18.1)
 
 PLATFORMS
   ruby

README.md

@@ -1,5 +1,7 @@
 # elasticsearch Puppet Module for Boxen
 
+[![Build Status](https://travis-ci.org/boxen/puppet-elasticsearch.png?branch=master)](https://travis-ci.org/boxen/puppet-elasticsearch)
+
 Install [elasticsearch](http://www.elasticsearch.org), a distributed,
 RESTful search engine. The `BOXEN_ELASTICSEARCH_PORT` and 
 `BOXEN_ELASTICSEARCH_URL` environment variables are set.
@@ -13,6 +15,8 @@ include elasticsearch
 ## Required Puppet Modules
 
 * `boxen`
+* `homebrew`
+* `java`
 
 ## Development
 

spec/classes/elasticsearch_spec.rb

@@ -5,7 +5,7 @@
   let(:configdir) { "#{boxen_home}/config/elasticsearch" }
   let(:facts) do
     {
-      :boxen_home => '/opt/boxen',
+      :boxen_home => boxen_home,
       :boxen_user => 'testuser',
     }
   end

spec/fixtures/Puppetfile

@@ -1,4 +1,5 @@
-mod 'boxen',    '0.2.0', :github_tarball => 'boxen/puppet-boxen'
-mod 'homebrew', '0.2.0', :github_tarball => 'boxen/puppet-homebrew'
-mod 'java',     '0.0.2', :github_tarball => 'boxen/puppet-java'
-mod 'stdlib',   '3.0.0', :github_tarball => 'puppetlabs/puppetlabs-stdlib'
+mod 'boxen',      '3.0.2', :github_tarball => 'boxen/puppet-boxen'
+mod 'homebrew',   '1.4.1', :github_tarball => 'boxen/puppet-homebrew'
+mod 'repository', '2.2.0', :github_tarball => 'boxen/puppet-repository'
+mod 'java',       '1.1.2', :github_tarball => 'boxen/puppet-java'
+mod 'stdlib',     '4.1.0', :github_tarball => 'puppetlabs/puppetlabs-stdlib'