ohai 15.6.3 → 15.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 257f27a9e93bbd45470aa2e42c2a9e1e503e8d2e6568a5cbca4d8d964724e854
-  data.tar.gz: aa10fc60bdf94170e7d14f9bf38278974baf68995869c7a9467f45081d193e61
+  metadata.gz: 3cc502163cd1c79f43b4b934c425a00b2b00c2626cefb82882659fa4756dd82f
+  data.tar.gz: 2eadca5148f5f1c0706157f3b2c7c2cfe6606c304f249815c418aba69ca87c53
 SHA512:
-  metadata.gz: 2595eef2b22bcafea6af89415c1ab6566036badb6b8ffba253be3ada2529632ad8210201d38bd5b56d2087cb5b2f2f513479a77ba8e0af5385ade1c250ae50dc
-  data.tar.gz: 4b8c0e3daa5eda327ce6f48f4c7ed34f7e045262e68a3f99c7e78667cc00f15ec4674c37efe4f134c71768841635739cfef06814b598c435cf70cd0d4058ffdb
+  metadata.gz: d3e0b6ae3e18c740ca5e30db4d4db8200c1cae7b742bd5cdda9541c05cc30e8d0570250b86b51dc5397cd8cc383d63d82240ffb5bb069ce9457b536a6c87dfed
+  data.tar.gz: 3925101539b829009b8215eddaccb20d6b88c791ee69224cddd7d4c824bc5939dab97352e97184183d8f1561b3a14108187370e37ac006869cbc8cceae7ce4f2

data/Gemfile

@@ -2,9 +2,8 @@ source "https://rubygems.org"
 
 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 "chefstyle", "~> 1.0"
   gem "rake", ">= 10.1.0"
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
@@ -26,6 +25,6 @@ end
 group :debug do
   gem "pry"
   gem "pry-byebug"
-  gem "pry-stack_explorer"
+  gem "pry-stack_explorer", "~> 0.4.0" # pin until we drop ruby < 2.6
   gem "rb-readline"
 end

data/lib/ohai/common/dmi.rb

@@ -117,12 +117,12 @@ module Ohai
       def convenience_keys(dmi)
         dmi.each do |type, records|
           in_common = Mash.new
-          next unless records.class.to_s == "Mash"
+          next unless records.is_a?(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 value.is_a?(Mash)
               next if field.to_s == "application_identifier"
               next if field.to_s == "size"
               next if field.to_s == "record_id"

data/lib/ohai/config.rb

@@ -39,7 +39,7 @@ module Ohai
       # causes all optional plugins to be run.
       default :run_all_plugins, false
       # optional plugins are the set of plugins that are marked optional but you wish to run.
-      default :optional_plugins, []
+      default(:optional_plugins, []).writes_value { |arr| arr.map(&:to_sym) }
       default :shellout_timeout, 30
     end
   end

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/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/filesystem.rb

@@ -162,6 +162,9 @@ Ohai.plugin(:Filesystem) do
   end
 
   ### Windows specific methods BEGINS
+  # Drive types
+  DRIVE_TYPE ||= %w{unknown no_root_dir removable local network cd ram}.freeze
+
   # Volume encryption or decryption status
   #
   # @see https://docs.microsoft.com/en-us/windows/desktop/SecProv/getconversionstatus-win32-encryptablevolume#parameters
@@ -173,7 +176,7 @@ Ohai.plugin(:Filesystem) do
 
   # Returns a Mash loaded with logical details
   #
-  # Uses Win32_LogicalDisk and logical_properties to return encryption details of volumes.
+  # Uses Win32_LogicalDisk and logical_properties to return general details of volumes.
   #
   # Returns an empty Mash in case of any WMI exception.
   #
@@ -184,7 +187,7 @@ Ohai.plugin(:Filesystem) do
   def logical_info
     wmi = WmiLite::Wmi.new("Root\\CIMV2")
 
-    # Note: we should really be parsing Win32_Volume and Win32_Mapped drive.
+    # TODO: We should really be parsing Win32_Volume and Win32_MountPoint.
     disks = wmi.instances_of("Win32_LogicalDisk")
     logical_properties(disks)
   rescue WmiLite::WmiException
@@ -234,9 +237,9 @@ Ohai.plugin(:Filesystem) do
     properties = Mash.new
     disks.each do |disk|
       property = Mash.new
-      # In windows the closet thing we have to a device is the volume_name
+      # In windows the closest thing we have to a device is the volume name
       # and the "mountpoint" is the drive letter...
-      device = disk["volume_name"].to_s.downcase
+      device = disk["volumename"].to_s.downcase
       mount = disk["deviceid"]
       property[:kb_size] = disk["size"] ? disk["size"].to_i / 1000 : 0
       property[:kb_available] = disk["freespace"].to_i / 1000
@@ -244,7 +247,10 @@ Ohai.plugin(:Filesystem) do
       property[:percent_used] = (property[:kb_size] == 0 ? 0 : (property[:kb_used] * 100 / property[:kb_size]))
       property[:mount] = mount
       property[:fs_type] = disk["filesystem"].to_s.downcase
-      property[:volume_name] = device
+      property[:drive_type] = disk["drivetype"].to_i
+      property[:drive_type_string] = DRIVE_TYPE[disk["drivetype"].to_i]
+      property[:drive_type_human] = disk["description"].to_s
+      property[:volume_name] = disk["volumename"].to_s
       property[:device] = device
 
       key = "#{device},#{mount}"
@@ -747,7 +753,7 @@ Ohai.plugin(:Filesystem) do
 
   collect_data(:windows) do
     require "wmi-lite/wmi"
-    require "ohai/mash"
+    require_relative "../mash"
 
     fs = merge_info(logical_info, encryptable_info)
 

data/lib/ohai/plugins/kernel.rb

@@ -4,7 +4,7 @@
 # Author:: Bryan McLellan (<btm@loftninjas.org>)
 # Author:: Claire McQuin (<claire@chef.io>)
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) 2008-2018 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software, Inc.
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # License:: Apache License, Version 2.0
 #
@@ -137,11 +137,12 @@ Ohai.plugin(:Kernel) do
     end
   end
 
-  # see if a WMI name is blacklisted so we can avoid writing out
-  # useless data to ohai
+  # see if a WMI name is in the blocked list so we can avoid writing
+  # out useless data to ohai
+  #
   # @param [String] name the wmi name to check
-  # @return [Boolean] is the wmi name blacklisted
-  def blacklisted_wmi_name?(name)
+  # @return [Boolean] is the wmi name in the blocked list
+  def blocked_wmi_name?(name)
     [
      "creation_class_name", # this is just the wmi name
      "cs_creation_class_name", # this is just the wmi name
@@ -262,7 +263,7 @@ Ohai.plugin(:Kernel) do
     host = wmi.first_of("Win32_OperatingSystem")
     kernel[:os_info] = Mash.new
     host.wmi_ole_object.properties_.each do |p|
-      next if blacklisted_wmi_name?(p.name.wmi_underscore)
+      next if blocked_wmi_name?(p.name.wmi_underscore)
 
       kernel[:os_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase]
     end
@@ -277,7 +278,7 @@ Ohai.plugin(:Kernel) do
     kernel[:cs_info] = Mash.new
     host = wmi.first_of("Win32_ComputerSystem")
     host.wmi_ole_object.properties_.each do |p|
-      next if blacklisted_wmi_name?(p.name.wmi_underscore)
+      next if blocked_wmi_name?(p.name.wmi_underscore)
 
       kernel[:cs_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase]
     end

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

@@ -118,8 +118,8 @@ Ohai.plugin(:Virtualization) do
 
     # parse dmi to discover various virtualization guests
     # we do this *after* the kvm detection so that OpenStack isn't detected as KVM
-    logger.trace("Looking up DMI data manufacturer: '#{get_attribute(:dmi, :system, :manufacturer)}' product: '#{get_attribute(:dmi, :system, :product)}' version: '#{get_attribute(:dmi, :system, :version)}'")
-    guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product), get_attribute(:dmi, :system, :version))
+    logger.trace("Looking up DMI data manufacturer: '#{get_attribute(:dmi, :system, :manufacturer)}' product_name: '#{get_attribute(:dmi, :system, :product_name)}' version: '#{get_attribute(:dmi, :system, :version)}'")
+    guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product_name), get_attribute(:dmi, :system, :version))
     if guest
       logger.trace("Plugin Virtualization: DMI data indicates #{guest} guest")
       virtualization[:system] = guest

data/lib/ohai/plugins/openstack.rb

@@ -51,11 +51,11 @@ Ohai.plugin(:Openstack) do
     # dream host doesn't support windows so bail early if we're on windows
     return "openstack" if RUBY_PLATFORM =~ /mswin|mingw32|windows/
 
-    if Etc.getpwnam("dhc-user")
+    if Etc::Passwd.entries.map(&:name).include?("dhc-user")
       "dreamhost"
+    else
+      "openstack"
     end
-  rescue ArgumentError # getpwnam raises ArgumentError if the user is not found
-    "openstack"
   end
 
   collect_data do

data/lib/ohai/plugins/shard.rb

@@ -22,10 +22,12 @@ Ohai.plugin(:ShardSeed) do
 
   def get_dmi_property(dmi, thing)
     %w{system base_board chassis}.each do |section|
-      unless dmi[section][thing].strip.empty?
+      if dmi[section] && dmi[section][thing] && !dmi[section][thing].strip.empty?
         return dmi[section][thing]
       end
     end
+    Ohai::Log.error("shard_seed: Failed to get dmi property #{thing}: is dmidecode installed?")
+    raise "Failed to generate shard_seed"
   end
 
   def default_sources
@@ -77,11 +79,16 @@ Ohai.plugin(:ShardSeed) do
                 yield(src)
               end
     end
+    if data.empty?
+      Ohai::Log.error("shard_seed: Unable to generate seed! Either ensure 'dmidecode' is installed, or use 'Ohai.config[:plugin][:shard_seed][:sources]' to set different sources.")
+      raise "Failed to generate shard_seed"
+    end
     shard_seed digest_algorithm.hexdigest(data)[0...7].to_i(16)
   end
 
   collect_data do
     create_seed do |src|
+      Ohai::Log.error("shard_seed: No such source #{src}")
       raise "No such shard_seed source: #{src}"
     end
   end
@@ -99,6 +106,7 @@ Ohai.plugin(:ShardSeed) do
       when :uuid
         wmi.first_of("Win32_ComputerSystemProduct")["UUID"]
       else
+        Ohai::Log.error("shard_seed: No such source #{src}")
         raise "No such shard_seed source: #{src}"
       end
     end
@@ -112,6 +120,7 @@ Ohai.plugin(:ShardSeed) do
       when :uuid
         hardware["platform_UUID"]
       else
+        Ohai::Log.error("shard_seed: No such source #{src}")
         raise "No such shard_seed source: #{src}"
       end
     end
@@ -125,6 +134,7 @@ Ohai.plugin(:ShardSeed) do
       when :uuid
         get_dmi_property(dmi, :uuid)
       else
+        Ohai::Log.error("shard_seed: No such source #{src}")
         raise "No such shard_seed source: #{src}"
       end
     end

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

@@ -24,7 +24,7 @@ Ohai.plugin(:DMI) do
 
     # if we already have a "dmi" with keys (presumably from dmidecode), don't try smbios
     # note that a single key just means dmidecode exited with its version
-    if (dmi.class.to_s == "Mash") && (dmi.keys.length > 1)
+    if dmi.is_a?(Mash) && dmi.keys.length > 1
       logger.trace("Plugin DMI: skipping smbios output, since DMI information has already been provided")
       return
     end
@@ -177,7 +177,7 @@ Ohai.plugin(:DMI) do
           next
         end
         # overwrite "raw" value with a new Mash
-        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].class.to_s == "Mash"
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].is_a?(Mash)
         dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = extended_data[2]
 
       else

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "15.6.3".freeze
+  VERSION = "15.12.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 15.6.3
+  version: 15.12.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu