ohai 15.1.5 → 15.2.5

data/lib/ohai/plugins/digital_ocean.rb

@@ -44,6 +44,7 @@ Ohai.plugin(:DigitalOcean) do
   def looks_like_digital_ocean?
     return true if hint?("digital_ocean")
     return true if has_do_dmi? && can_socket_connect?(Ohai::Mixin::DOMetadata::DO_METADATA_ADDR, 80)
+
     false
   end
 
@@ -53,6 +54,7 @@ Ohai.plugin(:DigitalOcean) do
       digital_ocean Mash.new
       fetch_metadata.each do |k, v|
         next if k == "vendor_data" # this may have sensitive data we shouldn't store
+
         digital_ocean[k] = v
       end
     else

data/lib/ohai/plugins/dmi.rb

@@ -58,6 +58,7 @@ Ohai.plugin(:DMI) do
       # ... similar lines trimmed
       so.stdout.lines do |line|
         next if blank_line.match(line)
+
         line = line.encode(line.encoding, universal_newline: true)
 
         if ( dmidecode_version = dmidecode_version_line.match(line) )

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

@@ -46,7 +46,7 @@ Ohai.plugin(:Memory) do
     so.stdout.lines do |line|
       # Device          1K-blocks     Used    Avail Capacity
       # /dev/ad0s1b        253648        0   253648     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/dragonflybsd/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/ec2.rb

@@ -124,6 +124,7 @@ Ohai.plugin(:EC2) do
         # to the server.
         # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AESDG-chapter-instancedata.html#instancedata-data-categories
         next if k == "iam" && !hint?("iam")
+
         ec2[k] = v
       end
       ec2[:userdata] = fetch_userdata

data/lib/ohai/plugins/eucalyptus.rb

@@ -71,6 +71,7 @@ Ohai.plugin(:Eucalyptus) do
         # to the server.
         # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AESDG-chapter-instancedata.html#instancedata-data-categories
         next if k == "iam" && !hint?("iam")
+
         eucalyptus[k] = v
       end
       eucalyptus[:userdata] = fetch_userdata

data/lib/ohai/plugins/filesystem.rb

@@ -68,6 +68,7 @@ Ohai.plugin(:Filesystem) do
       view[entry[:device]] ||= Mash.new
       entry.each do |key, val|
         next if %w{device mount}.include?(key)
+
         view[entry[:device]][key] = val
       end
       view[entry[:device]][:mounts] ||= []
@@ -82,9 +83,11 @@ Ohai.plugin(:Filesystem) do
     view = {}
     fs.each_value do |entry|
       next unless entry[:mount]
+
       view[entry[:mount]] ||= Mash.new
       entry.each do |key, val|
         next if %w{mount device}.include?(key)
+
         view[entry[:mount]][key] = val
       end
       view[entry[:mount]][:devices] ||= []
@@ -146,6 +149,7 @@ Ohai.plugin(:Filesystem) do
     unless Ohai.config[:plugin][:filesystem][:allow_partial_data]
       raise e
     end
+
     logger.warn("Plugin Filesystem: #{bin} binary is not available. Some data will not be available.")
   end
 
@@ -218,6 +222,7 @@ Ohai.plugin(:Filesystem) do
         so.stdout.each_line do |line|
           parsed = parse_line(line, cmdtype)
           next if parsed.nil?
+
           # lsblk lists each device once, so we need to update all entries
           # in the hash that are related to this device
           keys_to_update = []
@@ -233,7 +238,7 @@ Ohai.plugin(:Filesystem) do
           end
 
           keys_to_update.each do |k|
-            [:fs_type, :uuid, :label].each do |subkey|
+            %i{fs_type uuid label}.each do |subkey|
               if parsed[subkey] && !parsed[subkey].empty?
                 fs[k][subkey] = parsed[subkey]
               end
@@ -266,6 +271,7 @@ Ohai.plugin(:Filesystem) do
         if line =~ /^(\S+) (\S+) (\S+) (\S+) \S+ \S+$/
           key = "#{$1},#{$2}"
           next if fs.key?(key)
+
           fs[key] = Mash.new
           fs[key][:device] = $1
           fs[key][:mount] = $2
@@ -412,9 +418,11 @@ Ohai.plugin(:Filesystem) do
       so = shell_out("df -na")
       so.stdout.lines do |line|
         next unless line =~ /^(.+?)\s*: (\S+)\s*$/
+
         mount = $1
         fs.each do |key, fs_attributes|
           next unless fs_attributes[:mount] == mount
+
           fs[key][:fs_type] = $2
         end
       end
@@ -425,6 +433,7 @@ Ohai.plugin(:Filesystem) do
       so = shell_out("mount")
       so.stdout.lines do |line|
         next unless line =~ /^(.+?) on (.+?) (.+?) on (.+?)$/
+
         key = "#{$2},#{$1}"
         fs[key] ||= Mash.new
         fs[key][:mount] = $1
@@ -441,6 +450,7 @@ Ohai.plugin(:Filesystem) do
       so = shell_out(zfs_get)
       so.stdout.lines do |line|
         next unless line =~ /^([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)$/
+
         filesystem = $1
         property = $2
         value = $3
@@ -524,7 +534,7 @@ Ohai.plugin(:Filesystem) do
           oldie[key][:mount] = mountpoint
           oldie[key][:device] = dev
         # an entry starting with 'G' or / (E.G. /tmp or /var)
-        when /^\s*(G.*?|\/\w)/
+        when %r{^\s*(G.*?|/\w)}
           if fields[0] == "Global"
             dev = fields[0] + ":" + fields[1]
           else

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

@@ -46,7 +46,7 @@ Ohai.plugin(:Memory) do
     so.stdout.lines do |line|
       # Device          1K-blocks     Used    Avail Capacity
       # /dev/ad0s1b        253648        0   253648     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/freebsd/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/haskell.rb

@@ -17,10 +17,10 @@
 Ohai.plugin(:Haskell) do
 
   provides "languages/haskell",
-           "languages/haskell/ghc",
-           "languages/haskell/ghci",
-           "languages/haskell/cabal",
-           "languages/haskell/stack"
+    "languages/haskell/ghc",
+    "languages/haskell/ghci",
+    "languages/haskell/cabal",
+    "languages/haskell/stack"
 
   depends "languages"
 

data/lib/ohai/plugins/hostname.rb

@@ -115,7 +115,8 @@ Ohai.plugin(:Hostname) do
       end
     rescue
       logger.trace(
-        "Plugin Hostname: hostname returned an error, probably no domain set")
+        "Plugin Hostname: hostname returned an error, probably no domain set"
+      )
     end
     domain collect_domain
   end

data/lib/ohai/plugins/java.rb

@@ -63,6 +63,7 @@ Ohai.plugin(:Java) do
   # workaround for this particular annoyance.
   def has_real_java?
     return true unless on_darwin?
+
     shell_out("/usr/libexec/java_home").status.success?
   end
 

data/lib/ohai/plugins/kernel.rb

@@ -32,9 +32,9 @@ Ohai.plugin(:Kernel) do
     [["uname -s", :name], ["uname -r", :release],
      ["uname -v", :version], ["uname -m", :machine],
      ["uname -p", :processor]].each do |cmd, property|
-      so = shell_out(cmd)
-      kernel[property] = so.stdout.split($/)[0]
-    end
+       so = shell_out(cmd)
+       kernel[property] = so.stdout.split($/)[0]
+     end
     kernel
   end
 
@@ -71,8 +71,9 @@ Ohai.plugin(:Kernel) do
       43, # Storage Server Express Core
       44, # Storage Server Standard Core
       45, # Storage Server Workgroup Core
-      29 # Web Server Core
+      29, # Web Server Core
     ].include?(sku)
+
     false
   end
 
@@ -84,6 +85,7 @@ Ohai.plugin(:Kernel) do
   def arch_lookup(sys_type)
     return "x86_64" if sys_type == "x64-based PC"
     return "i386" if sys_type == "X86-based PC"
+
     sys_type
   end
 
@@ -94,6 +96,7 @@ Ohai.plugin(:Kernel) do
   # @return [String] Workstation or Server
   def product_type_decode(type)
     return "Workstation" if type == 1
+
     "Server"
   end
 
@@ -226,7 +229,7 @@ Ohai.plugin(:Kernel) do
     so = shell_out("uname -s")
     kernel[:os] = so.stdout.split($/)[0]
 
-    so = File.open("/etc/release") { |file| file.gets }
+    so = File.open("/etc/release", &:gets)
     md = /(?<update>\d.*\d)/.match(so)
     kernel[:update] = md[:update] if md
 
@@ -260,6 +263,7 @@ Ohai.plugin(:Kernel) do
     kernel[:os_info] = Mash.new
     host.wmi_ole_object.properties_.each do |p|
       next if blacklisted_wmi_name?(p.name.wmi_underscore)
+
       kernel[:os_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase]
     end
 
@@ -274,6 +278,7 @@ Ohai.plugin(:Kernel) do
     host = wmi.first_of("Win32_ComputerSystem")
     host.wmi_ole_object.properties_.each do |p|
       next if blacklisted_wmi_name?(p.name.wmi_underscore)
+
       kernel[:cs_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase]
     end
 

data/lib/ohai/plugins/linode.rb

@@ -57,7 +57,7 @@ Ohai.plugin(:Linode) do
       linode Mash.new
       get_ip_address(:public_ip, :eth0)
       get_ip_address(:private_ip, "eth0:1")
-      hint?("linode").each { |k, v| linode[k] = v } if hint?("linode").kind_of?(Hash)
+      hint?("linode").each { |k, v| linode[k] = v } if hint?("linode").is_a?(Hash)
     else
       logger.trace("Plugin Linode: looks_like_linode? == false")
     end

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

@@ -30,7 +30,7 @@ Ohai.plugin(:Lspci) do
     hh = /#{h}#{h}/ # any 2 hex digits
     hhhh = /#{h}#{h}#{h}#{h}/ # any 4 hex digits
 
-    d_id = String.new # This identifies our pci devices
+    d_id = "" # This identifies our pci devices
 
     def standard_form(devices, d_id, hhhh, tag, line)
       tmp = line.scan(/(.*)\s\[(#{hhhh})\]/)[0]
@@ -39,7 +39,7 @@ Ohai.plugin(:Lspci) do
     end
 
     def standard_array(devices, d_id, tag, line)
-      if !devices[d_id][tag].kind_of?(Array)
+      if !devices[d_id][tag].is_a?(Array)
         devices[d_id][tag] = [line]
       else
         devices[d_id][tag].push(line)
@@ -49,6 +49,7 @@ Ohai.plugin(:Lspci) do
     lspci.stdout.split("\n").each do |line|
       dev = line.scan(/^(.*):\s(.*)$/)[0]
       next if dev.nil?
+
       case dev[0]
       when "Device" # There are two different Device tags
         if ( tmp = dev[1].match(/(#{hh}:#{hh}.#{h})/) )

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

@@ -30,6 +30,7 @@ Ohai.plugin(:Network) do
     return "IPIP" if encap.eql?("IPIP Tunnel")
     return "6to4" if encap.eql?("IPv6-in-IPv4")
     return "Ethernet" if encap.eql?("ether")
+
     encap
   end
 
@@ -120,7 +121,7 @@ Ohai.plugin(:Network) do
           end
         end
 
-        iface[route_int][:routes] = Array.new unless iface[route_int][:routes]
+        iface[route_int][:routes] = [] unless iface[route_int][:routes]
         iface[route_int][:routes] << route_entry
       end
     end
@@ -149,9 +150,11 @@ Ohai.plugin(:Network) do
   # determine layer 1 details for the interface using ethtool
   def ethernet_layer_one(iface)
     return iface unless ethtool_binary_path
+
     keys = %w{ Speed Duplex Port Transceiver Auto-negotiation MDI-X }
     iface.each_key do |tmp_int|
       next unless iface[tmp_int][:encapsulation] == "Ethernet"
+
       so = shell_out("#{ethtool_binary_path} #{tmp_int}")
       so.stdout.lines do |line|
         line.chomp!
@@ -159,6 +162,7 @@ Ohai.plugin(:Network) do
         line.lstrip!
         k, v = line.split(": ")
         next unless keys.include? k
+
         k.downcase!.tr!("-", "_")
         if k == "speed"
           k = "link_speed" # This is not necessarily the maximum speed the NIC supports
@@ -173,8 +177,10 @@ Ohai.plugin(:Network) do
   # determine ring parameters for the interface using ethtool
   def ethernet_ring_parameters(iface)
     return iface unless ethtool_binary_path
+
     iface.each_key do |tmp_int|
       next unless iface[tmp_int][:encapsulation] == "Ethernet"
+
       so = shell_out("#{ethtool_binary_path} -g #{tmp_int}")
       logger.trace("Plugin Network: Parsing ethtool output: #{so.stdout}")
       type = nil
@@ -182,6 +188,7 @@ Ohai.plugin(:Network) do
       so.stdout.lines.each do |line|
         next if line.start_with?("Ring parameters for")
         next if line.strip.nil?
+
         if line =~ /Pre-set maximums/
           type = "max"
           next
@@ -192,7 +199,7 @@ Ohai.plugin(:Network) do
         end
         key, val = line.split(/:\s+/)
         if type && val
-          ring_key = "#{type}_#{key.downcase.tr(' ', '_')}"
+          ring_key = "#{type}_#{key.downcase.tr(" ", "_")}"
           iface[tmp_int]["ring_params"][ring_key] = val.to_i
         end
       end
@@ -276,7 +283,8 @@ Ohai.plugin(:Network) do
         end
       end
 
-      if line =~ /state (\w+)/
+      # https://rubular.com/r/JRp6lNANmpcLV5
+      if line =~ /\sstate (\w+)/
         iface[tmp_int]["state"] = $1.downcase
       end
     end
@@ -317,7 +325,7 @@ Ohai.plugin(:Network) do
   end
 
   def parse_ip_addr_link_line(cint, iface, line)
-    if line =~ /link\/(\w+) ([\da-f\:]+) /
+    if line =~ %r{link/(\w+) ([\da-f\:]+) }
       iface[cint][:encapsulation] = linux_encaps_lookup($1)
       unless $2 == "00:00:00:00:00:00"
         iface[cint][:addresses] ||= Mash.new
@@ -327,7 +335,7 @@ Ohai.plugin(:Network) do
   end
 
   def parse_ip_addr_inet_line(cint, iface, line)
-    if line =~ /inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(\/(\d{1,2}))?/
+    if line =~ %r{inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(/(\d{1,2}))?}
       tmp_addr, tmp_prefix = $1, $3
       tmp_prefix ||= "32"
       original_int = nil
@@ -364,7 +372,7 @@ Ohai.plugin(:Network) do
   end
 
   def parse_ip_addr_inet6_line(cint, iface, line)
-    if line =~ /inet6 ([a-f0-9\:]+)\/(\d+) scope (\w+)( .*)?/
+    if line =~ %r{inet6 ([a-f0-9\:]+)/(\d+) scope (\w+)( .*)?}
       iface[cint][:addresses] ||= Mash.new
       tmp_addr = $1
       tags = $4 || ""
@@ -395,11 +403,13 @@ Ohai.plugin(:Network) do
 
   def interface_has_no_addresses_in_family?(iface, family)
     return true if iface[:addresses].nil?
+
     iface[:addresses].values.all? { |addr| addr["family"] != family }
   end
 
   def interface_have_address?(iface, address)
     return false if iface[:addresses].nil?
+
     iface[:addresses].key?(address)
   end
 
@@ -605,7 +615,7 @@ Ohai.plugin(:Network) do
           iface[cint][:addresses][$1] = { "family" => "inet" }
           tmp_addr = $1
         end
-        if line =~ /inet6 addr: ([a-f0-9\:]+)\/(\d+) Scope:(\w+)/
+        if line =~ %r{inet6 addr: ([a-f0-9\:]+)/(\d+) Scope:(\w+)}
           iface[cint][:addresses] ||= Mash.new
           iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $2, "scope" => ($3.eql?("Host") ? "Node" : $3) }
         end
@@ -650,6 +660,7 @@ Ohai.plugin(:Network) do
       so.stdout.lines do |line|
         if line =~ /^\S+ \((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) \[(\w+)\] on ([0-9a-zA-Z\.\:\-]+)/
           next unless iface[$4] # this should never happen
+
           iface[$4][:arp] ||= Mash.new
           iface[$4][:arp][$1] = $2.downcase
         end

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

@@ -32,6 +32,7 @@ Ohai.plugin(:Platform) do
       "opensuse-leap" => "opensuseleap",
       "xenenterprise" => "xenserver",
       "cumulus-linux" => "cumulus",
+      "archarm" => "arch",
     }.freeze
 
   # @deprecated
@@ -39,20 +40,14 @@ Ohai.plugin(:Platform) do
     contents[/^Red Hat/i] ? "redhat" : contents[/(\w+)/i, 1].downcase
   end
 
-  # Amazon Linux AMI release 2013.09
-  # Amazon Linux 2
-  # Amazon Linux 2 (Karoo)
-  # Fedora release 28 (Twenty Eight)
-  # CentOS release 5.8 (Final)
-  # CentOS release 6.7 (Final)
-  # Red Hat Enterprise Linux Server release 7.5 (Maipo)
+  # See https://rubular.com/r/78c1yXYa7zDhdV for example matches
   #
   # @param contents [String] the contents of /etc/redhat-release
   #
   # @returns [String] the version string
   #
   def get_redhatish_version(contents)
-    contents[/Rawhide/i] ? contents[/((\d+) \(Rawhide\))/i, 1].downcase : contents[/(release)? ([\d\.]+)/, 2]
+    contents[/(release)? ([\d\.]+)/, 2]
   end
 
   #
@@ -64,6 +59,7 @@ Ohai.plugin(:Platform) do
   #
   def read_os_release_info(file)
     return nil unless File.exist?(file)
+
     File.read(file).split.inject({}) do |map, line|
       key, value = line.split("=")
       map[key] = value.gsub(/\A"|"\Z/, "") if value