Merge pull request #77 from mcanevet/strict_variables

Strict variables

9 files changed, 61 insertions, 4 deletions

diff --git a/.travis.yml b/.travis.yml
index e3ebbb8..7480714 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,14 +11,17 @@ after_success:
 rvm:
   - 1.8.7
   - 1.9.3
+  - 2.0.0
+  - 2.1.1
 env:
   matrix:
-    - PUPPET_GEM_VERSION="~> 3.5.1"
     - PUPPET_GEM_VERSION="~> 2.7.0"
     - PUPPET_GEM_VERSION="~> 3.0.0"
     - PUPPET_GEM_VERSION="~> 3.1.0"
     - PUPPET_GEM_VERSION="~> 3.2.0"
     - PUPPET_GEM_VERSION="~> 3.3.0"
+    - PUPPET_GEM_VERSION="~> 3.4.0"
+    - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
   global:
   - PUBLISHER_LOGIN=saz
   - secure: |-
@@ -26,13 +29,28 @@ env:
       JaSoYgjQpCILvniWg76o+HY1bTDEP3AmUlxNFgfDAOAQfv0RHv2cEcgNxNrxsddx6S
       Ks0FCvVkFgY703X+kBiYTpjP4SBzRe0y9OudSvk=
 matrix:
-  include:
+  fast_finish: true
+  exclude:
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
     - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.5.1"
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
     - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
+      env: PUPPET_GEM_VERSION="~> 3.0.0"
     - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 2.1.1
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+    - rvm: 2.1.1
+      env: PUPPET_GEM_VERSION="~> 3.0.0"
+    - rvm: 2.1.1
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 2.1.1
+      env: PUPPET_GEM_VERSION="~> 3.2.0"
+    - rvm: 2.1.1
       env: PUPPET_GEM_VERSION="~> 3.3.0"
+    - rvm: 2.1.1
+      env: PUPPET_GEM_VERSION="~> 3.4.0"
 notifications:
   email: false
 gemfile: .gemfile
diff --git a/manifests/params.pp b/manifests/params.pp
index 1b19773..4e86bff 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -88,6 +88,7 @@ class rsyslog::params {
         '$ModLoad imklog   # provides kernel logging support (previously done by rklogd)',
         '#$ModLoad immark  # provides --MARK-- message capability',
       ]
+      $preserve_fqdn          = false
     }
     freebsd: {
       $rsyslog_package_name   = 'sysutils/rsyslog5'
@@ -97,6 +98,7 @@ class rsyslog::params {
       $gnutls_package_name    = 'sysutils/rsyslog5-gnutls'
       $package_status         = 'present'
       $rsyslog_d              = '/etc/syslog.d/'
+      $purge_rsyslog_d        = false
       $rsyslog_conf           = '/etc/syslog.conf'
       $rsyslog_default        = '/etc/defaults/syslogd'
       $default_config_file    = 'rsyslog_default'
@@ -117,6 +119,7 @@ class rsyslog::params {
         '$ModLoad imklog   # provides kernel logging support (previously done by rklogd)',
         '#$ModLoad immark  # provides --MARK-- message capability',
       ]
+      $preserve_fqdn          = false
     }
 
     default: {
diff --git a/spec/classes/rsyslog_client_spec.rb b/spec/classes/rsyslog_client_spec.rb
index ecf5911..ec66a90 100644
--- a/spec/classes/rsyslog_client_spec.rb
+++ b/spec/classes/rsyslog_client_spec.rb
@@ -5,6 +5,7 @@ describe 'rsyslog::client', :type => :class do
     let :facts do
       {
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
         :operatingsystemrelease => 6.0,
       }
     end
diff --git a/spec/classes/rsyslog_database_spec.rb b/spec/classes/rsyslog_database_spec.rb
index cbbaa3a..a704d2d 100644
--- a/spec/classes/rsyslog_database_spec.rb
+++ b/spec/classes/rsyslog_database_spec.rb
@@ -5,6 +5,7 @@ describe 'rsyslog::database', :type => :class do
     let :facts do
       {
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
         :operatingsystemrelease => 6.0,
       }
     end
diff --git a/spec/classes/rsyslog_server_spec.rb b/spec/classes/rsyslog_server_spec.rb
index 677a8f4..b46eeaa 100644
--- a/spec/classes/rsyslog_server_spec.rb
+++ b/spec/classes/rsyslog_server_spec.rb
@@ -7,6 +7,7 @@ describe 'rsyslog::server', :type => :class do
       let :facts do
         {
           :osfamily               => osfamily,
+          :operatingsystem        => osfamily,
           :operatingsystemrelease => 6.0,
         }
       end
diff --git a/spec/classes/rsyslog_spec.rb b/spec/classes/rsyslog_spec.rb
index 5a06816..08f4761 100644
--- a/spec/classes/rsyslog_spec.rb
+++ b/spec/classes/rsyslog_spec.rb
@@ -5,6 +5,7 @@ describe 'rsyslog', :type => :class do
     let :facts do
       {
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
         :operatingsystemrelease => 6.0,
       }
     end
@@ -60,6 +61,7 @@ describe 'rsyslog', :type => :class do
     let :facts do
       {
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
         :operatingsystemrelease => 6.0,
       }
     end
@@ -112,6 +114,7 @@ describe 'rsyslog', :type => :class do
     let :facts do
       {
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
         :operatingsystemrelease => 6.0,
       }
     end
@@ -164,6 +167,7 @@ describe 'rsyslog', :type => :class do
     let :facts do
       {
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
         :operatingsystemrelease => 6.0,
       }
     end
diff --git a/spec/defines/rsyslog_imfile_spec.rb b/spec/defines/rsyslog_imfile_spec.rb
index ad311e3..ddc351d 100644
--- a/spec/defines/rsyslog_imfile_spec.rb
+++ b/spec/defines/rsyslog_imfile_spec.rb
@@ -5,6 +5,7 @@ describe 'rsyslog::imfile', :type => :define do
     let :facts do
       {
         :osfamily               => 'RedHat',
+        :operatingsystem        => 'RedHat',
         :operatingsystemrelease => 6.0,
       }
     end
diff --git a/spec/defines/rsyslog_snippet_spec.rb b/spec/defines/rsyslog_snippet_spec.rb
index 4f3d5b8..c034155 100644
--- a/spec/defines/rsyslog_snippet_spec.rb
+++ b/spec/defines/rsyslog_snippet_spec.rb
@@ -5,6 +5,7 @@ describe 'rsyslog::snippet', :type => :define do
     let :facts do

       {

         :osfamily               => 'RedHat',

+        :operatingsystem        => 'Redhat',

         :operatingsystemrelease => 6.0,

       }

     end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2c6f566..a05654b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1 +1,28 @@
 require 'puppetlabs_spec_helper/module_spec_helper'
+
+RSpec.configure do |c|
+  c.mock_with :rspec do |mock|
+    mock.syntax = [:expect, :should]
+  end
+  c.include PuppetlabsSpec::Files
+
+  c.before :each do
+    # Ensure that we don't accidentally cache facts and environment
+    # between test cases.
+    Facter::Util::Loader.any_instance.stubs(:load_all)
+    Facter.clear
+    Facter.clear_messages
+
+    # Store any environment variables away to be restored later
+    @old_env = {}
+    ENV.each_key {|k| @old_env[k] = ENV[k]}
+
+    if ENV['STRICT_VARIABLES'] == 'yes'
+      Puppet.settings[:strict_variables]=true
+    end
+  end
+
+  c.after :each do
+    PuppetlabsSpec::Files.cleanup
+  end
+end