Bring testing matrix up to date

.travis.yml

@@ -1,63 +1,50 @@
 sudo: false
 rvm:
+  - '2.4'
+  - '2.3'
   - '2.2'
   - '2.1'
   - '2.0'
-  - '1.9'
 notifications:
   email:
     - [email protected]
 env:
-  - PUPPET_VERSION="~> 4.2.0"
-  - PUPPET_VERSION="~> 4.1.0"
-  - PUPPET_VERSION="~> 4.0.0"
-  - PUPPET_VERSION="~> 3.7.0"
-  - PUPPET_VERSION="~> 3.6.0"
-  - PUPPET_VERSION="~> 3.5.0"
-  - PUPPET_VERSION="~> 3.4.0"
-  - PUPPET_VERSION="~> 3.3.0"
-  - PUPPET_VERSION="~> 3.2.0"
-  - PUPPET_VERSION="~> 3.1.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 2.7.0"
-
-before_script:
-  - puppet --version
+  - PUPPET_VERSION="~> 5.3.0"
+  - PUPPET_VERSION="~> 5.2.0"
+  - PUPPET_VERSION="~> 5.1.0"
+  - PUPPET_VERSION="~> 5.0.0"
+  - PUPPET_VERSION="~> 4.10.0"
+  - PUPPET_VERSION="~> 4.9.0"
+  - PUPPET_VERSION="~> 4.8.0"
+  - PUPPET_VERSION="~> 3.8.0"
 
 matrix:
-  # Puppet < 3.5.0 is broken under ruby 2.1 https://tickets.puppetlabs.com/browse/PUP-1243
-  # Puppet < 3.8.0 is broken under ruby 2.2 https://tickets.puppetlabs.com/browse/PUP-3796
   exclude:
-    - rvm: '2.1'
-      env: PUPPET_VERSION="~> 2.7.0"
-    - rvm: '2.1'
-      env: PUPPET_VERSION="~> 3.0.0"
-    - rvm: '2.1'
-      env: PUPPET_VERSION="~> 3.1.0"
-    - rvm: '2.1'
-      env: PUPPET_VERSION="~> 3.2.0"
-    - rvm: '2.1'
-      env: PUPPET_VERSION="~> 3.3.0"
-    - rvm: '2.1'
-      env: PUPPET_VERSION="~> 3.4.0"
-    - rvm: '2.2'
-      env: PUPPET_VERSION="~> 2.7.0"
-    - rvm: '2.2'
-      env: PUPPET_VERSION="~> 3.0.0"
-    - rvm: '2.2'
-      env: PUPPET_VERSION="~> 3.1.0"
-    - rvm: '2.2'
-      env: PUPPET_VERSION="~> 3.2.0"
-    - rvm: '2.2'
-      env: PUPPET_VERSION="~> 3.3.0"
-    - rvm: '2.2'
-      env: PUPPET_VERSION="~> 3.4.0"
-    - rvm: '2.2'
-      env: PUPPET_VERSION="~> 3.5.0"
-    - rvm: '2.2'
-      env: PUPPET_VERSION="~> 3.6.0"
-    - rvm: '2.2'
-      env: PUPPET_VERSION="~> 3.7.0"
+    # monkeypatches failing for Puppet 3.8 on Ruby 2.1 through 2.4
+    - rvm: '2.4'
+      env: PUPPET_VERSION="~> 3.8.0"
+    - rvm: '2.3'
+      env: PUPPET_VERSION="~> 3.8.0"
+    - rvm: '2.2'
+      env: PUPPET_VERSION="~> 3.8.0"
+    # Newer Puppet versions do not support old Ruby versions
+    - rvm: '2.0'
+      env: PUPPET_VERSION="~> 4.8.0"
+    - rvm: '2.0'
+      env: PUPPET_VERSION="~> 4.9.0"
+    - rvm: '2.0'
+      env: PUPPET_VERSION="~> 4.10.0"
+    - rvm: '2.0'
+      env: PUPPET_VERSION="~> 5.0.0"
+    - rvm: '2.0'
+      env: PUPPET_VERSION="~> 5.1.0"
+    - rvm: '2.0'
+      env: PUPPET_VERSION="~> 5.2.0"
+    - rvm: '2.0'
+      env: PUPPET_VERSION="~> 5.3.0"
+
+before_script:
+  - puppet --version
 
 deploy:
   provider: rubygems

Rakefile

@@ -12,9 +12,9 @@ RSpec::Core::RakeTask.new
 Cucumber::Rake::Task.new(:features) do |t|
   require 'puppet'
   puppet_version = Puppet::version.gsub("~>","").split(".").first.to_i
-  tags = (2..4).select {|i| i != puppet_version}.map{|i| "--tags @puppet#{puppet_version},~@puppet#{i}"}
+  tags = (2..5).select {|i| i != puppet_version}.map{|i| "--tags '@puppet#{puppet_version} and not @puppet#{i}'"}
   # don't run githubtarball scenarios in Travis, they easily fail with rate limit exceeded
-  tags << "--tags ~@github" if ENV['TRAVIS']=='true'
+  tags << "--tags 'not @github'" if ENV['TRAVIS']=='true'
   t.cucumber_opts = tags.join(" ")
 end
 

features/support/env.rb

@@ -15,7 +15,7 @@
 end
 
 Given(/^there is no Puppetfile$/) do
-  in_current_dir do
+  in_current_directory do
     fail "Puppetfile exists at #{File.expand_path('Puppetfile')}" if (File.exist?('Puppetfile'))
   end
 end