simp-rspec-puppet-facts 1.2.0 → 1.3.0

data/facts/Vagrantfile

@@ -10,25 +10,25 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define "redhat-6-x86_64" do |host|
     host.vm.box = "anandbitra/redhat-6.5"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-    host.vm.provision "shell", path: "get_facts.sh", args: "6"
-    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+    host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "6"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
   end
-  config.vm.define "redhat-6-x86_64" do |host|
+  config.vm.define "redhat-7-x86_64" do |host|
     host.vm.box = "mrlesmithjr/rhel-7"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-    host.vm.provision "shell", path: "get_facts.sh", args: "7"
-    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+    host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "7"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
   end
   config.vm.define "centos-6-x86_64" do |host|
     host.vm.box = "puppetlabs/centos-6.6-64-nocm"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-    host.vm.provision "shell", path: "get_facts.sh", args: "6"
-    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+    host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "6"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
   end
   config.vm.define "centos-7-x86_64" do |host|
     host.vm.box = "puppetlabs/centos-7.0-64-nocm"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-    host.vm.provision "shell", path: "get_facts.sh", args: "7"
-    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+    host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "7"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
   end
 end

data/facts/scripts/get_facts.rb

@@ -0,0 +1,8 @@
+require 'puppet'
+require 'json'
+require 'facter'
+
+ENV['FACTERLIB'].split(':').each{|x| Facter.search x }
+
+Puppet.initialize_settings
+jj JSON.parse Facter.collection.to_h.to_json

data/facts/{get_facts.sh → scripts/get_facts_for_each_facter.sh}

@@ -1,19 +1,23 @@
 #!/bin/bash
 operatingsystemmajrelease=$1
-
 export PATH=/opt/puppetlabs/bin:$PATH
 export FACTERLIB=`ls -1d /vagrant/modules/*/lib/facter | tr '\n' ':'`
 
-yum install epel-release -y
 wget "https://yum.puppetlabs.com/puppetlabs-release-pc1-el-${operatingsystemmajrelease}.noarch.rpm" -O /tmp/puppetlabs-release-pc1.rpm
 rpm -ivh /tmp/puppetlabs-release-pc1.rpm
 
+# Because `yum install epel-release -y` doesn't work for RedHat:
+wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-${operatingsystemmajrelease}.noarch.rpm
+rpm -Uvh epel-release-latest-${operatingsystemmajrelease}*.rpm
+
+
 # Capture data for (c)facter 3.X
 for puppet_agent_version in 1.2.2 1.2.7; do
   yum install -y puppet-agent-${puppet_agent_version} rubygems git ruby-devel
-  output_file="/vagrant/$(facter --version | cut -c1-3)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-  mkdir -p $(dirname ${output_file})
-  facter -j | tee ${output_file}
+  output_dir="/vagrant/$(facter --version | cut -c1-3)"
+  output_file="$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
+  mkdir -p $output_dir
+  puppet facts | tee "${output_dir}/${output_file}"
 done
 
 operatingsystem=$(facter operatingsystem | tr '[:upper:]' '[:lower:]')
@@ -25,11 +29,15 @@ gem install bundler --no-ri --no-rdoc --no-format-executable
 bundle install --path vendor/bundler
 
 # Capture data for ruby-based facters
-for version in 1.6.0 1.7.0 2.0.0 2.1.0 2.2.0 2.3.0 2.4.0; do
+for version in 1.7.0 2.0.0 2.1.0 2.2.0 2.3.0 2.4.0; do
   FACTER_GEM_VERSION="~> ${version}" bundle update
-  output_file="/vagrant/$(bundle exec facter --version | cut -c1-3)/${operatingsystem}-${operatingsystemmajrelease}-${hardwaremodel}.facts"
+  os_string="$(bundle exec facter --version | cut -c1-3)/${operatingsystem}-${operatingsystemmajrelease}-${hardwaremodel}"
+  echo
+  echo
+  echo ============== ${os_string} ================
+  echo
+  echo
+  output_file="/vagrant/${os_string}.facts"
   mkdir -p $(dirname $output_file)
-  echo $version | grep -q -E '^1\.' &&
-    FACTER_GEM_VERSION="~> ${version}" bundle exec facter -j | bundle exec ruby -e 'require "json"; jj JSON.parse gets' | tee $output_file ||
-    FACTER_GEM_VERSION="~> ${version}" bundle exec facter -j | tee $output_file
+  FACTER_GEM_VERSION="~> ${version}" bundle exec ruby /vagrant/scripts/get_facts.rb | tee $output_file
 done

data/lib/simp/rspec-puppet-facts.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'puppet'
 
 module Simp; end
 module Simp::RspecPuppetFacts
@@ -22,6 +23,7 @@ module Simp::RspecPuppetFacts
 
         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, {} )
@@ -60,16 +62,19 @@ module Simp::RspecPuppetFacts
     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',
     }

data/lib/simp/version.rb

@@ -1,4 +1,4 @@
 module Simp; end
 module Simp::RspecPuppetFacts
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -124,10 +124,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- facts/1.6/centos-6-x86_64.facts
-- facts/1.6/centos-7-x86_64.facts
-- facts/1.6/redhat-6-x86_64.facts
-- facts/1.6/redhat-7-x86_64.facts
 - facts/1.7/centos-6-x86_64.facts
 - facts/1.7/centos-7-x86_64.facts
 - facts/1.7/redhat-6-x86_64.facts
@@ -162,7 +158,8 @@ files:
 - facts/3.1/redhat-7-x86_64.facts
 - facts/Gemfile
 - facts/Vagrantfile
-- facts/get_facts.sh
+- facts/scripts/get_facts.rb
+- facts/scripts/get_facts_for_each_facter.sh
 - lib/simp-rspec-puppet-facts.rb
 - lib/simp/rspec-puppet-facts.rb
 - lib/simp/version.rb
@@ -209,11 +206,6 @@ test_files:
 - facts/2.0/redhat-6-x86_64.facts
 - facts/2.0/centos-7-x86_64.facts
 - facts/2.0/centos-6-x86_64.facts
-- facts/get_facts.sh
-- facts/1.6/redhat-7-x86_64.facts
-- facts/1.6/redhat-6-x86_64.facts
-- facts/1.6/centos-7-x86_64.facts
-- facts/1.6/centos-6-x86_64.facts
 - facts/1.7/redhat-7-x86_64.facts
 - facts/1.7/redhat-6-x86_64.facts
 - facts/1.7/centos-7-x86_64.facts
@@ -231,6 +223,8 @@ test_files:
 - facts/2.3/redhat-6-x86_64.facts
 - facts/2.3/centos-7-x86_64.facts
 - facts/2.3/centos-6-x86_64.facts
+- facts/scripts/get_facts_for_each_facter.sh
+- facts/scripts/get_facts.rb
 - facts/2.2/redhat-7-x86_64.facts
 - facts/2.2/redhat-6-x86_64.facts
 - facts/2.2/centos-7-x86_64.facts