From 39fd38ab467980d7fae92eb185487f527fd51f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Gali=C4=87?= Date: Fri, 27 Feb 2015 15:28:38 +0100 Subject: [PATCH 1/3] pin rspec-core to version that works w/ruby 1.8.7 this fix is analogous to https://github.com/puppetlabs/puppetlabs-puppetdb/pull/167 --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index e8b69a1..d6a330c 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,8 @@ source "https://rubygems.org" group :test do gem "rake" gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.0' - gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git' + # Pinning due to bug in newer rspec with Ruby 1.8.7 + gem 'rspec-core', '3.1.7' gem "puppetlabs_spec_helper" gem "metadata-json-lint" end From 7b19c0feacd0cc77f538cb866124e780658b0cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Gali=C4=87?= Date: Thu, 19 Mar 2015 13:40:51 +0100 Subject: [PATCH 2/3] pint rspec *correctly* like @raphink did in 7fba86e979815c180f3f5b813d2e2bb394f84ecb --- Gemfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index d6a330c..6fff33f 100644 --- a/Gemfile +++ b/Gemfile @@ -3,10 +3,11 @@ source "https://rubygems.org" group :test do gem "rake" gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.0' - # Pinning due to bug in newer rspec with Ruby 1.8.7 - gem 'rspec-core', '3.1.7' + gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git' gem "puppetlabs_spec_helper" gem "metadata-json-lint" + gem "rspec-puppet-facts" + gem "rspec", "< 3.2.0", { "platforms" => ["ruby_18"] } end group :development do From 4863568f5d67dce2ae0736e9ceba52cf0d4a0536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Gali=C4=87?= Date: Thu, 19 Mar 2015 13:46:22 +0100 Subject: [PATCH 3/3] simplify travis matrix --- .travis.yml | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index d786850..047b89d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,35 +14,21 @@ --- language: ruby -bundler_args: --without development +bundler_args: --without development system_tests sudo: false before_install: rm Gemfile.lock || true -rvm: - - 1.8.7 - - 1.9.3 - - 2.0.0 - - 2.1.0 script: bundle exec rake test -env: - - PUPPET_VERSION="~> 2.7.0" - - PUPPET_VERSION="~> 3.2.0" - - PUPPET_VERSION="~> 3.3.0" - - PUPPET_VERSION="~> 3.4.0" - - PUPPET_VERSION="~> 3.5.0" STRICT_VARIABLES=yes - - PUPPET_VERSION="~> 3.6.0" STRICT_VARIABLES=yes - - PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes - - PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes FUTURE_PARSER=yes matrix: - exclude: + include: + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 1.7.0" - rvm: 1.9.3 - env: PUPPET_VERSION="~> 2.7.0" + env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 - env: PUPPET_VERSION="~> 2.7.0" - - rvm: 2.1.0 - env: PUPPET_VERSION="~> 2.7.0" - - rvm: 2.1.0 - env: PUPPET_VERSION="~> 3.2.0" - - rvm: 2.1.0 - env: PUPPET_VERSION="~> 3.3.0" + env: PUPPET_GEM_VERSION="~> 3.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - rvm: 2.1.0 - env: PUPPET_VERSION="~> 3.4.0" + env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES=yes FUTURE_PARSER="yes"