Merge pull request voxpupuli#117 from poikilotherm/master

stankevich · stankevich · commit 526375936a75 · 2014-08-18T04:00:47.000-04:00
Added validations to init.pp, fixed some tests.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -5,7 +5,16 @@
 # === Parameters
 #
 # [*version*]
-#  Python version to install. Default: system default
+#  Python version to install. Beware that valid values for this differ a) by
+#  the provider you choose and b) by the osfamily/operatingsystem you are using.
+#  Default: system default
+#  Allowed values:
+#   - provider == pip: everything pip allows as a version after the 'python=='
+#   - else: 'system', 'pypy', 3/3.3/...
+#      - Be aware that 'system' usually means python 2.X.
+#      - 'pypy' actually lets us use pypy as python.
+#      - 3/3.3/... means you are going to install the python3/python3.3/...
+#        package, if available on your osfamily.
 #
 # [*pip*]
 #  Install python-pip. Default: true
@@ -23,6 +32,11 @@
 # [*manage_gunicorn*]
 #  Allow Installation / Removal of Gunicorn. Default: true
 #
+# [*provider*]
+#  What provider to use for installation of the packages, except gunicorn.
+#  Default: system default provider
+#  Allowed values: 'pip'
+#
 # === Examples
 #
 # class { 'python':
@@ -47,6 +61,24 @@
   $provider        = undef
 ) {
 
+  # validate inputs
+  if $provider != undef {
+    validate_re($provider, ['^pip$'], 'Only "pip" is a valid provider besides the system default.')
+  }
+
+  if $provider == 'pip' {
+    validate_re($version, ['^(2\.[4-7]\.\d|3\.\d\.\d)$','^system$'])
+  # this will only be checked if not pip, every other string would be rejected by provider check
+  } else {
+    validate_re($version, concat(['system', 'pypy'], $::python::install::valid_versions))
+  }
+
+  validate_bool($pip)
+  validate_bool($dev)
+  validate_bool($virtualenv)
+  validate_bool($gunicorn)
+  validate_bool($manage_gunicorn)
+
   # Module compatibility check
   $compatible = [ 'Debian', 'RedHat']
   if ! ($::osfamily in $compatible) {
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -15,7 +15,12 @@
 
 class python::install {
 
-  $python = $python::version ? {
+  $valid_version = $::osfamily ? {
+    'RedHat' => ['3'],
+    'Debian' => ['3', '3.3']
+  }
+
+  $python = $::python::version ? {
     'system' => 'python',
     'pypy'   => 'pypy',
     default  => "python${python::version}",
@@ -26,6 +31,13 @@
     'Debian' => "${python}-dev"
   }
 
+  # pip version: use only for installation via os package manager!
+  if $::python::version =~ /^3/ {
+    $pip = 'python3-pip'
+  } else {
+    $pip = 'python-pip'
+  }
+
   $dev_ensure = $python::dev ? {
     true    => present,
     default => absent,
@@ -46,12 +58,11 @@
     pip: {
       package { 'virtualenv': ensure => latest, provider => pip }
       package { 'pip': ensure => latest, provider => pip }
-      package { $pythondev: ensure => latest }
       package { "python==${python::version}": ensure => latest, provider => pip }
     }
     default: {
       package { 'python-virtualenv': ensure => $venv_ensure }
-      package { 'python-pip': ensure => $pip_ensure }
+      package { $pip: ensure => $pip_ensure }
       package { $pythondev: ensure => $dev_ensure }
       package { $python: ensure => present }
     }
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
@@ -167,7 +167,7 @@
 
       python::requirements { "${requirements}_${venv_dir}":
         requirements    => $requirements,
-        virtualenv     => $venv_dir,
+        virtualenv      => $venv_dir,
         proxy           => $proxy,
         owner           => $owner,
         group           => $group,
diff --git a/spec/classes/python_spec.rb b/spec/classes/python_spec.rb
@@ -72,9 +72,9 @@
           end
         end
         
-        describe "with python::virtualenv" do
+        describe "without python::virtualenv" do
           context "default/empty" do
-            let (:params) {{ :provider => '', :virtualenv => '' }}
+            let (:params) {{ :provider => '' }}
             it { is_expected.to contain_package("python-virtualenv").with_ensure('absent') }
           end
         end
@@ -87,7 +87,6 @@
         it { is_expected.to contain_package("python-dev").with_ensure('present') }
       end
       context "default/empty" do
-        let (:params) {{ :dev => '' }}
         it { is_expected.to contain_package("python-dev").with_ensure('absent') }
       end
     end
@@ -165,7 +164,7 @@
         
         describe "with python::virtualenv" do
           context "default/empty" do
-            let (:params) {{ :provider => '', :virtualenv => '' }}
+            let (:params) {{ :provider => '' }}
             it { is_expected.to contain_package("python-virtualenv").with_ensure('absent') }
           end
         end
@@ -178,7 +177,6 @@
         it { is_expected.to contain_package("python-devel").with_ensure('present') }
       end
       context "default/empty" do
-        let (:params) {{ :dev => '' }} 
         it { is_expected.to contain_package("python-devel").with_ensure('absent') }
       end
     end
