diff --git a/.travis.yml b/.travis.yml index bb42f80a6..7a6621a4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,5 +17,9 @@ matrix: exclude: - rvm: 2.2 env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES=yes + - rvm: 1.9.3 + env: PUPPET_GIT_URL="https://github.com/puppetlabs/puppet.git" + - rvm: 2.1.0 + env: PUPPET_GIT_URL="https://github.com/puppetlabs/puppet.git" allow_failures: - env: PUPPET_GIT_URL="https://github.com/puppetlabs/puppet.git" diff --git a/Gemfile b/Gemfile index f8ba4c09b..d61d1b36d 100755 --- a/Gemfile +++ b/Gemfile @@ -3,11 +3,11 @@ source "https://rubygems.org" group :test do gem "rake", "~> 10.0" if puppet_gem_version = ENV['PUPPET_GEM_VERSION'] - gem "puppet", ENV['PUPPET_GEM_VERSION'] + gem "puppet", puppet_gem_version elsif puppet_git_url = ENV['PUPPET_GIT_URL'] - gem "puppet", :git => "#{puppet_git_url}" + gem "puppet", :git => puppet_git_url else - gem "puppet", ENV['PUPPET_GEM_VERSION'] + gem "puppet" end gem "puppet-lint" gem "puppet-lint-unquoted_string-check" @@ -17,8 +17,9 @@ group :test do gem "metadata-json-lint" gem "rspec" gem "rspec-retry" - gem 'simplecov', '>= 0.11.0' - gem 'simplecov-console' + gem "simplecov", ">= 0.11.0" + gem "simplecov-console" + gem "json_pure", "<= 2.0.1" # 2.0.2 requires Ruby 2+ end group :system_tests do