ohai 16.2.0 → 16.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b01a821d5ffa3a329d434aa798b7e6396cd38329a5aed167cc9fa5d790e1e40b
-  data.tar.gz: 832b596c834b379cd996bdad0d097e38684be9e175fcd50d59fce4cebc04ec19
+  metadata.gz: 68766eeef1353df87e6a89c047bfe2d056be75698cf3e5db73f093a0d40059c5
+  data.tar.gz: 39b483600849fe31706da87bf2c70eda6a7fa7dec69f1155d12ce49e124581c6
 SHA512:
-  metadata.gz: ad4cbe610a98f04f3525b4d025e7053712dbe7c9218d38e506dd6beb031ded0e5d969ede709a0b2fdf95cea747905d18b021eea7d29db25271f24792c439bc4b
-  data.tar.gz: 5359aff83afbfceb44068bc838ce4a8153e863a6684319a65b1164e48169e6ba406e38e537c4686d1102e4bfc29e1f783fe4bdc216654fd0d19af53d8c5fbbf0
+  metadata.gz: 7730a85e74744663d1d7d282e07dbc249a4be8cfa0be63ee68b0e2fc09140c4053c0a97892295fcbf769c7653327898f77d1df482eb08734ce791cf4f6713aba
+  data.tar.gz: a299e3ebccb093d8bde8a0941ece0e8f085b496610623265e149aeefb545020cbfb497db85de53d0e1e1c640d2edce8f724b508d467d1cfdbbbea35a1edc0ef7

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
   gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+  gem "rubocop-performance", "1.7.1"
   gem "rake", ">= 10.1.0"
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
@@ -24,4 +25,4 @@ group :debug do
   gem "pry-byebug"
   gem "pry-stack_explorer", "~> 0.4.0" # pin until we drop ruby < 2.6
   gem "rb-readline"
-end
+end

data/bin/ohai

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 #
-# ./ohai - I'm in ur serverz, showin you the daters
-#
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0

data/lib/ohai/application.rb

@@ -18,9 +18,9 @@
 require "chef-config/path_helper"
 require "chef-config/workstation_config_loader"
 require_relative "../ohai"
-require_relative "log"
+require_relative "log" unless defined?(Ohai::Log)
 require "mixlib/cli" unless defined?(Mixlib::CLI)
-require "benchmark"
+require "benchmark" unless defined?(Benchmark)
 
 # The Application class is what is called by the Ohai CLI binary. It handles:
 #  - CLI options and attribute arguments

data/lib/ohai/dsl/plugin.rb

@@ -65,7 +65,7 @@ module Ohai
   #
   # @return [String]
   def self.dev_null
-    if RUBY_PLATFORM =~ /mswin|mingw|windows/
+    if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
       "NUL"
     else
       "/dev/null"

data/lib/ohai/loader.rb

@@ -71,8 +71,7 @@ module Ohai
       from = [ Ohai.config[:plugin_path], from].flatten
       plugin_files_by_dir(from).collect do |plugin_file|
         logger.trace "Loading additional plugin: #{plugin_file}"
-        plugin = load_plugin_class(plugin_file)
-        load_v7_plugin(plugin)
+        load_v7_plugin(load_plugin_class(plugin_file))
       end
     end
 

data/lib/ohai/log.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "mixlib/log"
+require "mixlib/log" unless defined?(Mixlib::Log)
 
 module Ohai
   # the Ohai Logger which is just Mixlib::Log defaulting to STDERR and :info level

data/lib/ohai/mixin/command.rb

@@ -30,7 +30,7 @@ module Ohai
         options = options.dup
         # unless specified by the caller timeout after configured timeout (default 30 seconds)
         options[:timeout] ||= Ohai::Config.ohai[:shellout_timeout]
-        unless RUBY_PLATFORM =~ /mswin|mingw32|windows/
+        unless RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
           options[:env] = options.key?(:env) ? options[:env].dup : {}
           options[:env]["PATH"] ||= ((ENV["PATH"] || "").split(":") + %w{/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin}).join(":")
         end

data/lib/ohai/mixin/dmi_decode.rb

@@ -26,7 +26,7 @@ module ::Ohai::Mixin::DmiDecode
     when /VMware/
       return "vmware"
     when /Microsoft/
-      return "hyperv" if product =~ /Virtual Machine/
+      return "hyperv" if /Virtual Machine/.match?(product)
     when /Amazon EC2/
       return "amazonec2"
     when /QEMU/
@@ -40,7 +40,7 @@ module ::Ohai::Mixin::DmiDecode
     case product
     when /VirtualBox/
       return "vbox"
-    when /OpenStack/ # yes this is here twice. Product catches Redhat's version
+    when /OpenStack/ # yes this is here twice. Product catches Red Hat's version
       return "openstack"
     when /(KVM|RHEV)/
       return "kvm"

data/lib/ohai/mixin/os.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "rbconfig"
+require "rbconfig" unless defined?(RbConfig)
 
 module Ohai
   module Mixin

data/lib/ohai/mixin/softlayer_metadata.rb

@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "net/https"
+require "net/http" unless defined?(Net::HTTP)
 require "uri" unless defined?(URI)
 
 # https://softlayer.github.io/reference/services/SoftLayer_Resource_Metadata/

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

@@ -29,8 +29,8 @@ 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
-    memory[:swap]["total"] = "#{(swapinfo[2].to_i) * 4}kB"
-    memory[:swap]["free"] = "#{(swapinfo[10].to_i) * 4}kB"
+    swap_info = shell_out("swap -s").stdout.split # returns swap info in 4K blocks
+    memory[:swap]["total"] = "#{(swap_info[2].to_i) * 4}kB"
+    memory[:swap]["free"] = "#{(swap_info[10].to_i) * 4}kB"
   end
 end

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

@@ -19,7 +19,6 @@
 #
 
 Ohai.plugin(:Network) do
-  require "ipaddr"
   require_relative "../../mixin/network_helper"
 
   provides "network", "counters/network", "macaddress"
@@ -27,6 +26,8 @@ Ohai.plugin(:Network) do
   include Ohai::Mixin::NetworkHelper
 
   collect_data(:aix) do
+    require "ipaddr" unless defined?(IPAddr)
+
     # Loads following information.
     # :default_interface, :default_gateway - route -n get 0
     # :interfaces

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

@@ -21,7 +21,7 @@ Ohai.plugin(:Uptime) do
   provides "uptime", "uptime_seconds"
 
   collect_data(:aix) do
-    require "date"
+    require "date" unless defined?(DateTime)
     # below we're going to assume that PID 1 is init (this is true 99.99999% of the time)
     # output will look like this
     # 1148-20:54:50
@@ -30,7 +30,7 @@ Ohai.plugin(:Uptime) do
     so = shell_out("LC_ALL=POSIX ps -o etime= -p 1").stdout.strip
 
     # Here we'll check our shell_out for a dash, which indicates there is a # of days involved
-    # We'll chunk off the days, hours (where applicable), minutes, seconds into seperate vars
+    # We'll chunk off the days, hours (where applicable), minutes, seconds into separate vars
     # We also need to do this because ps -o etime= will not display days if the machine has been up for less than 24 hours
     # If the machine has been up for less than one hour, the shell_out will not output hours hence our else
     # see here: https://www.ibm.com/support/knowledgecenter/en/ssw_aix_72/com.ibm.aix.cmds4/ps.htm#ps__row-d3e109655

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

@@ -57,7 +57,7 @@ Ohai.plugin(:Virtualization) do
           sections.each do |line|
             case title
             when "network"
-              next if line =~ /^Interface|^---/
+              next if /^Interface|^---/.match?(line)
 
               splat = line.strip.split
               key   = splat[0].downcase
@@ -68,7 +68,7 @@ Ohai.plugin(:Virtualization) do
                       }
               wpars[wpar_name][title][key] = value
             when "user-specified routes"
-              next if line =~ /^Type|^---/
+              next if /^Type|^---/.match?(line)
 
               splat = line.strip.split
               key   = splat[2].downcase
@@ -78,7 +78,7 @@ Ohai.plugin(:Virtualization) do
                       }
               wpars[wpar_name][title][key] = value
             when "file systems"
-              next if line =~ /^MountPoint|^---/
+              next if /^MountPoint|^---/.match?(line)
 
               splat = line.strip.split
               key = splat[1].downcase
@@ -93,7 +93,7 @@ Ohai.plugin(:Virtualization) do
               privileges ||= ""
               wpars[wpar_name][title]["Privileges"] ||= []
 
-              if line =~ /^Privileges/
+              if /^Privileges/.match?(line)
                 privileges << line.split(":")[1].strip
               else
                 privileges << line.strip
@@ -101,7 +101,7 @@ Ohai.plugin(:Virtualization) do
 
               wpars[wpar_name][title]["Privileges"] += privileges.split(",")
             when "device exports"
-              next if line =~ /^Name|^---/
+              next if /^Name|^---/.match?(line)
 
               splat = line.strip.split
               key = splat[0].downcase

data/lib/ohai/plugins/azure.rb

@@ -57,7 +57,7 @@ Ohai.plugin(:Azure) do
     has_245 = false
     if File.exist?("/var/lib/dhcp/dhclient.eth0.leases")
       File.open("/var/lib/dhcp/dhclient.eth0.leases").each do |line|
-        if line =~ /unknown-245/
+        if /unknown-245/.match?(line)
           logger.trace("Plugin Azure: Found unknown-245 DHCP option used by Azure.")
           has_245 = true
           break

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

@@ -76,7 +76,7 @@ Ohai.plugin(:Virtualization) do
     # Detect KVM/QEMU paravirt guests from cpu, report as KVM
     # hw.model: QEMU Virtual CPU version 0.9.1
     so = shell_out("sysctl -n hw.model")
-    if so.stdout =~ /QEMU Virtual CPU|KVM processor/
+    if /QEMU Virtual CPU|KVM processor/.match?(so.stdout)
       virtualization[:system] = "kvm"
       virtualization[:role] = "guest"
       virtualization[:systems][:kvm] = "guest"
@@ -96,7 +96,7 @@ Ohai.plugin(:Virtualization) do
                    "xen"
                  when /kvm/
                    so = shell_out("sysctl -n kern.hostuuid")
-                   so.stdout =~ /^ec2/ ? "amazonec2" : "kvm"
+                   /^ec2/.match?(so.stdout) ? "amazonec2" : "kvm"
                  when /bhyve/
                    "bhyve"
                  end

data/lib/ohai/plugins/c.rb

@@ -137,7 +137,7 @@ Ohai.plugin(:C) do
     logger.trace("Plugin C: 'xlc' binary could not be found. Skipping data.")
   end
 
-  def collect_sunpro
+  def collect_sun_pro
     # sun pro
     collect("cc -V -flags") do |so|
       output = so.stderr.split
@@ -173,7 +173,7 @@ Ohai.plugin(:C) do
     @c = Mash.new
     collect_gcc
     collect_glibc
-    collect_sunpro
+    collect_sun_pro
     languages[:c] = @c unless @c.empty?
   end
 end

data/lib/ohai/plugins/cloud.rb

@@ -320,7 +320,7 @@ Ohai.plugin(:Cloud) do
   end
 
   collect_data do
-    require "ipaddr"
+    require "ipaddr" unless defined?(IPAddr)
 
     @cloud_attr_obj = CloudAttrs.new
 

data/lib/ohai/plugins/cpu.rb

@@ -305,7 +305,7 @@ Ohai.plugin(:CPU) do
         cpu[index] = Mash.new
         cpu[index][:status] = status
         cpu[index][:location] = location
-        if status =~ /Available/
+        if /Available/.match?(status)
           cpu[:available] += 1
           lsattr = shell_out("lsattr -El #{name}").stdout.lines
           lsattr.each do |attribute|
@@ -377,7 +377,7 @@ Ohai.plugin(:CPU) do
   end
 
   collect_data(:windows) do
-    require "wmi-lite/wmi"
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
 
     cpu Mash.new
     cores = 0

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

@@ -41,8 +41,8 @@ Ohai.plugin(:Hardware) do
     hardware.merge!(hw_hash[0]["_items"][0])
 
     # ProductName:	Mac OS X
-    # ProductVersion:	10.12.5
-    # BuildVersion:	16F73
+    # ProductVersion:	10.15.6
+    # BuildVersion:	19G46c
     shell_out("sw_vers").stdout.lines.each do |line|
       case line
       when /^ProductName:\s*(.*)$/

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

@@ -66,8 +66,8 @@ Ohai.plugin(:Network) do
 
   def scope_lookup(scope)
     return "Node" if scope.eql?("::1")
-    return "Link" if scope =~ /^fe80\:/
-    return "Site" if scope =~ /^fec0\:/
+    return "Link" if /^fe80\:/.match?(scope)
+    return "Site" if /^fec0\:/.match?(scope)
 
     "Global"
   end
@@ -79,7 +79,7 @@ Ohai.plugin(:Network) do
   def locate_interface(ifaces, ifname, mac)
     return ifname unless ifaces[ifname].nil?
     # oh well, time to go hunting!
-    return ifname.chop if ifname =~ /\*$/
+    return ifname.chop if /\*$/.match?(ifname)
 
     ifaces.each_key do |ifc|
       ifaces[ifc][:addresses].each_key do |addr|

data/lib/ohai/plugins/darwin/platform.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");
@@ -23,11 +23,6 @@ Ohai.plugin(:Platform) do
     so = shell_out((Ohai.abs_path( "/usr/bin/sw_vers" )).to_s)
     so.stdout.lines do |line|
       case line
-      when /^ProductName:\s+(.+)$/
-        macname = $1
-        macname.downcase!
-        macname.tr!(" ", "_")
-        platform macname
       when /^ProductVersion:\s+(.+)$/
         platform_version $1
       when /^BuildVersion:\s+(.+)$/
@@ -35,6 +30,8 @@ Ohai.plugin(:Platform) do
       end
     end
 
+    # if we're on darwin assume we're on mac_os_x
+    platform "mac_os_x"
     platform_family "mac_os_x"
   end
 end

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

@@ -82,7 +82,7 @@ Ohai.plugin(:Virtualization) do
       virtualization[:systems][:parallels] = "host"
     elsif ioreg_exists?
       so = shell_out("ioreg -l")
-      if so.stdout =~ /pci1ab8,4000/
+      if /pci1ab8,4000/.match?(so.stdout)
         virtualization[:system] = "parallels"
         virtualization[:role] = "guest"
         virtualization[:systems][:parallels] = "guest"

data/lib/ohai/plugins/docker.rb

@@ -16,8 +16,6 @@
 #
 
 Ohai.plugin(:Docker) do
-  require "json"
-
   provides "docker"
   depends "virtualization"
 
@@ -50,6 +48,8 @@ Ohai.plugin(:Docker) do
   end
 
   collect_data do
+    require "json" unless defined?(JSON)
+
     if virtualization[:systems][:docker]
       docker_ohai_data(docker_info_json)
     end

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

@@ -20,10 +20,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:dragonflybsd) 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 "dragonflybsd"
   end
 end

data/lib/ohai/plugins/ec2.rb

@@ -28,7 +28,6 @@
 Ohai.plugin(:EC2) do
   require_relative "../mixin/ec2_metadata"
   require_relative "../mixin/http_helper"
-  require "base64"
 
   include Ohai::Mixin::Ec2Metadata
   include Ohai::Mixin::HttpHelper
@@ -41,7 +40,7 @@ Ohai.plugin(:EC2) do
   # @return [Boolean] do we have Amazon DMI data?
   def has_ec2_amazon_dmi?
     # detect a version of '4.2.amazon'
-    if file_val_if_exists("/sys/class/dmi/id/bios_vendor") =~ /Amazon/
+    if /Amazon/.match?(file_val_if_exists("/sys/class/dmi/id/bios_vendor"))
       logger.trace("Plugin EC2: has_ec2_amazon_dmi? == true")
       true
     else
@@ -56,7 +55,7 @@ Ohai.plugin(:EC2) do
   # @return [Boolean] do we have Amazon DMI data?
   def has_ec2_xen_dmi?
     # detect a version of '4.2.amazon'
-    if file_val_if_exists("/sys/class/dmi/id/bios_version") =~ /amazon/
+    if /amazon/.match?(file_val_if_exists("/sys/class/dmi/id/bios_version"))
       logger.trace("Plugin EC2: has_ec2_xen_dmi? == true")
       true
     else
@@ -68,7 +67,7 @@ Ohai.plugin(:EC2) do
   # looks for a xen UUID that starts with ec2 from within the Linux sys tree
   # @return [Boolean] do we have a Xen UUID or not?
   def has_ec2_xen_uuid?
-    if file_val_if_exists("/sys/hypervisor/uuid") =~ /^ec2/
+    if /^ec2/.match?(file_val_if_exists("/sys/hypervisor/uuid"))
       logger.trace("Plugin EC2: has_ec2_xen_uuid? == true")
       return true
     end
@@ -81,10 +80,10 @@ Ohai.plugin(:EC2) do
   # linux hosts
   # @return [Boolean] do we have a Xen Identifying Number or not?
   def has_ec2_identifying_number?
-    if RUBY_PLATFORM =~ /mswin|mingw32|windows/
-      require "wmi-lite/wmi"
+    if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
+      require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
       wmi = WmiLite::Wmi.new
-      if wmi.first_of("Win32_ComputerSystemProduct")["identifyingnumber"] =~ /^ec2/
+      if /^ec2/.match?(wmi.first_of("Win32_ComputerSystemProduct")["identifyingnumber"])
         logger.trace("Plugin EC2: has_ec2_identifying_number? == true")
         true
       end
@@ -115,6 +114,8 @@ Ohai.plugin(:EC2) do
   end
 
   collect_data do
+    require "base64"
+
     if looks_like_ec2?
       logger.trace("Plugin EC2: looks_like_ec2? == true")
       ec2 Mash.new