Merge pull request #508 from puppetlabs/travis-puppet4

Puppet 4 support

diff --git a/.travis.yml b/.travis.yml
index 6ff1d8a2a6851f4b28ce0c7e4af0ceace91d5b69..22ee56f6b3c9d1713a159ddd5a41a3921509a42f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,21 +7,26 @@ matrix:
   fast_finish: true
   include:
   - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.0"
+    env: PUPPET_GEM_VERSION="~> 3.0" ORDERING="random" STRICT_VARIABLES="yes"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 3.0" ORDERING="random" STRICT_VARIABLES="yes" FUTURE_PARSER="yes"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0"
+    env: PUPPET_GEM_VERSION="~> 3.0" ORDERING="random" STRICT_VARIABLES="yes"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+    env: PUPPET_GEM_VERSION="~> 3.0" ORDERING="random" STRICT_VARIABLES="yes" FUTURE_PARSER="yes"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3.0" ORDERING="random" STRICT_VARIABLES="yes"
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+    env: PUPPET_GEM_VERSION="~> 3.0" ORDERING="random" STRICT_VARIABLES="yes" FUTURE_PARSER="yes"
+  - rvm: 2.1
+    env: PUPPET_GEM_VERSION="~> 3.0" ORDERING="random" STRICT_VARIABLES="yes"
+  - rvm: 2.1
+    env: PUPPET_GEM_VERSION="~> 3.0" ORDERING="random" STRICT_VARIABLES="yes" FUTURE_PARSER="yes"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 4.0"
+    env: PUPPET_GEM_VERSION="~> 4.0" ORDERING="random"
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 4.0"
-  allow_failures:
-    - env: PUPPET_GEM_VERSION="~> 4.0"
-    - env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+    env: PUPPET_GEM_VERSION="~> 4.0" ORDERING="random"
+  - rvm: 2.1
+    env: PUPPET_GEM_VERSION="~> 4.0" ORDERING="random"
 notifications:
   email: false

diff --git a/Gemfile b/Gemfile
index 64e206f18578f6ce61702272c003e62e54c7d0fe..0cd807811502edb7d02691905890425e35409707 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ end
 group :development, :unit_tests do
   gem 'rake',                    :require => false
   gem 'rspec-core', '3.1.7',     :require => false
-  gem 'rspec-puppet', '~> 2.0',  :require => false
+  gem 'rspec-puppet', '~> 2.1',  :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 808c9751a042b32196dfc8c918216699f5085748..f3e2bfda040c82f3890fce47947949590c04c338 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -31,9 +31,9 @@ define apt::ppa(
     $_proxy = $::apt::_proxy
     if $_proxy['host'] {
       if $_proxy['https'] {
-        $_proxy_env = ["http_proxy=http://${_proxy['host']}:${_proxy['port']}", "https_proxy=https://${_proxy['host']}:${_proxy['port']}"]
+        $_proxy_env = ["http_proxy=http://${$_proxy['host']}:${$_proxy['port']}", "https_proxy=https://${$_proxy['host']}:${$_proxy['port']}"]
       } else {
-        $_proxy_env = ["http_proxy=http://${_proxy['host']}:${_proxy['port']}"]
+        $_proxy_env = ["http_proxy=http://${$_proxy['host']}:${$_proxy['port']}"]
       }
     } else {
       $_proxy_env = []

diff --git a/manifests/source.pp b/manifests/source.pp
index 40fc015bb6e8a194038d50e1f7444cb0bfc965b8..958bf25c79fea2e9b250a2dd09554da911a8e645 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -65,7 +65,7 @@ define apt::source(
   # We do not want to remove keys when the source is absent.
   if $key and ($ensure == 'present') {
     if is_hash($_key) {
-      apt::key { "Add key: ${_key['id']} from Apt::Source ${title}":
+      apt::key { "Add key: ${$_key['id']} from Apt::Source ${title}":
         ensure  => present,
         id      => $_key['id'],
         server  => $_key['server'],