Merge pull request #139 from mklette/fix-for-strict_variables

compatibiliy fix: ensure variables are defined
voxpupuli · Jun 19, 2015 · a196ac3 · a196ac3
2 parents a9ab506 + 8e7f43f
commit a196ac3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ env:
   - PUPPET_VERSION="~> 3.4.0"
   - PUPPET_VERSION="~> 3.5.0"
   - PUPPET_VERSION="~> 3.7.0"
-  - PUPPET_VERSION="~> 3.7.4" FUTURE_PARSER=yes
+  - PUPPET_VERSION="~> 3.7.4" FUTURE_PARSER=yes STRICT_VARIABLES=yes
 matrix:
   exclude:
   - rvm: 1.9.3

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -89,10 +89,14 @@
 
   if $config_hash_real['data_dir'] {
     $data_dir = $config_hash_real['data_dir']
+  } else {
+    $data_dir = undef
   }
 
   if $config_hash_real['ui_dir'] {
     $ui_dir = $config_hash_real['ui_dir']
+  } else {
+    $ui_dir = undef
   }
 
   if ($ui_dir and ! $data_dir) {

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -6,6 +6,7 @@
     c.default_facts = {
       :architecture    => 'x86_64',
       :operatingsystem => 'Ubuntu',
+      :osfamily        => 'Debian',
       :lsbdistrelease  => '10.04',
       :kernel          => 'Linux',
     }
@@ -29,7 +30,7 @@
     }}
     it { expect { should compile }.to raise_error(/is not a boolean/) }
   end
-  
+
   context 'When passing a non-bool as manage_service' do
     let(:params) {{
       :manage_service => 'hello'