testing: Updating travis settings

.travis.yml

@@ -1,50 +1,55 @@
 ---
-language: ruby
+#Travis CI Job File. Feel free to extend. Have a look at the special cases in the Gemfile for Ruby 1.9
 sudo: false
-
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
-
-matrix:
-  allow_failures:
-    - rvm: 1.8.7
-  exclude:
-    # No support for Ruby 2.1 before Puppet 3.5
-    - rvm: 2.1.5
-      env: PUPPET_VERSION="2.7"
-    # No real support for Ruby 1.9.3 on Puppet 2.x
-    - rvm: 1.9.3
-      env: PUPPET_VERSION="2.7"
-    # No support for Ruby 2.0 before Puppet 3.2
-    - rvm: 2.0.0
-      env: PUPPET_VERSION="2.7"
-    # No Puppet 4 on Ruby 1.8
-    - rvm: 1.8.7
-      env: PUPPET_VERSION="4.0"
-    - rvm: 1.8.7
-      env: PUPPET_VERSION="4.1"
-    - rvm: 1.8.7
-      env: PUPPET_VERSION="4.2"
-
+language: ruby
+cache: bundler
+#bundler_args: --without system_tests development
 before_install:
-  - 'gem install bundler'
-
+  - bundle -v
+  - rm Gemfile.lock || true
+  - gem update --system
+  - gem update bundler
+  - gem --version
+  - bundle -v
 script:
-  - bundle install
-  - bundle update
-  - bundle exec rake all
-
-env:
-  - PUPPET_VERSION="2.7"
-  - PUPPET_VERSION="3.5"
-  - PUPPET_VERSION="3.6"
-  - PUPPET_VERSION="3.7"
-  - PUPPET_VERSION="3.7" FUTURE_PARSER="yes"
-  - PUPPET_VERSION="3.8"
-  - PUPPET_VERSION="3.8" FUTURE_PARSER="yes"
-  - PUPPET_VERSION="4.0"
-  - PUPPET_VERSION="4.1"
-  - PUPPET_VERSION="4.2"
+  - 'bundle exec rake $CHECK'
+matrix:
+  fast_finish: true
+  include:
+  - rvm: 2.4.0
+    env: PUPPET_VERSION="~> 4.0" CHECK=all
+  - rvm: 2.3.3
+    env: PUPPET_VERSION="~> 4.0" CHECK=all
+  - rvm: 2.2.6
+    env: PUPPET_VERSION="~> 4.0" CHECK=all
+  - rvm: 2.1.9
+    env: PUPPET_VERSION="~> 4.0" CHECK=all
+  - rvm: 2.1.9
+    env: PUPPET_VERSION="~> 3.8" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=all
+  - rvm: 2.1.9
+    env: PUPPET_VERSION="~> 3.8" STRICT_VARIABLES="yes" CHECK=all
+  - rvm: 1.9.3
+    env: PUPPET_VERSION="~> 3.8" STRICT_VARIABLES="yes" CHECK=all
+  - rvm: 1.9.3
+    env: PUPPET_VERSION="~> 3.8" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=all
+  - rvm: 1.9.3
+    env: PUPPET_VERSION="~> 3.6.0" CHECK=all
+  - rvm: 2.1.9
+    env: PUPPET_VERSION="~> 3.6.0" CHECK=all
+  allow_failures:
+    - rvm: 2.4.0
+notifications:
+  email: false
+#deploy:
+#  provider: puppetforge
+#  deploy:
+#    branch: master
+#  user: someuser
+#  password:
+#    secure: "somepasswordhash"
+#  on:
+#    tags: true
+    # all_branches is required to use tags
+#    all_branches: true
+    # Only publish the build marked with "DEPLOY_TO_FORGE"
+#    condition: "$DEPLOY_TO_FORGE = yes"

Gemfile

@@ -7,7 +7,7 @@ if RUBY_VERSION =~ /^1\.8\./
   gem 'nokogiri', '~> 1.5.0'
 end
 
-gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}.0" : '>= 2.7'
+gem 'puppet', ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'].to_s : '>= 2.7'
 gem 'rspec-puppet', '~> 2.0'
 gem 'puppetlabs_spec_helper', '>= 0.1.0'
 gem 'puppet-lint', '>= 2'