rspec-puppet-facts 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dbd52f624b211b89fe821e11bb4b0b06f027990544d3fcab0670ed43649dc04
-  data.tar.gz: 590ab056e1834379ff220aa28bd0f84dd3190f52b9bca2d0621432c29c7333ec
+  metadata.gz: 3cc1e0c2d29c71210af4d52cd12eb0cf9be062dedd4a6eb59f931379acb12b57
+  data.tar.gz: b16313f97d45b158fec32cabf3e69519c28b64739964b9856249c24786f595a3
 SHA512:
-  metadata.gz: ae3e87f28130b1729435a68bd58573e091a0be404e0c666f5eba49c319308374f183b5312d3336ea37a684764b100696d32970cc0d45b16fb404c5eef7f7b967
-  data.tar.gz: 7c44c5f98f60b92b117129c52f1acedd4b355196db417267547be85cee91f261fe0703f3861b380360af1c2e75589bfb28084d29e8c90ad4cb736f3bfa1ccb7e
+  metadata.gz: 0b3e3465f50d1a9b2b2043aede40cfdc4345c9bf3c6be392b7c9dd7b898b9f4a6352bfde02c5e74761b737a55cb20af6a60cb781c359d2d0108c959bf18be755
+  data.tar.gz: f5935b8d432442845fa5cd64490cc480ee46ebd341f6be3041f76e20dadc259395d41a28cbcf382531c1a4e27014d850751800afe4a6824f86d41ea773e03615

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2018-10-24 - Release 1.9.2
+- Catch the right `LoadError` on missing augeas gem. Thanks to [baurmatt](https://github.com/baurmatt) for the quick fix, and [rodjek](https://github.com/rodjek) for dealing with the testing
+
 ## 2018-10-24 - Release 1.9.1
 - Do not rely on features of Augeas because Puppet 6
 

data/Rakefile

@@ -1,3 +1,5 @@
+require 'bundler/gem_tasks'
+
 begin
     require 'rspec/core/rake_task'
     require 'yard'

data/lib/rspec-puppet-facts.rb

@@ -216,15 +216,25 @@ module RspecPuppetFacts
         :rubysitedir   => RbConfig::CONFIG['sitelibdir'],
         :rubyversion   => RUBY_VERSION,
     }
-    begin
-      require 'augeas'
+
+    if 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
 
+  # Determine if the Augeas gem is available.
+  # @api private
+  # @return [Boolean] true if the augeas gem could be loaded.
+  def self.augeas?
+    require 'augeas'
+    true
+  rescue LoadError => e
+    RspecPuppetFacts.warning "Failed to retrieve Augeas version: #{e}"
+    false
+  end
+
   # Get the "operatingsystem_support" structure from
   # the parsed metadata.json file
   # @raise [StandardError] if there is no "operatingsystem_support"

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.1'
+    STRING = '1.9.2'
   end
 end

data/spec/rspec_puppet_facts_spec.rb

@@ -618,7 +618,7 @@ describe RspecPuppetFacts do
     end
 
     it 'should not add "augeasversion" if Augeas is supported' do
-      allow(Puppet.features).to receive(:augeas?).and_return(false)
+      allow(described_class).to receive(:augeas?).and_return(false)
       RspecPuppetFacts.reset
       expect(subject.common_facts).not_to include :augeasversion
     end
@@ -634,7 +634,7 @@ describe RspecPuppetFacts do
         end
       end
 
-      allow(Puppet.features).to receive(:augeas?).and_return(true)
+      allow(described_class).to receive(:augeas?).and_return(true)
       stub_const('Augeas', Augeas_stub)
       RspecPuppetFacts.reset
       expect(subject.common_facts[:augeasversion]).to eq 'my_version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Mickaël Canévet