diff options
| -rw-r--r-- | .gemfile | 13 | ||||
| -rw-r--r-- | .travis.yml | 25 | ||||
| -rw-r--r-- | Gemfile | 14 |
3 files changed, 25 insertions, 27 deletions
diff --git a/.gemfile b/.gemfile new file mode 100644 index 0000000..67c0f51 --- /dev/null +++ b/.gemfile @@ -0,0 +1,13 @@ +source 'https://rubygems.org' + +group :development, :test do + gem 'rake', :require => false + gem 'rspec-puppet', :require => false + gem 'puppetlabs_spec_helper', :require => false +end + +if puppetversion = ENV['PUPPET_GEM_VERSION'] + gem 'puppet', puppetversion, :require => false +else + gem 'puppet', :require => false +end diff --git a/.travis.yml b/.travis.yml index c0af63e..b180c60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,11 @@ branches: - master env: matrix: - - PUPPET_GEM_VERSION=">= 2.6.9" - - PUPPET_GEM_VERSION=">= 2.7.6" - - PUPPET_GEM_VERSION=">= 2.7.13" - - PUPPET_GEM_VERSION=">= 3.0.0" - - PUPPET_GEM_VERSION=">= 3.1.0" - - PUPPET_GEM_VERSION=">= 3.3.0" + - PUPPET_GEM_VERSION="~> 2.6.0" + - PUPPET_GEM_VERSION="~> 2.7.0" + - PUPPET_GEM_VERSION="~> 3.0.0" + - PUPPET_GEM_VERSION="~> 3.1.0" + - PUPPET_GEM_VERSION="~> 3.3.0" global: - PUBLISHER_LOGIN=saz - secure: |- @@ -29,19 +28,19 @@ env: matrix: exclude: - rvm: 1.9.3 - env: PUPPET_GEM_VERSION=">= 2.6.9" + env: PUPPET_GEM_VERSION="~> 2.6.0" - rvm: 2.0.0 - env: PUPPET_GEM_VERSION=">= 2.6.9" + env: PUPPET_GEM_VERSION="~> 2.6.0" - rvm: 2.0.0 - env: PUPPET_GEM_VERSION=">= 2.6.9" + env: PUPPET_GEM_VERSION="~> 2.6.0" - rvm: 2.0.0 - env: PUPPET_GEM_VERSION=">= 2.7.6" + env: PUPPET_GEM_VERSION="~> 2.7.0" - rvm: 2.0.0 - env: PUPPET_GEM_VERSION=">= 2.7.13" + env: PUPPET_GEM_VERSION="~> 2.7.0" - rvm: 2.0.0 - env: PUPPET_GEM_VERSION=">= 3.0.0" + env: PUPPET_GEM_VERSION="~> 3.0.0" - rvm: 2.0.0 - env: PUPPET_GEM_VERSION=">= 3.1.0" + env: PUPPET_GEM_VERSION="~> 3.1.0" notifications: email: false gemfile: .gemfile diff --git a/Gemfile b/Gemfile deleted file mode 100644 index a89043b..0000000 --- a/Gemfile +++ /dev/null @@ -1,14 +0,0 @@ -source :rubygems - -if ENV.key?('PUPPET_VERSION') - puppetversion = "= #{ENV['PUPPET_VERSION']}" -else - puppetversion = ['>= 2.7'] -end - -gem 'rake' -gem 'puppet-lint' -gem 'rspec-puppet' -gem 'puppet', puppetversion -gem 'puppetlabs_spec_helper', '>= 0.4.0' - |