Merge branch 'pall-valmundsson-travis-matrix'

Author: stephenrjohnson

.travis.yml

@@ -1,5 +1,12 @@
 language: ruby
+bundler_args: --without system_tests
 rvm:
   - 1.9.3
   - 2.0.0
 script: "bundle exec rake test"
+env:
+  matrix:
+    - PUPPET_GEM_VERSION="~> 3.7.0"
+    - PUPPET_GEM_VERSION="~> 3.7.0" FUTURE_PARSER="yes" STRICT_VARIABLES="no"
+    - PUPPET_GEM_VERSION="~> 3.7.0" FUTURE_PARSER="yes" STRICT_VARIABLES="yes"
+    - PUPPET_GEM_VERSION="~> 4.0.0"

Gemfile

@@ -1,13 +1,20 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
-gem 'puppet'
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+      gem 'puppet', puppetversion
+else
+      gem 'puppet', '< 4.0.0'
+end
 
 gem 'rake'
 gem 'rspec'
 gem 'puppet-lint'
-gem 'beaker'
-gem 'beaker-rspec'
 gem 'rspec-puppet'
 gem 'puppetlabs_spec_helper'
 gem 'puppet-syntax'
+
+group :system_tests do
+  gem 'beaker'
+  gem 'beaker-rspec'
+end