openfact 5.7.0 → 6.1.0

data/lib/facter/util/file_helper.rb

@@ -15,19 +15,18 @@ module Facter
           default_return
         end
 
-        # rubocop:disable Style/SpecialGlobalVars
+        # rubocop:disable-next Style/SpecialGlobalVars
         def safe_readlines(path, default_return = [], sep = $/, chomp: false)
           return File.readlines(path, sep, chomp: chomp, encoding: Encoding::UTF_8) if File.readable?(path)
 
           log_failed_to_read(path)
           default_return
         end
-        # rubocop:enable Style/SpecialGlobalVars
 
         # This previously acted as a helper method for versions of Ruby older
         # than 2.5, before Dir.children was added. As it isn't a private
-        # method, we can't remove it entirely until the next major Facter
-        # release (presumably Facter 5).
+        # method, we can't remove it entirely until the next major OpenFact
+        # release.
         def dir_children(path)
           Dir.children(path)
         end

data/lib/facter/util/macosx/system_profile_executor.rb

@@ -28,7 +28,7 @@ module Facter
 
           def normalize_keys(system_profiler_hash)
             system_profiler_hash.transform_keys do |k|
-              k.downcase.tr(' ', '_').delete("\(\)").to_sym
+              k.downcase.tr(' ', '_').delete('()').to_sym
             end.to_h
           end
         end

data/lib/facter/util/resolvers/ffi/hostname.rb

@@ -21,6 +21,7 @@ module Facter
           HOST_NAME_MAX = 64
 
           extend ::FFI::Library
+
           ffi_lib ::FFI::Library::LIBC
 
           attach_function :getaddrinfo, %i[string string pointer pointer], :int

data/lib/facter/util/resolvers/ffi/load_averages.rb

@@ -8,6 +8,7 @@ module Facter
       module Ffi
         module LoadAverages
           extend ::FFI::Library
+
           ffi_lib ::FFI::Library::LIBC
 
           attach_function :getloadavg, %i[pointer int], :int

data/lib/facter/util/resolvers/http.rb

@@ -6,6 +6,8 @@ module Facter
       module Http
         @log = Facter::Log.new(self)
 
+        class RequestError < StandardError; end
+
         class << self
           CONNECTION_TIMEOUT = 0.6
           SESSION_TIMEOUT = 5
@@ -27,6 +29,15 @@ module Facter
             make_request(url, headers, timeouts, 'GET', proxy)
           end
 
+          # Makes a GET HTTP request and returns its response body.
+          #
+          # Unlike get_request, this method raises when the response code is
+          # not 200 or when the request fails. A successful empty response is
+          # still returned as an empty string.
+          def get_request!(url, headers = {}, timeouts = {}, proxy = true)
+            make_request!(url, headers, timeouts, 'GET', proxy)
+          end
+
           # Makes a PUT HTTP request and returns its response
           # @param (see #get_request)
           # @return (see #get_request)
@@ -37,6 +48,28 @@ module Facter
           private
 
           def make_request(url, headers, timeouts, request_type, proxy)
+            response = perform_request(url, headers, timeouts, request_type, proxy)
+
+            successful_response?(response) ? response.body : ''
+          rescue StandardError => e
+            @log.debug("Trying to connect to #{url} but got: #{e.message}")
+            ''
+          end
+
+          def make_request!(url, headers, timeouts, request_type, proxy)
+            response = perform_request(url, headers, timeouts, request_type, proxy)
+
+            return response.body if successful_response?(response)
+
+            raise RequestError, "Request to #{url} failed with HTTP status #{response.code}"
+          rescue RequestError
+            raise
+          rescue StandardError => e
+            @log.debug("Trying to connect to #{url} but got: #{e.message}")
+            raise
+          end
+
+          def perform_request(url, headers, timeouts, request_type, proxy)
             require 'net/http'
 
             uri = URI.parse(url)
@@ -52,11 +85,7 @@ module Facter
             # Make the request
             response = http.request(request)
             response.uri = url
-
-            successful_response?(response) ? response.body : ''
-          rescue StandardError => e
-            @log.debug("Trying to connect to #{url} but got: #{e.message}")
-            ''
+            response
           end
 
           def http_obj(parsed_url, timeouts, proxy)

data/lib/facter/util/resolvers/networking/networking.rb

@@ -117,9 +117,9 @@ module Facter
             binding = find_valid_binding(bindings)
             ip_protocol_type = ipv4_type ? '' : '6'
 
-            values["ip#{ip_protocol_type}".to_sym] = binding[:address]
-            values["netmask#{ip_protocol_type}".to_sym] = binding[:netmask]
-            values["network#{ip_protocol_type}".to_sym] = binding[:network]
+            values[:"ip#{ip_protocol_type}"] = binding[:address]
+            values[:"netmask#{ip_protocol_type}"] = binding[:netmask]
+            values[:"network#{ip_protocol_type}"] = binding[:network]
             values[:scope6] = get_scope(binding[:address]) unless ipv4_type
           end
         end

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '5.7.0' unless defined?(VERSION)
+  VERSION = '6.1.0' unless defined?(VERSION)
 end

data/lib/facter.rb

@@ -15,7 +15,7 @@ module Facter
   @already_searched = {}
 
   class << self
-    # Method used by puppet-agent to retrieve facts
+    # Method used by openvox-agent to retrieve facts
     # @param args_as_string [string] facter cli arguments
     #
     # @return [Hash<String, Object>]
@@ -45,8 +45,8 @@ module Facter
       Hash[queried_facts(cli.args)]
     end
 
-    # Method used by cli to set puppet paths
-    # in order to retrieve puppet custom and external facts
+    # Method used by cli to set OpenVox paths
+    # in order to retrieve OpenVox custom and external facts
     #
     # @return nil
     #
@@ -54,7 +54,7 @@ module Facter
     def puppet_facts
       require 'puppet'
 
-      # don't allow puppet logger to be injected in Facter
+      # don't allow the OpenVox logger to be injected in OpenFact
       Options[:allow_external_loggers] = false
 
       Puppet.initialize_settings
@@ -69,7 +69,7 @@ module Facter
         end
       end
     rescue LoadError => e
-      logger.error("Could not load puppet gem, got #{e}")
+      logger.error("Could not load the openvox gem, got #{e}")
     end
 
     # Alias method for Facter.fact()
@@ -375,7 +375,7 @@ module Facter
     # @api public
     def to_hash
       log_blocked_facts
-      logger.debug("Facter version: #{Facter::VERSION}")
+      logger.debug("OpenFact version: #{Facter::VERSION}")
 
       resolved_facts = Facter::FactManager.instance.resolve_facts
       resolved_facts.reject! { |fact| fact.type == :custom && fact.value.nil? }
@@ -439,7 +439,7 @@ module Facter
       @already_searched[user_query]
     end
 
-    # Returns Facter version
+    # Returns OpenFact version
     #
     # @return [String] Current version
     #
@@ -456,7 +456,7 @@ module Facter
     def to_user_output(cli_options, *args)
       init_cli_options(cli_options)
       logger.info("executed with command line: #{ARGV.drop(1).join(' ')}")
-      logger.debug("Facter version: #{Facter::VERSION}")
+      logger.debug("OpenFact version: #{Facter::VERSION}")
       log_blocked_facts
       resolved_facts = resolve_facts_for_user_query(args)
       fact_formatter = Facter::FormatterFactory.build(Facter::Options.get)
@@ -530,7 +530,7 @@ module Facter
       resolved_facts = Facter::FactManager.instance.resolve_facts(user_query)
       user_querie = resolved_facts.uniq(&:user_query).map(&:user_query).first
 
-      resolved_facts.reject! { |fact| fact.type == :custom && fact.value.nil? } if user_querie&.empty?
+      resolved_facts.reject! { |fact| fact.type == :custom && fact.value.nil? } if user_querie && user_querie.empty?
 
       resolved_facts
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openfact
 version: !ruby/object:Gem::Version
-  version: 5.7.0
+  version: 6.1.0
 platform: ruby
 authors:
 - OpenVox Project
@@ -87,20 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.85'
+        version: 1.90.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.85'
+        version: 1.90.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -285,22 +279,16 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: tsort
   requirement: !ruby/object:Gem::Requirement
@@ -1292,14 +1280,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: OpenFact, a system inventory tool
 test_files: []