ohai 18.1.18 → 18.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba5e0cd23be58860dbaeaa8215628de72afb4ca181235acacd356064c8cdcdb6
-  data.tar.gz: 8059d2d3e7bf4c4a68b75f926165929446a3dbe280402438eba20be552c05fec
+  metadata.gz: bc1e862dfe2a3422ef70b91b2564c12e2ca00d48bee8b48960b89af65e07bc5c
+  data.tar.gz: efcd968a8da9052c51bfc3aaffddd8fe8c57fe571700196f9326821f24d2f852
 SHA512:
-  metadata.gz: 5161f55dba454fff218dd4545a940cb0b324e3802930bf01b3b0d62730026d470961d4138259c4b6c8f76e3ed4059eb98e1a37b188823e02808d1e35817254e3
-  data.tar.gz: 27e98bd57c54192067a797a1303466becf7fa0eff0448665b35782613abbe238ae8c623192afd0ac6acd270a313212384e25c98373b0f101cd766dbece762358
+  metadata.gz: 1717b87c35a7b0dde1b5df9366fef96b2656d63a15be005baa52c42206e811623922421fc9aaf6ceb2fce61edb077e95d3613a057f73d69d2297f94cd52661f3
+  data.tar.gz: ead72e1e179af3e3c2037deda21c4a4fc1a8cc8f56aa75784759f143c412c113a92ee5b1a6baf8a89ab8336dde6e84cd1aea9ef49947e30e36eac93562c411ba

data/Gemfile

@@ -4,12 +4,12 @@ source "https://rubygems.org"
 gemspec
 
 # pull these gems from main of chef/chef so that we're testing against what we will release
-gem "chef-config", git: "https://github.com/chef/chef", branch: "main", glob: "chef-config/chef-config.gemspec"
-gem "chef-utils", git: "https://github.com/chef/chef", branch: "main", glob: "chef-utils/chef-utils.gemspec"
+gem "chef-config", git: "https://github.com/chef/chef", branch: "chef-18", glob: "chef-config/chef-config.gemspec"
+gem "chef-utils", git: "https://github.com/chef/chef", branch: "chef-18", glob: "chef-utils/chef-utils.gemspec"
 
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
-  gem "chefstyle", "2.2.2"
+  gem "cookstyle", ">= 7.32.8"
   gem "ipaddr_extensions"
   gem "rake", ">= 10.1.0"
   gem "rspec-collection_matchers", "~> 1.0"

data/lib/ohai/application.rb

@@ -49,7 +49,7 @@ class Ohai::Application
     short: "-l LEVEL",
     long: "--log_level LEVEL",
     description: "Set the log level (debug, info, warn, error, fatal)",
-    proc: lambda { |l| l.to_sym }
+    proc: lambda(&:to_sym)
 
   option :log_location,
     short: "-L LOGLOCATION",

data/lib/ohai/dsl/plugin/versionvii.rb

@@ -149,11 +149,11 @@ module Ohai
         end
 
         def provides(*paths)
-          logger.warn("[UNSUPPORTED OPERATION] \'provides\' is no longer supported in a \'collect_data\' context. Please specify \'provides\' before collecting plugin data. Ignoring command \'provides #{paths.join(", ")}")
+          logger.warn("[UNSUPPORTED OPERATION] 'provides' is no longer supported in a 'collect_data' context. Please specify 'provides' before collecting plugin data. Ignoring command 'provides #{paths.join(", ")}")
         end
 
         def require_plugin(*args)
-          logger.warn("[UNSUPPORTED OPERATION] \'require_plugin\' is no longer supported. Please use \'depends\' instead.\nIgnoring plugin(s) #{args.join(", ")}")
+          logger.warn("[UNSUPPORTED OPERATION] 'require_plugin' is no longer supported. Please use 'depends' instead.\nIgnoring plugin(s) #{args.join(", ")}")
         end
 
         def configuration(option, *options)

data/lib/ohai/loader.rb

@@ -100,7 +100,7 @@ module Ohai
       contents = ""
       begin
         logger.trace("Loading plugin at #{plugin_path}")
-        contents << IO.read(plugin_path)
+        contents << File.read(plugin_path)
       rescue IOError, Errno::ENOENT
         logger.warn("Unable to open or read plugin at #{plugin_path}")
         return nil
@@ -110,9 +110,9 @@ module Ohai
       if contents.include?("Ohai.plugin")
         load_v7_plugin_class(contents, plugin_path)
       else
-        raise Exceptions::IllegalPluginDefinition, "[DEPRECATION] Plugin at #{plugin_path}"\
-        " is a version 6 plugin. Version 6 plugins are no longer supported by Ohai. This"\
-        " plugin will need to be updated to the v7 Ohai plugin format. See"\
+        raise Exceptions::IllegalPluginDefinition, "[DEPRECATION] Plugin at #{plugin_path}" \
+        " is a version 6 plugin. Version 6 plugins are no longer supported by Ohai. This" \
+        " plugin will need to be updated to the v7 Ohai plugin format. See" \
         " https://docs.chef.io/ohai_custom.html for v7 syntax."
       end
     end
@@ -151,7 +151,7 @@ module Ohai
     rescue Ohai::Exceptions::IllegalPluginDefinition => e
       logger.warn("Plugin Definition Error: <#{plugin_path}>: #{e.message}")
     rescue NoMethodError => e
-      logger.warn("Plugin Method Error: <#{plugin_path}>: unsupported operation \'#{e.name}\'")
+      logger.warn("Plugin Method Error: <#{plugin_path}>: unsupported operation '#{e.name}'")
     rescue SyntaxError => e
       # split on occurrences of
       #    <env>: syntax error,

data/lib/ohai/mixin/ec2_metadata.rb

@@ -248,8 +248,14 @@ module Ohai
       private
 
       def expand_path(file_name)
-        path = file_name.gsub(/\=.*$/, "/")
-        # ignore "./" and "../"
+        # First substitution - exactly matches original behavior but safer
+        path = if file_name.include?("=")
+                 file_name[0...file_name.index("=")] + "/"
+               else
+                 file_name.dup
+               end
+
+        # Handle relative path components
         path.gsub(%r{/\.\.?(?:/|$)}, "/")
           .sub(%r{^\.\.?(?:/|$)}, "")
           .sub(/^$/, "/")

data/lib/ohai/mixin/string.rb

@@ -25,7 +25,7 @@ class String
   # ActiveSupport::CoreExtensions::String::Inflections
   # @return [String]
   def wmi_underscore
-    gsub(/::/, "/").gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+    gsub("::", "/").gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
       .gsub(/([a-z\d])([A-Z])/, '\1_\2').tr("-", "_").downcase
   end
 end

data/lib/ohai/plugins/aix/kernel.rb

@@ -26,11 +26,11 @@ Ohai.plugin(:Kernel) do
 
     uname_so = shell_out("uname -rvp").stdout.split
 
-    kernel[:name] =    "aix" # this is here for historical reasons, but it's always aix
+    kernel[:name] = "aix" # this is here for historical reasons, but it's always aix
     kernel[:release] = uname_so[0]
     kernel[:version] = uname_so[1]
     kernel[:machine] = uname_so[2]
-    kernel[:bits] =    shell_out("getconf KERNEL_BITMODE").stdout.strip
+    kernel[:bits] = shell_out("getconf KERNEL_BITMODE").stdout.strip
 
     modules = Mash.new
     so = shell_out("genkex -d")

data/lib/ohai/plugins/aix/network.rb

@@ -120,7 +120,7 @@ Ohai.plugin(:Network) do
           interface = $6
           ifaces[interface][:routes] ||= []
           ifaces[interface][:routes] << Mash.new( destination: $1, family: family,
-                                                  via: $2, flags: $3)
+            via: $2, flags: $3)
         end
       end
     end

data/lib/ohai/plugins/aix/virtualization.rb

@@ -143,7 +143,7 @@ Ohai.plugin(:Virtualization) do
           evalstr = "wpars['#{wpar_name}']"
           breadcrumb = attribute.split(".")
           breadcrumb.each do |node|
-            evalstr << "[\'#{node}\']"
+            evalstr << "['#{node}']"
           end
           wpars[wpar_name][breadcrumb[-1]] = eval evalstr # rubocop: disable Security/Eval
         end

data/lib/ohai/plugins/alibaba.rb

@@ -54,7 +54,7 @@ Ohai.plugin(:Alibaba) do
   # a single check that combines all the various detection methods for Alibaba
   # @return [Boolean] Does the system appear to be on Alibaba
   def looks_like_alibaba?
-    return true if hint?("alibaba") || has_ali_dmi?
+    true if hint?("alibaba") || has_ali_dmi?
   end
 
   collect_data do

data/lib/ohai/plugins/cpu.rb

@@ -63,7 +63,8 @@ Ohai.plugin(:CPU) do
   def parse_lscpu(cpu_info)
     lscpu_info = Mash.new
     begin
-      so = shell_out("lscpu")
+      # Pipe to cat to retain previous output on newer util-linux (see lscpu(1))
+      so = shell_out("lscpu | cat")
       cpu_cores = shell_out("lscpu -p=CPU,CORE,SOCKET")
       if so.exitstatus == 0 && cpu_cores.exitstatus == 0
         lscpu_info[:numa_node_cpus] = Mash.new
@@ -96,10 +97,12 @@ Ohai.plugin(:CPU) do
             end
           when /^Thread\(s\) per core:\s+(.+)/ # http://rubular.com/r/lOw2pRrw1q
             lscpu_info[:threads_per_core] = $1.to_i
-          when /^Core\(s\) per socket:\s+(.+)/ # http://rubular.com/r/lOw2pRrw1q
+          when /^Core\(s\) per (?:socket|cluster):\s+(.+)/ # http://rubular.com/r/lOw2pRrw1q
             lscpu_info[:cores_per_socket] = $1.to_i
           when /^Socket\(s\):\s+(.+)/ # http://rubular.com/r/DIzmPtJFvK
             lscpu_info[:sockets] = $1.to_i
+          when /^Clusters\(s\):\s+(.+)/
+            lscpu_info[:clusters] = $1.to_i
           when /^Socket\(s\) per book:\s+(.+)/
             lscpu_info[:sockets_per_book] = $1.to_i
           when /^Book\(s\) per drawer:\s+(.+)/
@@ -110,6 +113,10 @@ Ohai.plugin(:CPU) do
             lscpu_info[:numa_nodes] = $1.to_i
           when /^Vendor ID:\s+(.+)/
             lscpu_info[:vendor_id] = $1
+          when /^BIOS Vendor ID:\s+(.+)/
+            lscpu_info[:bios_vendor_id] = $1
+          when /^BIOS Model name:\s+(.+)/
+            lscpu_info[:bios_model_name] = $1.strip
           when /^Machine type:\s+(.+)/
             lscpu_info[:machine_type] = $1
           when /^CPU family:\s+(.+)/
@@ -630,6 +637,6 @@ Ohai.plugin(:CPU) do
 
     cpu[:total] = logical_processors
     cpu[:cores] = cores
-    cpu[:real] =  processors.length
+    cpu[:real] = processors.length
   end
 end

data/lib/ohai/plugins/darwin/virtualization.rb

@@ -36,7 +36,7 @@ Ohai.plugin(:Virtualization) do
   end
 
   def fusion_exists?
-    file_exist?("/Applications/VMware\ Fusion.app/")
+    file_exist?("/Applications/VMware Fusion.app/")
   end
 
   def docker_exists?

data/lib/ohai/plugins/filesystem.rb

@@ -276,19 +276,21 @@ Ohai.plugin(:Filesystem) do
     if entry[:fs_type] == "btrfs" && entry["uuid"]
       uuid = entry["uuid"]
       alloc = "/sys/fs/btrfs/#{uuid}/allocation"
-      %w{data metadata system}.each do |bg_type|
-        dir = "#{alloc}/#{bg_type}"
-        %w{single dup}.each do |raid|
-          if file_exist?("#{dir}/#{raid}")
-            btrfs["raid"] = raid
+      if Dir.exist?(alloc)
+        %w{data metadata system}.each do |bg_type|
+          dir = "#{alloc}/#{bg_type}"
+          %w{single dup}.each do |raid|
+            if file_exist?("#{dir}/#{raid}")
+              btrfs["raid"] = raid
+            end
+          end
+          logger.trace("Plugin Filesystem: reading btrfs allocation files at #{dir}")
+          btrfs["allocation"] ||= Mash.new
+          btrfs["allocation"][bg_type] ||= Mash.new
+          %w{total_bytes bytes_used}.each do |field|
+            bytes = file_read("#{dir}/#{field}").chomp.to_i
+            btrfs["allocation"][bg_type][field] = "#{bytes}"
           end
-        end
-        logger.trace("Plugin Filesystem: reading btrfs allocation files at #{dir}")
-        btrfs["allocation"] ||= Mash.new
-        btrfs["allocation"][bg_type] ||= Mash.new
-        %w{total_bytes bytes_used}.each do |field|
-          bytes = file_read("#{dir}/#{field}").chomp.to_i
-          btrfs["allocation"][bg_type][field] = "#{bytes}"
         end
       end
     end

data/lib/ohai/plugins/gce.rb

@@ -72,7 +72,7 @@ Ohai.plugin(:GCE) do
     return true if hint?("gce")
 
     if has_gce_dmi? || has_gce_system_info?
-      return true if can_socket_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80)
+      true if can_socket_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80)
     end
   end
 

data/lib/ohai/plugins/linux/interrupts.rb

@@ -27,9 +27,8 @@ Ohai.plugin(:Interrupts) do
   # each bit is a CPU, right to left ordering (i.e. CPU0 is rightmost)
   def parse_smp_affinity(path, cpus)
     masks = file_read(path).strip
-    bit_masks = []
-    masks.split(",").each do |mask|
-      bit_masks << mask.rjust(8, "0").to_i(16).to_s(2)
+    bit_masks = masks.split(",").map do |mask|
+      mask.rjust(8, "0").to_i(16).to_s(2)
     end
     affinity_mask = bit_masks.join
     affinity_by_cpu = affinity_mask.split("").reverse

data/lib/ohai/plugins/linux/network.rb

@@ -104,7 +104,7 @@ Ohai.plugin(:Network) do
       end
       route_endings.each do |route_ending|
         route_entry = Mash.new(destination: route_dest,
-                               family: family[:name])
+          family: family[:name])
         route_int = nil
         if route_ending =~ /\bdev\s+([^\s]+)\b/
           route_int = $1

data/lib/ohai/plugins/passwd.rb

@@ -31,7 +31,7 @@ Ohai.plugin(:Passwd) do
 
       Etc.group do |entry|
         group_entry = Mash.new(gid: entry.gid,
-                               members: entry.mem.map { |u| fix_encoding(u) })
+          members: entry.mem.map { |u| fix_encoding(u) })
 
         etc[:group][fix_encoding(entry.name)] = group_entry
       end

data/lib/ohai/plugins/platform.rb

@@ -18,12 +18,24 @@
 #
 
 Ohai.plugin(:Platform) do
-  provides "platform", "platform_version", "platform_family"
+  provides "platform", "platform_version", "platform_family", "platform_backend"
   depends "os", "os_version"
 
   collect_data(:default) do
     platform os unless attribute?("platform")
     platform_version os_version unless attribute?("platform_version")
     platform_family platform unless attribute?("platform_family")
+
+    platform_backend Mash.new
+    platform_backend["type"] = "local"
+    platform_backend["uri"] = "local://"
+
+    if connection
+      platform_backend["type"] = connection.backend_type
+      if connection.respond_to?(:uri)
+        platform_backend["type"] = connection.uri.split(":").first
+        platform_backend["uri"] = connection.uri
+      end
+    end
   end
 end

data/lib/ohai/plugins/rackspace.rb

@@ -115,7 +115,7 @@ Ohai.plugin(:Rackspace) do
   def get_instance_id
     so = shell_out("xenstore-read name")
     if so.exitstatus == 0
-      rackspace[:instance_id] = so.stdout.gsub(/instance-/, "")
+      rackspace[:instance_id] = so.stdout.gsub("instance-", "")
     end
   rescue Ohai::Exceptions::Exec
     logger.trace("Plugin Rackspace: Unable to find xenstore-read, cannot capture instance ID information for Rackspace cloud")

data/lib/ohai/provides_map.rb

@@ -65,8 +65,8 @@ module Ohai
       plugins = []
       attributes.each do |attribute|
         attrs = select_subtree(@map, attribute)
-        raise Ohai::Exceptions::AttributeNotFound, "No such attribute: \'#{attribute}\'" unless attrs
-        raise Ohai::Exceptions::ProviderNotFound, "Cannot find plugin providing attribute: \'#{attribute}\'" unless attrs[:_plugins]
+        raise Ohai::Exceptions::AttributeNotFound, "No such attribute: '#{attribute}'" unless attrs
+        raise Ohai::Exceptions::ProviderNotFound, "Cannot find plugin providing attribute: '#{attribute}'" unless attrs[:_plugins]
 
         plugins += attrs[:_plugins]
       end
@@ -93,7 +93,7 @@ module Ohai
           attrs = select_closest_subtree(@map, attribute)
 
           unless attrs
-            raise Ohai::Exceptions::AttributeNotFound, "No such attribute: \'#{attribute}\'"
+            raise Ohai::Exceptions::AttributeNotFound, "No such attribute: '#{attribute}'"
           end
         end
 
@@ -115,10 +115,10 @@ module Ohai
       plugins = []
       attributes.each do |attribute|
         parts = normalize_and_validate(attribute)
-        raise Ohai::Exceptions::AttributeNotFound, "No such attribute: \'#{attribute}\'" unless @map[parts[0]]
+        raise Ohai::Exceptions::AttributeNotFound, "No such attribute: '#{attribute}'" unless @map[parts[0]]
 
         attrs = select_closest_subtree(@map, attribute)
-        raise Ohai::Exceptions::ProviderNotFound, "Cannot find plugin providing attribute: \'#{attribute}\'" unless attrs
+        raise Ohai::Exceptions::ProviderNotFound, "Cannot find plugin providing attribute: '#{attribute}'" unless attrs
 
         plugins += attrs[:_plugins]
       end

data/lib/ohai/runner.rb

@@ -119,9 +119,7 @@ module Ohai
     # cycle. Does not include plugins that aren't a part of the cycle
     def get_cycle(plugins, cycle_start)
       cycle = plugins.drop_while { |plugin| !plugin.eql?(cycle_start) }
-      names = []
-      cycle.each { |plugin| names << plugin.name }
-      names
+      cycle.map(&:name)
     end
 
   end

data/lib/ohai/version.rb

@@ -19,5 +19,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "18.1.18"
+  VERSION = "18.2.6"
 end

data/ohai.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef-config", ">= 14.12", "< 19"
   s.add_dependency "chef-utils", ">= 16.0", "< 19"
-  s.add_dependency "ffi", "~> 1.9"
+  s.add_dependency "ffi", "~> 1.9", "<= 1.17.0"
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "ipaddress"
   s.add_dependency "mixlib-cli", ">= 1.7.0" # 1.7+ needed to support passing multiple options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 18.1.18
+  version: 18.2.6
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-28 00:00:00.000000000 Z
+date: 2025-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -57,6 +57,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -64,6 +67,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
@@ -401,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON