ohai 8.10.0 → 8.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df97b8b25c82b3afc5230e4be648989481aa4082
-  data.tar.gz: b6814cfa34071bd5e11bee94c417c0e57035c32e
+  metadata.gz: f773eb5ea1a32204f9cf602455776492dded72e5
+  data.tar.gz: 9a49d6bba8ea5058935e8a7f12d4ad204db71168
 SHA512:
-  metadata.gz: aa2aa6235d8baf1371e4a40c6fb3b7d2e238a6d3da7a460cb312519ed24d4a8edd9d9188b0f02b9c77e47bcc838583fffe2422aba57663750b4003c8945386ea
-  data.tar.gz: 8578b6b564b23aef84eea2efcc356df71f4a410ae212a25ee213542eab8ce63c4f82a026741c2f78cef647729e405289f71ac641df52f30f7cd9c3d68bc04364
+  metadata.gz: 102f27a1df33f5049c3ca49ed6d4944281b65a2702cdbc11fd7dc2d62fb4fd185359581db7380936ec1d86bc04ca0224bdd6cd237f01695653ba3130b815d284
+  data.tar.gz: 148e626698de7337b8ebaf79b882786ead5a6d7ef04b71d475047c016874952a3f1d5bcae5ea97a2361d3bd354056f99a55833434b29d5d391c115075054320c

data/Gemfile

@@ -6,9 +6,8 @@ group :development do
   gem "chef", github: "chef/chef", branch: "master"
 
   gem "sigar", :platform => "ruby"
-  gem 'plist'
 
-  gem "chefstyle", "= 0.1.0"
+  gem "chefstyle", "= 0.3.0"
   # gem 'pry-byebug'
   # gem 'pry-stack_explorer'
 end

data/Rakefile

@@ -1,12 +1,12 @@
 require "bundler/gem_tasks"
-require 'date'
-require 'ohai/version'
+require "date"
+require "ohai/version"
 
 begin
-  require 'rspec/core/rake_task'
+  require "rspec/core/rake_task"
 
   RSpec::Core::RakeTask.new do |t|
-    t.pattern = 'spec/**/*_spec.rb'
+    t.pattern = "spec/**/*_spec.rb"
   end
 rescue LoadError
   desc "rspec is not installed, this task is disabled"
@@ -22,3 +22,12 @@ require "rubocop/rake_task"
 RuboCop::RakeTask.new(:style) do |task|
   task.options += ["--display-cop-names", "--no-color"]
 end
+
+require "github_changelog_generator/task"
+
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.future_release = Ohai::VERSION
+  config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
+  config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
+  config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion".split(",")
+end

data/bin/ohai

@@ -19,9 +19,8 @@
 # limitations under the License.
 #
 
-
 begin
-  require 'rubygems'
+  require "rubygems"
 rescue LoadError
   # must be debian! ;)
   missing_rubygems = true
@@ -29,8 +28,8 @@ end
 begin
   # if we're in a source code checkout, we want to run the code from that.
   # have to do this *after* rubygems is loaded.
-  $:.unshift File.expand_path('../../lib', __FILE__)
-  require 'ohai/application'
+  $:.unshift File.expand_path("../../lib", __FILE__)
+  require "ohai/application"
 rescue LoadError
   if missing_rubygems
     STDERR.puts "rubygems previously failed to load - is it installed?"

data/lib/ohai.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'ohai/version'
-require 'ohai/config'
-require 'ohai/system'
-require 'ohai/exception'
+require "ohai/version"
+require "ohai/config"
+require "ohai/system"
+require "ohai/exception"

data/lib/ohai/application.rb

@@ -15,11 +15,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'chef-config/path_helper'
-require 'chef-config/workstation_config_loader'
-require 'ohai'
-require 'ohai/log'
-require 'mixlib/cli'
+require "chef-config/path_helper"
+require "chef-config/workstation_config_loader"
+require "ohai"
+require "ohai/log"
+require "mixlib/cli"
 
 class Ohai::Application
   include Mixlib::CLI
@@ -62,7 +62,7 @@ class Ohai::Application
     :long         => "--version",
     :description  => "Show Ohai version",
     :boolean      => true,
-    :proc         => lambda {|v| puts "Ohai: #{::Ohai::VERSION}"},
+    :proc         => lambda { |v| puts "Ohai: #{::Ohai::VERSION}" },
     :exit         => 0
 
   def initialize
@@ -113,6 +113,7 @@ class Ohai::Application
   end
 
   private
+
   def load_workstation_config
     config_loader = ChefConfig::WorkstationConfigLoader.new(
       config[:config_file], Ohai::Log

data/lib/ohai/common/dmi.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,48 +25,48 @@ module Ohai
       # 128-255 are 'oem_data_[id]'
       # Everything else is 'unknown'
       IdToDescription = {
-        0 =>   'bios',
-        1 =>   'system',
-        2 =>   'base_board',
-        3 =>   'chassis',
-        4 =>   'processor',
-        5 =>   'memory_controller',
-        6 =>   'memory_module',
-        7 =>   'cache',
-        8 =>   'port_connector',
-        9 =>   'system_slots',
-        10 =>  'on_board_devices',
-        11 =>  'oem_strings',
-        12 =>  'system_configuration_options',
-        13 =>  'bios_language',
-        14 =>  'group_associations',
-        15 =>  'system_event_log',
-        16 =>  'physical_memory_array',
-        17 =>  'memory_device',
-        18 =>  '32_bit_memory_error',
-        19 =>  'memory_array_mapped_address',
-        20 =>  'memory_device_mapped_address',
-        21 =>  'built_in_pointing_device',
-        22 =>  'portable_battery',
-        23 =>  'system_reset',
-        24 =>  'hardware_security',
-        25 =>  'system_power_controls',
-        26 =>  'voltage_probe',
-        27 =>  'cooling_device',
-        28 =>  'temperature_probe',
-        29 =>  'electrical_current_probe',
-        30 =>  'out_of_band_remote_access',
-        31 =>  'boot_integrity_services',
-        32 =>  'system_boot',
-        33 =>  '64_bit_memory_error',
-        34 =>  'management_device',
-        35 =>  'management_device_component',
-        36 =>  'management_device_threshold_data',
-        37 =>  'memory_channel',
-        38 =>  'ipmi_device',
-        39 =>  'power_supply',
-        126 => 'disabled_entries',
-        127 => 'end_of_table_marker',
+        0 =>   "bios",
+        1 =>   "system",
+        2 =>   "base_board",
+        3 =>   "chassis",
+        4 =>   "processor",
+        5 =>   "memory_controller",
+        6 =>   "memory_module",
+        7 =>   "cache",
+        8 =>   "port_connector",
+        9 =>   "system_slots",
+        10 =>  "on_board_devices",
+        11 =>  "oem_strings",
+        12 =>  "system_configuration_options",
+        13 =>  "bios_language",
+        14 =>  "group_associations",
+        15 =>  "system_event_log",
+        16 =>  "physical_memory_array",
+        17 =>  "memory_device",
+        18 =>  "32_bit_memory_error",
+        19 =>  "memory_array_mapped_address",
+        20 =>  "memory_device_mapped_address",
+        21 =>  "built_in_pointing_device",
+        22 =>  "portable_battery",
+        23 =>  "system_reset",
+        24 =>  "hardware_security",
+        25 =>  "system_power_controls",
+        26 =>  "voltage_probe",
+        27 =>  "cooling_device",
+        28 =>  "temperature_probe",
+        29 =>  "electrical_current_probe",
+        30 =>  "out_of_band_remote_access",
+        31 =>  "boot_integrity_services",
+        32 =>  "system_boot",
+        33 =>  "64_bit_memory_error",
+        34 =>  "management_device",
+        35 =>  "management_device_component",
+        36 =>  "management_device_threshold_data",
+        37 =>  "memory_channel",
+        38 =>  "ipmi_device",
+        39 =>  "power_supply",
+        126 => "disabled_entries",
+        127 => "end_of_table_marker",
       }
 
       # list of IDs to collect, otherwise we generate pages of hashes about cache chip size and whatnot
@@ -83,7 +83,7 @@ module Ohai
             id = DMI::IdToDescription[id]
           else
             Ohai::Log.debug("unrecognized header id; falling back to 'unknown'")
-            id = 'unknown'
+            id = "unknown"
           end
         rescue
           Ohai::Log.debug("failed to look up id #{id}, returning unchanged")
@@ -95,17 +95,17 @@ module Ohai
       # for single occurrences of one type, copy to top level all fields and values
       # for multiple occurrences of same type, copy to top level all fields and values that are common to all records
       def convenience_keys(dmi)
-        dmi.each{ |type, records|
+        dmi.each { |type, records|
           in_common = Mash.new
-          next unless records.class.to_s == 'Mash'
-          next unless records.has_key?('all_records')
-          records[:all_records].each{ |record| 
-            record.each{ |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]/, '_')
+          next unless records.class.to_s == "Mash"
+          next unless records.has_key?("all_records")
+          records[:all_records].each { |record|
+            record.each { |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.has_key?(translated)
                 in_common[translated] = nil unless in_common[translated] == value
@@ -114,7 +114,7 @@ module Ohai
               end
             }
           }
-          in_common.each{ |field, value|
+          in_common.each { |field, value|
             next if value == nil
             dmi[type][field] = value.strip
           }

data/lib/ohai/config.rb

@@ -17,10 +17,10 @@
 # limitations under the License.
 #
 
-require 'chef-config/config'
-require 'ohai/exception'
-require 'ohai/log'
-require 'ohai/plugin_config'
+require "chef-config/config"
+require "ohai/exception"
+require "ohai/log"
+require "ohai/plugin_config"
 
 module Ohai
   Config = ChefConfig::Config
@@ -30,16 +30,19 @@ module Ohai
   class Config
     # These methods need to be defined before they are used as config defaults,
     # otherwise they will get method_missing'd to nil.
+
     private
+
     def self.default_hints_path
-      [ ChefConfig::Config.platform_specific_path('/etc/chef/ohai/hints') ]
+      [ ChefConfig::Config.platform_specific_path("/etc/chef/ohai/hints") ]
     end
 
     def self.default_plugin_path
-      [ File.expand_path(File.join(File.dirname(__FILE__), 'plugins')) ]
+      [ File.expand_path(File.join(File.dirname(__FILE__), "plugins")) ]
     end
 
     public
+
     # Copy deprecated configuration options into the ohai config context.
     def self.merge_deprecated_config
       [ :hints_path, :plugin_path ].each do |option|
@@ -68,7 +71,7 @@ module Ohai
       :disabled_plugins,
       :log_level,
       :log_location,
-      :version
+      :version,
     ].each do |option|
       # https://docs.chef.io/config_rb_client.html#ohai-settings
       # hints_path and plugin_path are intentionally excluded here; warnings for
@@ -100,6 +103,7 @@ module Ohai
     end
 
     private
+
     def self.option_deprecated(option)
       <<-EOM.chomp!.gsub("\n", " ")
 Ohai::Config[:#{option}] is set. Ohai::Config[:#{option}] is deprecated and will
@@ -119,6 +123,6 @@ EOM
 
   # Shortcut for Ohai::Config.ohai
   def self.config
-    Config::ohai
+    Config.ohai
   end
 end

data/lib/ohai/dsl.rb

@@ -17,6 +17,6 @@
 # limitations under the License.
 #
 
-require 'ohai/dsl/plugin'
-require 'ohai/dsl/plugin/versionvi'
-require 'ohai/dsl/plugin/versionvii'
+require "ohai/dsl/plugin"
+require "ohai/dsl/plugin/versionvi"
+require "ohai/dsl/plugin/versionvii"

data/lib/ohai/dsl/plugin.rb

@@ -18,10 +18,10 @@
 # limitations under the License.
 #
 
-require 'ohai/mixin/os'
-require 'ohai/mixin/command'
-require 'ohai/mixin/seconds_to_human'
-require 'ohai/hints'
+require "ohai/mixin/os"
+require "ohai/mixin/command"
+require "ohai/mixin/seconds_to_human"
+require "ohai/hints"
 
 module Ohai
 
@@ -171,7 +171,7 @@ module Ohai
           raise e
         rescue => e
           Ohai::Log.debug("Plugin #{self.name} threw #{e.inspect}")
-          e.backtrace.each { |line| Ohai::Log.debug( line )}
+          e.backtrace.each { |line| Ohai::Log.debug( line ) }
         end
       end
 

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

@@ -59,4 +59,3 @@ module Ohai
     end
   end
 end
-

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

@@ -112,6 +112,7 @@ module Ohai
         end
 
         private
+
         def plugin_config
           @plugin_config ||= fetch_plugin_config
         end

data/lib/ohai/hints.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'ffi_yajl'
+require "ffi_yajl"
 
 module Ohai
   module Hints

data/lib/ohai/loader.rb

@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require 'chef-config/path_helper'
-require 'ohai/log'
-require 'ohai/mash'
-require 'ohai/dsl'
-require 'pathname'
+require "chef-config/path_helper"
+require "ohai/log"
+require "ohai/mash"
+require "ohai/dsl"
+require "pathname"
 
 module Ohai
 
@@ -39,7 +39,7 @@ module Ohai
 
       # Finds all the *.rb files under the configured paths in :plugin_path
       def self.find_all_in(plugin_dir)
-        Dir[File.join(ChefConfig::PathHelper.escape_glob(plugin_dir), "**", "*.rb")].map do |file|
+        Dir[File.join(ChefConfig::PathHelper.escape_glob_dir(plugin_dir), "**", "*.rb")].map do |file|
           new(file, plugin_dir)
         end
       end
@@ -95,7 +95,7 @@ module Ohai
     # If `plugin_dir_path` is given, and the file at `plugin_path` is a v6
     # plugin, the 'relative path' of the plugin (used by `require_plugin()`) is
     # computed by finding the relative path from `plugin_dir_path` to `plugin_path`
-    def load_plugin_class(plugin_path, plugin_dir_path=nil)
+    def load_plugin_class(plugin_path, plugin_dir_path = nil)
       # Read the contents of the plugin to understand if it's a V6 or V7 plugin.
       contents = ""
       begin

data/lib/ohai/log.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'mixlib/log'
+require "mixlib/log"
 
 module Ohai
   class Log

data/lib/ohai/mash.rb

@@ -128,7 +128,7 @@ class Mash < Hash
   #
   # @return [Array] The values at each of the provided keys
   def values_at(*indices)
-    indices.collect {|key| self[convert_key(key)]}
+    indices.collect { |key| self[convert_key(key)] }
   end
 
   # @param hash<Hash> The hash to merge with the mash.
@@ -152,7 +152,7 @@ class Mash < Hash
   #   { :one => 1, :two => 2, :three => 3 }.except(:one)
   #     #=> { "two" => 2, "three" => 3 }
   def except(*keys)
-    super(*keys.map {|k| convert_key(k)})
+    super(*keys.map { |k| convert_key(k) })
   end
 
   # Used to provide the same interface as Hash.
@@ -181,6 +181,7 @@ class Mash < Hash
   end
 
   protected
+
   # @param key<Object> The key to convert.
   #
   # @param [Object]