Merge pull request voxpupuli#232 from ghoneycutt/support_puppet_v4

Shiva Poudel · Shiva Poudel · commit 5283669a0dcd · 2015-08-21T21:33:15.000+05:45
Support puppet v4
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,11 @@ env:
     - 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"
 
 sudo: false
 
@@ -37,6 +42,14 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 3.3.0"
     - rvm: 2.1.0
       env: PUPPET_GEM_VERSION="~> 3.4.0"
+    - rvm: 1.8.7
+      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"
 
 notifications:
   email: false
diff --git a/README.md b/README.md
@@ -6,7 +6,15 @@ Puppet module for installing and managing python, pip, virtualenvs and Gunicorn
 
 # Compatibility #
 
-Puppet v3 with Ruby versions 1.8.7, 1.9.3, 2.0.0 and 2.1.0.
+* Puppet v3 (with and without the future parser)
+* Puppet v4
+
+## Ruby versions
+
+* 1.8.7
+* 1.9.3
+* 2.0.0
+* 2.1.0
 
 ## OS Distributions ##
 
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -71,9 +71,9 @@
   $use_epel                  = $python::params::use_epel,
 ) inherits python::params{
 
-  # validate inputs
-  if $provider != undef {
-    validate_re($provider, ['^(pip|scl|rhscl)$'], 'Only "pip", "rhscl", and "scl" are valid providers besides the system default.')
+  if $provider != undef and $provider != '' {
+    validate_re($provider, ['^(pip|scl|rhscl)$'],
+      "Only 'pip', 'rhscl' and 'scl' are valid providers besides the system default. Detected provider is <${provider}>.")
   }
 
   if $provider == 'pip' {
diff --git a/metadata.json b/metadata.json
@@ -49,11 +49,11 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">=3.0.0 < 4.0.0"
+      "version_requirement": ">=3.0.0 < 5.0.0"
     }
   ],
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 4.0.0 < 6.0.0"},
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"},
     {"name":"stahnma/epel","version_requirement":">= 1.0.1 < 2.0.0"}
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,11 @@`
`49`	`49`	`"requirements": [`
`50`	`50`	`{`
`51`	`51`	`"name": "puppet",`
`52`		`- "version_requirement": ">=3.0.0 < 4.0.0"`
	`52`	`+ "version_requirement": ">=3.0.0 < 5.0.0"`
`53`	`53`	`}`
`54`	`54`	`],`
`55`	`55`	`"dependencies": [`
`56`		`- {"name":"puppetlabs/stdlib","version_requirement":">= 4.0.0 < 6.0.0"},`
	`56`	`+ {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"},`
`57`	`57`	`{"name":"stahnma/epel","version_requirement":">= 1.0.1 < 2.0.0"}`
`58`	`58`	`]`
`59`	`59`	`}`