facter 4.3.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3dd94ae85f9b9327eac3cbcc63794f202f4eea27d7b8c2c80b8a5b354aca94a
-  data.tar.gz: a179d9b63edb75738a22d5ed2061c0b2b4313da80dad43af2ad9eb4b1e3bee27
+  metadata.gz: a329a8e0a2281e2640784c89bd374f16a2cb75dbbde5a19b5608340371d92601
+  data.tar.gz: 9374fd76feb4d7d583b566e6f5c6daffb613fff8c6adeca0fffd9201e6dd676c
 SHA512:
-  metadata.gz: 33fd39d071e0033316518b51310290694d869c7b8f3b7d006c66f20629999cbcc549df6ed58b28d46c092664ba3a89c7f5813117bf5bff50c555202e79c99476
-  data.tar.gz: c824262cd5cdcb601b203bc4675c832348dce77ca9867f008a23cb8f8677812ab858cc3f11012b80deec949515d6419876b5480d25587e2a7df52c9df1c15540
+  metadata.gz: 7c1ef71b91e17ba0441a4a56c10fcf1eaea3c09e99754e9a42035e3ddbf41de82268d49b9debef5096eed6673b499b6fd3368473c7cdeaddc0b8ab0a3d0ad4a0
+  data.tar.gz: 7c431855c6d26c5bda0f17f647d80c7c593c455ad8bad56aa0b9d5077bb4d59ea0f34a53b512cfe3569d13c46ff477e887e14c45e01d9e55044e0b3311257d81

data/lib/docs/generate_cli.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'facter/framework/cli/cli_launcher'
+require_relative '../facter/framework/cli/cli_launcher'
 
 cli = Facter::Cli.new([])
 

data/lib/facter/custom_facts/core/execution/base.rb

@@ -106,6 +106,7 @@ module Facter
             raise Facter::Core::Execution::ExecutionFailure.new, message
           end
 
+          out.force_encoding(Encoding.default_external) unless out.valid_encoding?
           [out.strip, stderr]
         end
 
@@ -140,7 +141,7 @@ module Facter
 
         def builtin_command?(command)
           output, _status = Open3.capture2("type #{command}")
-          output.chomp =~ /builtin/ ? true : false
+          /builtin/.match?(output.chomp) ? true : false
         end
       end
     end

data/lib/facter/custom_facts/core/execution/posix.rb

@@ -44,7 +44,7 @@ module Facter
 
           return unless exe && (expanded = which(exe))
 
-          expanded = "'#{expanded}'" if expanded =~ /\s/
+          expanded = "'#{expanded}'" if /\s/.match?(expanded)
           expanded << " #{args}" if args
 
           expanded

data/lib/facter/custom_facts/core/execution/windows.rb

@@ -11,7 +11,7 @@ module Facter
         def which(bin)
           # `echo` is allowed for facter 3.x compatibility, otherwise
           # all commands much be found on the PATH or absolute.
-          return bin if /^echo$/i =~ bin
+          return bin if /^echo$/i.match?(bin)
 
           if absolute_path?(bin)
             return bin if File.executable?(bin)
@@ -56,7 +56,7 @@ module Facter
 
           return unless exe && (expanded = which(exe))
 
-          expanded = "\"#{expanded}\"" if expanded =~ /\s+/
+          expanded = "\"#{expanded}\"" if /\s+/.match?(expanded)
           expanded << " #{args}" if args
 
           expanded

data/lib/facter/custom_facts/core/file_loader.rb

@@ -1,28 +1,27 @@
 # frozen_string_literal: true
 
-require 'facter/custom_facts/core/legacy_facter'
-require 'facter/custom_facts/util/fact'
-require 'facter/custom_facts/util/collection'
-require 'facter/custom_facts/util/fact'
-require 'facter/custom_facts/util/loader'
-require 'facter/custom_facts/core/execution/base'
-require 'facter/custom_facts/core/execution/windows'
-require 'facter/custom_facts/core/execution/posix'
-require 'facter/custom_facts/util/values'
-require 'facter/custom_facts/util/confine'
+require_relative '../../../facter/custom_facts/util/fact'
+require_relative '../../../facter/custom_facts/util/collection'
+require_relative '../../../facter/custom_facts/util/fact'
+require_relative '../../../facter/custom_facts/util/loader'
+require_relative '../../../facter/custom_facts/core/execution/base'
+require_relative '../../../facter/custom_facts/core/execution/windows'
+require_relative '../../../facter/custom_facts/core/execution/posix'
+require_relative '../../../facter/custom_facts/util/values'
+require_relative '../../../facter/custom_facts/util/confine'
 
-require 'facter/custom_facts/util/config'
+require_relative '../../../facter/custom_facts/util/config'
 
-require 'facter/custom_facts/util/normalization'
-require 'facter/custom_facts/core/execution'
-require 'facter/custom_facts/core/resolvable'
-require 'facter/custom_facts/core/suitable'
-require 'facter/custom_facts/util/resolution'
-require 'facter/custom_facts/core/directed_graph'
-require 'facter/custom_facts/core/resolvable'
-require 'facter/custom_facts/core/aggregate'
-require 'facter/custom_facts/util/composite_loader'
-require 'facter/custom_facts/util/parser'
-require 'facter/custom_facts/util/directory_loader'
-require 'facter/custom_facts/util/nothing_loader'
-require 'facter/custom_facts/util/nothing_loader'
+require_relative '../../../facter/custom_facts/util/normalization'
+require_relative '../../../facter/custom_facts/core/execution'
+require_relative '../../../facter/custom_facts/core/resolvable'
+require_relative '../../../facter/custom_facts/core/suitable'
+require_relative '../../../facter/custom_facts/util/resolution'
+require_relative '../../../facter/custom_facts/core/directed_graph'
+require_relative '../../../facter/custom_facts/core/resolvable'
+require_relative '../../../facter/custom_facts/core/aggregate'
+require_relative '../../../facter/custom_facts/util/composite_loader'
+require_relative '../../../facter/custom_facts/util/parser'
+require_relative '../../../facter/custom_facts/util/directory_loader'
+require_relative '../../../facter/custom_facts/util/nothing_loader'
+require_relative '../../../facter/custom_facts/util/nothing_loader'

data/lib/facter/custom_facts/core/legacy_facter.rb

@@ -18,7 +18,7 @@
 
 require 'pathname'
 
-require 'facter/custom_facts/core/file_loader'
+require_relative '../../../facter/custom_facts/core/file_loader'
 
 # Functions as a hash of 'facts' about your system system, such as MAC
 # address, IP address, architecture, etc.

data/lib/facter/custom_facts/util/normalization.rb

@@ -38,11 +38,7 @@ module LegacyFacter
       #
       # Attempt to normalize and validate the given string.
       #
-      # On Ruby 1.8 the string is checked by stripping out all non UTF-8
-      # characters and comparing the converted string to the original. If they
-      # do not match then the string is considered invalid.
-      #
-      # On Ruby 1.9+, the string is validate by checking that the string encoding
+      # The string is validated by checking that the string encoding
       # is UTF-8 and that the string content matches the encoding. If the string
       # is not an expected encoding then it is converted to UTF-8.
       #
@@ -51,27 +47,16 @@ module LegacyFacter
       # @param value [String]
       # @return [void]
 
-      if RUBY_VERSION =~ /^1\.8/
-        require 'iconv'
-
-        def normalize_string(value)
-          converted = Iconv.conv('UTF-8//IGNORE', 'UTF-8', value)
-          raise NormalizationError, "String #{value.inspect} is not valid UTF-8" if converted != value
+      def normalize_string(value)
+        value = value.encode(Encoding::UTF_8)
 
-          value
+        unless value.valid_encoding?
+          raise NormalizationError, "String #{value.inspect} doesn't match the reported encoding #{value.encoding}"
         end
-      else
-        def normalize_string(value)
-          value = value.encode(Encoding::UTF_8)
 
-          unless value.valid_encoding?
-            raise NormalizationError, "String #{value.inspect} doesn't match the reported encoding #{value.encoding}"
-          end
-
-          value
-        rescue EncodingError
-          raise NormalizationError, "String encoding #{value.encoding} is not UTF-8 and could not be converted to UTF-8"
-        end
+        value
+      rescue EncodingError
+        raise NormalizationError, "String encoding #{value.encoding} is not UTF-8 and could not be converted to UTF-8"
       end
 
       # Validate all elements of the array.

data/lib/facter/custom_facts/util/windows_root.rb

@@ -4,7 +4,7 @@ module LegacyFacter
   module Util
     module Root
       def self.root?
-        require 'facter/resolvers/windows/ffi/identity_ffi'
+        require_relative '../../../facter/resolvers/windows/ffi/identity_ffi'
         IdentityFFI.privileged?
       end
     end

data/lib/facter/facts/debian/architecture.rb

@@ -10,7 +10,7 @@ module Facts
         def call_the_resolver
           fact_value = Facter::Resolvers::Uname.resolve(:machine)
           fact_value = 'amd64' if fact_value == 'x86_64'
-          fact_value = 'i386' if fact_value =~ /i[3456]86|pentium/
+          fact_value = 'i386' if /i[3456]86|pentium/.match?(fact_value)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/hypervisors/kvm.rb

@@ -52,9 +52,9 @@ module Facts
 
           return { google: true } if manufacturer == 'Google'
 
-          return { openstack: true } if manufacturer =~ /^OpenStack/
+          return { openstack: true } if /^OpenStack/.match?(manufacturer)
 
-          return { amazon: true } if manufacturer =~ /^Amazon/
+          return { amazon: true } if /^Amazon/.match?(manufacturer)
 
           {}
         end

data/lib/facter/facts/linux/os/architecture.rb

@@ -10,7 +10,7 @@ module Facts
         def call_the_resolver
           fact_value = Facter::Resolvers::Uname.resolve(:machine)
 
-          fact_value = 'i386' if fact_value =~ /i[3456]86|pentium/
+          fact_value = 'i386' if /i[3456]86|pentium/.match?(fact_value)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/hypervisors/kvm.rb

@@ -27,9 +27,9 @@ module Facts
 
           return { google: true } if manufacturer == 'Google'
 
-          return { openstack: true } if Facter::Resolvers::DMIComputerSystem.resolve(:name) =~ /^OpenStack/
+          return { openstack: true } if /^OpenStack/.match?(Facter::Resolvers::DMIComputerSystem.resolve(:name))
 
-          return { amazon: true } if manufacturer =~ /^Amazon/
+          return { amazon: true } if /^Amazon/.match?(manufacturer)
         end
       end
     end

data/lib/facter/framework/cli/cli_launcher.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'facter/framework/logging/logger.rb'
+require_relative '../../../facter/framework/logging/logger.rb'
 Facter::Log.output(STDERR)
-require 'facter'
-require 'facter/framework/cli/cli'
+require_relative '../../../facter'
+require_relative '../../../facter/framework/cli/cli'
 
 class CliLauncher
   class << self

data/lib/facter/framework/config/fact_groups.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'facter/config'
+require_relative '../../../facter/config'
 
 module Facter
   class FactGroups
@@ -64,7 +64,7 @@ module Facter
     def get_fact(fact_name)
       return @facts_ttls[fact_name] if @facts_ttls[fact_name]
 
-      result = @facts_ttls.select { |name, fact| break fact if fact_name =~ /^#{name}\..*/ }
+      result = @facts_ttls.select { |name, fact| break fact if /^#{name}\..*/.match?(fact_name) }
       return nil if result == {}
 
       result

data/lib/facter/framework/core/fact_loaders/fact_loader.rb

@@ -103,7 +103,7 @@ module Facter
 
       blocked_facts.each do |blocked|
         facts.each do |fact|
-          next unless fact.name =~ /^#{blocked}\..*|^#{blocked}$/
+          next unless /^#{blocked}\..*|^#{blocked}$/.match?(fact.name)
 
           if fact.type == :core
             reject_list_core << fact