Merge pull request voxpupuli#299 from ghoneycutt/strict_vars

stankevich · web-flow · commit fde674bc9ef3 · 2016-08-24T08:56:00.000+02:00
Strict vars
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -5,6 +5,6 @@ fixtures:
       ref: '4.6.0'
     'epel':
       repo: 'git://github.com/stahnma/puppet-module-epel.git'
-      ref: '1.0.2'
+      ref: '1.2.2'
   symlinks:
     python: "#{source_dir}"
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ env:
     - PUPPET_GEM_VERSION="~> 4.3.0"
     - PUPPET_GEM_VERSION="~> 4.4.0"
     - PUPPET_GEM_VERSION="~> 4.5.0"
-    - PUPPET_GEM_VERSION="~> 4"
+    - PUPPET_GEM_VERSION="~> 4" STRICT_VARIABLES="yes"
 
 sudo: false
 
@@ -59,7 +59,7 @@ matrix:
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4.5.0"
     - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 4"
+      env: PUPPET_GEM_VERSION="~> 4" STRICT_VARIABLES="yes"
     - rvm: 2.3.1
       env: PUPPET_GEM_VERSION="~> 3.1.0"
     - rvm: 2.3.1
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 group :development, :test do
   gem 'metadata-json-lint',      :require => false
   gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper', '>= 1.1.1'
+  gem 'puppetlabs_spec_helper', '1.1.1'
   gem 'puppet-lint',             :require => false
   gem 'pry',                     :require => false
   gem 'simplecov',               :require => false
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -190,9 +190,10 @@
 
         $virtualenv_package = "${python}-virtualenv"
       } else {
-        $virtualenv_package = $::lsbdistcodename ? {
-          'jessie' => 'virtualenv',
-          default  => 'python-virtualenv',
+        if $::lsbdistcodename == 'jessie' {
+          $virtualenv_package = 'virtualenv'
+        } else {
+          $virtualenv_package = 'python-virtualenv'
         }
       }
 
diff --git a/manifests/pyvenv.pp b/manifests/pyvenv.pp
@@ -59,6 +59,8 @@
   $environment      = [],
 ) {
 
+  include ::python
+
   if $ensure == 'present' {
 
     $virtualenv_cmd = $version ? {
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
@@ -80,6 +80,8 @@
   $timeout                = 1800,
 ) {
 
+  include ::python
+
   if $virtualenv == 'system' and ($owner != 'root' or $group != 'root') {
     fail('python::pip: root user must be used when virtualenv is system')
   }
@@ -98,8 +100,8 @@
   }
 
   $pip_env = $virtualenv ? {
-    'system' => "${python::exec_prefix} pip",
-    default  => "${python::exec_prefix} ${virtualenv}/bin/pip",
+    'system' => "${::python::exec_prefix} pip",
+    default  => "${::python::exec_prefix} ${virtualenv}/bin/pip",
   }
 
   $proxy_flag = $proxy ? {
@@ -136,5 +138,4 @@
     subscribe   => File[$requirements],
     environment => $environment,
   }
-
 }
diff --git a/metadata.json b/metadata.json
@@ -54,6 +54,6 @@
   ],
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"},
-    {"name":"stahnma/epel","version_requirement":">= 1.0.1 < 2.0.0"}
+    {"name":"stahnma/epel","version_requirement":">= 1.2.2 < 2.0.0"}
   ]
 }
diff --git a/spec/classes/python_spec.rb b/spec/classes/python_spec.rb
@@ -187,6 +187,7 @@
       {
         :id => 'root',
         :kernel => 'Linux',
+        :lsbdistcodename => nil,
         :osfamily => 'Suse',
         :operatingsystem => 'SLES',
         :operatingsystemrelease => '11.3',
diff --git a/spec/defines/pyvenv_spec.rb b/spec/defines/pyvenv_spec.rb
@@ -2,6 +2,12 @@
 
 describe 'python::pyvenv', :type => :define do
   let (:title) { '/opt/env' }
+  let (:facts) do
+    {
+      :lsbdistcodename => 'jessie',
+      :osfamily => 'Debian',
+    }
+  end
 
   it {
     is_expected.to contain_file( '/opt/env')

Original file line number	Diff line number	Diff line change
`@@ -190,9 +190,10 @@`
`190`	`190`
`191`	`191`	`$virtualenv_package = "${python}-virtualenv"`
`192`	`192`	`} else {`
`193`		`- $virtualenv_package = $::lsbdistcodename ? {`
`194`		`- 'jessie' => 'virtualenv',`
`195`		`- default => 'python-virtualenv',`
	`193`	`+ if $::lsbdistcodename == 'jessie' {`
	`194`	`+ $virtualenv_package = 'virtualenv'`
	`195`	`+ } else {`
	`196`	`+ $virtualenv_package = 'python-virtualenv'`
`196`	`197`	`}`
`197`	`198`	`}`
`198`	`199`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,8 @@`
`80`	`80`	`$timeout = 1800,`
`81`	`81`	`) {`
`82`	`82`
	`83`	`+ include ::python`
	`84`	`+`
`83`	`85`	`if $virtualenv == 'system' and ($owner != 'root' or $group != 'root') {`
`84`	`86`	`fail('python::pip: root user must be used when virtualenv is system')`
`85`	`87`	`}`
`@@ -98,8 +100,8 @@`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`$pip_env = $virtualenv ? {`
`101`		`- 'system' => "${python::exec_prefix} pip",`
`102`		`- default => "${python::exec_prefix} ${virtualenv}/bin/pip",`
	`103`	`+ 'system' => "${::python::exec_prefix} pip",`
	`104`	`+ default => "${::python::exec_prefix} ${virtualenv}/bin/pip",`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`$proxy_flag = $proxy ? {`
`@@ -136,5 +138,4 @@`
`136`	`138`	`subscribe => File[$requirements],`
`137`	`139`	`environment => $environment,`
`138`	`140`	`}`
`139`		`-`
`140`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,6 @@`
`54`	`54`	`],`
`55`	`55`	`"dependencies": [`
`56`	`56`	`{"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"},`
`57`		`- {"name":"stahnma/epel","version_requirement":">= 1.0.1 < 2.0.0"}`
	`57`	`+ {"name":"stahnma/epel","version_requirement":">= 1.2.2 < 2.0.0"}`
`58`	`58`	`]`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,7 @@`
`187`	`187`	`{`
`188`	`188`	`:id => 'root',`
`189`	`189`	`:kernel => 'Linux',`
	`190`	`+ :lsbdistcodename => nil,`
`190`	`191`	`:osfamily => 'Suse',`
`191`	`192`	`:operatingsystem => 'SLES',`
`192`	`193`	`:operatingsystemrelease => '11.3',`