ohai 15.1.5 → 15.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9675f206602060c3853fda1b7c6789fa409de0b7991738f1346c80512e42675
-  data.tar.gz: cc56609a6641a36be3007f194b814d1d82fd1ea3bac5db9f803b28bd8361c396
+  metadata.gz: 98f79af3f1e5744de5e63178fcc9acf038c0d8cc7f684064dac8aabc2d34cbad
+  data.tar.gz: e3a2b907da4cb97b5218b3d9013688c14cce257ef594f3bc47f43ecc84dc1526
 SHA512:
-  metadata.gz: 00b6ad532cd5a3dcf5ee2773ee5721a8c4503c6e4f374bc087ea4f8b70d463a42f2da337e01a1b22f3bfd4cdae30a5f445332301bc3b5de795f8012fd21d83eb
-  data.tar.gz: f85fbabf6f445e4a4c439475e4d2cabfa72083a232e1fc5a576b3bc66725e27eb737fef35975bef1b039ef10ef33ffcf2a5814e311f323551919601ae0262a1b
+  metadata.gz: 9cdc8ca66bdd032d58ddce52f9a99c2a29189b7cdc95aa727ea84cd0b525cb84d8121cd161ab1681a9b0a46309679c46f07a396bfa055847a570cc63edf455ae
+  data.tar.gz: 9fa787535d3ae2229647cb4e589f8a3bded19e25d2457b7858290555ff777258de6d8559bcdd1b8ce31767fd77c8d3f2fdac6c78249ea308350c5ff63dda7fe9

data/Rakefile

@@ -39,4 +39,4 @@ task :console do
   IRB.start
 end
 
-task default: [:style, :spec]
+task default: %i{style spec}

data/lib/ohai/common/dmi.rb

@@ -119,12 +119,14 @@ module Ohai
           in_common = Mash.new
           next unless records.class.to_s == "Mash"
           next unless records.key?("all_records")
+
           records[:all_records].each do |record|
             record.each do |field, value|
               next if value.class.to_s == "Mash"
               next if field.to_s == "application_identifier"
               next if field.to_s == "size"
               next if field.to_s == "record_id"
+
               translated = field.downcase.gsub(/[^a-z0-9]/, "_")
               value      = value.strip
               if in_common.key?(translated)
@@ -136,6 +138,7 @@ module Ohai
           end
           in_common.each do |field, value|
             next if value.nil?
+
             dmi[type][field] = value.strip
           end
         end

data/lib/ohai/dsl/plugin.rb

@@ -145,6 +145,7 @@ module Ohai
       def from(cmd)
         _status, stdout, _stderr = run_command(command: cmd)
         return "" if stdout.nil? || stdout.empty?
+
         stdout.strip
       end
 
@@ -155,6 +156,7 @@ module Ohai
         regex_list.flatten.each do |regex|
           _status, stdout, _stderr = run_command(command: cmd)
           return "" if stdout.nil? || stdout.empty?
+
           stdout.chomp!.strip
           md = stdout.match(regex)
           return md[1]
@@ -210,6 +212,7 @@ module Ohai
           unless attrs.nil? || attrs.is_a?(Array) || attrs.is_a?(Hash)
             raise TypeError.new("Expected Hash but got #{attrs.class}.")
           end
+
           attrs[key]
         end
       rescue NoMethodError

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

@@ -145,9 +145,11 @@ module Ohai
 
         def configuration(option, *options)
           return nil if plugin_config.nil? || !plugin_config.key?(option)
+
           value = plugin_config[option]
           options.each do |opt|
             return nil unless value.key?(opt)
+
             value = value[opt]
           end
           value
@@ -169,12 +171,12 @@ module Ohai
           # ["", "Memory"] => ["Memory"]
           # ["", "Network", "", "Listeners"] => ["Network", "Listeners"]
           # ["SSH", "Host", "", "Key"] => ["SSH", "Host", "Key"]
-          parts.delete_if { |part| part.empty? }
+          parts.delete_if(&:empty?)
           # ["DMI"] => :dmi
           # ["Memory"] => :memory
           # ["Network", "Listeners"] => :network_listeners
           # ["SSH", "Host", "Key"] => :ssh_host_key
-          snake_case_name = parts.map { |part| part.downcase }.join("_").to_sym
+          snake_case_name = parts.map(&:downcase).join("_").to_sym
 
           # Plugin names in config hashes are auto-vivified, so we check with
           # key? to avoid falsely instantiating a configuration hash.

data/lib/ohai/hints.rb

@@ -51,14 +51,16 @@ module Ohai
     def self.hint?(name)
       @hints ||= {}
       return @hints[name] if @hints[name]
+
       Ohai.config[:hints_path].each do |path|
         filename = File.join(path, "#{name}.json")
         next unless File.exist?(filename)
+
         Ohai::Log.trace("Found hint #{name}.json at #{filename}")
         @hints[name] = parse_hint_file(filename)
       end
 
-      Ohai::Log.trace("Did not find hint #{name}.json in the hint path(s): #{Ohai.config[:hints_path].join(', ')} ") unless @hints.key?(name)
+      Ohai::Log.trace("Did not find hint #{name}.json in the hint path(s): #{Ohai.config[:hints_path].join(", ")} ") unless @hints.key?(name)
       @hints[name]
     end
   end

data/lib/ohai/loader.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");
@@ -83,7 +83,8 @@ module Ohai
     # @param plugin_path [String]
     def load_plugin(plugin_path)
       plugin_class = load_plugin_class(plugin_path)
-      return nil unless plugin_class.kind_of?(Class)
+      return nil unless plugin_class.is_a?(Class)
+
       if plugin_class < Ohai::DSL::Plugin::VersionVII
         load_v7_plugin(plugin_class)
       else
@@ -137,9 +138,10 @@ module Ohai
     # @return [Ohai::DSL::Plugin::VersionVII] Ohai plugin object
     def load_v7_plugin_class(contents, plugin_path)
       plugin_class = eval(contents, TOPLEVEL_BINDING, plugin_path) # rubocop: disable Security/Eval
-      unless plugin_class.kind_of?(Class) && plugin_class < Ohai::DSL::Plugin
+      unless plugin_class.is_a?(Class) && plugin_class < Ohai::DSL::Plugin
         raise Ohai::Exceptions::IllegalPluginDefinition, "Plugin file cannot contain any statements after the plugin definition"
       end
+
       plugin_class.sources << plugin_path
       @v7_plugin_classes << plugin_class unless @v7_plugin_classes.include?(plugin_class)
       plugin_class
@@ -159,9 +161,10 @@ module Ohai
       parts = e.message.split(/<.*>[:[0-9]+]*: syntax error, /)
       parts.each do |part|
         next if part.length == 0
+
         logger.warn("Plugin Syntax Error: <#{plugin_path}>: #{part}")
       end
-    rescue Exception, Errno::ENOENT => e
+    rescue Exception => e
       logger.warn("Plugin Error: <#{plugin_path}>: #{e.message}")
       logger.trace("Plugin Error: <#{plugin_path}>: #{e.inspect}, #{e.backtrace.join('\n')}")
     end

data/lib/ohai/mash.rb

@@ -179,7 +179,7 @@ class Mash < Hash
   #
   # @api private
   def convert_key(key)
-    key.kind_of?(Symbol) ? key.to_s : key
+    key.is_a?(Symbol) ? key.to_s : key
   end
 
   # @param value [Object] The value to convert.

data/lib/ohai/mixin/constant_helper.rb

@@ -34,6 +34,7 @@ module Ohai
         if object.respond_to?(:constants)
           object.constants.each do |const|
             next unless strict_const_defined?(object, const)
+
             recursive_remove_constants(object.const_get(const))
             object.send(:remove_const, const)
           end

data/lib/ohai/mixin/ec2_metadata.rb

@@ -68,6 +68,7 @@ module Ohai
           if versions.empty?
             raise "Mixin EC2: Unable to determine EC2 metadata version (no supported entries found)"
           end
+
           versions.last
         end
       end
@@ -134,7 +135,7 @@ module Ohai
       end
 
       def fetch_dir_metadata(id, api_version)
-        metadata = Hash.new
+        metadata = {}
         retrieved_metadata = metadata_get(id, api_version)
         if retrieved_metadata
           retrieved_metadata.split("\n").each do |o|
@@ -195,11 +196,11 @@ module Ohai
         # ignore "./" and "../"
         path.gsub(%r{/\.\.?(?:/|$)}, "/")
           .sub(%r{^\.\.?(?:/|$)}, "")
-          .sub(%r{^$}, "/")
+          .sub(/^$/, "/")
       end
 
       def metadata_key(key)
-        key.gsub(/\-|\//, "_")
+        key.gsub(%r{\-|/}, "_")
       end
 
     end

data/lib/ohai/mixin/gce_metadata.rb

@@ -31,8 +31,7 @@ module Ohai
         conn.get(uri, {
                         "Metadata-Flavor" => "Google",
                         "User-Agent" => "chef-ohai/#{Ohai::VERSION}",
-                      }
-                )
+                      })
       end
 
       def fetch_metadata(id = "")
@@ -76,7 +75,7 @@ module Ohai
       end
 
       def sanitize_key(key)
-        key.gsub(/\-|\//, "_")
+        key.gsub(%r{\-|/}, "_")
       end
     end
   end

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

@@ -37,7 +37,7 @@ Ohai.plugin(:Kernel) do
     #          6390000    20000          63a0000      ba8 /usr/lib/drivers/if_en
     # f1000000c0318000    20000 f1000000c0320000    17138 /usr/lib/drivers/random
     so.stdout.lines do |line|
-      if line =~ /\s*([0-9a-f]+)\s+([0-9a-f]+)\s+([0-9a-f]+)\s+([0-9a-f]+)\s+([a-zA-Z0-9\/\._]+)/
+      if line =~ %r{\s*([0-9a-f]+)\s+([0-9a-f]+)\s+([0-9a-f]+)\s+([0-9a-f]+)\s+([a-zA-Z0-9/\._]+)}
         modules[$5] = { text: { address: $1, size: $2 }, data: { address: $3, size: $4 } }
       end
     end

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

@@ -77,7 +77,7 @@ Ohai.plugin(:Network) do
           iface[interface][:metric] = $1 if lin =~ /metric\s(\S+)/
         else
           # We have key value pairs.
-          if lin =~ /inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(\/(\d{1,2}))?/
+          if lin =~ %r{inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(/(\d{1,2}))?}
             tmp_addr, tmp_prefix = $1, $3
             if tmp_prefix.nil?
               netmask = hex_to_dec_netmask($1) if lin =~ /netmask\s(\S+)\s/
@@ -96,7 +96,7 @@ Ohai.plugin(:Network) do
             if lin =~ /broadcast\s(\S+)\s/
               iface[interface][:addresses][tmp_addr][:broadcast] = $1
             end
-          elsif lin =~ /inet6 ([a-f0-9\:]+)%?([\d]*)\/?(\d*)?/
+          elsif lin =~ %r{inet6 ([a-f0-9\:]+)%?([\d]*)/?(\d*)?}
             # TODO do we have more properties on inet6 in aix? broadcast
             iface[interface][:addresses] ||= Mash.new
             iface[interface][:addresses][$1] = { "family" => "inet6", "zone_index" => $2, "prefixlen" => $3 }
@@ -128,7 +128,7 @@ Ohai.plugin(:Network) do
       so_n.stdout.lines.each do |line|
         if line =~ /(\S+)\s+(\S+)\s+(\S+)\s+(\d+)\s+(\d+)\s+(\S+)/
           interface = $6
-          iface[interface][:routes] = Array.new unless iface[interface][:routes]
+          iface[interface][:routes] = [] unless iface[interface][:routes]
           iface[interface][:routes] << Mash.new( destination: $1, family: family,
                                                  via: $2, flags: $3)
         end

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

@@ -58,6 +58,7 @@ Ohai.plugin(:Virtualization) do
             case title
             when "network"
               next if line =~ /^Interface|^---/
+
               splat = line.strip.split
               key   = splat[0].downcase
               value = {
@@ -68,6 +69,7 @@ Ohai.plugin(:Virtualization) do
               wpars[wpar_name][title][key] = value
             when "user-specified routes"
               next if line =~ /^Type|^---/
+
               splat = line.strip.split
               key   = splat[2].downcase
               value = {
@@ -77,6 +79,7 @@ Ohai.plugin(:Virtualization) do
               wpars[wpar_name][title][key] = value
             when "file systems"
               next if line =~ /^MountPoint|^---/
+
               splat = line.strip.split
               key = splat[1].downcase
               value = {
@@ -99,6 +102,7 @@ Ohai.plugin(:Virtualization) do
               wpars[wpar_name][title]["Privileges"] += privileges.split(",")
             when "device exports"
               next if line =~ /^Name|^---/
+
               splat = line.strip.split
               key = splat[0].downcase
               value = {

data/lib/ohai/plugins/azure.rb

@@ -97,6 +97,7 @@ Ohai.plugin(:Azure) do
 
     endpoint_data = fetch_metadata
     return nil if endpoint_data.nil?
+
     metadata = initialize_metadata_mash_compute
 
     # blindly add everything in compute to our data structure

data/lib/ohai/plugins/cloud.rb

@@ -53,14 +53,15 @@ Ohai.plugin(:Cloud) do
 
     def add_ipv4_addr(ip, accessibility)
       return if ip.nil? # just skip if ip is nil
+
       ipaddr = validate_ip_addr(ip, :ipv4)
 
       case accessibility
       when :public
-        @cloud[:public_ipv4_addrs] ||= Array.new
+        @cloud[:public_ipv4_addrs] ||= []
         @cloud[:public_ipv4_addrs] << ipaddr.to_s
       when :private
-        @cloud[:local_ipv4_addrs] ||= Array.new
+        @cloud[:local_ipv4_addrs] ||= []
         @cloud[:local_ipv4_addrs] << ipaddr.to_s
       else
         raise "ERROR: invalid accessibility param of '#{accessibility}'. must be :public or :private."
@@ -69,15 +70,17 @@ Ohai.plugin(:Cloud) do
 
     def add_ipv6_addr(ip, accessibility)
       return if ip.nil? # just skip if ip is nil
+
       ipaddr = validate_ip_addr(ip, :ipv6)
 
       raise "ERROR: invalid ipv6 address of '#{ip}' detected. " unless ipaddr.ipv6?
+
       case accessibility
       when :public
-        @cloud[:public_ipv6_addrs] ||= Array.new
+        @cloud[:public_ipv6_addrs] ||= []
         @cloud[:public_ipv6_addrs] << ipaddr.to_s
       when :private
-        @cloud[:local_ipv6_addrs] ||= Array.new
+        @cloud[:local_ipv6_addrs] ||= []
         @cloud[:local_ipv6_addrs] << ipaddr.to_s
       else
         raise "ERROR: invalid accessibility param of '#{accessibility}'. must be :public or :private."

data/lib/ohai/plugins/cpu.rb

@@ -61,7 +61,7 @@ Ohai.plugin(:CPU) do
         cpu_number += 1
       when /vendor_id\s+:\s(.+)/
         vendor_id = $1
-        if vendor_id =~ (/IBM\/S390/)
+        if vendor_id =~ (%r{IBM/S390})
           cpuinfo["vendor_id"] = vendor_id
         else
           cpuinfo[current_cpu]["vendor_id"] = vendor_id
@@ -173,9 +173,9 @@ Ohai.plugin(:CPU) do
         cpuinfo["model"] = $3.to_i(16).to_s
         cpuinfo["stepping"] = $4
         # These _should_ match /AMD Features2?/ lines as well
-      when /FreeBSD\/SMP: Multiprocessor System Detected: (\d*) CPUs/
+      when %r{FreeBSD/SMP: Multiprocessor System Detected: (\d*) CPUs}
         cpuinfo["total"] = $1.to_i
-      when /FreeBSD\/SMP: (\d*) package\(s\) x (\d*) core\(s\)/
+      when %r{FreeBSD/SMP: (\d*) package\(s\) x (\d*) core\(s\)}
         cpuinfo["real"] = $1.to_i
         cpuinfo["cores"] = $1.to_i * $2.to_i
       end
@@ -336,8 +336,8 @@ Ohai.plugin(:CPU) do
     cpu["cpustates"] = Mash.new
 
     currentcpu = 0
-    cpucores = Array.new
-    cpusockets = Array.new
+    cpucores = []
+    cpusockets = []
     processor_info.each do |processor|
       _desc, instance, _record, keyvalue = processor.split(":")
       cpu[instance] ||= Mash.new
@@ -406,7 +406,7 @@ Ohai.plugin(:CPU) do
       cpu[current_cpu]["model_name"] = processor["name"]
       cpu[current_cpu]["description"] = processor["description"]
       cpu[current_cpu]["mhz"] = processor["maxclockspeed"].to_s
-      cpu[current_cpu]["cache_size"] = "#{processor['l2cachesize']} KB"
+      cpu[current_cpu]["cache_size"] = "#{processor["l2cachesize"]} KB"
     end
 
     cpu[:total] = logical_processors

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

@@ -21,14 +21,14 @@ Ohai.plugin(:Network) do
   provides "counters/network", "counters/network/interfaces"
 
   def parse_media(media_string)
-    media = Hash.new
+    media = {}
     line_array = media_string.split(" ")
 
     0.upto(line_array.length - 1) do |i|
       unless line_array[i].eql?("none")
 
         if line_array[i + 1] =~ /^\<([a-zA-Z\-\,]+)\>$/
-          media[line_array[i]] = Hash.new unless media.key?(line_array[i])
+          media[line_array[i]] = {} unless media.key?(line_array[i])
           if media[line_array[i]].key?("options")
             $1.split(",").each do |opt|
               media[line_array[i]]["options"] << opt unless media[line_array[i]]["options"].include?(opt)
@@ -38,7 +38,7 @@ Ohai.plugin(:Network) do
           end
         else
           if line_array[i].eql?("autoselect")
-            media["autoselect"] = Hash.new unless media.key?("autoselect")
+            media["autoselect"] = {} unless media.key?("autoselect")
             media["autoselect"]["options"] = []
           end
         end
@@ -56,6 +56,7 @@ Ohai.plugin(:Network) do
     return "IPIP" if ifname.eql?("gif")
     return "6to4" if ifname.eql?("stf")
     return "dot1q" if ifname.eql?("vlan")
+
     "Unknown"
   end
 
@@ -63,6 +64,7 @@ Ohai.plugin(:Network) do
     return "Node" if scope.eql?("::1")
     return "Link" if scope =~ /^fe80\:/
     return "Site" if scope =~ /^fec0\:/
+
     "Global"
   end
 
@@ -74,6 +76,7 @@ Ohai.plugin(:Network) do
     return ifname unless ifaces[ifname].nil?
     # oh well, time to go hunting!
     return ifname.chop if ifname =~ /\*$/
+
     ifaces.each_key do |ifc|
       ifaces[ifc][:addresses].each_key do |addr|
         return ifc if addr.eql? mac
@@ -115,7 +118,7 @@ Ohai.plugin(:Network) do
         if line =~ /\sflags\=\d+\<((UP|BROADCAST|DEBUG|SMART|SIMPLEX|LOOPBACK|POINTOPOINT|NOTRAILERS|RUNNING|NOARP|PROMISC|ALLMULTI|SLAVE|MASTER|MULTICAST|DYNAMIC|,)+)\>\s/
           flags = $1.split(",")
         else
-          flags = Array.new
+          flags = []
         end
         iface[cint][:flags] = flags.flatten
         if cint =~ /^(\w+)(\d+.*)/
@@ -165,6 +168,7 @@ Ohai.plugin(:Network) do
       if line =~ /^\S+ \((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([a-zA-Z0-9\.\:\-]+).*\[(\w+)\]/
         # MAC addr really should be normalized to include all the zeroes.
         next if iface[$3].nil? # this should never happen
+
         iface[$3][:arp] ||= Mash.new
         iface[$3][:arp][$1] = $2
       end
@@ -189,6 +193,7 @@ Ohai.plugin(:Network) do
           line =~ /^([a-zA-Z0-9\.\:\-\*]+)\s+\d+\s+\<[a-zA-Z0-9\#]+\>(\s+)(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
         ifname = locate_interface(iface, $1, $2)
         next if iface[ifname].nil? # this shouldn't happen, but just in case
+
         net_counters[ifname] ||= Mash.new
         net_counters[ifname] = { rx: { bytes: $5, packets: $3, errors: $4, drop: 0, overrun: 0, frame: 0, compressed: 0, multicast: 0 },
                                  tx: { bytes: $8, packets: $6, errors: $7, drop: 0, overrun: 0, collisions: $9, carrier: 0, compressed: 0 },