ohai 14.2.0 → 14.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b945f38a205eba8ba878ca75cb0e060ce08659f75cc854fe9e430bd7ed133961
-  data.tar.gz: a709b76357dc0c705e4a57602be622773362890e0467ed7049985b6e83a71daa
+  metadata.gz: 63dacc5848d269ab4c734b26cfd943b4918d5cdfbe640fce1b8b1804a9094198
+  data.tar.gz: '0885d6bbffe839c17f2683f75c11cae64b2177c2e12effeefa8abd09b5198a16'
 SHA512:
-  metadata.gz: ba896baca29452e5bfe0dba1f296df3cab45bb9a22fdb68ca61617e597788f1d3ec6f8245bd8b15ab25e7cba733d1f35e90946088407885488a83ec8c45f9c24
-  data.tar.gz: b037ad1653096e4579e8b1ac0375d1e542fbcabee595414dabca26746bc2c75936199ef6da2ed471534934fbf24f701a788f4dae67444f62ab777fa64d9df6ae
+  metadata.gz: 815b9e031ecece77af44c06828dadd7c95db98d651b8b732c4b5b8d95376676905cd48ea3ba02bb409f38d65ca796c1707df9b880cbcae09305c1638257a454b
+  data.tar.gz: dc225e37afcc613a73c6ed3f02b47718052263a43d7c66d2dbf763e9955ed60860d600f7f33b584a1fefa3a610e8524995fe08680eb74fa817871e0b2d14278b

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
-  gem "chefstyle"
+  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
   gem "rake", ">= 10.1.0"
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"

data/Rakefile

@@ -15,7 +15,7 @@ rescue LoadError
   end
 end
 
-task :default => :spec
+task default: :spec
 
 require "chefstyle"
 require "rubocop/rake_task"

data/lib/ohai/application.rb

@@ -26,45 +26,45 @@ class Ohai::Application
   include Mixlib::CLI
 
   option :config_file,
-    :short       => "-c CONFIG",
-    :long        => "--config CONFIG",
-    :description => "A configuration file to use",
-    :proc => lambda { |path| File.expand_path(path, Dir.pwd) }
+    short: "-c CONFIG",
+    long: "--config CONFIG",
+    description: "A configuration file to use",
+    proc: lambda { |path| File.expand_path(path, Dir.pwd) }
 
   option :directory,
-    :short       => "-d DIRECTORY",
-    :long        => "--directory DIRECTORY",
-    :description => "A directory to add to the Ohai plugin search path",
-    :proc        => lambda { |path| Ohai::Config.platform_specific_path(path) }
+    short: "-d DIRECTORY",
+    long: "--directory DIRECTORY",
+    description: "A directory to add to the Ohai plugin search path",
+    proc: lambda { |path| Ohai::Config.platform_specific_path(path) }
 
   option :log_level,
-    :short        => "-l LEVEL",
-    :long         => "--log_level LEVEL",
-    :description  => "Set the log level (debug, info, warn, error, fatal)",
-    :proc         => lambda { |l| l.to_sym }
+    short: "-l LEVEL",
+    long: "--log_level LEVEL",
+    description: "Set the log level (debug, info, warn, error, fatal)",
+    proc: lambda { |l| l.to_sym }
 
   option :log_location,
-    :short        => "-L LOGLOCATION",
-    :long         => "--logfile LOGLOCATION",
-    :description  => "Set the log file location, defaults to STDOUT - recommended for daemonizing",
-    :proc         => nil
+    short: "-L LOGLOCATION",
+    long: "--logfile LOGLOCATION",
+    description: "Set the log file location, defaults to STDOUT - recommended for daemonizing",
+    proc: nil
 
   option :help,
-    :short        => "-h",
-    :long         => "--help",
-    :description  => "Show this message",
-    :on           => :tail,
-    :boolean      => true,
-    :show_options => true,
-    :exit         => 0
+    short: "-h",
+    long: "--help",
+    description: "Show this message",
+    on: :tail,
+    boolean: true,
+    show_options: true,
+    exit: 0
 
   option :version,
-    :short        => "-v",
-    :long         => "--version",
-    :description  => "Show Ohai version",
-    :boolean      => true,
-    :proc         => lambda { |v| puts "Ohai: #{::Ohai::VERSION}" },
-    :exit         => 0
+    short: "-v",
+    long: "--version",
+    description: "Show Ohai version",
+    boolean: true,
+    proc: lambda { |v| puts "Ohai: #{::Ohai::VERSION}" },
+    exit: 0
 
   def initialize
     super

data/lib/ohai/common/dmi.rb

@@ -70,11 +70,11 @@ module Ohai
         42 =>  "management_controller_host_interfaces",
         126 => "disabled_entries",
         127 => "end_of_table_marker",
-      }
+      }.freeze
 
       # list of IDs to collect from config or default to a sane list that prunes
       # away some of the less useful IDs
-      ID_TO_CAPTURE = [ 0, 1, 2, 3, 4, 6, 11 ]
+      ID_TO_CAPTURE = [ 0, 1, 2, 3, 4, 6, 11 ].freeze
 
       # the whitelisted DMI IDs. This is combination of the defaults + any additional
       # IDs defined in the :additional_dmi_ids config
@@ -100,7 +100,7 @@ module Ohai
         id = id.to_i
         if (id >= 128) && (id <= 255)
           id = "oem_data_#{id}"
-        elsif DMI::ID_TO_DESCRIPTION.has_key?(id)
+        elsif DMI::ID_TO_DESCRIPTION.key?(id)
           id = DMI::ID_TO_DESCRIPTION[id]
         else
           Ohai::Log.debug("unrecognized header id; falling back to 'unknown'")
@@ -118,7 +118,7 @@ module Ohai
         dmi.each do |type, records|
           in_common = Mash.new
           next unless records.class.to_s == "Mash"
-          next unless records.has_key?("all_records")
+          next unless records.key?("all_records")
           records[:all_records].each do |record|
             record.each do |field, value|
               next if value.class.to_s == "Mash"
@@ -127,7 +127,7 @@ module Ohai
               next if field.to_s == "record_id"
               translated = field.downcase.gsub(/[^a-z0-9]/, "_")
               value      = value.strip
-              if in_common.has_key?(translated)
+              if in_common.key?(translated)
                 in_common[translated] = nil unless in_common[translated] == value
               else
                 in_common[translated] = value

data/lib/ohai/dsl/plugin.rb

@@ -128,7 +128,7 @@ module Ohai
       end
 
       def has_key?(name)
-        @data.has_key?(name)
+        @data.key?(name)
       end
 
       def attribute?(name, *keys)
@@ -140,7 +140,7 @@ module Ohai
       end
 
       def from(cmd)
-        _status, stdout, _stderr = run_command(:command => cmd)
+        _status, stdout, _stderr = run_command(command: cmd)
         return "" if stdout.nil? || stdout.empty?
         stdout.strip
       end
@@ -150,7 +150,7 @@ module Ohai
       # the value.
       def from_with_regex(cmd, *regex_list)
         regex_list.flatten.each do |regex|
-          _status, stdout, _stderr = run_command(:command => cmd)
+          _status, stdout, _stderr = run_command(command: cmd)
           return "" if stdout.nil? || stdout.empty?
           stdout.chomp!.strip
           md = stdout.match(regex)

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

@@ -108,7 +108,7 @@ module Ohai
         # @param block [block] the actual code to collect data for the specified platforms
         def self.collect_data(platform = :default, *other_platforms, &block)
           [platform, other_platforms].flatten.each do |plat|
-            if data_collector.has_key?(plat)
+            if data_collector.key?(plat)
               raise Ohai::Exceptions::IllegalPluginDefinition, "collect_data already defined on platform #{plat}"
             else
               data_collector[plat] = block
@@ -125,9 +125,9 @@ module Ohai
           collector = self.class.data_collector
           platform = collect_os
 
-          if collector.has_key?(platform)
+          if collector.key?(platform)
             instance_eval(&collector[platform])
-          elsif collector.has_key?(:default)
+          elsif collector.key?(:default)
             instance_eval(&collector[:default])
           else
             logger.trace("Plugin #{name}: No data to collect. Skipping...")

data/lib/ohai/mixin/azure_metadata.rb

@@ -21,8 +21,8 @@ module Ohai
   module Mixin
     module AzureMetadata
 
-      AZURE_METADATA_ADDR = "169.254.169.254" unless defined?(AZURE_METADATA_ADDR)
-      AZURE_METADATA_URL = "/metadata/instance?api-version=2017-08-01" unless defined?(AZURE_METADATA_URL)
+      AZURE_METADATA_ADDR = "169.254.169.254".freeze unless defined?(AZURE_METADATA_ADDR)
+      AZURE_METADATA_URL = "/metadata/instance?api-version=2017-08-01".freeze unless defined?(AZURE_METADATA_URL)
 
       # fetch the meta content with a timeout and the required header
       def http_get(uri)

data/lib/ohai/mixin/do_metadata.rb

@@ -20,15 +20,15 @@ module Ohai
   module Mixin
     module DOMetadata
 
-      DO_METADATA_ADDR = "169.254.169.254" unless defined?(DO_METADATA_ADDR)
-      DO_METADATA_URL = "/metadata/v1.json" unless defined?(DO_METADATA_URL)
+      DO_METADATA_ADDR = "169.254.169.254".freeze unless defined?(DO_METADATA_ADDR)
+      DO_METADATA_URL = "/metadata/v1.json".freeze unless defined?(DO_METADATA_URL)
 
       def http_client
         Net::HTTP.start(DO_METADATA_ADDR).tap { |h| h.read_timeout = 6 }
       end
 
       def fetch_metadata
-        uri = "#{DO_METADATA_URL}"
+        uri = (DO_METADATA_URL).to_s
         response = http_client.get(uri)
         case response.code
         when "200"

data/lib/ohai/mixin/ec2_metadata.rb

@@ -39,13 +39,13 @@ module Ohai
     #
     module Ec2Metadata
 
-      EC2_METADATA_ADDR = "169.254.169.254" unless defined?(EC2_METADATA_ADDR)
+      EC2_METADATA_ADDR = "169.254.169.254".freeze unless defined?(EC2_METADATA_ADDR)
       EC2_SUPPORTED_VERSIONS = %w{ 1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 2007-12-15
                                    2008-02-01 2008-09-01 2009-04-04 2011-01-01 2011-05-01 2012-01-12
-                                   2014-02-25 2014-11-05 2015-10-20 2016-04-19 2016-06-30 2016-09-02 }
-      EC2_ARRAY_VALUES = %w{security-groups local_ipv4s}
-      EC2_ARRAY_DIR    = %w{network/interfaces/macs}
-      EC2_JSON_DIR     = %w{iam}
+                                   2014-02-25 2014-11-05 2015-10-20 2016-04-19 2016-06-30 2016-09-02 }.freeze
+      EC2_ARRAY_VALUES = %w{security-groups local_ipv4s}.freeze
+      EC2_ARRAY_DIR    = %w{network/interfaces/macs}.freeze
+      EC2_JSON_DIR     = %w{iam}.freeze
 
       def best_api_version
         @api_version ||= begin
@@ -193,9 +193,9 @@ module Ohai
       def expand_path(file_name)
         path = file_name.gsub(/\=.*$/, "/")
         # ignore "./" and "../"
-        path.gsub(%r{/\.\.?(?:/|$)}, "/").
-          sub(%r{^\.\.?(?:/|$)}, "").
-          sub(%r{^$}, "/")
+        path.gsub(%r{/\.\.?(?:/|$)}, "/")
+          .sub(%r{^\.\.?(?:/|$)}, "")
+          .sub(%r{^$}, "/")
       end
 
       def metadata_key(key)

data/lib/ohai/mixin/gce_metadata.rb

@@ -21,8 +21,8 @@ module Ohai
     module GCEMetadata
 
       # Trailing dot to host is added to avoid DNS search path
-      GCE_METADATA_ADDR = "metadata.google.internal." unless defined?(GCE_METADATA_ADDR)
-      GCE_METADATA_URL = "/computeMetadata/v1/?recursive=true" unless defined?(GCE_METADATA_URL)
+      GCE_METADATA_ADDR = "metadata.google.internal.".freeze unless defined?(GCE_METADATA_ADDR)
+      GCE_METADATA_URL = "/computeMetadata/v1/?recursive=true".freeze unless defined?(GCE_METADATA_URL)
 
       # fetch the meta content with a timeout and the required header
       def http_get(uri)

data/lib/ohai/mixin/network_constants.rb

@@ -23,7 +23,7 @@ module Ohai
       FAMILIES = {
         "inet" => "default",
         "inet6" => "default_inet6",
-      }
+      }.freeze
     end
   end
 end

data/lib/ohai/mixin/scaleway_metadata.rb

@@ -20,8 +20,8 @@ module Ohai
   module Mixin
     module ScalewayMetadata
 
-      SCALEWAY_METADATA_ADDR = "169.254.42.42" unless defined?(SCALEWAY_METADATA_ADDR)
-      SCALEWAY_METADATA_URL = "/conf?format=json" unless defined?(SCALEWAY_METADATA_URL)
+      SCALEWAY_METADATA_ADDR = "169.254.42.42".freeze unless defined?(SCALEWAY_METADATA_ADDR)
+      SCALEWAY_METADATA_URL = "/conf?format=json".freeze unless defined?(SCALEWAY_METADATA_URL)
 
       # @return [Net::HTTP] net/http object without timeout set to 6
       def http_client
@@ -32,7 +32,7 @@ module Ohai
       #
       # @return [Hash]
       def fetch_metadata
-        uri = "#{SCALEWAY_METADATA_URL}"
+        uri = (SCALEWAY_METADATA_URL).to_s
         response = http_client.get(uri)
         case response.code
         when "200"

data/lib/ohai/mixin/softlayer_metadata.rb

@@ -22,7 +22,7 @@ require "uri"
 
 # https://softlayer.github.io/reference/services/SoftLayer_Resource_Metadata/
 module ::Ohai::Mixin::SoftlayerMetadata
-  SOFTLAYER_API_QUERY_URL = "https://api.service.softlayer.com/rest/v3.1/SoftLayer_Resource_Metadata" unless defined?(SOFTLAYER_API_QUERY_URL)
+  SOFTLAYER_API_QUERY_URL = "https://api.service.softlayer.com/rest/v3.1/SoftLayer_Resource_Metadata".freeze unless defined?(SOFTLAYER_API_QUERY_URL)
 
   # fetch metadata items and build out hash of data
   #

data/lib/ohai/mixin/string.rb

@@ -24,7 +24,7 @@ class String
   # ActiveSupport::CoreExtensions::String::Inflections
   # @return [String]
   def wmi_underscore
-    gsub(/::/, "/").gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
-      gsub(/([a-z\d])([A-Z])/, '\1_\2').tr("-", "_").downcase
+    gsub(/::/, "/").gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2').tr("-", "_").downcase
   end
 end

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

@@ -33,8 +33,8 @@ Ohai.plugin(:CPU) do
       cpu[:available] = 0
 
       cpudevs = shell_out("lsdev -Cc processor").stdout.lines
-      #from http://www-01.ibm.com/software/passportadvantage/pvu_terminology_for_customers.html
-      #on AIX number of cores and processors are considered same
+      # from http://www-01.ibm.com/software/passportadvantage/pvu_terminology_for_customers.html
+      # on AIX number of cores and processors are considered same
       cpu[:real] = cpu[:cores] = cpudevs.length
       cpudevs.each.with_index do |c, i|
         name, status, location = c.split
@@ -50,7 +50,7 @@ Ohai.plugin(:CPU) do
             if attrib == "type"
               cpu[index][:model_name] = value
             elsif attrib == "frequency"
-              cpu[index][:mhz] = value.to_i / (1000 * 1000) #convert from hz to MHz
+              cpu[index][:mhz] = value.to_i / (1000 * 1000) # convert from hz to MHz
             else
               cpu[index][attrib] = value
             end

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

@@ -72,7 +72,7 @@ Ohai.plugin(:Filesystem) do
     df_hash    = parse_df_or_mount shell_outs[:df_Pk]
 
     mount_hash.each do |key, hash|
-      df_hash[key].merge!(hash) if df_hash.has_key?(key)
+      df_hash[key].merge!(hash) if df_hash.key?(key)
     end
 
     mount_hash.merge(df_hash)

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

@@ -38,7 +38,7 @@ Ohai.plugin(:Kernel) do
     # 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\/\._]+)/
-        modules[$5] = { :text => { :address => $1, :size => $2 }, :data => { :address => $3, :size => $4 } }
+        modules[$5] = { text: { address: $1, size: $2 }, data: { address: $3, size: $4 } }
       end
     end
 

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

@@ -29,7 +29,7 @@ Ohai.plugin(:Memory) do
     memory[:total] = "#{total_in_mb.to_i * 1024}kB"
     memory[:free] = "#{free_in_mb.to_i * 1024}kB"
 
-    swapinfo = shell_out("swap -s").stdout.split #returns swap info in 4K blocks
+    swapinfo = shell_out("swap -s").stdout.split # returns swap info in 4K blocks
     memory[:swap]["total"] = "#{(swapinfo[2].to_i) * 4}kB"
     memory[:swap]["free"] = "#{(swapinfo[10].to_i) * 4}kB"
   end

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

@@ -120,7 +120,7 @@ Ohai.plugin(:Network) do
           macaddress $1.upcase unless shell_out("uname -W").stdout.to_i > 0
         end
       end
-    end #ifconfig stdout
+    end # ifconfig stdout
 
     # Query routes information
     %w{inet inet6}.each do |family|
@@ -129,8 +129,8 @@ Ohai.plugin(:Network) do
         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] << Mash.new( :destination => $1, :family => family,
-                                                 :via => $2, :flags => $3)
+          iface[interface][:routes] << Mash.new( destination: $1, family: family,
+                                                 via: $2, flags: $3)
         end
       end
     end

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

@@ -49,7 +49,7 @@ Ohai.plugin(:Virtualization) do
     end
 
     # detect from modules
-    so = shell_out("#{Ohai.abs_path('/sbin/kldstat')}")
+    so = shell_out((Ohai.abs_path("/sbin/kldstat")).to_s)
     so.stdout.lines do |line|
       case line
       when /vboxdrv/

data/lib/ohai/plugins/cloud.rb

@@ -124,7 +124,7 @@ Ohai.plugin(:Cloud) do
 
   def get_gce_values
     public_ips = gce["instance"]["networkInterfaces"].collect do |interface|
-      if interface.has_key?("accessConfigs")
+      if interface.key?("accessConfigs")
         interface["accessConfigs"].collect { |ac| ac["externalIp"] unless ac["externalIp"] == "" }
       end
     end.flatten.compact

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

@@ -71,7 +71,7 @@ Ohai.plugin(:Hardware) do
       drive[:name] = drive_entry["_name"]
       drive[:bsd_name] = drive_entry["bsd_name"]
       drive[:capacity] = drive_entry["size_in_bytes"]
-      if drive_entry.has_key?("com.apple.corestorage.pv")
+      if drive_entry.key?("com.apple.corestorage.pv")
         drive[:drive_type] = drive_entry["com.apple.corestorage.pv"][0]["medium_type"]
         drive[:smart_status] = drive_entry["com.apple.corestorage.pv"][0]["smart_status"]
         drive[:partitions] = drive_entry["com.apple.corestorage.pv"].count

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

@@ -28,8 +28,8 @@ Ohai.plugin(:Network) do
       unless line_array[i].eql?("none")
 
         if line_array[i + 1] =~ /^\<([a-zA-Z\-\,]+)\>$/
-          media[line_array[i]] = Hash.new unless media.has_key?(line_array[i])
-          if media[line_array[i]].has_key?("options")
+          media[line_array[i]] = Hash.new 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)
             end
@@ -38,7 +38,7 @@ Ohai.plugin(:Network) do
           end
         else
           if line_array[i].eql?("autoselect")
-            media["autoselect"] = Hash.new unless media.has_key?("autoselect")
+            media["autoselect"] = Hash.new unless media.key?("autoselect")
             media["autoselect"]["options"] = []
           end
         end
@@ -189,8 +189,8 @@ Ohai.plugin(:Network) do
         ifname = locate_interface(iface, $1, $2)
         next if iface[ifname].nil? # this shouldn't happen, but just in case
         net_counters[ifname] = Mash.new unless net_counters[ifname]
-        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 },
+        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 },
         }
       end
     end