openfact 5.2.1 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5a589e601bbd6104761454fe62993ccd31ecff21e819fa9264956ac5aa22130
-  data.tar.gz: 5513ddbfd7586fb4d471aa97f423ad347ad3f0c79a7f3f1ad064a7482c8e73b9
+  metadata.gz: f6d2e82c285041a67df8e09555f99b036c71b809b0f2de5b1bf51bffbd4ba6b6
+  data.tar.gz: ed4379f690cc03afd6e55a34f9b92ef71f4092c1f39a5e141f962957cc13da16
 SHA512:
-  metadata.gz: 110648d95577eb8336f1b75051d03b676ae34bb39ae23956265170a925f390e0844d769b369159aa3dd2b770d2702867262530697fdd7be1c9f3fd8e98e3f4a0
-  data.tar.gz: 3b078e9f6be75c1b19de6192c02a3643775347b8ef099cd96e7fcc398cceedfa0bdbb5510300791c81bee7c460558e47114cf8b789958f8d7f94c4e0fcff26e9
+  metadata.gz: c355f5cade881c26c9bb534e0db6a60cb1a3bbd4ff9a58d95b43cbe512155b797bdccb9acbc7e2cba5b97b048472c65190a35a7c736a26e604c2749af0627716
+  data.tar.gz: 2f767582f751bbc74a73dd7dd26457f4bcd2c201a2cadfe7fc8aab38b8904a29cc7b3438265bc37de04f6e960c24b1a573c62a4b575025df73f2af524b0bf1d2

data/lib/facter/facts/openbsd/processors/count.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Processors
+      class Count
+        FACT_NAME = 'processors.count'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Openbsd::Processors.resolve(:online_count)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

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

@@ -201,11 +201,11 @@ module Facter
         Cli.commands.values
            .select { |command_class| command_class.instance_of?(Thor::Command) }
            .each do |command|
-          help_command_options << build_option(
-            command['name'],
-            [command['usage'].split(',')[1]],
-            command['description']
-          )
+             help_command_options << build_option(
+               command['name'],
+               [command['usage'].split(',')[1]],
+               command['description']
+             )
         end
 
         help_command_options

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

@@ -709,6 +709,7 @@ os_hierarchy.each do |os|
     require_relative '../../facts/openbsd/os/hardware'
     require_relative '../../facts/openbsd/os/name'
     require_relative '../../facts/openbsd/os/release'
+    require_relative '../../facts/openbsd/processors/count'
     require_relative '../../facts/openbsd/processors/isa'
     require_relative '../../facts/openbsd/ruby/platform'
     require_relative '../../facts/openbsd/ruby/sitedir'
@@ -721,6 +722,7 @@ os_hierarchy.each do |os|
     require_relative '../../resolvers/openbsd/dhcp'
     require_relative '../../resolvers/openbsd/dmi'
     require_relative '../../resolvers/openbsd/mountpoints'
+    require_relative '../../resolvers/openbsd/processors'
     require_relative '../../resolvers/openbsd/virtual'
 
   when 'openwrt'

data/lib/facter/resolvers/linux/processors.rb

@@ -70,7 +70,7 @@ module Facter
                .select { |dir| dir =~ /cpu[0-9]+$/ }
                .select { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
                .map do |dir|
-              Facter::Util::FileHelper.safe_read("/sys/devices/system/cpu/#{dir}/topology/physical_package_id").strip
+                 Facter::Util::FileHelper.safe_read("/sys/devices/system/cpu/#{dir}/topology/physical_package_id").strip
             end
                .uniq.count
           end

data/lib/facter/resolvers/openbsd/processors.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require_relative '../../../facter/resolvers/bsd/processors'
+
+module Facter
+  module Resolvers
+    module Openbsd
+      class Processors < BaseResolver
+        init_resolver
+
+        class << self
+          private
+
+          def post_resolve(fact_name, _options)
+            @fact_list.fetch(fact_name) { collect_processors_info(fact_name) }
+          end
+
+          def collect_processors_info(fact_name)
+            require_relative '../../../facter/resolvers/bsd/ffi/ffi_helper'
+
+            count = online_count
+            model = processor_model
+            speed = processor_speed
+
+            @fact_list[:online_count] = count
+            @fact_list[:model] = Array.new(count, model) if online_count && model
+            @fact_list[:speed] = speed * 1000 * 1000 if speed
+
+            @fact_list[fact_name]
+          end
+
+          CTL_HW = 6
+          HW_MODEL = 2
+          HW_NCPUONLINE = 25
+          HW_CPUSPEED = 12
+
+          def processor_model
+            Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_MODEL])
+          end
+
+          def online_count
+            Facter::Bsd::FfiHelper.sysctl(:uint32_t, [CTL_HW, HW_NCPUONLINE])
+          end
+
+          def processor_speed
+            Facter::Bsd::FfiHelper.sysctl(:uint32_t, [CTL_HW, HW_CPUSPEED])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/openbsd/virtual.rb

@@ -10,9 +10,11 @@ module Facter
           # :model
 
           VM_GUEST_SYSCTL_NAMES = {
+            'QEMU' => 'qemu',
             'VMM' => 'vmm',
-            'vServer' => 'vserver',
+            'Yandex' => 'yandex',
             'oracle' => 'virtualbox',
+            'vServer' => 'vserver',
             'xen' => 'xenu',
             'none' => nil
           }.freeze
@@ -24,17 +26,23 @@ module Facter
           end
 
           CTL_HW = 6
+          HW_VENDOR  = 14
           HW_PRODUCT = 15
 
           def read_facts(fact_name)
             require 'facter/resolvers/bsd/ffi/ffi_helper'
 
             vm = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_PRODUCT])
-            vm = if VM_GUEST_SYSCTL_NAMES.key?(vm)
-                   VM_GUEST_SYSCTL_NAMES[vm]
-                 else
-                   'physical'
-                 end
+            if VM_GUEST_SYSCTL_NAMES.key?(vm)
+              vm = VM_GUEST_SYSCTL_NAMES[vm]
+            else
+              vm = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_VENDOR])
+              vm = if VM_GUEST_SYSCTL_NAMES.key?(vm)
+                     VM_GUEST_SYSCTL_NAMES[vm]
+                   else
+                     'physical'
+                   end
+            end
             @fact_list[:vm] = vm
             @fact_list[fact_name]
           end

data/lib/facter/resolvers/solaris/processors.rb

@@ -26,7 +26,8 @@ module Facter
           def parse_output(output)
             @fact_list[:logical_count] = output.scan(/module/).size
             @fact_list[:physical_count] = output.scan(/chip_id .*/).uniq.size
-            @fact_list[:speed] = output.scan(/current_clock_Hz .*/).first.gsub(/[a-zA-z\s]+/, '').to_i
+            # .scan(//current_clock_Hz\s+(\d+)/) returns [['123']] (or [['123'], ['456']] if there are more matches)
+            @fact_list[:speed] = output.scan(/current_clock_Hz\s+(\d+)/).first&.first&.to_i
             @fact_list[:models] = output.scan(/brand .*/).map { |elem| elem.gsub(/brand(\s+)/, '') }
             calculate_threads_cores(output)
           end

data/lib/facter/util/linux/dhcp.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'facter/util/linux'
+
 module Facter
   module Util
     module Linux
@@ -73,11 +75,18 @@ module Facter
           end
 
           def search_with_dhcpcd_command(interface_name)
-            @log.debug("Attempt to get DHCP for interface #{interface_name}, from dhcpcd command")
+            return if interface_name == 'lo'
 
             @dhcpcd_command ||= Facter::Core::Execution.which('dhcpcd')
             return unless @dhcpcd_command
 
+            unless Facter::Util::Linux.process_running?('dhcpcd')
+              @log.debug('Skipping dhcpcd -U because dhcpcd daemon is not running')
+              return
+            end
+
+            @log.debug("Attempt to get DHCP for interface #{interface_name}, from dhcpcd command")
+
             output = Facter::Core::Execution.execute("#{@dhcpcd_command} -U #{interface_name}", logger: @log)
             dhcp = output.match(/dhcp_server_identifier='(.*)'/)
             dhcp[1] if dhcp

data/lib/facter/util/linux.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Facter
+  module Util
+    module Linux
+      def self.process_running?(process_name)
+        pidfiles = Dir.glob("{/run,/var/run}/#{process_name}{,*,/}*.pid")
+        pidfiles.each do |pf|
+          next unless File.file?(pf)
+
+          pid = begin
+            Integer(Facter::Util::FileHelper.safe_read(pf, '').strip, 10)
+          rescue StandardError
+            nil
+          end
+          next unless pid&.positive?
+
+          begin
+            # Doesn't actually kill, just detects if the process exists
+            Process.kill(0, pid)
+            return true if proc_comm(pid) == process_name || proc_cmdline(pid)&.match?(%r{(^|\s|/)#{process_name}(\s|$)})
+          rescue Errno::ESRCH
+            # If we can't confirm identity, still treat it as not running to be safe.
+            next
+          rescue Errno::EPERM
+            # Exists but we can't inspect it; assume it's running.
+            return true
+          end
+        end
+
+        # Fallback: Try to find it in /proc
+        return false unless Dir.exist?('/proc')
+
+        Dir.glob('/proc/[0-9]*/comm').any? do |path|
+          Facter::Util::FileHelper.safe_read(path, nil)&.strip == process_name
+        end
+      end
+
+      def self.proc_comm(pid)
+        Facter::Util::FileHelper.safe_read("/proc/#{pid}/comm", nil)&.strip
+      end
+
+      def self.proc_cmdline(pid)
+        raw = Facter::Util::FileHelper.safe_read("/proc/#{pid}/cmdline", nil)
+        raw&.tr("\0", ' ')
+      end
+    end
+  end
+end

data/lib/facter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openfact
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.4.0
 platform: ruby
 authors:
 - OpenVox Project
@@ -18,7 +18,7 @@ dependencies:
         version: 1.15.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.18.0
     - - "!="
       - !ruby/object:Gem::Version
         version: 1.16.0
@@ -37,7 +37,7 @@ dependencies:
         version: 1.15.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.18.0
     - - "!="
       - !ruby/object:Gem::Version
         version: 1.16.0
@@ -90,7 +90,7 @@ dependencies:
         version: '1.28'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.79'
+        version: '1.85'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -100,49 +100,69 @@ dependencies:
         version: '1.28'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.79'
+        version: '1.85'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +225,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: hocon
   requirement: !ruby/object:Gem::Requirement
@@ -233,6 +267,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -786,6 +834,7 @@ files:
 - lib/facter/facts/openbsd/os/name.rb
 - lib/facter/facts/openbsd/os/release.rb
 - lib/facter/facts/openbsd/path.rb
+- lib/facter/facts/openbsd/processors/count.rb
 - lib/facter/facts/openbsd/processors/isa.rb
 - lib/facter/facts/openbsd/ruby/platform.rb
 - lib/facter/facts/openbsd/ruby/sitedir.rb
@@ -1117,6 +1166,7 @@ files:
 - lib/facter/resolvers/openbsd/dhcp.rb
 - lib/facter/resolvers/openbsd/dmi.rb
 - lib/facter/resolvers/openbsd/mountpoints.rb
+- lib/facter/resolvers/openbsd/processors.rb
 - lib/facter/resolvers/openbsd/virtual.rb
 - lib/facter/resolvers/os_release.rb
 - lib/facter/resolvers/partitions.rb
@@ -1195,6 +1245,7 @@ files:
 - lib/facter/util/facts/uptime_parser.rb
 - lib/facter/util/facts/windows_release_finder.rb
 - lib/facter/util/file_helper.rb
+- lib/facter/util/linux.rb
 - lib/facter/util/linux/dhcp.rb
 - lib/facter/util/linux/if_inet6.rb
 - lib/facter/util/linux/proc.rb
@@ -1230,14 +1281,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '4.0'
+      version: '5.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: OpenFact, a system inventory tool
 test_files: []