Fix Travis tests

.fixtures.yml

@@ -5,6 +5,6 @@ fixtures:
       ref:  "4.1.0"
     concat:
       repo: "puppetlabs/concat"
-      ref:  "1.2.0"
+      ref:  "1.2.1"
   symlinks:
     sudo: "#{source_dir}"

.travis.yml

@@ -2,44 +2,39 @@ language: ruby
 sudo: false
 bundler_args: --without development
 before_install: rm Gemfile.lock || true
-rvm:
-- 1.9
-- 2.0
-- 2.1
 script: bundle exec rake test
-env:
-- PUPPET_VERSION="~> 3.6.0" STRICT_VARIABLES=true
-- PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=true
-- PUPPET_VERSION="~> 3.8.0" STRICT_VARIABLES=true
-- PUPPET_VERSION="~> 3.8.0" STRICT_VARIABLES=true PARSER="future"
-- PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=true
-- PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=true
-- PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=true
 matrix:
-  exclude:
-  - rvm: 1.9
-    env: PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=true
-  - rvm: 1.9
-    env: PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=true
-  - rvm: 1.9
-    env: PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=true
-  - rvm: 2.0
-    env: PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=true
-  - rvm: 2.0
-    env: PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=true
-  - rvm: 2.0
-    env: PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=true
-notifications:
-  slack:
-    secure: Bgqq8f5Ej+g78Iy8o0HSexx4OyCrO2eNrSiev8O8FCB2zQSNZ82EUnuXwDq5LeHJZb3eTBM/6NcAYeXRNuHwgniQQef9xiHC8uBvV3pMstAe5pa+9l7OaXzKyMrVhbjUfqZUhnRYPHY+OYgUMb4UfotfxvRCduPj1YhMrSVXocs=
+  fast_finish: true
+  include:
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.6.0" STRICT_VARIABLES=true
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.7.0" STRICT_VARIABLES=true
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.8.5" STRICT_VARIABLES=true
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 3.8.5" STRICT_VARIABLES=true FUTURE_PARSER="yes"
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.5.0" STRICT_VARIABLES=true
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.7.0" STRICT_VARIABLES=true
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.8.0" STRICT_VARIABLES=true
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.9.0" STRICT_VARIABLES=true
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.10.4" STRICT_VARIABLES=true
+
 deploy:
   provider: puppetforge
   user: abstractit
   password:
     secure: ZbtzOD15CmlaLJ0zK2qwLLaqXDk+Ile/2nGwZQ3pV5+cx6ILBVHN/cH0PaddVM9z2bV8k/sHN9ZCe5NXEyC54Vta8jCgLvIckS0tRqNICagn5BMhyEg5jSP7IIDhM9pWgF9KiJyMtx+8iWIt6h7v5+HbOylUuSUyhA0ewpFp2GA=
   on:
     tags: true
-    rvm: 2.1
+    # all_branches is required to use tags
+    all_branches: true
+    rvm: 2.1.9
     condition:
-    - $PUPPET_VERSION = '~> 4.2.0'
+    - $PUPPET_GEM_VERSION = '4.10.4'
     - $STRICT_VARIABLES = true

Gemfile

@@ -1,26 +1,37 @@
 source 'https://rubygems.org'
 
+def location_for(place, fake_version = nil)
+  if place =~ /^(git:[^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
+
 group :test do
-  gem 'rake'
-  gem 'puppet', ENV['PUPPET_VERSION'] || '~> 4.2.0'
-  gem 'puppet-lint', :git =>  'https://github.com/rodjek/puppet-lint'
-  gem 'puppet-lint-unquoted_string-check', :require => false
-  gem 'puppet-lint-empty_string-check', :require => false
-  gem 'puppet-lint-leading_zero-check', :require => false
-  gem 'puppet-lint-variable_contains_upcase', :require => false
+  gem "rspec-core",             '3.5.4',                  :require => false
+  gem "rspec-puppet",           '2.5.0',                  :require => false
+  gem 'puppetlabs_spec_helper', '2.1.0',                  :require => false
+  gem 'rspec-puppet-facts',     '1.7.1',                  :require => false
+  gem "puppet-syntax",          '2.1.0',                  :require => false
+  gem 'metadata-json-lint',                               :require => false
+  gem 'simplecov',                                        :require => false
+  gem 'json',                   '1.8.5',                  :require => false
+  gem "puppet-blacksmith",                                :require => false
+  gem 'pry',                    '<= 0.9.8',               :require => false
+  gem 'puppet-lint',            '2.0.2',                  :require => false
+  gem 'puppet-lint-unquoted_string-check',                :require => false
+  gem 'puppet-lint-empty_string-check',                   :require => false
+  gem 'puppet-lint-leading_zero-check',                   :require => false
+  gem 'puppet-lint-variable_contains_upcase',             :require => false
   gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false
-  gem 'puppet-lint-absolute_classname-check', :require => false
-  gem 'puppet-lint-undef_in_function-check', :require => false
-  gem 'puppet-lint-roles_and_profiles-check', :require => false
-  gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet'#'~> 2.1'
-  gem 'rspec-puppet-facts', :git => 'https://github.com/mcanevet/rspec-puppet-facts',:require => false
-  gem "puppet-syntax"
-  gem 'metadata-json-lint', :require => false
-  gem 'puppetlabs_spec_helper', :git => 'https://github.com/puppetlabs/puppetlabs_spec_helper'
-  gem "rspec", '< 3.2.0'
-  # gem 'coveralls', require: false
-  gem 'pry', '<= 0.9.8'
-  gem "puppet-blacksmith"
+  gem 'puppet-lint-absolute_classname-check',             :require => false
+  gem 'puppet-lint-undef_in_function-check',              :require => false
+  gem 'puppet-lint-roles_and_profiles-check',             :require => false
+  # gem "rspec-puppet", :require => false
+  # gem 'ci_reporter', :require => false
 end
 
 group :development do
@@ -29,3 +40,38 @@ group :development do
 #  gem "beaker", :git => 'https://github.com/puppetlabs/beaker.git'
 #  gem "beaker-rspec"
 end
+
+# group :system_tests do
+#   if beaker_version = ENV['BEAKER_VERSION']
+#     gem 'beaker', *location_for(beaker_version)
+#   end
+#   if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
+#     gem 'beaker-rspec', *location_for(beaker_rspec_version)
+#   else
+#     gem 'beaker-rspec',  :require => false
+#   end
+#   gem 'serverspec',    :require => false
+#   gem 'beaker-puppet_install_helper', :require => false
+# end
+
+# puppet requires json_pure; json_pure > 2.0.1 requires Ruby 2
+# so force the older json_pure in the case of older ruby
+gem 'json_pure', '< 2.0.2', :require => false, :platforms => [:ruby_18, :ruby_19]
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
+end
+
+if facterversion = ENV['FACTER_GEM_VERSION']
+  gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
+end
+
+if hieraversion = ENV['HIERA_GEM_VERSION']
+  gem 'hiera', hieraversion, :require => false
+else
+  gem 'hiera', :require => false
+end