ohai 13.1.0 → 13.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a790e9dca44c313d60c13521eddb5f71fb17d95
-  data.tar.gz: b42fe376d2bc0ae29386b3d5e90607e65f47050a
+  metadata.gz: 2c77bbdaf5110dc3837d208227d35171c3abd7d7
+  data.tar.gz: 2781b142b0bf7b9201edbbb01b82d005f0703165
 SHA512:
-  metadata.gz: 9280f45b479f112e18e8118db63f9b091c94eab2a08756f3e306ee4fc23d4bba4246550c6c1e5d9fb2e2293eaeeac11da6946af12778258b3f96c5c236b13910
-  data.tar.gz: 94e260d4a12d569b9a8c3a0cef67359f05b82760b636f30f10658ebb73adcbcd9bd2af5a33681a715ce4c743d1ca3dc2292d83edcb8cb2fa5b0b0a023b01833a
+  metadata.gz: 4b0e442fe9e3506dac3b41c9f2cd239c04f649581df61f4302fe510e898f5dd4fff1ec8741704c0075025f3f76d98f5af55fb6beb8e5abd899803ffda6c014f2
+  data.tar.gz: e18343490101bc00c3f385b13d875f56c12c4724a404a2b1a30d863975fac898ce193330f600ef8d9a652eb7bff3a97df367ad2137fd73f914dcbaef3e2cff08

data/Gemfile

@@ -2,18 +2,27 @@ 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"
-  gem "overcommit", ">= 0.34.1"
-  gem "pry-byebug"
-  gem "pry-stack_explorer"
-  gem "rb-readline"
-  gem "rake", ">= 10.1.0", "< 12.0.0"
+  gem "rake", ">= 10.1.0"
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
   gem "rspec-mocks", "~> 3.0"
   gem "rspec-collection_matchers", "~> 1.0"
+  gem "ipaddr_extensions"
+end
+
+group :ci do
   gem "rspec_junit_formatter"
+end
+
+group :changelog do
   gem "github_changelog_generator", git: "https://github.com/chef/github-changelog-generator"
-  gem "ipaddr_extensions"
 end
+
+instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
+
+# If you want to load debugging tools into the bundle exec sandbox,
+# add these additional dependencies into Gemfile.local
+eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")

data/lib/ohai/common/dmi.rb

@@ -78,20 +78,18 @@ module Ohai
 
       # look up DMI ID
       def id_lookup(id)
-        begin
-          id = id.to_i
-          if (id >= 128) && (id <= 255)
-            id = "oem_data_#{id}"
-          elsif DMI::ID_TO_DESCRIPTION.has_key?(id)
-            id = DMI::ID_TO_DESCRIPTION[id]
-          else
-            Ohai::Log.debug("unrecognized header id; falling back to 'unknown'")
-            id = "unknown"
-          end
-        rescue
-          Ohai::Log.debug("failed to look up id #{id}, returning unchanged")
-          id
+        id = id.to_i
+        if (id >= 128) && (id <= 255)
+          id = "oem_data_#{id}"
+        elsif DMI::ID_TO_DESCRIPTION.has_key?(id)
+          id = DMI::ID_TO_DESCRIPTION[id]
+        else
+          Ohai::Log.debug("unrecognized header id; falling back to 'unknown'")
+          id = "unknown"
         end
+      rescue
+        Ohai::Log.debug("failed to look up id #{id}, returning unchanged")
+        id
       end
 
       # create simplified convenience access keys for each record type

data/lib/ohai/dsl/plugin.rb

@@ -180,14 +180,12 @@ module Ohai
 
       # emulates the old plugin loading behavior
       def safe_run
-        begin
-          self.run
-        rescue Ohai::Exceptions::Error => e
-          raise e
-        rescue => e
-          Ohai::Log.debug("Plugin #{self.name} threw #{e.inspect}")
-          e.backtrace.each { |line| Ohai::Log.debug( line ) }
-        end
+        run
+      rescue Ohai::Exceptions::Error => e
+        raise e
+      rescue => e
+        Ohai::Log.debug("Plugin #{name} threw #{e.inspect}")
+        e.backtrace.each { |line| Ohai::Log.debug( line ) }
       end
 
       def method_missing(name, *args)

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

@@ -44,7 +44,7 @@ module Ohai
         end
 
         def self.collect_contents(contents)
-          define_method(:run_plugin) { self.instance_eval(contents) }
+          define_method(:run_plugin) { instance_eval(contents) }
         end
 
         def provides(*paths)

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

@@ -85,11 +85,11 @@ module Ohai
           platform = collect_os
 
           if collector.has_key?(platform)
-            self.instance_eval(&collector[platform])
+            instance_eval(&collector[platform])
           elsif collector.has_key?(:default)
-            self.instance_eval(&collector[:default])
+            instance_eval(&collector[:default])
           else
-            Ohai::Log.debug("Plugin #{self.name}: No data to collect. Skipping...")
+            Ohai::Log.debug("Plugin #{name}: No data to collect. Skipping...")
           end
         end
 
@@ -122,7 +122,7 @@ module Ohai
           # Memory => ["", "Memory"]
           # NetworkListeners => ["", "Network", "", "Listeners"]
           # SSHHostKey => ["SSH", "Host", "", "Key"]
-          parts = self.name.to_s.split(/([A-Z][a-z]+)/)
+          parts = name.to_s.split(/([A-Z][a-z]+)/)
           # ["DMI"] => ["DMI"]
           # ["", "Memory"] => ["Memory"]
           # ["", "Network", "", "Listeners"] => ["Network", "Listeners"]

data/lib/ohai/mash.rb

@@ -135,7 +135,7 @@ class Mash < Hash
   #
   # @return [Mash] A new mash with the hash values merged in.
   def merge(hash)
-    self.dup.update(hash)
+    dup.update(hash)
   end
 
   # @param key<Object>

data/lib/ohai/mixin/command.rb

@@ -37,13 +37,13 @@ module Ohai
         so = Mixlib::ShellOut.new(cmd, options)
         begin
           so.run_command
-          Ohai::Log.debug("Plugin #{self.name}: ran '#{cmd}' and returned #{so.exitstatus}")
+          Ohai::Log.debug("Plugin #{name}: ran '#{cmd}' and returned #{so.exitstatus}")
           so
         rescue Errno::ENOENT => e
-          Ohai::Log.debug("Plugin #{self.name}: ran '#{cmd}' and failed #{e.inspect}")
+          Ohai::Log.debug("Plugin #{name}: ran '#{cmd}' and failed #{e.inspect}")
           raise Ohai::Exceptions::Exec, e
         rescue Mixlib::ShellOut::CommandTimeout => e
-          Ohai::Log.debug("Plugin #{self.name}: ran '#{cmd}' and timed out after #{options[:timeout]} seconds")
+          Ohai::Log.debug("Plugin #{name}: ran '#{cmd}' and timed out after #{options[:timeout]} seconds")
           raise Ohai::Exceptions::Exec, e
         end
       end

data/lib/ohai/mixin/dmi_decode.rb

@@ -46,6 +46,6 @@ module ::Ohai::Mixin::DmiDecode
         return "veertu"
       end
     end
-    return nil
+    nil
   end
 end

data/lib/ohai/mixin/ec2_metadata.rb

@@ -49,24 +49,24 @@ module Ohai
 
       def best_api_version
         @api_version ||= begin
-          Ohai::Log.debug("ec2 metadata mixin: Fetching http://#{EC2_METADATA_ADDR}/ to determine the latest supported metadata release")
+          Ohai::Log.debug("Mixin EC2: Fetching http://#{EC2_METADATA_ADDR}/ to determine the latest supported metadata release")
           response = http_client.get("/")
           if response.code == "404"
-            Ohai::Log.debug("ec2 metadata mixin: Received HTTP 404 from metadata server while determining API version, assuming 'latest'")
+            Ohai::Log.debug("Mixin EC2: Received HTTP 404 from metadata server while determining API version, assuming 'latest'")
             return "latest"
           elsif response.code != "200"
-            raise "Unable to determine EC2 metadata version (returned #{response.code} response)"
+            raise "Mixin EC2: Unable to determine EC2 metadata version (returned #{response.code} response)"
           end
           # Note: Sorting the list of versions may have unintended consequences in
           # non-EC2 environments. It appears to be safe in EC2 as of 2013-04-12.
           versions = response.body.split("\n").sort
           until versions.empty? || EC2_SUPPORTED_VERSIONS.include?(versions.last)
             pv = versions.pop
-            Ohai::Log.debug("ec2 metadata mixin: EC2 lists metadata version: #{pv} not yet supported by Ohai") unless pv == "latest"
+            Ohai::Log.debug("Mixin EC2: EC2 lists metadata version: #{pv} not yet supported by Ohai") unless pv == "latest"
           end
-          Ohai::Log.debug("ec2 metadata mixin: Latest supported EC2 metadata version: #{versions.last}")
+          Ohai::Log.debug("Mixin EC2: Latest supported EC2 metadata version: #{versions.last}")
           if versions.empty?
-            raise "Unable to determine EC2 metadata version (no supported entries found)"
+            raise "Mixin EC2: Unable to determine EC2 metadata version (no supported entries found)"
           end
           versions.last
         end
@@ -88,16 +88,16 @@ module Ohai
       #   `nil` and continue the run instead of failing it.
       def metadata_get(id, api_version)
         path = "/#{api_version}/meta-data/#{id}"
-        Ohai::Log.debug("ec2 metadata mixin: Fetching http://#{EC2_METADATA_ADDR}#{path}")
+        Ohai::Log.debug("Mixin EC2: Fetching http://#{EC2_METADATA_ADDR}#{path}")
         response = http_client.get(path)
         case response.code
         when "200"
           response.body
         when "404"
-          Ohai::Log.debug("ec2 metadata mixin: Encountered 404 response retreiving EC2 metadata path: #{path} ; continuing.")
+          Ohai::Log.debug("Mixin EC2: Encountered 404 response retreiving EC2 metadata path: #{path} ; continuing.")
           nil
         else
-          raise "Encountered error retrieving EC2 metadata (#{path} returned #{response.code} response)"
+          raise "Mixin EC2: Encountered error retrieving EC2 metadata (#{path} returned #{response.code} response)"
         end
       end
 
@@ -169,7 +169,7 @@ module Ohai
       end
 
       def fetch_userdata
-        Ohai::Log.debug("ec2 metadata mixin: Fetching http://#{EC2_METADATA_ADDR}/#{best_api_version}/user-data/")
+        Ohai::Log.debug("Mixin EC2: Fetching http://#{EC2_METADATA_ADDR}/#{best_api_version}/user-data/")
         response = http_client.get("/#{best_api_version}/user-data/")
         response.code == "200" ? response.body : nil
       end

data/lib/ohai/mixin/os.rb

@@ -26,32 +26,32 @@ module Ohai
       def collect_os
         case ::RbConfig::CONFIG["host_os"]
         when /aix(.+)$/
-          return "aix"
+          "aix"
         when /darwin(.+)$/
-          return "darwin"
+          "darwin"
         when /hpux(.+)$/
-          return "hpux"
+          "hpux"
         when /linux/
-          return "linux"
+          "linux"
         when /freebsd(.+)$/
-          return "freebsd"
+          "freebsd"
         when /openbsd(.+)$/
-          return "openbsd"
+          "openbsd"
         when /netbsd(.*)$/
-          return "netbsd"
+          "netbsd"
         when /dragonfly(.*)$/
-          return "dragonflybsd"
+          "dragonflybsd"
         when /solaris2/
-          return "solaris2"
+          "solaris2"
         when /mswin|mingw32|windows/
           # After long discussion in IRC the "powers that be" have come to a consensus
           # that no Windows platform exists that was not based on the
           # Windows_NT kernel, so we herby decree that "windows" will refer to all
           # platforms built upon the Windows_NT kernel and have access to win32 or win64
           # subsystems.
-          return "windows"
+          "windows"
         else
-          return ::RbConfig::CONFIG["host_os"]
+          ::RbConfig::CONFIG["host_os"]
         end
       end
 

data/lib/ohai/mixin/softlayer_metadata.rb

@@ -54,11 +54,11 @@ module ::Ohai::Mixin::SoftlayerMetadata
     if res.code.to_i.between?(200, 299)
       res.body
     else
-      ::Ohai::Log.error("Unable to fetch item #{full_url}: status (#{res.code}) body (#{res.body})")
+      ::Ohai::Log.error("Mixin Softlayer: Unable to fetch item #{full_url}: status (#{res.code}) body (#{res.body})")
       nil
     end
   rescue => e
-    ::Ohai::Log.error("Unable to fetch softlayer metadata from #{u}: #{e.class}: #{e.message}")
+    ::Ohai::Log.error("Mixin Softlayer: Unable to fetch softlayer metadata from #{u}: #{e.class}: #{e.message}")
     raise e
   end
 end

data/lib/ohai/mixin/string.rb

@@ -23,7 +23,7 @@ class String
   # This should implement the same functionality as underscore method in
   # ActiveSupport::CoreExtensions::String::Inflections
   def wmi_underscore
-    self.gsub(/::/, "/").gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+    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/azure.rb

@@ -41,7 +41,7 @@ Ohai.plugin(:Azure) do
   def has_waagent?
     if File.exist?("/usr/sbin/waagent") || Dir.exist?('C:\WindowsAzure')
       Ohai::Log.debug("Plugin Azure: Found waagent used by MS Azure.")
-      return true
+      true
     end
   end
 
@@ -56,7 +56,7 @@ Ohai.plugin(:Azure) do
         end
       end
     end
-    return has_245
+    has_245
   end
 
 end

data/lib/ohai/plugins/c.rb

@@ -123,18 +123,17 @@ Ohai.plugin(:C) do
 
   def collect_xlc
     # ibm xlc
-    begin
-      so = shell_out("xlc -qversion")
-      if so.exitstatus == 0 || (so.exitstatus >> 8) == 249
-        description = so.stdout.split($/).first
-        if description =~ /V(\d+\.\d+)/
-          @c[:xlc] = Mash.new
-          @c[:xlc][:version] = $1
-          @c[:xlc][:description] = description.strip
-        end
+
+    so = shell_out("xlc -qversion")
+    if so.exitstatus == 0 || (so.exitstatus >> 8) == 249
+      description = so.stdout.split($/).first
+      if description =~ /V(\d+\.\d+)/
+        @c[:xlc] = Mash.new
+        @c[:xlc][:version] = $1
+        @c[:xlc][:description] = description.strip
       end
-    rescue Ohai::Exceptions::Exec
     end
+  rescue Ohai::Exceptions::Exec
   end
 
   def collect_sunpro

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

@@ -22,25 +22,29 @@ Ohai.plugin(:CPU) do
 
   collect_data(:darwin) do
     cpu Mash.new
-    so = shell_out("sysctl -n hw.packages")
-    cpu[:real] = so.stdout.to_i
-    so = shell_out("sysctl -n hw.physicalcpu")
-    cpu[:cores] = so.stdout.to_i
-    so = shell_out("sysctl -n hw.logicalcpu")
-    cpu[:total] = so.stdout.to_i
-    so = shell_out("sysctl -n hw.cpufrequency")
-    cpu[:mhz] = so.stdout.to_i / 1000000
-    so = shell_out("sysctl -n machdep.cpu.vendor")
-    cpu[:vendor_id] = so.stdout.chomp
-    so = shell_out("sysctl -n machdep.cpu.brand_string")
-    cpu[:model_name] = so.stdout.chomp
-    so = shell_out("sysctl -n machdep.cpu.model")
-    cpu[:model] = so.stdout.to_i
-    so = shell_out("sysctl -n machdep.cpu.family")
-    cpu[:family] = so.stdout.to_i
-    so = shell_out("sysctl -n machdep.cpu.stepping")
-    cpu[:stepping] = so.stdout.to_i
-    so = shell_out("sysctl -n machdep.cpu.features")
-    cpu[:flags] = so.stdout.downcase.split(" ")
+    shell_out("sysctl -a").stdout.lines.each do |line|
+      case line
+      when /^hw.packages: (.*)$/
+        cpu[:real] = Regexp.last_match[1].to_i
+      when /^hw.physicalcpu: (.*)$/
+        cpu[:cores] = Regexp.last_match[1].to_i
+      when /^hw.logicalcpu: (.*)$/
+        cpu[:total] = Regexp.last_match[1].to_i
+      when /^hw.cpufrequency: (.*)$/
+        cpu[:mhz] = Regexp.last_match[1].to_i / 1000000
+      when /^machdep.cpu.vendor: (.*)$/
+        cpu[:vendor_id] = Regexp.last_match[1].chomp
+      when /^machdep.cpu.brand_string: (.*)$/
+        cpu[:model_name] = Regexp.last_match[1].chomp
+      when /^machdep.cpu.model: (.*)$/
+        cpu[:model] = Regexp.last_match[1].to_i
+      when /^machdep.cpu.family: (.*)$/
+        cpu[:family] = Regexp.last_match[1].to_i
+      when /^machdep.cpu.stepping: (.*)$/
+        cpu[:stepping] = Regexp.last_match[1].to_i
+      when /^machdep.cpu.features: (.*)$/
+        cpu[:flags] = Regexp.last_match[1].downcase.split(" ")
+      end
+    end
   end
 end

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

@@ -30,7 +30,7 @@ Ohai.plugin(:Hardware) do
     unless hardware
       hardware Mash.new
     else
-      Ohai::Log.debug("Plugin Darwin Hardware: namespace already exists")
+      Ohai::Log.debug("Plugin Hardware: namespace already exists")
       next
     end
 
@@ -46,16 +46,22 @@ Ohai.plugin(:Hardware) do
     hw_hash[0]["_items"][0].delete("_name")
     hardware.merge!(hw_hash[0]["_items"][0])
 
-    {
-      "operating_system" => "sw_vers -productName",
-      "operating_system_version" => "sw_vers -productVersion",
-      "build_version" => "sw_vers -buildVersion",
-      "architecture" => "uname -m",
-    }.each do |var, cmd|
-      os_info = shell_out(cmd).stdout
-      hardware[var] = os_info.strip unless os_info.nil?
+    # ProductName:	Mac OS X
+    # ProductVersion:	10.12.5
+    # BuildVersion:	16F73
+    shell_out("sw_vers").stdout.lines.each do |line|
+      case line
+      when /^ProductName:\s*(.*)$/
+        hardware["operating_system"] = Regexp.last_match[1].strip
+      when /^ProductVersion:\s*(.*)$/
+        hardware["operating_system_version"] = Regexp.last_match[1].strip
+      when /^BuildVersion:\s*(.*)$/
+        hardware["build_version"] = Regexp.last_match[1].strip
+      end
     end
 
+    hardware["architecture"] = shell_out("uname -m").stdout.strip
+
     # Storage queries
     storage = []
     storage_hash = system_profiler("SPStorageDataType")

data/lib/ohai/plugins/digital_ocean.rb

@@ -38,13 +38,13 @@ Ohai.plugin(:DigitalOcean) do
       # dmi[:bios][:all_records][0][:Vendor] may not exist
     end
     Ohai::Log.debug("Plugin DigitalOcean: has_do_dmi? == false")
-    return false
+    false
   end
 
   def looks_like_digital_ocean?
     return true if hint?("digital_ocean")
     return true if has_do_dmi? && can_socket_connect?(Ohai::Mixin::DOMetadata::DO_METADATA_ADDR, 80)
-    return false
+    false
   end
 
   collect_data do