Support Ruby v2.0.0 and improve scope of testing

.travis.yml

@@ -1,31 +1,63 @@
+---
 language: ruby
+
 bundler_args: --without development
+
 rvm:
   - 1.8.7
   - 1.9.3
-  - 2.1.4
-script:
-  - "bundle exec rake lint spec SPEC_OPTS='--format documentation'"
+  - 2.0.0
+  - 2.1.0
+
 env:
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.1.0"
-  - PUPPET_VERSION="~> 3.8.0"
-  - PUPPET_VERSION="~> 4.2"
+  matrix:
+    - PUPPET_GEM_VERSION="~> 3.1.0"
+    - PUPPET_GEM_VERSION="~> 3.2.0"
+    - PUPPET_GEM_VERSION="~> 3.3.0"
+    - PUPPET_GEM_VERSION="~> 3.4.0"
+    - PUPPET_GEM_VERSION="~> 3.5.0"
+    - PUPPET_GEM_VERSION="~> 3.6.0"
+    - PUPPET_GEM_VERSION="~> 3.7.0"
+    - PUPPET_GEM_VERSION="~> 3.8.0"
+    - PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
+    - PUPPET_GEM_VERSION="~> 4.0.0"
+    - PUPPET_GEM_VERSION="~> 4.1.0"
+    - PUPPET_GEM_VERSION="~> 4.2.0"
+    - PUPPET_GEM_VERSION="~> 4.3.0"
+    - PUPPET_GEM_VERSION="~> 4.4.0"
+    - PUPPET_GEM_VERSION="~> 4" STRICT_VARIABLES="yes"
+
+sudo: false
+
+script: 'bundle exec rake metadata_lint && bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
+
 matrix:
+  fast_finish: true
   exclude:
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 2.1.0
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 2.1.0
+      env: PUPPET_GEM_VERSION="~> 3.2.0"
+    - rvm: 2.1.0
+      env: PUPPET_GEM_VERSION="~> 3.3.0"
+    - rvm: 2.1.0
+      env: PUPPET_GEM_VERSION="~> 3.4.0"
     - rvm: 1.8.7
-      env: PUPPET_VERSION="~> 4.2"
-    - rvm: 1.9.3
-      env: PUPPET_VERSION="~> 2.7.0"
-    - rvm: 2.1.4
-      env: PUPPET_VERSION="~> 2.7.0"
-    - rvm: 2.1.4
-      env: PUPPET_VERSION="~> 3.0.0"
-    - rvm: 2.1.4
-      env: PUPPET_VERSION="~> 3.1.0"
+      env: PUPPET_GEM_VERSION="~> 4.0.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.1.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.2.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.3.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.4.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4" STRICT_VARIABLES="yes"
 
-sudo: false
 notifications:
-  email:
-    - [email protected]
+  email: false

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-if puppetversion = ENV['PUPPET_VERSION']
+if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
 else
   gem 'puppet', :require => false

README.md

@@ -5,14 +5,25 @@
 ####Table of Contents
 
 1. [Overview](#overview)
-2. [Setup](#setup)
-3. [Usage](#usage)
+1. [Compatibility](#compatibility)
+1. [Setup](#setup)
+1. [Usage](#usage)
 
 
 ##Overview
 
 This module installs java (JDK + JRE) versions
 
+##Compatibility
+Puppet v3 (with and without the future parser) and Puppet v4 with Ruby versions
+1.8.7, 1.9.3, 2.0.0 and 2.1.0 where supported by Puppet.
+
+* Debian 6
+* EL 6
+* Solaris 10
+* Solaris 11
+* Ubuntu 14.04
+
 ##Setup
 
 ###Setup Requirements
@@ -23,10 +34,12 @@ This module installs java (JDK + JRE) versions
 
 The main class is used only.
 
-        class { 'java':
-          jdk     => false, # default - whether to install the jdk or the jre only
-          version => '6', # Java version to install
-        }
+```puppet
+class { 'java':
+  jdk     => false, # default - whether to install the jdk or the jre only
+  version => '6', # Java version to install
+}
+```
 
 ##Development