rspec-puppet-facts 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 601e63e42c9bd47dcfa7a4595770e4b2f75638f1
-  data.tar.gz: 86c454040c79b8dc060e197fa0ca2a810edafaa7
+SHA256:
+  metadata.gz: 7dbd52f624b211b89fe821e11bb4b0b06f027990544d3fcab0670ed43649dc04
+  data.tar.gz: 590ab056e1834379ff220aa28bd0f84dd3190f52b9bca2d0621432c29c7333ec
 SHA512:
-  metadata.gz: fba02b4a1a05373922f6686bd606e328918f443e528934fd0b056c128d51f01c60a3fdb70c2db309f697cdcbe7a0a538eb8e3e0dee3558940311955977bc01d0
-  data.tar.gz: 62e87c175fd6280657886628b371b457cde4a6452f9558f931db0f83be3ceaecba05340e728f39003246a57e191c927b612ad64e6ad9be5384a86a62dbc7a67c
+  metadata.gz: ae3e87f28130b1729435a68bd58573e091a0be404e0c666f5eba49c319308374f183b5312d3336ea37a684764b100696d32970cc0d45b16fb404c5eef7f7b967
+  data.tar.gz: 7c44c5f98f60b92b117129c52f1acedd4b355196db417267547be85cee91f261fe0703f3861b380360af1c2e75589bfb28084d29e8c90ad4cb736f3bfa1ccb7e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2018-10-24 - Release 1.9.1
+- Do not rely on features of Augeas because Puppet 6
+
 ## 2018-01-31 - Release 1.9.0
 - Bumps facterdb requirement to 0.5.0
 - Adds docs for using custom external facts

data/README.md

@@ -38,7 +38,7 @@ include RspecPuppetFacts
 
 ## Specifying the supported operating systems
 
-To determine which facts to run your tests against, `rspec-puppet-facts` checks your module's `metadata.json` to find out what operating systems your module supports. The `metadata.json` file is located in the root of your module. To learn more about this file, see Puppet's [metatdata](https://docs.puppet.com/puppet/latest/modules_metadata.html) documentation.
+To determine which facts to run your tests against, `rspec-puppet-facts` checks your module's `metadata.json` to find out what operating systems your module supports. The `metadata.json` file is located in the root of your module. To learn more about this file, see Puppet's [metadata](https://docs.puppet.com/puppet/latest/modules_metadata.html) documentation.
 
 By default, `rspec-puppet-facts` provides the facts only for `x86_64` architecture. However, you can override this default and the supported operating system list by passing a hash to `on_supported_os` in your tests. This hash must contain either or both of the following keys:
 

data/lib/rspec-puppet-facts.rb

@@ -60,6 +60,13 @@ module RspecPuppetFacts
               hardwaremodel = 'amd64'
             elsif os_sup['operatingsystem'] =~ /Solaris/i
               hardwaremodel = 'i86pc'
+            elsif os_sup['operatingsystem'] =~ /AIX/i
+              hardwaremodel = '/^IBM,.*/'
+              os_release_filter = if operatingsystemmajrelease =~ /\A(\d+)\.(\d+)\Z/
+                                    "/^#{$~[1]}#{$~[2]}00-/"
+                                  else
+                                    "/^#{operatingsystemmajrelease}-/"
+                                  end
             elsif os_sup['operatingsystem'] =~ /Windows/i
               hardwaremodel = version =~ /^[12]\./ ? 'x64' : 'x86_64'
               os_sup['operatingsystem'] = os_sup['operatingsystem'].downcase
@@ -209,8 +216,11 @@ module RspecPuppetFacts
         :rubysitedir   => RbConfig::CONFIG['sitelibdir'],
         :rubyversion   => RUBY_VERSION,
     }
-    if Puppet.features.augeas?
+    begin
+      require 'augeas'
       @common_facts[:augeasversion] = Augeas.open(nil, nil, Augeas::NO_MODL_AUTOLOAD).get('/augeas/version')
+    rescue => e
+      RspecPuppetFacts.warning "Failed to retrieve Augeas version: #{e}"
     end
     @common_facts
   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.0'
+    STRING = '1.9.1'
   end
 end

data/spec/rspec_puppet_facts_spec.rb

@@ -265,6 +265,37 @@ describe RspecPuppetFacts do
       end
     end
 
+    context 'When testing AIX 7.1' do
+      subject {
+        on_supported_os(
+            {
+                :supported_os => [
+                    {
+                        "operatingsystem" => "AIX",
+                        "operatingsystemrelease" => [
+                            "7.1", "7100"
+                        ],
+                    },
+                ],
+                :facterversion => '3.9'
+            }
+        )
+      }
+      it 'should return a hash' do
+        expect(subject.class).to eq Hash
+      end
+      it 'should have 1 elements' do
+        expect(subject.size).to eq 1
+      end
+      it 'should return supported OS' do
+        # NOTE: See FACT-1827 for details on the IBM,8284-22A part
+        # That has to match whatever hardware generated the facts file.
+        expect(subject.keys.sort).to eq %w(
+          aix-7100-IBM,8284-22A
+        )
+      end
+    end
+
     context 'When testing Windows', :if => Facter.version.to_f >= 2.4 do
       subject do
         on_supported_os(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Mickaël Canévet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Standard facts fixtures for Puppet