ohai 15.1.5 → 15.2.5

data/lib/ohai/plugins/netbsd/memory.rb

@@ -85,7 +85,7 @@ Ohai.plugin(:Memory) do
     so.stdout.lines do |line|
       # Device      1024-blocks     Used    Avail Capacity  Priority
       # swap_device     1048824        0  1048824     0%    0
-      if line =~ /^([\d\w\/]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+([\d\%]+)/
+      if line =~ %r{^([\d\w/]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+([\d\%]+)}
         mdev = $1
         memory[:swap][mdev] = Mash.new
         memory[:swap][mdev][:total] = $2

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

@@ -89,6 +89,7 @@ Ohai.plugin(:Network) do
     so.stdout.lines do |line|
       if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
         next unless iface[$3] # this should never happen
+
         iface[$3][:arp] ||= Mash.new
         iface[$3][:arp][$1] = $2.downcase
       end

data/lib/ohai/plugins/network.rb

@@ -37,8 +37,10 @@ Ohai.plugin(:NetworkAddresses) do
     ipaddresses = []
     Mash[network["interfaces"]].each do |iface, iface_v|
       next if iface_v.nil? || !iface_v.key?("addresses")
+
       iface_v["addresses"].each do |addr, addr_v|
         next if addr_v.nil? || (not addr_v.key? "family") || addr_v["family"] != family
+
         ipaddresses << {
           ipaddress: addr_v["prefixlen"] ? IPAddress("#{addr}/#{addr_v["prefixlen"]}") : IPAddress("#{addr}/#{addr_v["netmask"]}"),
           scope: addr_v["scope"].nil? ? nil : addr_v["scope"].downcase,

data/lib/ohai/plugins/openbsd/memory.rb

@@ -85,7 +85,7 @@ Ohai.plugin(:Memory) do
     so.stdout.lines do |line|
       # Device      1024-blocks     Used    Avail Capacity  Priority
       # swap_device     1048824        0  1048824     0%    0
-      if line =~ /^([\d\w\/]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+([\d\%]+)/
+      if line =~ %r{^([\d\w/]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+([\d\%]+)}
         mdev = $1
         memory[:swap][mdev] = Mash.new
         memory[:swap][mdev][:total] = $2

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

@@ -89,6 +89,7 @@ Ohai.plugin(:Network) do
     so.stdout.lines do |line|
       if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
         next unless iface[$3] # this should never happen
+
         iface[$3][:arp] ||= Mash.new
         iface[$3][:arp][$1] = $2.downcase
       end

data/lib/ohai/plugins/openstack.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Matt Ray (<matt@chef.io>)
 # Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2012-2019 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,21 +23,14 @@ Ohai.plugin(:Openstack) do
   include Ohai::Mixin::HttpHelper
 
   provides "openstack"
-  depends "dmi"
   depends "etc"
+  depends "virtualization"
 
-  # do we have the openstack dmi data
-  def openstack_dmi?
-    # detect a manufacturer of OpenStack Foundation
-    if get_attribute(:dmi, :system, :all_records, 0, :Manufacturer) =~ /OpenStack/
-      logger.trace("Plugin Openstack: has_openstack_dmi? == true")
+  # use virtualization data
+  def openstack_virtualization?
+    if get_attribute(:virtualization, :system, :guest) == "openstack"
+      logger.trace("Plugin Openstack: has_openstack_virtualization? == true")
       true
-    elsif get_attribute(:dmi, :system, :product_name) == "OpenStack Compute"
-      logger.trace("Plugin Openstack: has_openstack_dmi? == true")
-      true
-    else
-      logger.trace("Plugin Openstack: has_openstack_dmi? == false")
-      false
     end
   end
 
@@ -55,12 +48,13 @@ Ohai.plugin(:Openstack) do
   # dreamhost systems have the dhc-user on them
   def openstack_provider
     return "dreamhost" if get_attribute("etc", "passwd", "dhc-user")
+
     "openstack"
   end
 
   collect_data do
     # fetch data if we look like openstack
-    if openstack_hint? || openstack_dmi?
+    if openstack_hint? || openstack_virtualization?
       openstack Mash.new
       openstack[:provider] = openstack_provider
 

data/lib/ohai/plugins/packages.rb

@@ -48,7 +48,34 @@ Ohai.plugin(:Packages) do
 
       pkgs.each do |pkg|
         name, epoch, version, release, installdate, arch = pkg.split
-        packages[name] = { "epoch" => epoch, "version" => version, "release" => release, "installdate" => installdate, "arch" => arch }
+        if packages[name]
+          # We have more than one package with this exact name!
+          # Create an "versions" array for tracking all versions of packages with this name.
+          # The top-level package information will be the first one returned by rpm -qa,
+          # all versions go in this list, with the same information they'd normally have.
+          if packages[name]["versions"].nil?
+            # add the data of the first package to the list, so that all versions are in the list.
+            packages[name]["versions"] = []
+            packages[name]["versions"] << Mash.new({ "epoch" => packages[name]["epoch"],
+                                                     "version" => packages[name]["version"],
+                                                     "release" => packages[name]["release"],
+                                                     "installdate" => packages[name]["installdate"],
+                                                     "arch" => packages[name]["arch"] })
+          end
+          packages[name]["versions"] << Mash.new({ "epoch" => epoch, "version" => version, "release" => release, "installdate" => installdate, "arch" => arch }) # Add this package version to the list
+          # When this was originally written, it didn't account for multiple versions of the same package
+          # so it just kept clobbering the package data if it encountered multiple versions
+          # of the same package. As a result, the last duplicate returned by rpm -qa was what was present;
+          # here we clobber that data for compatibility. Note that we can't overwrite the entire hash
+          # without losing the versions array.
+          packages[name]["epoch"] = epoch
+          packages[name]["version"] = version
+          packages[name]["release"] = release
+          packages[name]["installdate"] = installdate
+          packages[name]["arch"] = arch
+        else
+          packages[name] = { "epoch" => epoch, "version" => version, "release" => release, "installdate" => installdate, "arch" => arch }
+        end
       end
 
     when "arch"
@@ -92,6 +119,7 @@ Ohai.plugin(:Packages) do
         pkg = reg.open(key)
         name = pkg["DisplayName"] rescue nil
         next if name.nil?
+
         package = packages[name] = Mash.new
         WINDOWS_ATTRIBUTE_ALIASES.each do |registry_attr, package_attr|
           value = pkg[registry_attr] rescue nil

data/lib/ohai/plugins/rackspace.rb

@@ -49,6 +49,7 @@ Ohai.plugin(:Rackspace) do
   # false:: Otherwise
   def has_rackspace_manufacturer?
     return false unless RUBY_PLATFORM =~ /mswin|mingw32|windows/
+
     require "wmi-lite/wmi"
     wmi = WmiLite::Wmi.new
     if wmi.first_of("Win32_ComputerSystem")["PrimaryOwnerName"] == "Rackspace"

data/lib/ohai/plugins/scaleway.rb

@@ -39,6 +39,7 @@ Ohai.plugin(:Scaleway) do
   def looks_like_scaleway?
     return true if hint?("scaleway")
     return true if has_scaleway_cmdline? && can_socket_connect?(Ohai::Mixin::ScalewayMetadata::SCALEWAY_METADATA_ADDR, 80)
+
     false
   end
 

data/lib/ohai/plugins/shard.rb

@@ -31,7 +31,7 @@ Ohai.plugin(:ShardSeed) do
   def default_sources
     case collect_os
     when "linux", "darwin", "windows"
-      [:machinename, :serial, :uuid]
+      %i{machinename serial uuid}
     else
       [:machinename]
     end

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

@@ -70,6 +70,7 @@ Ohai.plugin(:Network) do
     return "Ethernet" if ETHERNET_ENCAPS.include?(ifname)
     return "Ethernet" if ifname.eql?("net")
     return "Loopback" if ifname.eql?("lo")
+
     "Unknown"
   end
 
@@ -129,7 +130,7 @@ Ohai.plugin(:Network) do
         iface[cint][:addresses] ||= Mash.new
         iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf("%2x" * 4) * ".", "broadcast" => $4 }
       end
-      if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*)\/(\d+)\s*$/
+      if line =~ %r{\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*)/(\d+)\s*$}
         iface[cint][:addresses] ||= Mash.new
         iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 }
       end
@@ -141,6 +142,7 @@ Ohai.plugin(:Network) do
     so.stdout.lines do |line|
       if line =~ /([0-9a-zA-Z]+)\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\w+)?\s+([a-zA-Z0-9\.\:\-]+)/
         next unless iface[arpname_to_ifname(iface, $1)] # this should never happen, except on solaris because sun hates you.
+
         iface[arpname_to_ifname(iface, $1)][:arp] ||= Mash.new
         iface[arpname_to_ifname(iface, $1)][:arp][$2] = $5
       end

data/lib/ohai/plugins/virtualbox.rb

@@ -87,6 +87,7 @@ Ohai.plugin(:Virtualbox) do
       hostfloppies hostonlyifs natnets
     }
     return nil unless supported_queries.include? query_type
+
     results = Mash.new
 
     so_cmd = "VBoxManage list --sorted #{query_type}"
@@ -103,8 +104,9 @@ Ohai.plugin(:Virtualbox) do
         # initialize a blank record hash
         record = Mash.new
         # parse the record block into key/value pairs
-        blk.each_line() do |line|
+        blk.each_line do |line|
           next unless line.include? ":"
+
           # split the line into key/value pair
           key, right = line.split(":", 2)
 
@@ -144,9 +146,9 @@ Ohai.plugin(:Virtualbox) do
               virtualbox[:host][:version] = Regexp.last_match(1)
             when /VBoxRev, value: (\S*),/
               virtualbox[:host][:revision] = Regexp.last_match(1)
-            when /GuestAdd\/VersionExt, value: (\S*),/
+            when %r{GuestAdd/VersionExt, value: (\S*),}
               virtualbox[:guest][:guest_additions_version] = Regexp.last_match(1)
-            when /GuestAdd\/Revision, value: (\S*),/
+            when %r{GuestAdd/Revision, value: (\S*),}
               virtualbox[:guest][:guest_additions_revision] = Regexp.last_match(1)
             end
           end

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

@@ -22,6 +22,7 @@ Ohai.plugin(:Network) do
 
   def windows_encaps_lookup(encap)
     return "Ethernet" if encap.eql?("Ethernet 802.3")
+
     encap
   end
 
@@ -40,6 +41,7 @@ Ohai.plugin(:Network) do
       # that does not populate the deprecated win32_* WMI classes, then we should
       # grab data from the newer MSFT_* classes
       return msft_adapter_data if data[:addresses].count == 0
+
       data[:adapters] = wmi.instances_of("Win32_NetworkAdapter")
       data
     end
@@ -84,6 +86,7 @@ Ohai.plugin(:Network) do
   #
   def prefer_ipv4(addresses)
     return nil unless addresses.is_a?(Array)
+
     addresses.find { |ip| IPAddress.valid_ipv4?(ip) } ||
       addresses.find { |ip| IPAddress.valid_ipv6?(ip) }
   end
@@ -99,6 +102,7 @@ Ohai.plugin(:Network) do
   #
   def favored_default_route_windows(configuration)
     return nil unless configuration.is_a?(Hash)
+
     config = configuration.dup
 
     config.inject([]) do |arr, (k, v)|
@@ -143,6 +147,7 @@ Ohai.plugin(:Network) do
       adapter.wmi_ole_object.properties_.each do |p|
         # skip wmi class name fields which make no sense in ohai
         next if %w{creation_class_name system_creation_class_name}.include?(p.name.wmi_underscore)
+
         iface_instance[i][p.name.wmi_underscore.to_sym] = adapter[p.name.downcase]
       end
     end
@@ -204,6 +209,7 @@ Ohai.plugin(:Network) do
           cint = $2.downcase
         end
         next unless iface[cint]
+
         if line =~ /^\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+([a-fA-F0-9\:-]+)/
           iface[cint][:arp][$1] = $2.tr("-", ":").downcase
         end

data/lib/ohai/provides_map.rb

@@ -31,8 +31,13 @@ module Ohai
       @map = Mash.new
     end
 
+    # @param [Ohai::DSL::Plugin] plugin
+    # @param [Array] provided_attributes
+    #
+    # @return void
+    #
     def set_providers_for(plugin, provided_attributes)
-      unless plugin.kind_of?(Ohai::DSL::Plugin)
+      unless plugin.is_a?(Ohai::DSL::Plugin)
         raise ArgumentError, "set_providers_for only accepts Ohai Plugin classes (got: #{plugin})"
       end
 
@@ -48,13 +53,20 @@ module Ohai
       end
     end
 
+    #
     # gather plugins providing exactly the attributes listed
+    #
+    # @param [Array] attributes
+    #
+    # @return [Array] plugin names
+    #
     def find_providers_for(attributes)
       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]
+
         plugins += attrs[:_plugins]
       end
       plugins.uniq
@@ -67,6 +79,10 @@ module Ohai
     # If it can't find any, it looks for plugins that might
     # provide the parents of a given attribute and returns the
     # first parent found.
+    #
+    # @param [Array] attributes
+    #
+    # @return [Array] plugin names
     def deep_find_providers_for(attributes)
       plugins = []
       attributes.each do |attribute|
@@ -90,13 +106,19 @@ module Ohai
     # 'depends "languages"' statements in plugins.
     # It gathers plugins providing each of the attributes listed, or the
     # plugins providing the closest parent attribute
+    #
+    # @param [Array] attributes
+    #
+    # @return [Array] plugin names
     def find_closest_providers_for(attributes)
       plugins = []
       attributes.each do |attribute|
         parts = normalize_and_validate(attribute)
         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
+
         plugins += attrs[:_plugins]
       end
       plugins.uniq
@@ -114,8 +136,8 @@ module Ohai
     private
 
     def normalize_and_validate(attribute)
-      raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains duplicate '/' characters: #{attribute}" if attribute =~ /\/\/+/
-      raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains a trailing '/': #{attribute}" if attribute =~ /\/$/
+      raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains duplicate '/' characters: #{attribute}" if attribute =~ %r{//+}
+      raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains a trailing '/': #{attribute}" if attribute =~ %r{/$}
 
       parts = attribute.split("/")
       parts.shift if parts.length != 0 && parts[0].length == 0 # attribute begins with a '/'
@@ -127,6 +149,7 @@ module Ohai
       parts = normalize_and_validate(attribute)
       parts.each do |part|
         return nil unless subtree[part]
+
         subtree = subtree[part]
       end
       subtree

data/lib/ohai/runner.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Claire McQuin (<claire@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -37,9 +37,14 @@ module Ohai
     # Runs plugins and any un-run dependencies.
     # If force is set to true, then this plugin and its dependencies
     # will be run even if they have been run before.
+    #
+    # @param [Ohai::DSL::Plugin] plugin
+    #
+    # @return void
+    #
     def run_plugin(plugin)
-      elapsed = Benchmark.measure do
-        unless plugin.kind_of?(Ohai::DSL::Plugin)
+      elapsed = Benchmark.realtime do
+        unless plugin.is_a?(Ohai::DSL::Plugin)
           raise Ohai::Exceptions::InvalidPlugin, "Invalid plugin #{plugin} (must be an Ohai::DSL::Plugin or subclass)"
         end
 
@@ -53,13 +58,17 @@ module Ohai
           raise
         rescue SystemExit # abort or exit from plug-in should exit Ohai with failure code
           raise
-        rescue Exception, Errno::ENOENT => e
+        rescue Exception => e
           logger.trace("Plugin #{plugin.name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
         end
       end
-      logger.trace("Plugin #{plugin.name} took #{elapsed.total} seconds to run.")
+      logger.trace("Plugin #{plugin.name} took #{elapsed} seconds to run.")
     end
 
+    # @param [Ohai::DSL::Plugin] plugin
+    #
+    # @return void
+    #
     def run_v7_plugin(plugin)
       return true if plugin.optional? &&
         !Ohai.config[:run_all_plugins] &&
@@ -94,6 +103,10 @@ module Ohai
       end
     end
 
+    # @param [Array] attributes
+    #
+    # @return [Array]
+    #
     def fetch_plugins(attributes)
       @provides_map.find_closest_providers_for(attributes)
     end

data/lib/ohai/system.rb

@@ -84,6 +84,7 @@ module Ohai
     # to run the system.
     #
     # @param [Array<String>] attribute_filter the attributes to run. All will be run if not specified
+    #
     # @return [void]
     def all_plugins(attribute_filter = nil)
       # Reset the system when all_plugins is called since this function
@@ -96,6 +97,7 @@ module Ohai
     end
 
     # load all plugins by calling Ohai::Loader.load_all
+    #
     # @see Ohai::Loader.load_all
     def load_plugins
       @loader.load_all
@@ -131,6 +133,10 @@ module Ohai
       freeze_strings!
     end
 
+    # @param [String] plugin_path
+    #
+    # @return [void]
+    #
     def run_additional_plugins(plugin_path)
       @loader.load_additional(plugin_path).each do |plugin|
         logger.trace "Running plugin #{plugin}"
@@ -160,6 +166,7 @@ module Ohai
         data = data[part]
       end
       raise ArgumentError, "I cannot find an attribute named #{a}!" if data.nil?
+
       case data
       when Hash, Mash, Array, Integer
         json_pretty_print(data)
@@ -184,6 +191,7 @@ module Ohai
         # make sure the directory config is an array since it could be a string set in client.rb
         Array(Ohai.config[:directory]).each do |dir|
           next if Ohai.config[:plugin_path].include?(dir)
+
           Ohai.config[:plugin_path] << dir
         end
       end