rspec-puppet-facts.rb in simp-rspec-puppet-facts-1.3.0

- old
+ new

@@ -1,6 +1,7 @@
 require 'json'
+require 'puppet'
 
 module Simp; end
 module Simp::RspecPuppetFacts
   require File.expand_path('version', File.dirname(__FILE__))
 
@@ -20,10 +21,11 @@
         captured_facts = symbolize_keys JSON.parse( captured_facts_raw )
         captured_facts.keep_if{ |k,v| (captured_facts.keys-facts.keys).include? k }
 
         facts.merge! captured_facts
         facts.merge! opts.fetch( :extra_facts, {} )
+        facts.merge!({ :puppetversion => ::Puppet.version })
         facts.merge! lsb_facts( facts )
         facts.merge! selinux_facts( selinux_mode, facts )
         facts.merge! opts.fetch( :extra_facts_immutable, {} )
       end
 
@@ -58,19 +60,22 @@
       fail "FATAL: `mode` must be one of: #{SELINUX_MODES.map{|x| x.to_s.sub(/^/,':')}.join(', ')}"
     end
     sefacts = {}
     sefacts_enforcing = {
       :selinux              => true,
+      :selinux_enforced     => true,
       :selinux_current_mode => 'enforcing',
       :selinux_state        => 'enforcing',
     }
     sefacts_permissive = {
       :selinux              => true,
+      :selinux_enforced     => false,
       :selinux_current_mode => 'permissive',
       :selinux_state        => 'permssive',
     }
     sefacts_disabled = {
       :selinux              => false,
+      :selinux_enforced     => false,
       :selinux_current_mode => 'disabled',
       :selinux_state        => 'disabled',
     }
     sefacts = sefacts_enforcing
     sefacts = sefacts_enforcing  if mode == :enforcing