openfact 5.2.1 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5a589e601bbd6104761454fe62993ccd31ecff21e819fa9264956ac5aa22130
-  data.tar.gz: 5513ddbfd7586fb4d471aa97f423ad347ad3f0c79a7f3f1ad064a7482c8e73b9
+  metadata.gz: 77dfa35ee24dab70b670a69829ec1dfa5b8eda1556bdeaca2e0135563399e23b
+  data.tar.gz: 93a15f41fe6e2d37fd64fb4d346f869065bf069f267142f0b0a5c3c5a99b2e69
 SHA512:
-  metadata.gz: 110648d95577eb8336f1b75051d03b676ae34bb39ae23956265170a925f390e0844d769b369159aa3dd2b770d2702867262530697fdd7be1c9f3fd8e98e3f4a0
-  data.tar.gz: 3b078e9f6be75c1b19de6192c02a3643775347b8ef099cd96e7fcc398cceedfa0bdbb5510300791c81bee7c460558e47114cf8b789958f8d7f94c4e0fcff26e9
+  metadata.gz: c0e0583dfa6236a2bddefe14389581b81474fd963ae68cf2574b3f2a9ba67e29b5f11e910d36da2f8d8dc219a89f1980f802e2788eea92335afd826b14dbd6b5
+  data.tar.gz: b729512000798aabc2117fcc926a89689b6c41cd3570a2dfadd87e9764154188b12c8c2f01917ca3cca1dcf5d4a2d3924b6f493d305b67937693e95a4ad99c8c

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '5.2.1' unless defined?(VERSION)
+  VERSION = '5.3.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.3.0
 platform: ruby
 authors:
 - OpenVox Project
@@ -205,6 +205,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 +247,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
@@ -1230,14 +1258,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: []