facter 4.0.17 → 4.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5045cd46bc46b826aee23e2da1e62dc583e5daf0216a3ca31098970f55bd3d77
-  data.tar.gz: 6ebd3870b201a82fad831783ee0d3b2cc84fa0bce81e4600b56f6d2ec8ecdc4b
+  metadata.gz: 2fd059e5d95e07714eaeefb1191e20b343e11105516a1d6ce963d583783a0409
+  data.tar.gz: d5835d1a4a8757f2d75380c988d9e2f23865dbb769a1eb5c3e191b17ea16dbb6
 SHA512:
-  metadata.gz: 61874498a45ac854b2da205e441bed65880f9cf92ff094c7c04ad3d984189873bfb25be34ac9221f3266839a7f977eda610323fb1db033eafc58a918d71eaf02
-  data.tar.gz: 5ee49a1e8742b4ba9f63a6436a637366d316c170f43c5da677130ad9a6036442c81456265b37935d5c527feb82df78bfaa2e69c05918fd1fb70e55c442e51fbc
+  metadata.gz: 4e97ff1b61c5b8fff096a36c2597b756cde59d5a5c5242bd09b755325771996640da315e286f8df3e4ae3244be344f1da7d4195a086d3510363e943a4b9ec0c3
+  data.tar.gz: f57576178ae1e3b13cd760adf77dbbf5c0c1cb79d609dbcecd64ddfdfececb98c1b5ae02927bcace7e223c378434f11dfbcc7f216e09ab28bf3b69ccb37d6a26

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1000`
-# on 2020-04-15 10:09:42 +0300 using RuboCop version 0.74.0.
+# on 2020-04-16 12:37:29 +0300 using RuboCop version 0.74.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -190,7 +190,7 @@ RSpec/SubjectStub:
     - 'spec/custom_facts/util/fact_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
 
-# Offense count: 179
+# Offense count: 172
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
@@ -254,6 +254,4 @@ RSpec/VerifiedDoubles:
     - 'spec/framework/core/session_cache_spec.rb'
     - 'spec/framework/formatters/hocon_fact_formatter_spec.rb'
     - 'spec/framework/formatters/json_fact_formatter_spec.rb'
-    - 'spec/framework/formatters/legacy_fact_formatter_spec.rb'
-    - 'spec/framework/formatters/yaml_fact_formatter_spec.rb'
     - 'spec/mocks/util.rb'

data/VERSION

@@ -1 +1 @@
-4.0.17
+4.0.18

data/lib/facts/solaris/zpool_featureflags.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class ZpoolFeatureflags
+      FACT_NAME = 'zpool_featureflags'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Solaris::ZPool.resolve(:zpool_featureflags)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/framework/formatters/legacy_fact_formatter.rb

@@ -65,7 +65,8 @@ module Facter
       @log.debug('Remove quotes from parent nodes')
       pretty_json.gsub!(/\"(.*)\"\ =>/, '\1 =>')
 
-      pretty_json
+      @log.debug('Remove double backslashes from paths')
+      pretty_json.gsub(/\\\\/, '\\')
     end
 
     def remove_enclosing_accolades(pretty_fact_json)

data/lib/framework/formatters/yaml_fact_formatter.rb

@@ -9,6 +9,8 @@ module Facter
     def format(fact_hash)
       yaml_pretty = YAML.dump(JSON.parse(JsonFactFormatter.new.format(fact_hash)))
 
+      @log.debug('Replace single backslash with double backslashes')
+      yaml_pretty.gsub!(/\\/, '\&\&')
       @log.debug('Replace ---  from yaml beginning, to keep it compatible with C facter')
       yaml_pretty.gsub(/^---[\r\n]+/, '')
     end

data/lib/framework/logging/logger.rb

@@ -65,7 +65,7 @@ module Facter
     end
 
     def debug(msg)
-      return unless Facter.debugging?
+      return unless debugging_active?
 
       if msg.nil? || msg.empty?
         invoker = caller(1..1).first.slice(/.*:\d+/)
@@ -94,5 +94,13 @@ module Facter
     def colorize(msg, color)
       "\e[#{color}m#{msg}\e[0m"
     end
+
+    private
+
+    def debugging_active?
+      return true unless Facter.respond_to?(:debugging?)
+
+      Facter.debugging?
+    end
   end
 end

data/lib/resolvers/solaris/zpool_resolver.rb

@@ -22,11 +22,13 @@ module Facter
           def build_zpool_facts
             output, _status = Open3.capture2('zpool upgrade -v')
             features_list = output.scan(/^\s+(\d+)/).flatten
+            features_flags = output.scan(/^([a-z0-9_]+)[[:blank:]]*(\(read-only compatible\))?$/).map(&:first)
 
             return if features_list.empty?
 
             @fact_list[:zpool_featurenumbers] = features_list.join(',')
-            @fact_list[:zpool_version] = features_list.last
+            @fact_list[:zpool_featureflags] = features_flags.join(',')
+            @fact_list[:zpool_version] = features_flags.any? ? '5000' : features_list.last
           end
         end
       end

data/lib/util/file_helper.rb

@@ -4,19 +4,28 @@ module Facter
   module Util
     class FileHelper
       @log = Log.new(self)
+
       class << self
         DEBUG_MESSAGE = 'File at: %s is not accessible.'
 
-        def safe_read(path, result_if_not_readable = '')
+        def safe_read(path, default_return = '')
           return File.read(path) if File.readable?(path)
 
-          result_if_not_readable
+          log_failed_to_read(path)
+          default_return
         end
 
-        def safe_readlines(path, result_if_not_readable = [])
+        def safe_readlines(path, default_return = [])
           return File.readlines(path) if File.readable?(path)
 
-          result_if_not_readable
+          log_failed_to_read(path)
+          default_return
+        end
+
+        private
+
+        def log_failed_to_read(path)
+          @log.debug(DEBUG_MESSAGE % path)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.17
+  version: 4.0.18
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -663,6 +663,7 @@ files:
 - lib/facts/solaris/timezone.rb
 - lib/facts/solaris/zfs_featurenumbers.rb
 - lib/facts/solaris/zfs_version.rb
+- lib/facts/solaris/zpool_featureflags.rb
 - lib/facts/solaris/zpool_featurenumbers.rb
 - lib/facts/solaris/zpool_version.rb
 - lib/facts/windows/augeas/version.rb