fixed some mistakes / lint warnings in modules, fixed the python class spec to reflect default params

poikilotherm · poikilotherm · commit a71ee7c686df · 2014-08-17T14:31:55.000+02:00
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -67,10 +67,10 @@
   }
 
   if $provider == 'pip' {
-    validate_re($version, '^(2\.[4-7]\.\d|3\.\d\.\d)$') 
-  # this will only be checked if not pip, every other string would be rejected by provider check 
+    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_re($version, concat(['system', 'pypy'], $::python::install::valid_versions))
   }
 
   validate_bool($pip)
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -15,7 +15,7 @@
 
 class python::install {
 
-  $valid_version = $osfamily ? {
+  $valid_version = $::osfamily ? {
     'RedHat' => ['3'],
     'Debian' => ['3', '3.3']
   }
@@ -32,7 +32,7 @@
   }
 
   # pip version: use only for installation via os package manager!
-  if $::python::version =~ '^3' {
+  if $::python::version =~ /^3/ {
     $pip = 'python3-pip'
   } else {
     $pip = 'python-pip'
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

Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,10 @@`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`if $provider == 'pip' {`
`70`		`- validate_re($version, '^(2\.[4-7]\.\d\|3\.\d\.\d)$')`
`71`		`- # this will only be checked if not pip, every other string would be rejected by provider check`
	`70`	`+ validate_re($version, ['^(2\.[4-7]\.\d\|3\.\d\.\d)$','^system$'])`
	`71`	`+ # this will only be checked if not pip, every other string would be rejected by provider check`
`72`	`72`	`} else {`
`73`		`- validate_re($version, concat(['system', 'pypy'], $::python::install::valid_versions]))`
	`73`	`+ validate_re($version, concat(['system', 'pypy'], $::python::install::valid_versions))`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`validate_bool($pip)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`class python::install {`
`17`	`17`
`18`		`- $valid_version = $osfamily ? {`
	`18`	`+ $valid_version = $::osfamily ? {`
`19`	`19`	`'RedHat' => ['3'],`
`20`	`20`	`'Debian' => ['3', '3.3']`
`21`	`21`	`}`
`@@ -32,7 +32,7 @@`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`# pip version: use only for installation via os package manager!`
`35`		`- if $::python::version =~ '^3' {`
	`35`	`+ if $::python::version =~ /^3/ {`
`36`	`36`	`$pip = 'python3-pip'`
`37`	`37`	`} else {`
`38`	`38`	`$pip = 'python-pip'`