diff --git a/.travis.yml b/.travis.yml index 80707b4..c365f95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ script: "./script/cibuild" gemfile: "this/does/not/exist" rvm: - - "1.8.7" + - "2.0.0" diff --git a/Gemfile b/Gemfile index b35fba7..acf5f45 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "cardboard", "~> 1.0" +gem "cardboard", "~> 2.1" diff --git a/Gemfile.lock b/Gemfile.lock index 20f1cf3..6034bde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,72 +1,83 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.3.2) - ansi (1.4.3) - boxen (1.0.0) + CFPropertyList (2.2.8) + addressable (2.3.8) + ansi (1.5.0) + boxen (2.9.0) ansi (~> 1.4) - hiera (~> 1.0.0) - highline (~> 1.6) + hiera (~> 1.0) + highline (~> 1.6.0) json_pure (>= 1.7.7, < 2.0) - librarian-puppet (~> 0.9) - octokit (~> 1.15) - puppet (~> 3.0) - cardboard (1.0.0) - boxen (~> 1.0) + librarian-puppet (~> 1.0.0) + octokit (~> 2.7, >= 2.7.1) + puppet (~> 3.7) + cardboard (2.1.0) + boxen (~> 2.1) 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) - 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) - json + rspec-puppet (~> 1.0) + diff-lcs (1.2.5) + facter (2.4.6) + CFPropertyList (~> 2.2.6) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + hiera (1.3.4) + json_pure + highline (1.6.21) + json (2.0.2) + json_pure (1.8.3) + librarian (0.1.2) + highline thor (~> 0.15) - metaclass (0.0.1) - mocha (0.13.2) + librarian-puppet (1.0.9) + json + librarian (>= 0.1.2) + metaclass (0.0.4) + mocha (1.2.1) metaclass (~> 0.0.1) - multi_json (1.6.0) - multipart-post (1.1.5) - netrc (0.7.7) - octokit (1.23.0) - addressable (~> 2.2) - faraday (~> 0.8) - faraday_middleware (~> 0.9) - hashie (~> 1.2) - multi_json (~> 1.3) - netrc (~> 0.7.7) - puppet (3.1.0) - facter (~> 1.6) + multipart-post (2.0.0) + octokit (2.7.2) + sawyer (~> 0.5.2) + puppet (3.8.7) + facter (> 1.6, < 3) hiera (~> 1.0) + json_pure puppet-lint (0.3.2) - puppetlabs_spec_helper (0.4.1) - mocha (>= 0.10.5) + puppet-syntax (2.1.1) 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) - rspec-puppet (0.1.6) + puppetlabs_spec_helper (0.10.3) + mocha + puppet-lint + puppet-syntax + rake + rspec-puppet + rake (11.3.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-puppet (1.0.1) rspec - thor (0.17.0) + rspec-support (3.5.0) + sawyer (0.5.5) + addressable (~> 2.3.5) + faraday (~> 0.8, < 0.10) + thor (0.19.1) PLATFORMS ruby DEPENDENCIES - cardboard (~> 1.0) + cardboard (~> 2.1) + +BUNDLED WITH + 1.10.6 diff --git a/README.md b/README.md index 244b8a0..d36971e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # XQuartz Puppet Module for Boxen +![Build Status](https://travis-ci.org/TORO-IO/puppet-xquartz.svg)](https://travis-ci.org/TORO-IO/puppet-xquartz) + ## Usage ```puppet diff --git a/manifests/init.pp b/manifests/init.pp index fa318db..9031acf 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,10 +4,10 @@ # # include xquartz class xquartz ( - $version = '2.7.7', + $version = '2.7.10', ) { package { 'XQuartz': provider => 'pkgdmg', - source => "http://xquartz.macosforge.org/downloads/SL/XQuartz-${version}.dmg", + source => "https://dl.bintray.com/xquartz/downloads/XQuartz-${version}.dmg", } } diff --git a/spec/classes/xquartz_spec.rb b/spec/classes/xquartz_spec.rb index 6edc94d..191f2b4 100644 --- a/spec/classes/xquartz_spec.rb +++ b/spec/classes/xquartz_spec.rb @@ -1,12 +1,12 @@ require 'spec_helper' describe 'xquartz' do - let(:params) { {:version => '2.7.7'} } + let(:params) { {:version => '2.7.10'} } it do should contain_package('XQuartz').with({ :provider => 'pkgdmg', - :source => 'http://xquartz.macosforge.org/downloads/SL/XQuartz-2.7.7.dmg' + :source => 'https://dl.bintray.com/xquartz/downloads/XQuartz-2.7.10.dmg' }) end end