diff --git a/.travis.yml b/.travis.yml index ef9dcf18..34e0ec2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,8 +38,11 @@ env: - PUPPET_GEM_VERSION="~> 4.6.0" - PUPPET_GEM_VERSION="~> 4.7.0" - PUPPET_GEM_VERSION="~> 4.8.0" + - PUPPET_GEM_VERSION="~> 4.9.0" + - PUPPET_GEM_VERSION="~> 4.10.0" - PUPPET_GEM_VERSION="~> 4" + sudo: false script: 'SPEC_OPTS="--format documentation" bundle exec rake validate lint spec' @@ -76,7 +79,9 @@ matrix: - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 4.8.0" - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 4" + env: PUPPET_GEM_VERSION="~> 4.9.0" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 4.10.0" - rvm: 2.3.1 env: PUPPET_GEM_VERSION="~> 3.1.0" - rvm: 2.3.1 @@ -95,6 +100,16 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.8.0" - rvm: 2.3.1 env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes" + # deprecated ruby versions in puppet 4.9.0 + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 4.9.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 4.9.0" + # deprecated ruby versions in puppet 4.10.0 + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 4.10.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 4.10.0" notifications: email: false diff --git a/Gemfile b/Gemfile index 898be012..50a8e52a 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,9 @@ else gem 'facter', :require => false end -gem 'puppetlabs_spec_helper', '>= 1.2.0', :require => false +gem 'puppetlabs_spec_helper', '2.0.2', :require => false if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' +gem 'puppetlabs_spec_helper', '>= 2.0.0', :require => false if RUBY_VERSION >= '1.9' + gem 'rspec-puppet', :require => false gem 'puppet-lint', '~> 2.0', :require => false gem 'simplecov', :require => false diff --git a/manifests/init.pp b/manifests/init.pp index 8b3caf30..a4e22236 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -133,10 +133,10 @@ } # Anchor pattern to contain dependencies - anchor { 'python::begin': } -> - class { 'python::install': } -> - class { 'python::config': } -> - anchor { 'python::end': } + anchor { 'python::begin': } + -> class { 'python::install': } + -> class { 'python::config': } + -> anchor { 'python::end': } # Allow hiera configuration of python resources create_resources('python::pip', $python_pips) diff --git a/manifests/install.pp b/manifests/install.pp index afe17dac..72da81de 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -164,12 +164,12 @@ } if $::python::rhscl_use_public_repository { - Package <| tag == 'python-scl-repo' |> -> - Package <| tag == 'python-scl-package' |> + Package <| tag == 'python-scl-repo' |> + -> Package <| tag == 'python-scl-package' |> } - Package <| tag == 'python-scl-package' |> -> - Package <| tag == 'python-pip-package' |> + Package <| tag == 'python-scl-package' |> + -> Package <| tag == 'python-pip-package' |> } default: {