ohai 8.13.0 → 8.14.0

data/lib/ohai/plugins/erlang.rb

@@ -34,7 +34,7 @@ Ohai.plugin(:Erlang) do
         erlang[:version] = output[5]
         erlang[:options] = options.split(",")
         erlang[:emulator] = output[2].gsub!(/(\(|\))/, "")
-        if erlang[:version] and erlang[:options] and erlang[:emulator]
+        if erlang[:version] && erlang[:options] && erlang[:emulator]
           languages[:erlang] = erlang
         end
       end

data/lib/ohai/plugins/ip_scopes.rb

@@ -30,7 +30,7 @@ Ohai.plugin(:IpScopes) do
         interface = network["interfaces"][ifName]
         interface["addresses"].each do |address, attrs|
           begin
-            attrs.merge! "ip_scope" => address.to_ip.scope
+            attrs["ip_scope"] = address.to_ip.scope
 
             if private_addr?(address) && !tunnel_iface?(interface)
               privateaddress(address)

data/lib/ohai/plugins/kernel.rb

@@ -191,7 +191,7 @@ Ohai.plugin(:Kernel) do
     host = wmi.first_of("Win32_ComputerSystem")
     kernel[:cs_info] = Mash.new
     cs_info_blacklist = [
-      "oem_logo_bitmap"
+      "oem_logo_bitmap",
     ]
     host.wmi_ole_object.properties_.each do |p|
       if !cs_info_blacklist.include?(p.name.wmi_underscore)

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

@@ -205,7 +205,7 @@ Ohai.plugin(:Network) do
         net_counters[tmp_int][:tx][:queuelen] = $1
       end
 
-      if line =~ /vlan id (\d+)/ or line =~ /vlan protocol ([\w\.]+) id (\d+)/
+      if line =~ /vlan id (\d+)/ || line =~ /vlan protocol ([\w\.]+) id (\d+)/
         if $2
           tmp_prot = $1
           tmp_id = $2
@@ -463,7 +463,7 @@ Ohai.plugin(:Network) do
 
         default_route = choose_default_route(routes)
 
-        if default_route.nil? or default_route.empty?
+        if default_route.nil? || default_route.empty?
           attribute_name = if family[:name] == "inet"
                              "default_interface"
                            else

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

@@ -125,7 +125,12 @@ Ohai.plugin(:Platform) do
       suse_version = suse_release[/VERSION = ([\d\.]{2,})/, 1] if suse_version == ""
       platform_version suse_version
       if suse_release =~ /^openSUSE/
-        platform "opensuse"
+        # opensuse releases >= 42 are openSUSE Leap
+        if platform_version.to_i < 42
+          platform "opensuse"
+        else
+          platform "opensuseleap"
+        end
       else
         platform "suse"
       end

data/lib/ohai/plugins/mono.rb

@@ -33,7 +33,7 @@ Ohai.plugin(:Mono) do
         mono[:version] = output[4]
       end
       if output.length >= 11
-        mono[:builddate] = "%s %s %s %s" % [output[6], output[7], output[8], output[11].gsub!(/\)/, "")]
+        mono[:builddate] = "%s %s %s %s" % [output[6], output[7], output[8], output[11].delete!(")")]
       end
       languages[:mono] = mono if mono[:version]
     end

data/lib/ohai/plugins/network.rb

@@ -39,7 +39,7 @@ Ohai.plugin(:NetworkAddresses) do
     Mash[network["interfaces"]].each do |iface, iface_v|
       next if iface_v.nil? || !iface_v.has_key?("addresses")
       iface_v["addresses"].each do |addr, addr_v|
-        next if addr_v.nil? or not addr_v.has_key? "family" or addr_v["family"] != family
+        next if addr_v.nil? || (not addr_v.has_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,
@@ -106,7 +106,7 @@ Ohai.plugin(:NetworkAddresses) do
       Ohai::Log.debug("[#{family}] no default interface, picking the first ipaddress")
     end
 
-    return [ nil, nil ] if r.nil? or r.empty?
+    return [ nil, nil ] if r.nil? || r.empty?
 
     [ r[:ipaddress].to_s, r[:iface] ]
   end

data/lib/ohai/plugins/packages.rb

@@ -22,63 +22,78 @@ Ohai.plugin(:Packages) do
   provides "packages"
   depends "platform_family"
 
+  WINDOWS_ATTRIBUTE_ALIASES = {
+    "DisplayVersion" => "version",
+    "Publisher" => "publisher",
+    "InstallDate" => "installdate",
+  }
+
   collect_data(:linux) do
-    if configuration(:enabled)
-      packages Mash.new
-      if %w{debian}.include? platform_family
-        so = shell_out("dpkg-query -W")
-        pkgs = so.stdout.lines
+    packages Mash.new
+    if %w{debian}.include? platform_family
+      so = shell_out("dpkg-query -W")
+      pkgs = so.stdout.lines
 
-        pkgs.each do |pkg|
-          name, version = pkg.split
-          packages[name] = { "version" => version }
-        end
+      pkgs.each do |pkg|
+        name, version = pkg.split
+        packages[name] = { "version" => version }
+      end
 
-      elsif %w{rhel fedora suse}.include? platform_family
-        require "shellwords"
-        format = Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n'
-        so = shell_out("rpm -qa --queryformat #{format}")
-        pkgs = so.stdout.lines
+    elsif %w{rhel fedora suse}.include? platform_family
+      require "shellwords"
+      format = Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n'
+      so = shell_out("rpm -qa --queryformat #{format}")
+      pkgs = so.stdout.lines
 
-        pkgs.each do |pkg|
-          name, version, release = pkg.split
-          packages[name] = { "version" => version, "release" => release }
-        end
+      pkgs.each do |pkg|
+        name, version, release = pkg.split
+        packages[name] = { "version" => version, "release" => release }
       end
     end
   end
 
-  collect_data(:windows) do
-    if configuration(:enabled)
-      packages Mash.new
-      require "wmi-lite"
-
-      wmi = WmiLite::Wmi.new
-      w32_product = wmi.instances_of("Win32_Product")
-
-      w32_product.find_all.each do |product|
-        name = product["name"]
+  def collect_programs_from_registry_key(key_path)
+    # from http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129(v=vs.85).aspx
+    if ::RbConfig::CONFIG["target_cpu"] == "i386"
+      reg_type = Win32::Registry::KEY_READ | 0x100
+    elsif ::RbConfig::CONFIG["target_cpu"] == "x86_64"
+      reg_type = Win32::Registry::KEY_READ | 0x200
+    else
+      reg_type = Win32::Registry::KEY_READ
+    end
+    Win32::Registry::HKEY_LOCAL_MACHINE.open(key_path, reg_type) do |reg|
+      reg.each_key do |key, _wtime|
+        pkg = reg.open(key)
+        name = pkg["DisplayName"] rescue nil
+        next if name.nil?
         package = packages[name] = Mash.new
-        %w{version vendor installdate}.each do |attr|
-          package[attr] = product[attr]
+        WINDOWS_ATTRIBUTE_ALIASES.each do |registry_attr, package_attr|
+          value = pkg[registry_attr] rescue nil
+          package[package_attr] = value unless value.nil?
         end
       end
     end
   end
 
+  collect_data(:windows) do
+    require "win32/registry"
+    packages Mash.new
+    collect_programs_from_registry_key('Software\Microsoft\Windows\CurrentVersion\Uninstall')
+    # on 64 bit systems, 32 bit programs are stored here
+    collect_programs_from_registry_key('Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall')
+  end
+
   collect_data(:aix) do
-    if configuration(:enabled)
-      packages Mash.new
-      so = shell_out("lslpp -L -q -c")
-      pkgs = so.stdout.lines
+    packages Mash.new
+    so = shell_out("lslpp -L -q -c")
+    pkgs = so.stdout.lines
 
-      # Output format is
-      # Package Name:Fileset:Level
-      # On aix, filesets are packages and levels are versions
-      pkgs.each do |pkg|
-        _, name, version = pkg.split(":")
-        packages[name] = { "version" => version }
-      end
+    # Output format is
+    # Package Name:Fileset:Level
+    # On aix, filesets are packages and levels are versions
+    pkgs.each do |pkg|
+      _, name, version = pkg.split(":")
+      packages[name] = { "version" => version }
     end
   end
 
@@ -119,10 +134,8 @@ Ohai.plugin(:Packages) do
   end
 
   collect_data(:solaris2) do
-    if configuration(:enabled)
-      packages Mash.new
-      collect_ips_packages
-      collect_sysv_packages
-    end
+    packages Mash.new
+    collect_ips_packages
+    collect_sysv_packages
   end
 end

data/lib/ohai/plugins/python.rb

@@ -32,10 +32,10 @@ Ohai.plugin(:Python) do
       output = so.stdout.split
       python[:version] = output[0]
       if output.length >= 6
-        python[:builddate] = "%s %s %s %s" % [output[2], output[3], output[4], output[5].gsub!(/\)/, "")]
+        python[:builddate] = "%s %s %s %s" % [output[2], output[3], output[4], output[5].delete!(")")]
       end
 
-      languages[:python] = python if python[:version] and python[:builddate]
+      languages[:python] = python if python[:version] && python[:builddate]
     end
   end
 end

data/lib/ohai/plugins/rackspace.rb

@@ -40,7 +40,7 @@ Ohai.plugin(:Rackspace) do
     if so.exitstatus == 0
       so.stdout.strip.downcase == "rackspace"
     end
-  rescue Errno::ENOENT
+  rescue Ohai::Exceptions::Exec
     false
   end
 
@@ -91,7 +91,7 @@ Ohai.plugin(:Rackspace) do
         rackspace[:region] = line.split[2].delete('\"') if line =~ /^region/
       end
     end
-  rescue Errno::ENOENT
+  rescue Ohai::Exceptions::Exec
     Ohai::Log.debug("rackspace plugin: Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
     nil
   end
@@ -103,7 +103,7 @@ Ohai.plugin(:Rackspace) do
     if so.exitstatus == 0
       rackspace[:instance_id] = so.stdout.gsub(/instance-/, "")
     end
-  rescue Errno::ENOENT
+  rescue Ohai::Exceptions::Exec
     Ohai::Log.debug("rackspace plugin: Unable to find xenstore-read, cannot capture instance ID information for Rackspace cloud")
     nil
   end
@@ -127,7 +127,7 @@ Ohai.plugin(:Rackspace) do
       networks.delete_if { |hash| hash["label"] == "private" }
       networks.delete_if { |hash| hash["label"] == "public" }
     end
-  rescue Errno::ENOENT
+  rescue Ohai::Exceptions::Exec
     Ohai::Log.debug("rackspace plugin: Unable to capture custom private networking information for Rackspace cloud")
     nil
   end

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

@@ -156,7 +156,7 @@ Ohai.plugin(:Network) do
       network[:interfaces][route.ifname][:route] = Mash.new unless network[:interfaces][route.ifname][:route]
       route_data = {}
       Ohai::Mixin::NetworkConstants::SIGAR_ROUTE_METHODS.each do |m|
-        if(m == :flags)
+        if m == :flags
           route_data[m] = flags(route.send(m))
         else
           route_data[m] = route.send(m)

data/lib/ohai/plugins/sigar/network_route.rb

@@ -49,7 +49,7 @@ Ohai.plugin(:NetworkRoutes) do
         network[:interfaces][route.ifname][:route] = Mash.new unless network[:interfaces][route.ifname][:route]
         route_data = {}
         Ohai::Mixin::NetworkConstants::SIGAR_ROUTE_METHODS.each do |m|
-          if(m == :flags)
+          if m == :flags
             route_data[m] = flags(route.send(m))
           else
             route_data[m] = route.send(m)

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

@@ -24,7 +24,7 @@ Ohai.plugin(:DMI) do
 
     # if we already have a "dmi" with keys (presumably from dmidecode), don't try smbios
     # note that a single key just means dmidecode exited with its version
-    if (dmi.class.to_s == "Mash") and (dmi.keys.length > 1)
+    if (dmi.class.to_s == "Mash") && (dmi.keys.length > 1)
       Ohai::Log.debug("skipping smbios output, since DMI information has already been provided")
       return
     end

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

@@ -58,7 +58,7 @@ ETHERNET_ENCAPS = %w{ afe amd8111s arn atge ath bfe bge bnx bnxe ce cxgbe
                       dmfe e1000g efe elxl emlxs eri hermon hme hxge igb
                       iprb ipw iwh iwi iwk iwp ixgb ixgbe mwl mxfe myri10ge
                       nge ntxn nxge pcn platform qfe qlc ral rge rtls rtw rwd
-                      rwn sfe tavor vr wpi xge yge} unless defined?(ETHERNET_ENCAPS)
+                      rwn sfe tavor vr wpi xge yge } unless defined?(ETHERNET_ENCAPS)
 
 Ohai.plugin(:Network) do
   provides "network", "network/interfaces"
@@ -79,6 +79,15 @@ Ohai.plugin(:Network) do
     nil
   end
 
+  def full_interface_name(iface, part_name, index)
+    iface.each do |name, attrs|
+      next unless attrs && attrs.respond_to?(:[])
+      return name if /^#{part_name}($|:)/.match(name) && attrs[:index] == index
+    end
+
+    nil
+  end
+
   collect_data(:solaris2) do
     require "scanf"
 
@@ -97,10 +106,10 @@ Ohai.plugin(:Network) do
         iface[cint] = Mash.new unless iface[cint]
         iface[cint][:mtu] = $2
         iface[cint][:index] = $3
-        if line =~ / flags\=\d+\<((ADDRCONF|ANYCAST|BROADCAST|CoS|DEPRECATED|DHCP|DUPLICATE|FAILED|FIXEDMTU|INACTIVE|L3PROTECT|LOOPBACK|MIP|MULTI_BCAST|MULTICAST|NOARP|NOFAILOVER|NOLOCAL|NONUD|NORTEXCH|NOXMIT|OFFLINE|POINTOPOINT|PREFERRED|PRIVATE|ROUTER|RUNNING|STANDBY|TEMPORARY|UNNUMBERED|UP|VIRTUAL|XRESOLV|IPv4|IPv6|,)+)\>\s/
+        if line =~ / flags\=\d+\<((ADDRCONF|ANYCAST|BROADCAST|CoS|DEPRECATED|DHCP|DUPLICATE|FAILED|FIXEDMTU|INACTIVE|L3PROTECT|LOOPBACK|MIP|MULTI_BCAST|MULTICAST|NOARP|NOFAILOVER|NOLOCAL|NONUD|NORTEXCH|NOXMIT|OFFLINE|PHYSRUNNING|POINTOPOINT|PREFERRED|PRIVATE|ROUTER|RUNNING|STANDBY|TEMPORARY|UNNUMBERED|UP|VIRTUAL|XRESOLV|IPv4|IPv6|,)+)\>\s/
           flags = $1.split(",")
         else
-          flags = Array.new
+          flags = []
         end
         iface[cint][:flags] = flags.flatten
         if cint =~ /^(\w+)(\d+.*)/
@@ -156,16 +165,24 @@ Ohai.plugin(:Network) do
 
     network[:interfaces] = iface
 
-    so = shell_out("route -n get default")
+    so = shell_out("route -v -n get default")
     so.stdout.lines do |line|
-      matches = /interface: (\S+)/.match(line)
+      matches = /interface: (?<name>\S+)\s+index\s+(?<index>\d+)/.match(line)
       if matches
-        Ohai::Log.debug("found gateway device: #{$1}")
-        network[:default_interface] = matches[1]
+        network[:default_interface] =
+        case
+        when iface[matches[:name]]
+          matches[:name]
+        when int_name = full_interface_name(iface, matches[:name], matches[:index])
+          int_name
+        else
+          matches[:name]
+        end
+        Ohai::Log.debug("found interface device: #{network[:default_interface]} #{matches[:name]}")
       end
       matches = /gateway: (\S+)/.match(line)
       if matches
-        Ohai::Log.debug("found gateway: #{$1}")
+        Ohai::Log.debug("found gateway: #{matches[1]}")
         network[:default_gateway] = matches[1]
       end
     end

data/lib/ohai/plugins/ssh_host_key.rb

@@ -51,7 +51,7 @@ Ohai.plugin(:SSHHostKey) do
     if sshd_config
       File.open(sshd_config) do |conf|
         conf.each_line do |line|
-          if line.match(/^hostkey\s/i)
+          if line =~ /^hostkey\s/i
             pub_file = "#{line.split[1]}.pub"
             content = IO.read(pub_file).split
             key_type, key_subtype = extract_keytype?(content)

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

@@ -64,7 +64,7 @@ Ohai.plugin(:Network) do
     end
 
     iface_instance.keys.each do |i|
-      if iface_config[i][:ip_enabled] and iface_instance[i][:net_connection_id]
+      if iface_config[i][:ip_enabled] && iface_instance[i][:net_connection_id]
         cint = sprintf("0x%x", iface_instance[i][:interface_index] ? iface_instance[i][:interface_index] : iface_instance[i][:index] ).downcase
         iface[cint] = Mash.new
         iface[cint][:configuration] = iface_config[i]
@@ -76,7 +76,7 @@ Ohai.plugin(:Network) do
           ip = iface[cint][:configuration][:ip_address][i]
           _ip = IPAddress("#{ip}/#{iface[cint][:configuration][:ip_subnet][i]}")
           iface[cint][:addresses][ip] = Mash.new(
-                                                 :prefixlen => _ip.prefix,
+                                                 :prefixlen => _ip.prefix
                                                  )
           if _ip.ipv6?
             # inet6 address
@@ -96,14 +96,14 @@ Ohai.plugin(:Network) do
         # Apparently you can have more than one mac_address? Odd.
         [iface[cint][:configuration][:mac_address]].flatten.each do |mac_addr|
           iface[cint][:addresses][mac_addr] = {
-            "family" => "lladdr"
+            "family" => "lladdr",
           }
         end
         iface[cint][:mtu] = iface[cint][:configuration][:mtu]
         iface[cint][:type] = iface[cint][:instance][:adapter_type]
         iface[cint][:arp] = {}
         iface[cint][:encapsulation] = windows_encaps_lookup(iface[cint][:instance][:adapter_type])
-        if iface[cint][:configuration][:default_ip_gateway] != nil and iface[cint][:configuration][:default_ip_gateway].size > 0
+        if iface[cint][:configuration][:default_ip_gateway] != nil && iface[cint][:configuration][:default_ip_gateway].size > 0
           network[:default_gateway] = iface[cint][:configuration][:default_ip_gateway].first
           network[:default_interface] = cint
         end
@@ -119,7 +119,7 @@ Ohai.plugin(:Network) do
         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.gsub("-", ":").downcase
+          iface[cint][:arp][$1] = $2.tr("-", ":").downcase
         end
       end
     end

data/lib/ohai/provides_map.rb

@@ -114,8 +114,8 @@ module Ohai
     private
 
     def normalize_and_validate(attribute)
-      raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains duplicate '/' characters: #{attribute}" if attribute.match(/\/\/+/)
-      raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains a trailing '/': #{attribute}" if attribute.match(/\/$/)
+      raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains duplicate '/' characters: #{attribute}" if attribute =~ /\/\/+/
+      raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains a trailing '/': #{attribute}" if attribute =~ /\/$/
 
       parts = attribute.split("/")
       parts.shift if parts.length != 0 && parts[0].length == 0 # attribute begins with a '/'

data/lib/ohai/system.rb

@@ -88,7 +88,7 @@ module Ohai
       # Users who are migrating from ohai 6 may give one or more Ohai 6 plugin
       # names as the +attribute_filter+. In this case we return early because
       # the v7 plugin provides map will not have an entry for this plugin.
-      if attribute_filter and Array(attribute_filter).all? { |filter_item| have_v6_plugin?(filter_item) }
+      if attribute_filter && Array(attribute_filter).all? { |filter_item| have_v6_plugin?(filter_item) }
         return true
       end