diff options
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | Gemfile | 7 | ||||
| -rw-r--r-- | spec/classes/master_hiera_spec.rb | 2 | ||||
| -rw-r--r-- | spec/classes/yaml_spec.rb | 4 |
4 files changed, 15 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index c85bde4..1ac8b2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,16 @@ rvm: - 1.8.7 - 1.9.3 - - 2.0.0 -script: 'bundle exec rake spec' + - 2.2.0 +script: 'bundle exec rake' env: - - PUPPET_VERSION=3.8.4 + - PUPPET_VERSION=3.8.6 + - PUPPET_VERSION=4.4.1 matrix: exclude: # No support for Ruby 2.0 before Puppet 3.2 - - rvm: 2.0.0 - env: PUPPET_VERSION=3.0.0 - - rvm: 2.0.0 - env: PUPPET_VERSION=3.1.0 + - rvm: 2.2.0 + env: PUPPET_VERSION=3.8.6 + - rvm: 1.8.7 + env: PUPPET_VERSION=4.4.1 @@ -3,21 +3,22 @@ source 'https://rubygems.org' if ENV.key?('PUPPET_VERSION') puppetversion = "~> #{ENV['PUPPET_VERSION']}" else - puppetversion = ['>= 3.8.4'] + puppetversion = ['>= 3.8.6'] end if RUBY_VERSION == '1.8.7' - puppetversion = ['~> 3.8.4'] + puppetversion = ['~> 3.8.6'] gem 'i18n', '~> 0.6.11' gem 'activesupport', '~> 3.2' gem 'highline', '~> 1.6.21' gem 'librarian-puppet', '~> 1.0.0' gem 'rspec', '~> 3.1.0' + gem 'rake', '< 11' else gem 'librarian-puppet' + gem 'rake' end gem 'puppet', puppetversion gem 'puppet-lint' gem 'puppetlabs_spec_helper' -gem 'rake' diff --git a/spec/classes/master_hiera_spec.rb b/spec/classes/master_hiera_spec.rb index 62112fb..287abaa 100644 --- a/spec/classes/master_hiera_spec.rb +++ b/spec/classes/master_hiera_spec.rb @@ -4,7 +4,7 @@ describe 'trocla::master::hiera', :type => 'class' do context 'with default params' do it { should compile.with_all_deps } it { should contain_package('rubygem-hiera-backend-trocla').with( - :ensure => 'present', + :ensure => 'present' )} end end diff --git a/spec/classes/yaml_spec.rb b/spec/classes/yaml_spec.rb index 9ded270..49d2cb5 100644 --- a/spec/classes/yaml_spec.rb +++ b/spec/classes/yaml_spec.rb @@ -32,14 +32,14 @@ store_options: :owner => 'puppet', :group => 0, :mode => '0600', - :require => 'Package[trocla]', + :require => 'Package[trocla]' )} it { should contain_file('/var/lib/trocla/trocla_data.yaml').with( :ensure => 'file', :owner => 'puppet', :group => 0, :mode => '0600', - :require => 'Package[trocla]', + :require => 'Package[trocla]' )} it { should compile.with_all_deps } end |