ohai 16.2.1 → 16.4.12

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

@@ -26,8 +26,7 @@ Ohai.plugin(:Network) do
     counters Mash.new unless counters
     counters[:network] ||= Mash.new
 
-    so = shell_out("route -n get default")
-    so.stdout.lines do |line|
+    shell_out("route -n get default").stdout.lines do |line|
       if line =~ /(\w+): ([\w\.]+)/
         case $1
         when "gateway"
@@ -39,9 +38,8 @@ Ohai.plugin(:Network) do
     end
 
     iface = Mash.new
-    so = shell_out("#{Ohai.abs_path( "/sbin/ifconfig" )} -a")
     cint = nil
-    so.stdout.lines do |line|
+    shell_out("#{Ohai.abs_path( "/sbin/ifconfig" )} -a").stdout.lines do |line|
       if line =~ /^([0-9a-zA-Z\.]+):\s+/
         cint = $1
         iface[cint] = Mash.new
@@ -85,8 +83,7 @@ Ohai.plugin(:Network) do
       end
     end
 
-    so = shell_out("arp -an")
-    so.stdout.lines do |line|
+    shell_out("arp -an").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
 
@@ -102,8 +99,7 @@ Ohai.plugin(:Network) do
     # Show the state of all network interfaces or a single interface
     # which have been auto-configured (interfaces statically configured
     # into a system, but not located at boot time are not shown).
-    so = shell_out("netstat -idn")
-    so.stdout.lines do |line|
+    shell_out("netstat -idn").stdout.lines do |line|
       # Name    Mtu Network       Address              Ipkts Ierrs    Opkts Oerrs  Coll Drop
       # em0     1500  <Link>      00:11:25:2d:90:be  3719557     0  3369969     0     0    0
       # $1                        $2                      $3    $4    $5       $6    $7   $8

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

@@ -20,10 +20,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:netbsd) do
-    so = shell_out("uname -s")
-    platform so.stdout.split($/)[0].downcase
-    so = shell_out("uname -r")
-    platform_version so.stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.split($/)[0].downcase
+    platform_version shell_out("uname -r").stdout.split($/)[0]
     platform_family "netbsd"
   end
 end

data/lib/ohai/plugins/network.rb

@@ -17,7 +17,6 @@
 #
 
 Ohai.plugin(:NetworkAddresses) do
-  require "ipaddress"
   require_relative "../mixin/network_helper"
   include Ohai::Mixin::NetworkHelper
 
@@ -54,7 +53,7 @@ Ohai.plugin(:NetworkAddresses) do
     ipaddresses.sort_by do |v|
       [ ( scope_prio.index(v[:scope]) || 999999 ),
         128 - v[:ipaddress].prefix.to_i,
-        ( family == "inet" ? v[:ipaddress].to_u32 : v[:ipaddress].to_u128 ),
+        v[:ipaddress].to_i,
       ]
     end
   end
@@ -88,9 +87,9 @@ Ohai.plugin(:NetworkAddresses) do
           r = gw_if_ips.first
         else
           # checking network masks
-          r = gw_if_ips.select do |v|
+          r = gw_if_ips.find do |v|
             network_contains_address(network[gw_attr], v[:ipaddress], v[:iface])
-          end.first
+          end
           if r.nil?
             r = gw_if_ips.first
             logger.trace("Plugin Network: [#{family}] no ipaddress/mask on #{network[int_attr]} matching the gateway #{network[gw_attr]}, picking #{r[:ipaddress]}")
@@ -134,6 +133,8 @@ Ohai.plugin(:NetworkAddresses) do
   # time as ipaddress. if ipaddress is set and macaddress is nil, that means
   # the interface ipaddress is bound to has the NOARP flag
   collect_data do
+    require "ipaddress" unless defined?(IPAddress)
+
     results = {}
 
     network Mash.new unless network

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

@@ -26,8 +26,7 @@ Ohai.plugin(:Network) do
     counters Mash.new unless counters
     counters[:network] ||= Mash.new
 
-    so = shell_out("route -n get default")
-    so.stdout.lines do |line|
+    shell_out("route -n get default").stdout.lines do |line|
       if line =~ /(\w+): ([\w\.]+)/
         case $1
         when "gateway"
@@ -39,9 +38,8 @@ Ohai.plugin(:Network) do
     end
 
     iface = Mash.new
-    so = shell_out( "#{Ohai.abs_path( "/sbin/ifconfig" )} -a" )
     cint = nil
-    so.stdout.lines do |line|
+    shell_out( "#{Ohai.abs_path( "/sbin/ifconfig" )} -a" ).stdout.lines do |line|
       if line =~ /^([0-9a-zA-Z\.]+):\s+/
         cint = $1
         iface[cint] = Mash.new
@@ -85,8 +83,7 @@ Ohai.plugin(:Network) do
       end
     end
 
-    so = shell_out("arp -an")
-    so.stdout.lines do |line|
+    shell_out("arp -an").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
 
@@ -102,8 +99,7 @@ Ohai.plugin(:Network) do
     # Show the state of all network interfaces or a single interface
     # which have been auto-configured (interfaces statically configured
     # into a system, but not located at boot time are not shown).
-    so = shell_out("netstat -idn")
-    so.stdout.lines do |line|
+    shell_out("netstat -idn").stdout.lines do |line|
       # Name    Mtu Network       Address              Ipkts Ierrs    Opkts Oerrs  Coll Drop
       # em0     1500  <Link>      00:11:25:2d:90:be  3719557     0  3369969     0     0    0
       # $1                        $2                      $3    $4    $5       $6    $7   $8

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

@@ -20,10 +20,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:openbsd) do
-    so = shell_out("uname -s")
-    platform so.stdout.split($/)[0].downcase
-    so = shell_out("uname -r")
-    platform_version so.stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.split($/)[0].downcase
+    platform_version shell_out("uname -r").stdout.split($/)[0]
     platform_family "openbsd"
   end
 end

data/lib/ohai/plugins/openstack.rb

@@ -19,7 +19,6 @@
 Ohai.plugin(:Openstack) do
   require_relative "../mixin/ec2_metadata"
   require_relative "../mixin/http_helper"
-  require "etc" unless defined?(Etc)
   include Ohai::Mixin::Ec2Metadata
   include Ohai::Mixin::HttpHelper
 
@@ -49,7 +48,7 @@ Ohai.plugin(:Openstack) do
   # https://help.dreamhost.com/hc/en-us/articles/228377408-How-to-find-the-default-user-of-an-image
   def openstack_provider
     # dream host doesn't support windows so bail early if we're on windows
-    return "openstack" if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+    return "openstack" if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
 
     if Etc::Passwd.entries.map(&:name).include?("dhc-user")
       "dreamhost"
@@ -59,6 +58,8 @@ Ohai.plugin(:Openstack) do
   end
 
   collect_data do
+    require "etc" unless defined?(Etc)
+
     # fetch data if we look like openstack
     if openstack_hint? || openstack_virtualization?
       openstack Mash.new

data/lib/ohai/plugins/packages.rb

@@ -79,7 +79,7 @@ Ohai.plugin(:Packages) do
       end
 
     when "arch"
-      require "date"
+      require "date" unless defined?(DateTime)
 
       # Set LANG=C to force an easy to parse date format
       so = shell_out("LANG=C pacman -Qi")

data/lib/ohai/plugins/passwd.rb

@@ -1,6 +1,5 @@
 
 Ohai.plugin(:Passwd) do
-  require "etc" unless defined?(Etc)
   provides "etc", "current_user"
   optional true
 
@@ -14,6 +13,8 @@ Ohai.plugin(:Passwd) do
   end
 
   collect_data do
+    require "etc" unless defined?(Etc)
+
     unless etc
       etc Mash.new
 

data/lib/ohai/plugins/rackspace.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 Ohai.plugin(:Rackspace) do
-  require "resolv"
   provides "rackspace"
 
   depends "kernel", "network/interfaces"
@@ -48,9 +47,9 @@ Ohai.plugin(:Rackspace) do
   # true:: If the rackspace cloud can be identified
   # false:: Otherwise
   def has_rackspace_manufacturer?
-    return false unless RUBY_PLATFORM =~ /mswin|mingw32|windows/
+    return false unless RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
 
-    require "wmi-lite/wmi"
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
     wmi = WmiLite::Wmi.new
     if wmi.first_of("Win32_ComputerSystem")["PrimaryOwnerName"] == "Rackspace"
       logger.trace("Plugin Rackspace: has_rackspace_manufacturer? == true")
@@ -102,7 +101,7 @@ Ohai.plugin(:Rackspace) do
     so = shell_out("xenstore-ls vm-data/provider_data")
     if so.exitstatus == 0
       so.stdout.split("\n").each do |line|
-        rackspace[:region] = line.split[2].delete('\"') if line =~ /^region/
+        rackspace[:region] = line.split[2].delete('\"') if /^region/.match?(line)
       end
     end
   rescue Ohai::Exceptions::Exec
@@ -147,6 +146,8 @@ Ohai.plugin(:Rackspace) do
   end
 
   collect_data do
+    require "resolv"
+
     # Adds rackspace Mash
     if looks_like_rackspace?
       rackspace Mash.new

data/lib/ohai/plugins/root_group.rb

@@ -19,7 +19,7 @@ Ohai.plugin(:RootGroup) do
   provides "root_group"
 
   collect_data(:windows) do
-    require "wmi-lite/wmi"
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
 
     wmi = WmiLite::Wmi.new
     # Per http://support.microsoft.com/kb/243330 SID: S-1-5-32-544 is the

data/lib/ohai/plugins/ruby.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,6 +43,8 @@ Ohai.plugin(:Ruby) do
       host_vendor: "RbConfig::CONFIG['host_vendor']",
       bin_dir: "RbConfig::CONFIG['bindir']",
       ruby_bin: "::File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])",
+      gem_bin: "::File.join(RbConfig::CONFIG['bindir'], ::Gem.default_exec_format % 'gem')",
+      gems_dir: "::Gem.dir",
     }
 
     # Create a query string from above hash
@@ -52,25 +54,12 @@ Ohai.plugin(:Ruby) do
     end
 
     # Query the system ruby
-    result = run_ruby "puts %Q(#{env_string})"
+    result = run_ruby "require 'rubygems'; puts %Q(#{env_string})"
 
     # Parse results to plugin hash
     result.split(",").each do |entry|
       key, value = entry.split("=")
       languages[:ruby][key.to_sym] = value || ""
     end
-
-    # Perform one more (conditional) query
-    bin_dir = languages[:ruby][:bin_dir]
-    ruby_bin = languages[:ruby][:ruby_bin]
-    gem_binaries = [
-                    run_ruby("require 'rubygems'; puts ::Gem.default_exec_format % 'gem'"),
-                    "gem",
-                   ].map { |bin| ::File.join(bin_dir, bin) }
-    gem_binary = gem_binaries.find { |bin| ::File.exist? bin }
-    if gem_binary
-      languages[:ruby][:gems_dir] = run_ruby "puts %x{#{ruby_bin} #{gem_binary} env gemdir}.chomp!"
-      languages[:ruby][:gem_bin] = gem_binary
-    end
   end
 end

data/lib/ohai/plugins/scaleway.rb

@@ -26,7 +26,7 @@ Ohai.plugin(:Scaleway) do
   # looks for `scaleway` keyword in kernel command line
   # @return [Boolean] do we have the keyword or not?
   def has_scaleway_cmdline?
-    if ::File.read("/proc/cmdline") =~ /scaleway/
+    if ::File.exist?("/proc/cmdline") && /scaleway/.match?(::File.read("/proc/cmdline"))
       logger.trace("Plugin Scaleway: has_scaleway_cmdline? == true")
       return true
     end

data/lib/ohai/plugins/shard.rb

@@ -94,7 +94,7 @@ Ohai.plugin(:ShardSeed) do
   end
 
   collect_data(:windows) do
-    require "wmi-lite/wmi"
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
     wmi = WmiLite::Wmi.new
 
     create_seed do |src|

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

@@ -86,7 +86,7 @@ Ohai.plugin(:DMI) do
       "SUN_OEM_EXT_MEMARRAY" => 144, # phys memory array extended info
       "SUN_OEM_EXT_MEMDEVICE" => 145, # memory device extended info
       "SMB_TYPE_OEM_HI" => 256, # end of OEM-specific type range
-    }
+    }.freeze
 
     # all output lines should fall within one of these patterns
     header_type_line = /^ID\s+SIZE\s+TYPE/
@@ -99,7 +99,6 @@ Ohai.plugin(:DMI) do
     dmi_record = nil
     field = nil
 
-    so = shell_out("smbios")
     # ==== EXAMPLE: ====
     # ID    SIZE TYPE
     # 0     40   SMB_TYPE_BIOS (BIOS information)
@@ -111,7 +110,7 @@ Ohai.plugin(:DMI) do
     #         SMB_BIOSFL_PCI (PCI is supported)
     # ... similar lines trimmed
     # note the second level of indentation is via a *tab*
-    so.stdout.lines do |raw_line|
+    shell_out("smbios").stdout.lines do |raw_line|
       next if header_type_line.match(raw_line)
       next if blank_line.match(raw_line)
 

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

@@ -20,8 +20,7 @@ Ohai.plugin(:Memory) do
   collect_data(:solaris2) do
     memory Mash.new
     memory[:swap] = Mash.new
-    meminfo = shell_out("prtconf | grep Memory").stdout
-    memory[:total] = "#{meminfo.split[2].to_i * 1024}kB"
+    memory[:total] = "#{shell_out("prtconf | grep Memory").stdout.split[2].to_i * 1024}kB"
 
     tokens = shell_out("swap -s").stdout.strip.split
     used_swap = tokens[8][0..-1].to_i # strip k from end

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

@@ -54,13 +54,11 @@
 #  inet6 fe80::203:baff:fe17:4444/128
 
 # Extracted from http://illumos.org/hcl/
-unless defined?(ETHERNET_ENCAPS)
-  ETHERNET_ENCAPS = %w{ afe amd8111s arn atge ath bfe bge bnx bnxe ce cxgbe
+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 aggr}.freeze
-end
 
 Ohai.plugin(:Network) do
   require_relative "../../mixin/network_helper"
@@ -102,10 +100,8 @@ Ohai.plugin(:Network) do
     counters Mash.new unless counters
     counters[:network] ||= Mash.new
 
-    so = shell_out("ifconfig -a")
     cint = nil
-
-    so.stdout.lines do |line|
+    shell_out("ifconfig -a").stdout.lines do |line|
       # regex: https://rubular.com/r/ZiIHbsnfiWPW1p
       if line =~ /^([0-9a-zA-Z\.\:\-]+): \S+ mtu (\d+)(?: index (\d+))?/
         cint = $1

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

@@ -26,8 +26,7 @@ Ohai.plugin(:Platform) do
       uname_exec = "uname"
     end
 
-    so = shell_out("#{uname_exec} -X")
-    so.stdout.lines do |line|
+    shell_out("#{uname_exec} -X").stdout.lines do |line|
       case line
       when /^Release =\s+(.+)$/
         platform_version $1

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

@@ -25,9 +25,7 @@ Ohai.plugin(:Virtualization) do
   depends "dmi"
 
   def collect_solaris_guestid
-    command = "/usr/sbin/zoneadm list -p"
-    so = shell_out(command)
-    so.stdout.split(":").first
+    shell_out("/usr/sbin/zoneadm list -p").stdout.split(":").first
   end
 
   collect_data(:solaris2) do
@@ -38,7 +36,7 @@ Ohai.plugin(:Virtualization) do
     psrinfo_path = Ohai.abs_path( "/usr/sbin/psrinfo" )
     if File.exist?(psrinfo_path)
       so = shell_out("#{psrinfo_path} -pv")
-      if so.stdout =~ /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/
+      if /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/.match?(so.stdout)
         virtualization[:system] = "kvm"
         virtualization[:role] = "guest"
         virtualization[:systems][:kvm] = "guest"
@@ -56,8 +54,7 @@ Ohai.plugin(:Virtualization) do
 
     if File.executable?("/usr/sbin/zoneadm")
       zones = Mash.new
-      so = shell_out("zoneadm list -pc")
-      so.stdout.lines do |line|
+      shell_out("zoneadm list -pc").stdout.lines do |line|
         info = line.chomp.split(/:/)
         zones[info[1]] = {
           "id" => info[0],

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 =~ /^hostkey\s/i
+          if /^hostkey\s/i.match?(line)
             pub_file = "#{line.split[1]}.pub"
             content = IO.read(pub_file).split
             key_type, key_subtype = extract_keytype?(content)

data/lib/ohai/plugins/uptime.rb

@@ -84,7 +84,7 @@ Ohai.plugin(:Uptime) do
   end
 
   collect_data(:windows) do
-    require "wmi-lite/wmi"
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
     wmi = WmiLite::Wmi.new
     last_boot_up_time = wmi.first_of("Win32_OperatingSystem")["lastbootuptime"]
     uptime_seconds Time.new.to_i - Time.parse(last_boot_up_time).to_i

data/lib/ohai/plugins/vmware.rb

@@ -51,12 +51,12 @@ Ohai.plugin(:VMware) do
         # to attribute "vmware[:<parameter>]"
         %w{hosttime speed sessionid balloon swap memlimit memres cpures cpulimit}.each do |param|
           vmware[param] = from_cmd("#{vmtools_path} stat #{param}")
-          if vmware[param] =~ /UpdateInfo failed/
+          if /UpdateInfo failed/.match?(vmware[param])
             vmware[param] = nil
           end
         end
         # vmware-toolbox-cmd <param> status commands
-        # Iterate through each parameter supported by the "vwware-toolbox-cmd status" command, assign value
+        # Iterate through each parameter supported by the "vmware-toolbox-cmd status" command, assign value
         # to attribute "vmware[:<parameter>]"
         %w{upgrade timesync}.each do |param|
           vmware[param] = from_cmd("#{vmtools_path} #{param} status")