Merge pull request #112 from tuxmea/travis_fix

use proper Puppet version env variable name

Author: rwaffen

.travis.yml

@@ -4,31 +4,35 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.1
+  - 2.1.2
 language: ruby
 bundler_args: --without development
 script: "bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 env:
-  - PUPPET_VERSION=2.6.18
-  - PUPPET_VERSION=2.7.23
-  - PUPPET_VERSION=3.0.2
-  - PUPPET_VERSION=3.1.1
-  - PUPPET_VERSION=3.2.4
-  - PUPPET_VERSION=3.3.2
-  - PUPPET_VERSION=3.4.1
+  - PUPPET_GEM_VERSION=3.1.1
+  - PUPPET_GEM_VERSION=3.2.4
+  - PUPPET_GEM_VERSION=3.3.2
+  - PUPPET_GEM_VERSION=3.4.3
+  - PUPPET_GEM_VERSION=3.5.1
+  - PUPPET_GEM_VERSION=3.6.2
+  - PUPPET_GEM_VERSION=3.7.1
 matrix:
   fast_finish: true
   exclude:
-    - rvm: 1.9.2
-      env: PUPPET_VERSION=2.6.18
-    - rvm: 1.9.3
-      env: PUPPET_VERSION=2.6.18
     - rvm: 2.0.0
-      env: PUPPET_VERSION=2.6.18
-    - rvm: 2.0.0
-      env: PUPPET_VERSION=2.7.23
-    - rvm: 2.0.0
-      env: PUPPET_VERSION=3.0.2
-    - rvm: 2.0.0
-      env: PUPPET_VERSION=3.1.1
+      env: PUPPET_GEM_VERSION=3.1.1
+    - rvm: 2.1.1
+      env: PUPPET_GEM_VERSION=3.1.1
+    - rvm: 2.1.1
+      env: PUPPET_GEM_VERSION=3.2.4
+    - rvm: 2.1.1
+      env: PUPPET_GEM_VERSION=3.3.2
+    - rvm: 2.1.2
+      env: PUPPET_GEM_VERSION=3.1.1
+    - rvm: 2.1.2
+      env: PUPPET_GEM_VERSION=3.2.4
+    - rvm: 2.1.2
+      env: PUPPET_GEM_VERSION=3.3.2
 notifications:
   email: false

Gemfile

@@ -20,6 +20,9 @@ end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
+  if puppetversion < '3.0'
+    gem 'hiera-puppet', :require => false
+  end
 else
   gem 'puppet', :require => false
 end