rspec-puppet-facts 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 643de41b550424eb4cf57cdb3b2c7a68ee9391b80df3eedb29f0896d0b88bd70
-  data.tar.gz: e9db928178faccb9a8825f27a655d33d2488197985211b22ff78b48bdfd4d8bb
+SHA1:
+  metadata.gz: a64115f0d16cfdcdc93bae297977afe14d8cc710
+  data.tar.gz: ae69075f4678a762b2f9974144ba275f095aac9f
 SHA512:
-  metadata.gz: afe0f40872939558ac3112ac26c1cb2186203174d5a68247d01a8559bb9054b6f8f2f0538359f609149e95b7cac755b21c2823e12e97f86096814846855c6d5d
-  data.tar.gz: a5d72718244ef7dd72d667660e21f7e958c2d5025d2da6818f9dde169e7a8841aa6389a281294da28dfbb0f3fe972f7e6de82db81eaa17b2c048d1b3c59f1ecc
+  metadata.gz: 98b7d46da60565cec886e89b78bf15dee26691d9f7060d6ad48852f19ea0fa0799a50412e16e4ee089689aa71dd7e831eff420f8e3ebd811fbe13ecca3631402
+  data.tar.gz: 812d53e7265c0f97af809625ca4d8f2b2a0c963d70e2aad0ae35aa6c8f2ac882138e7d6257f03b8251baf5bde0e04795af396da0bdad234359f7e8e7b05f43d6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2019-07-31 - Release 1.9.6
+- Suppress the warning message generated when the Augeas gem is not available.
+- Searching through older Facter releases for a fact set that does not exist no
+  longer causes it to hang indefinitely.
+- The `operatingsystemrelease` values are now correctly escaped when building
+  the FacterDB filters, allowing the use of `operatingsystemrelease` values
+  that contain special regular expression characters like parentheses.
+
 ## 2019-07-29 - Release 1.9.5
 - The default version of Facter to search for is now configurable with
   `RSpec.configuration.default_facter_version`.

data/lib/rspec-puppet-facts.rb

@@ -59,7 +59,7 @@ module RspecPuppetFacts
         Array(os_sup['operatingsystemrelease']).map do |operatingsystemmajrelease|
           opts[:hardwaremodels].each do |hardwaremodel|
 
-            os_release_filter = "/^#{operatingsystemmajrelease.split(' ')[0]}/"
+            os_release_filter = "/^#{Regexp.escape(operatingsystemmajrelease.split(' ')[0])}/"
             if os_sup['operatingsystem'] =~ /BSD/i
               hardwaremodel = 'amd64'
             elsif os_sup['operatingsystem'] =~ /Solaris/i
@@ -109,7 +109,7 @@ module RspecPuppetFacts
       db = FacterDB.get_facts(filter_spec.merge({ :facterversion =>  facter_version_filter }))
 
       version = facterversion
-      while db.empty? && version !~ /\d+\.0($|\.\d+)/
+      while db.empty? && version !~ /\A\d+\.0($|\.\d+)/
         version = RspecPuppetFacts.down_facter_version(version)
         facter_version_filter = RspecPuppetFacts.facter_version_to_filter(version)
         db = FacterDB.get_facts(filter_spec.merge({ :facterversion =>  facter_version_filter }))
@@ -260,8 +260,7 @@ module RspecPuppetFacts
   def self.augeas?
     require 'augeas'
     true
-  rescue LoadError => e
-    RspecPuppetFacts.warning "Failed to retrieve Augeas version: #{e}"
+  rescue LoadError
     false
   end
   # :nocov:
@@ -344,8 +343,9 @@ module RspecPuppetFacts
   # @param minor_subtractor [int] the value which to subtract by
   # @api private
   def self.down_facter_version(version, minor_subtractor = 1)
-      major, minor, z = version.split('.')
-      minor = (minor.to_i - minor_subtractor).to_s
-      "#{major}.#{minor}.#{z}"
+    major, minor, z = version.split('.')
+    z = '0' if z.nil?
+    minor = (minor.to_i - minor_subtractor).to_s
+    "#{major}.#{minor}.#{z}"
   end
 end

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

@@ -2,6 +2,6 @@ module RspecPuppetFacts
   # This module contains the current version constant
   module Version
     # The current version of this gem
-    STRING = '1.9.5'
+    STRING = '1.9.6'
   end
 end

data/spec/rspec_puppet_facts_spec.rb

@@ -486,6 +486,43 @@ describe RspecPuppetFacts do
       end
     end
 
+    context 'When the operatingsystemrelease contains parens' do
+      subject do
+        on_supported_os(
+          {
+            :supported_os => [
+              {
+                'operatingsystem'        => 'IOS',
+                'operatingsystemrelease' => ['12.2(25)EWA9'],
+              }
+            ],
+          }
+        )
+      end
+
+      before(:each) do
+        allow(RspecPuppetFacts).to receive(:warning).with(a_string_matching(/no facts were found/i))
+        allow(FacterDB).to receive(:get_facts).and_call_original
+      end
+
+      it 'escapes the parens in the filter' do
+        filter = [
+          include(
+            :operatingsystem        => "IOS",
+            :operatingsystemrelease => "/^12\\.2\\(25\\)EWA9/",
+            :hardwaremodel          => "x86_64",
+          ),
+        ]
+
+        expect(FacterDB).to receive(:get_facts).with(filter)
+        subject
+      end
+
+      it 'does not raise an error' do
+        expect { subject }.not_to raise_error
+      end
+    end
+
     context 'Without a custom facterversion in the options hash' do
       subject do
         on_supported_os(
@@ -753,10 +790,6 @@ describe RspecPuppetFacts do
       expect(subject.common_facts[:augeasversion]).to eq 'my_version'
     end
 
-    it 'can output a warning message' do
-      expect { RspecPuppetFacts.warning('test') }.to output(/test/).to_stderr_from_any_process
-    end
-
     context 'when mcollective is available' do
       module MCollective_stub
         VERSION = 'my_version'
@@ -850,4 +883,17 @@ describe RspecPuppetFacts do
       end
     end
   end
+
+  describe '.down_facter_version' do
+    context 'with MAJOR.MINOR.PATCH version' do
+      it 'decrements MINOR version' do
+        expect(RspecPuppetFacts.down_facter_version('3.5.5')).to eq '3.4.5'
+      end
+    end
+    context 'with MAJOR.MINOR version' do
+      it 'decrements MINOR version and sets PATCH to \'0\'' do
+        expect(RspecPuppetFacts.down_facter_version('3.5')).to eq '3.4.0'
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - Mickaël Canévet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Standard facts fixtures for Puppet