simp-rspec-puppet-facts 1.4.1 → 2.0.0

data/facts/scripts/get_facts.rb

@@ -2,7 +2,7 @@ require 'puppet'
 require 'json'
 require 'facter'
 
-ENV['FACTERLIB'].split(':').each{|x| Facter.search x }
+ENV.fetch('FACTERLIB').split(':').each{|x| Facter.search x }
 
 Puppet.initialize_settings
 Facter.loadfacts

data/facts/scripts/get_facts_for_each_facter.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
+#
+# This script record factsets for various versions of cfacter & facter into
+# JSON files.  It is run as the vagrant user
+#
 operatingsystem=$( echo "$1" | cut -f1 -d' ' )
 operatingsystemmajrelease=$( echo "$1" | cut -f2 -d' ' )
 
@@ -17,9 +21,9 @@ export FACTERLIB=`ls -1d /vagrant/modules/*/lib/facter | tr '\n' ':'`
 
 which dnf > /dev/null 2>&1
 if [ $? -eq 0 ]; then
-  rpm_cmd='dnf --best --allowerasing'
+  rpm_cmd='sudo dnf --best --allowerasing'
 else
-  rpm_cmd='yum --skip-broken'
+  rpm_cmd='sudo yum --skip-broken'
 fi
 
 if [ "${operatingsystem}" != 'fedora' ]; then
@@ -31,16 +35,22 @@ else
 fi
 
 $rpm_cmd install -y --nogpgcheck "https://yum.puppetlabs.com/puppetlabs-release-pc1-${plabs_ver}-${operatingsystemmajrelease}.noarch.rpm"
+$rpm_cmd install -y --nogpgcheck "https://yum.puppetlabs.com/puppetlabs-release-pc1-${plabs_ver}-${operatingsystemmajrelease}.noarch.rpm"
+$rpm_cmd install -y https://yum.puppetlabs.com/puppet5/puppet5-release-${plabs_ver}-${operatingsystemmajrelease}.noarch.rpm
 
 # Prereqs
 $rpm_cmd install -y facter rubygem-bundler git augeas-devel \
   libicu-devel libxml2 libxml2-devel libxslt libxslt-devel \
-  gcc gcc-c++ ruby-devel audit
+  gcc gcc-c++ ruby-devel audit bind-utils net-tools
 
 rpm -qi puppet > /dev/null &&  $rpm_cmd remove -y puppet
 
 # Capture data for (c)facter 3.X
-for puppet_agent_version in 1.2.2 1.2.7 1.5.3 1.6.0; do
+#                                           *LTS*           +2016.4
+# PE                        2015.2.0 2016.2 2016.4.3 2016.5 2017.2   -----
+# Puppet                    4.2.1    4.5.2  4.7.1    4.8.2  4.10.4   5.0.1
+# Facter                    3.0      3.1    3.4.2    3.5.1  3.6.5    3.7.1
+for puppet_agent_version in 1.2.2    1.5.3  1.7.2    1.8.3  1.10.4   5.0.1 ; do
   rpm -qi puppet-agent > /dev/null && $rpm_cmd remove -y puppet-agent
   $rpm_cmd install -y puppet-agent-$puppet_agent_version
   facter_version=$( facter --version | cut -c1-3 )
@@ -66,7 +76,7 @@ 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.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 2.5.0 ; do
   FACTER_GEM_VERSION="~> ${version}" PUPPET_VERSION="~> 3.7" bundle update
   os_string="$(FACTER_GEM_VERSION="~> ${version}" PUPPET_VERSION="~> 3.7" bundle exec facter --version | cut -c1-3)/${operatingsystem}-${operatingsystemmajrelease}-${hardwaremodel}"
   echo

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

@@ -5,20 +5,63 @@ module Simp; end
 module Simp::RspecPuppetFacts
   require File.expand_path('version', File.dirname(__FILE__))
 
-  SELINUX_MODES= [:enforcing, :disabled, :permissive]
+  SELINUX_MODES = [:enforcing, :disabled, :permissive]
+
+
+  def supported_os_strings( opts )
+    supported_os = opts.fetch(:supported_os, RspecPuppetFacts.meta_supported_os)
+    hardwaremodels = opts.fetch(:hardwaremodels, ['x86_64'])
+    os_strings = []
+    supported_os.each do |os|
+      os['operatingsystemrelease'].each do |rel|
+        hardwaremodels.each do |hw|
+          os_strings << [os['operatingsystem'],rel,hw].map{|x| x.downcase }.join('-')
+        end
+      end
+    end
+    os_strings
+  end
+
+  # Don't ask rspec-puppet-facts for operatingsystems we've already recorded
+  # because if it doesn't have them it will crash
+  def filter_opts( opts, simp_h, filter_type = :reject )
+    rfh_hw = opts.fetch(:hardwaremodels, ['x86_64'])
+    rfh_os = opts.fetch(:supported_os, RspecPuppetFacts.meta_supported_os).dup
+		_os = rfh_os.send(filter_type) do |os|
+      _name = os['operatingsystem']
+      _rels = os['operatingsystemrelease'].send(filter_type) do |rel|
+        _hw = rfh_hw.send(filter_type) do |hw|
+          simp_h.key? [_name,rel,hw].map{|x| x.downcase }.join('-')
+        end
+        !_hw.empty?
+      end
+      !_rels.empty?
+    end
+    _opts = opts.dup
+    _opts[:supported_os] = _os
+    _opts
+  end
 
   def on_supported_os( opts = {} )
-    h = Simp::RspecPuppetFacts::Shim.on_supported_os( opts )
-    selinux_mode = opts.fetch(:selinux_mode,:enforcing)
+    opts[:selinux_mode]       ||= :enforcing
+    opts[:simp_fact_dir_path] ||= File.expand_path("../../facts/",
+                                                   File.dirname(__FILE__))
 
-    h.each do | os, facts |
-      facts ||= Hash.new
+		simp_h         = load_facts(opts[:simp_fact_dir_path])
+    strings        = supported_os_strings(opts)
+    masked_opts    = filter_opts(opts, simp_h, :reject)
+    selected_opts  = filter_opts(opts, simp_h, :select)
+    rfh_h  = Simp::RspecPuppetFacts::Shim.on_supported_os(masked_opts)
 
-      facter_version=Facter.version[0..2]
-      facts_file = File.expand_path("../../facts/#{facter_version}/#{os}.facts", File.dirname(__FILE__))
+    h = rfh_h.merge(simp_h).select{|k,v| supported_os_strings(opts).include? k}
+    h.each do | os, facts |
+      facter_ver=Facter.version[0..2]
+      facts_file = File.expand_path("../../facts/#{facter_ver}/#{os}.facts",
+                                    File.dirname(__FILE__))
       if File.file? facts_file
         captured_facts_raw = File.open(
-          File.expand_path("../../facts/#{facter_version}/#{os}.facts", File.dirname(__FILE__))
+          File.expand_path("../../facts/#{facter_ver}/#{os}.facts",
+                           File.dirname(__FILE__))
         ).read
         captured_facts = symbolize_keys JSON.parse( captured_facts_raw )
         captured_facts.keep_if{ |k,v| (captured_facts.keys-facts.keys).include? k }
@@ -27,15 +70,14 @@ module Simp::RspecPuppetFacts
         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! selinux_facts( opts[:selinux_mode], facts )
         facts.merge! opts.fetch( :extra_facts_immutable, {} )
       end
 
-      if ( ENV.key?('SIMP_FACTS_OS') &&
-           !ENV['SIMP_FACTS_OS'].nil? &&
-           ENV['SIMP_FACTS_OS'].strip != '' &&
+      if ( ENV.fetch('SIMP_FACTS_OS',nil) &&
+           !ENV['SIMP_FACTS_OS'].strip.empty? &&
            ENV['SIMP_FACTS_OS'] !~ /all/i )
-        unless ENV['SIMP_FACTS_OS'].split(/[ ,]+/).include? os
+        unless ENV['SIMP_FACTS_OS'].strip.split(/[ ,]+/).include? os
           h.delete(os)
         end
       end
@@ -117,6 +159,32 @@ module Simp::RspecPuppetFacts
     }
   end
 
+
+  def load_facts( fact_dir_path )
+    facter_zy_version = Facter.version.split('.')[0..1].join('.')
+    fact_dir          = File.join(fact_dir_path,facter_zy_version)
+
+    unless File.exists? fact_dir
+      _msg = "Can't find SIMP facts for Facter #{facter_zy_version}, skipping...
+
+HINT: If this version of Facter has been released recently, try running
+
+    `FACTER_GEM_VERSION='~> X.Y.0' bundler update facter
+
+Where 'X.Y' is the version of the last facter that worked"
+      fail(_msg)
+    end
+
+    simp_h     = {}
+    fact_files = Dir.glob( File.join(fact_dir, '*.facts') ).sort
+    fact_files.each do |file|
+      key  = File.basename(file).sub(/\.facts$/,'')
+      data = JSON.parse(File.read(file))
+      simp_h[key] = symbolize_keys(data)
+    end
+    simp_h
+  end
+
   class Shim
     require 'rspec-puppet-facts'
     extend ::RspecPuppetFacts

data/lib/simp/version.rb

@@ -1,4 +1,4 @@
 module Simp; end
 module Simp::RspecPuppetFacts
-  VERSION = '1.4.1'
+  VERSION = '2.0.0'
 end

data/spec/simp_rspec_puppet_facts_spec.rb

@@ -9,7 +9,7 @@ describe 'Simp::RspecPuppetFacts' do
       subject { on_supported_os() }
 
       context 'Without a metadata.json file' do
-        it { expect { subject }.to raise_error(StandardError, /Can't find metadata.json/) }
+        it { expect { subject }.to raise_error(StandardError, /Can't find metadata\.json/) }
       end
 
       context 'With a metadata.json file' do
@@ -21,26 +21,29 @@ describe 'Simp::RspecPuppetFacts' do
           expect( on_supported_os().class ).to eq Hash
         end
         it 'should have 4 elements' do
-          expect(subject.size).to eq 4
+          expect(subject.size).to be >= 4
         end
         it 'should return supported OS' do
-          expect(subject.keys.sort).to eq [
-            'centos-6-x86_64',
-            'centos-7-x86_64',
-            'redhat-6-x86_64',
-            'redhat-7-x86_64',
-          ]
+          expect(subject.keys.sort).to include 'centos-6-x86_64'
+          expect(subject.keys.sort).to include 'centos-7-x86_64'
+          expect(subject.keys.sort).to include 'redhat-6-x86_64'
+          expect(subject.keys.sort).to include 'redhat-7-x86_64'
         end
         it 'should return SIMP-specific OS facts' do
-          expect(subject.map{ |os,data|  {os =>
+          grub_version_facts = subject.map{ |os,data|  {os =>
             data.select{ |x,v| x == :uid_min || x == :grub_version }}}
-          ).to eq [
-            {"centos-6-x86_64"=>{:uid_min=>"500",  :grub_version=>"0.97"      }},
-            {"centos-7-x86_64"=>{:uid_min=>"1000", :grub_version=>"2.02~beta2"}},
-            {"redhat-6-x86_64"=>{:uid_min=>"500",  :grub_version=>"0.97"      }},
-            {"redhat-7-x86_64"=>{:uid_min=>"1000", :grub_version=>"2.02~beta2"}},
-          ]
-
+          expect( grub_version_facts ).to include(
+            {"centos-6-x86_64"=>{:uid_min=>"500",  :grub_version=>"0.97"}}
+          )
+          expect( grub_version_facts ).to include(
+            {"centos-7-x86_64"=>{:uid_min=>"1000", :grub_version=>"2.02~beta2"}}
+          )
+          expect( grub_version_facts ).to include(
+            {"redhat-6-x86_64"=>{:uid_min=>"500",  :grub_version=>"0.97"}}
+          )
+          expect( grub_version_facts ).to include(
+            {"redhat-7-x86_64"=>{:uid_min=>"1000", :grub_version=>"2.02~beta2"}}
+          )
         end
       end
     end
@@ -106,7 +109,7 @@ describe 'Simp::RspecPuppetFacts' do
               {
                 "operatingsystem" => "Debian",
                 "operatingsystemrelease" => [
-                  "4",
+                  "X",
                 ],
               },
             ]
@@ -115,7 +118,7 @@ describe 'Simp::RspecPuppetFacts' do
       }
 
       it 'should output warning message' do
-        expect { subject }.to output(/Can't find facts for 'debian-4-x86_64'/).to_stderr
+        expect { subject }.to output(/Can't find facts for 'debian-X-x86_64'/).to_stderr
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-puppet-facts
@@ -154,6 +154,11 @@ files:
 - facts/2.4/fedora-23-x86_64.facts
 - facts/2.4/redhat-6-x86_64.facts
 - facts/2.4/redhat-7-x86_64.facts
+- facts/2.5/--.facts
+- facts/2.5/centos-6-x86_64.facts
+- facts/2.5/centos-7-x86_64.facts
+- facts/2.5/redhat-6-x86_64.facts
+- facts/2.5/redhat-7-x86_64.facts
 - facts/3.0/centos-6-x86_64.facts
 - facts/3.0/centos-7-x86_64.facts
 - facts/3.0/redhat-6-x86_64.facts
@@ -170,12 +175,27 @@ files:
 - facts/3.3/centos-7-x86_64.facts
 - facts/3.3/fedora-23-x86_64.facts
 - facts/3.3/redhat-6-x86_64.facts
+- facts/3.3/redhat-7-x86_64.facts
 - facts/3.4/centos-6-x86_64.facts
 - facts/3.4/centos-7-x86_64.facts
 - facts/3.4/fedora-23-x86_64.facts
 - facts/3.4/redhat-6-x86_64.facts
+- facts/3.4/redhat-7-x86_64.facts
+- facts/3.5/centos-6-x86_64.facts
+- facts/3.5/centos-7-x86_64.facts
+- facts/3.5/redhat-6-x86_64.facts
+- facts/3.5/redhat-7-x86_64.facts
+- facts/3.6/centos-6-x86_64.facts
+- facts/3.6/centos-7-x86_64.facts
+- facts/3.6/redhat-6-x86_64.facts
+- facts/3.6/redhat-7-x86_64.facts
+- facts/3.7/centos-6-x86_64.facts
+- facts/3.7/centos-7-x86_64.facts
+- facts/3.7/redhat-6-x86_64.facts
+- facts/3.7/redhat-7-x86_64.facts
 - facts/Gemfile
 - facts/Vagrantfile
+- facts/puppetfiles/Puppetfile.6.0.0-0
 - facts/scripts/get_facts.rb
 - facts/scripts/get_facts_for_each_facter.sh
 - lib/simp-rspec-puppet-facts.rb
@@ -212,61 +232,81 @@ specification_version: 4
 summary: standard SIMP facts fixtures for Puppet
 test_files:
 - Rakefile
-- spec/fixtures/metadata.json
-- spec/fixtures/metadata.json_with_missing_operatingsystem_support
 - spec/simp_rspec_puppet_facts_spec.rb
+- spec/fixtures/metadata.json_with_missing_operatingsystem_support
+- spec/fixtures/metadata.json
 - spec/spec_helper.rb
-- facts/2.4/redhat-6-x86_64.facts
-- facts/2.4/centos-6-x86_64.facts
-- facts/2.4/redhat-7-x86_64.facts
-- facts/2.4/centos-7-x86_64.facts
-- facts/2.4/fedora-23-x86_64.facts
-- facts/2.0/redhat-6-x86_64.facts
+- facts/scripts/get_facts_for_each_facter.sh
+- facts/scripts/get_facts.rb
+- facts/Vagrantfile
 - facts/2.0/centos-6-x86_64.facts
-- facts/2.0/redhat-7-x86_64.facts
+- facts/2.0/redhat-6-x86_64.facts
 - facts/2.0/centos-7-x86_64.facts
+- facts/2.0/redhat-7-x86_64.facts
 - facts/2.0/fedora-23-x86_64.facts
-- facts/2.1/redhat-6-x86_64.facts
+- facts/3.0/centos-6-x86_64.facts
+- facts/3.0/redhat-6-x86_64.facts
+- facts/3.0/centos-7-x86_64.facts
+- facts/3.0/redhat-7-x86_64.facts
 - facts/2.1/centos-6-x86_64.facts
-- facts/2.1/redhat-7-x86_64.facts
+- facts/2.1/redhat-6-x86_64.facts
 - facts/2.1/centos-7-x86_64.facts
+- facts/2.1/redhat-7-x86_64.facts
 - facts/2.1/fedora-23-x86_64.facts
-- facts/3.1/redhat-6-x86_64.facts
-- facts/3.1/centos-6-x86_64.facts
-- facts/3.1/redhat-7-x86_64.facts
-- facts/3.1/centos-7-x86_64.facts
-- facts/2.2/redhat-6-x86_64.facts
-- facts/2.2/centos-6-x86_64.facts
-- facts/2.2/redhat-7-x86_64.facts
-- facts/2.2/centos-7-x86_64.facts
-- facts/2.2/fedora-23-x86_64.facts
-- facts/1.7/redhat-6-x86_64.facts
 - facts/1.7/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
+- facts/1.7/redhat-7-x86_64.facts
 - facts/1.7/fedora-23-x86_64.facts
-- facts/scripts/get_facts_for_each_facter.sh
-- facts/scripts/get_facts.rb
-- facts/3.3/redhat-6-x86_64.facts
-- facts/3.3/centos-6-x86_64.facts
-- facts/3.3/centos-7-x86_64.facts
-- facts/3.3/fedora-23-x86_64.facts
-- facts/3.2/redhat-6-x86_64.facts
-- facts/3.2/centos-6-x86_64.facts
-- facts/3.2/centos-7-x86_64.facts
-- facts/3.2/fedora-23-x86_64.facts
-- facts/Vagrantfile
-- facts/Gemfile
-- facts/2.3/redhat-6-x86_64.facts
 - facts/2.3/centos-6-x86_64.facts
-- facts/2.3/redhat-7-x86_64.facts
+- facts/2.3/redhat-6-x86_64.facts
 - facts/2.3/centos-7-x86_64.facts
+- facts/2.3/redhat-7-x86_64.facts
 - facts/2.3/fedora-23-x86_64.facts
-- facts/3.4/redhat-6-x86_64.facts
+- facts/3.6/centos-6-x86_64.facts
+- facts/3.6/redhat-6-x86_64.facts
+- facts/3.6/centos-7-x86_64.facts
+- facts/3.6/redhat-7-x86_64.facts
+- facts/2.2/centos-6-x86_64.facts
+- facts/2.2/redhat-6-x86_64.facts
+- facts/2.2/centos-7-x86_64.facts
+- facts/2.2/redhat-7-x86_64.facts
+- facts/2.2/fedora-23-x86_64.facts
+- facts/3.1/centos-6-x86_64.facts
+- facts/3.1/redhat-6-x86_64.facts
+- facts/3.1/centos-7-x86_64.facts
+- facts/3.1/redhat-7-x86_64.facts
+- facts/3.7/centos-6-x86_64.facts
+- facts/3.7/redhat-6-x86_64.facts
+- facts/3.7/centos-7-x86_64.facts
+- facts/3.7/redhat-7-x86_64.facts
+- facts/3.3/centos-6-x86_64.facts
+- facts/3.3/redhat-6-x86_64.facts
+- facts/3.3/centos-7-x86_64.facts
+- facts/3.3/redhat-7-x86_64.facts
+- facts/3.3/fedora-23-x86_64.facts
 - facts/3.4/centos-6-x86_64.facts
+- facts/3.4/redhat-6-x86_64.facts
 - facts/3.4/centos-7-x86_64.facts
+- facts/3.4/redhat-7-x86_64.facts
 - facts/3.4/fedora-23-x86_64.facts
-- facts/3.0/redhat-6-x86_64.facts
-- facts/3.0/centos-6-x86_64.facts
-- facts/3.0/redhat-7-x86_64.facts
-- facts/3.0/centos-7-x86_64.facts
+- facts/puppetfiles/Puppetfile.6.0.0-0
+- facts/3.5/centos-6-x86_64.facts
+- facts/3.5/redhat-6-x86_64.facts
+- facts/3.5/centos-7-x86_64.facts
+- facts/3.5/redhat-7-x86_64.facts
+- facts/2.4/centos-6-x86_64.facts
+- facts/2.4/redhat-6-x86_64.facts
+- facts/2.4/centos-7-x86_64.facts
+- facts/2.4/redhat-7-x86_64.facts
+- facts/2.4/fedora-23-x86_64.facts
+- facts/2.5/--.facts
+- facts/2.5/centos-6-x86_64.facts
+- facts/2.5/redhat-6-x86_64.facts
+- facts/2.5/centos-7-x86_64.facts
+- facts/2.5/redhat-7-x86_64.facts
+- facts/Gemfile
+- facts/3.2/centos-6-x86_64.facts
+- facts/3.2/redhat-6-x86_64.facts
+- facts/3.2/centos-7-x86_64.facts
+- facts/3.2/fedora-23-x86_64.facts