ohai 15.0.35 → 15.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b536c237b18f6b940c6a9082745d73d0c092e45f250129d4648e1b13834d0f
-  data.tar.gz: e2efa2a548dd3270584593fc5bc056043cae6a85902c6d0dfbc6a3b27cf78934
+  metadata.gz: f7c38d18ba317c18ecba9a443a7e56bd45b6ae8eb546694588954699ef74f5e8
+  data.tar.gz: 6708362273b4e202c3b6dc59e65490618b72ad6b79eaab1065e85a0c5b3cc4e9
 SHA512:
-  metadata.gz: '0038af185c2ba323b41cef83792e77072efb95b02ef3e506814712504ed7e90b518e576a515ace49455b604f602f9ebdf54746899ebd233a0b485d604b63d941'
-  data.tar.gz: 2f507deee0668f4f9aa0eb06b1616535e3abf1a9101097d89fb485763e804b8a61470249bc905aa95c2dd706fc7b11f0e4dbd7cf2760bb49aae3b9e3bf2c90b5
+  metadata.gz: ad8dc68e5fae6d069e227f5678a3e0e2d78cb098a17de6cdff595feeb24515e3c3fe86d1c63ea1a583a334350d3b6fd123fda0dfb63c1f4c37ac5117375aabb1
+  data.tar.gz: 463c53e37b1a8bdc6a0f9606c7316109ee8fbf72049f39c7dbac7fae93f584b7ede41174e4e619ac2a8a1ebc70e78515b156f8ba77f5795365e5fd57707cfe32

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_relative "ohai/version"
+require_relative "ohai/config"
+require_relative "ohai/system"
+require_relative "ohai/exception"

data/lib/ohai/application.rb

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

data/lib/ohai/config.rb

@@ -18,8 +18,8 @@
 #
 
 require "chef-config/config"
-require "ohai/exception"
-require "ohai/plugin_config"
+require_relative "exception"
+require_relative "plugin_config"
 
 module Ohai
   Config = ChefConfig::Config

data/lib/ohai/dsl.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 #
 
-require "ohai/dsl/plugin"
-require "ohai/dsl/plugin/versionvii"
+require_relative "dsl/plugin"
+require_relative "dsl/plugin/versionvii"

data/lib/ohai/dsl/plugin.rb

@@ -18,11 +18,11 @@
 # limitations under the License.
 #
 
-require "ohai/mixin/os"
-require "ohai/mixin/command"
-require "ohai/mixin/seconds_to_human"
-require "ohai/hints"
-require "ohai/util/file_helper"
+require_relative "../mixin/os"
+require_relative "../mixin/command"
+require_relative "../mixin/seconds_to_human"
+require_relative "../hints"
+require_relative "../util/file_helper"
 
 module Ohai
 

data/lib/ohai/hints.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Ohai
   # Ohai hints are json files on disk that give ohai a hint to things that are often

data/lib/ohai/loader.rb

@@ -17,10 +17,10 @@
 #
 
 require "chef-config/path_helper"
-require "ohai/log"
-require "ohai/mash"
-require "ohai/dsl"
-require "pathname"
+require_relative "log"
+require_relative "mash"
+require_relative "dsl"
+require "pathname" unless defined?(Pathname)
 
 module Ohai
 

data/lib/ohai/mixin/azure_metadata.rb

@@ -15,14 +15,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "net/http"
+require "net/http" unless defined?(Net::HTTP)
 
 module Ohai
   module Mixin
     module AzureMetadata
 
-      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)
+      AZURE_METADATA_ADDR ||= "169.254.169.254".freeze
+      AZURE_METADATA_URL ||= "/metadata/instance?api-version=2017-08-01".freeze
 
       # fetch the meta content with a timeout and the required header
       def http_get(uri)

data/lib/ohai/mixin/command.rb

@@ -17,9 +17,9 @@
 # limitations under the License.
 #
 
-require "ohai/exception"
-require "ohai/log"
-require "mixlib/shellout"
+require_relative "../exception"
+require_relative "../log"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT)
 
 module Ohai
   module Mixin

data/lib/ohai/mixin/do_metadata.rb

@@ -14,14 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "net/http"
+require "net/http" unless defined?(Net::HTTP)
 
 module Ohai
   module Mixin
     module DOMetadata
 
-      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)
+      DO_METADATA_ADDR ||= "169.254.169.254".freeze
+      DO_METADATA_URL ||= "/metadata/v1.json".freeze
 
       def http_client
         Net::HTTP.start(DO_METADATA_ADDR).tap { |h| h.read_timeout = 6 }

data/lib/ohai/mixin/ec2_metadata.rb

@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "net/http"
+require "net/http" unless defined?(Net::HTTP)
 
 module Ohai
   module Mixin
@@ -39,13 +39,13 @@ module Ohai
     #
     module Ec2Metadata
 
-      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
+      EC2_METADATA_ADDR ||= "169.254.169.254".freeze
+      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 }.freeze
-      EC2_ARRAY_VALUES = %w{security-groups local_ipv4s}.freeze
-      EC2_ARRAY_DIR    = %w{network/interfaces/macs}.freeze
-      EC2_JSON_DIR     = %w{iam}.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

data/lib/ohai/mixin/gce_metadata.rb

@@ -14,15 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "net/http"
+require "net/http" unless defined?(Net::HTTP)
 
 module Ohai
   module Mixin
     module GCEMetadata
 
       # Trailing dot to host is added to avoid DNS search path
-      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)
+      GCE_METADATA_ADDR ||= "metadata.google.internal.".freeze
+      GCE_METADATA_URL ||= "/computeMetadata/v1/?recursive=true".freeze
 
       # fetch the meta content with a timeout and the required header
       def http_get(uri)

data/lib/ohai/mixin/http_helper.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "socket"
+require "socket" unless defined?(Socket)
 
 module Ohai
   module Mixin

data/lib/ohai/mixin/scaleway_metadata.rb

@@ -14,14 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "net/http"
+require "net/http" unless defined?(Net::HTTP)
 
 module Ohai
   module Mixin
     module ScalewayMetadata
 
-      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)
+      SCALEWAY_METADATA_ADDR ||= "169.254.42.42".freeze
+      SCALEWAY_METADATA_URL ||= "/conf?format=json".freeze
 
       # @return [Net::HTTP] net/http object without timeout set to 6
       def http_client

data/lib/ohai/mixin/softlayer_metadata.rb

@@ -18,11 +18,11 @@
 # limitations under the License.
 
 require "net/https"
-require "uri"
+require "uri" unless defined?(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".freeze unless defined?(SOFTLAYER_API_QUERY_URL)
+  SOFTLAYER_API_QUERY_URL ||= "https://api.service.softlayer.com/rest/v3.1/SoftLayer_Resource_Metadata".freeze
 
   # fetch metadata items and build out hash of data
   #

data/lib/ohai/plugin_config.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "ohai/exception"
+require_relative "exception"
 
 module Ohai
   class PluginConfig < Hash

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

@@ -44,7 +44,7 @@ Ohai.plugin(:Network) do
     iface = Mash.new
 
     network Mash.new unless network
-    network[:interfaces] = Mash.new unless network[:interfaces]
+    network[:interfaces] ||= Mash.new
 
     # We unfortunately have to do things a bit different here, if ohai is running
     # within a WPAR. For instance, the WPAR isn't aware of some of its own networking
@@ -89,7 +89,7 @@ Ohai.plugin(:Network) do
               netmask = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
             end
 
-            iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
+            iface[interface][:addresses] ||= Mash.new
             iface[interface][:addresses][tmp_addr] = { "family" => "inet", "prefixlen" => tmp_prefix }
             iface[interface][:addresses][tmp_addr][:netmask] = netmask
 
@@ -98,7 +98,7 @@ Ohai.plugin(:Network) do
             end
           elsif lin =~ /inet6 ([a-f0-9\:]+)%?([\d]*)\/?(\d*)?/
             # TODO do we have more properties on inet6 in aix? broadcast
-            iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
+            iface[interface][:addresses] ||= Mash.new
             iface[interface][:addresses][$1] = { "family" => "inet6", "zone_index" => $2, "prefixlen" => $3 }
           else
             # load all key-values, example "tcp_sendspace 131072 tcp_recvspace 131072 rfc1323 1"
@@ -113,7 +113,7 @@ Ohai.plugin(:Network) do
 
       # Query macaddress
       e_so = shell_out("entstat -d #{interface} | grep \"Hardware Address\"")
-      iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
+      iface[interface][:addresses] ||= Mash.new
       e_so.stdout.lines.each do |l|
         if l =~ /Hardware Address: (\S+)/
           iface[interface][:addresses][$1.upcase] = { "family" => "lladdr" }
@@ -139,9 +139,9 @@ Ohai.plugin(:Network) do
     so = shell_out("arp -an")
     count = 0
     so.stdout.lines.each do |line|
-      network[:arp] = Mash.new unless network[:arp]
+      network[:arp] ||= Mash.new
       if line =~ /\s*(\S+) \((\S+)\) at ([a-fA-F0-9\:]+) \[(\w+)\] stored in bucket/
-        network[:arp][count] = Mash.new unless network[:arp][count]
+        network[:arp][count] ||= Mash.new
         network[:arp][count][:remote_host] = $1
         network[:arp][count][:remote_ip] = $2
         network[:arp][count][:remote_mac] = $3.downcase

data/lib/ohai/plugins/azure.rb

@@ -15,8 +15,8 @@
 #
 
 Ohai.plugin(:Azure) do
-  require "ohai/mixin/azure_metadata"
-  require "ohai/mixin/http_helper"
+  require_relative "../mixin/azure_metadata"
+  require_relative "../mixin/http_helper"
 
   include Ohai::Mixin::AzureMetadata
   include Ohai::Mixin::HttpHelper

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

@@ -20,13 +20,13 @@
 Ohai.plugin(:Virtualization) do
   provides "virtualization"
   depends "dmi"
-  require "ohai/mixin/dmi_decode"
+  require_relative "../../mixin/dmi_decode"
   include Ohai::Mixin::DmiDecode
 
   collect_data(:freebsd, :openbsd, :netbsd, :dragonflybsd) do
 
     virtualization Mash.new unless virtualization
-    virtualization[:systems] = Mash.new unless virtualization[:systems]
+    virtualization[:systems] ||= Mash.new
 
     # detect when in a jail or when a jail is actively running (not in stopped state)
     so = shell_out("sysctl -n security.jail.jailed")

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

@@ -87,9 +87,9 @@ Ohai.plugin(:Network) do
     require "scanf"
 
     network Mash.new unless network
-    network[:interfaces] = Mash.new unless network[:interfaces]
+    network[:interfaces] ||= Mash.new
     counters Mash.new unless counters
-    counters[:network] = Mash.new unless counters[:network]
+    counters[:network] ||= Mash.new
 
     so = shell_out("route -n get default")
     so.stdout.lines do |line|
@@ -109,7 +109,8 @@ Ohai.plugin(:Network) do
     so.stdout.lines do |line|
       if line =~ /^([0-9a-zA-Z\.\:\-]+): \S+ mtu (\d+)$/
         cint = $1
-        iface[cint] = Mash.new unless iface[cint]; iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint] ||= Mash.new
+        iface[cint][:addresses] ||= Mash.new
         iface[cint][:mtu] = $2
         if line =~ /\sflags\=\d+\<((UP|BROADCAST|DEBUG|SMART|SIMPLEX|LOOPBACK|POINTOPOINT|NOTRAILERS|RUNNING|NOARP|PROMISC|ALLMULTI|SLAVE|MASTER|MULTICAST|DYNAMIC|,)+)\>\s/
           flags = $1.split(",")
@@ -124,37 +125,37 @@ Ohai.plugin(:Network) do
         end
       end
       if line =~ /^\s+ether ([0-9a-f\:]+)/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         iface[cint][:addresses][$1] = { "family" => "lladdr" }
         iface[cint][:encapsulation] = "Ethernet"
       end
       if line =~ /^\s+lladdr ([0-9a-f\:]+)\s/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         iface[cint][:addresses][$1] = { "family" => "lladdr" }
       end
       if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask 0x(([0-9a-f]){1,8})\s*$/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf("%2x" * 4) * "." }
       end
       if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask 0x(([0-9a-f]){1,8}) broadcast (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf("%2x" * 4) * ".", "broadcast" => $4 }
       end
       if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+)\s*/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 , "scope" => scope_lookup($1) }
       end
       if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+) scopeid 0x([a-f0-9]+)/
-        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses] ||= Mash.new
         iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 , "scope" => scope_lookup($1) }
       end
       if line =~ /^\s+media: ((\w+)|(\w+ [a-zA-Z0-9\-\<\>]+)) status: (\w+)/
-        iface[cint][:media] = Mash.new unless iface[cint][:media]
+        iface[cint][:media] ||= Mash.new
         iface[cint][:media][:selected] = parse_media($1)
         iface[cint][:status] = $4
       end
       if line =~ /^\s+supported media: (.*)/
-        iface[cint][:media] = Mash.new unless iface[cint][:media]
+        iface[cint][:media] ||= Mash.new
         iface[cint][:media][:supported] = parse_media($1)
       end
     end
@@ -164,7 +165,7 @@ Ohai.plugin(:Network) do
       if line =~ /^\S+ \((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([a-zA-Z0-9\.\:\-]+).*\[(\w+)\]/
         # MAC addr really should be normalized to include all the zeroes.
         next if iface[$3].nil? # this should never happen
-        iface[$3][:arp] = Mash.new unless iface[$3][:arp]
+        iface[$3][:arp] ||= Mash.new
         iface[$3][:arp][$1] = $2
       end
     end
@@ -188,7 +189,7 @@ Ohai.plugin(:Network) do
           line =~ /^([a-zA-Z0-9\.\:\-\*]+)\s+\d+\s+\<[a-zA-Z0-9\#]+\>(\s+)(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
         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] ||= Mash.new
         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 },
         }

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

@@ -44,7 +44,7 @@ Ohai.plugin(:Virtualization) do
 
   collect_data(:darwin) do
     virtualization Mash.new unless virtualization
-    virtualization[:systems] = Mash.new unless virtualization[:systems]
+    virtualization[:systems] ||= Mash.new
 
     if docker_exists?
       virtualization[:system] = "docker"

data/lib/ohai/plugins/digital_ocean.rb

@@ -16,8 +16,8 @@
 # limitations under the License.
 
 Ohai.plugin(:DigitalOcean) do
-  require "ohai/mixin/do_metadata"
-  require "ohai/mixin/http_helper"
+  require_relative "../mixin/do_metadata"
+  require_relative "../mixin/http_helper"
 
   include Ohai::Mixin::DOMetadata
   include Ohai::Mixin::HttpHelper

data/lib/ohai/plugins/dmi.rb

@@ -22,7 +22,7 @@ Ohai.plugin(:DMI) do
   # dmidecode does not return data without access to /dev/mem (or its equivalent)
 
   collect_data do
-    require "ohai/common/dmi"
+    require_relative "../common/dmi"
     dmi Mash.new
 
     # all output lines should fall within one of these patterns
@@ -82,8 +82,8 @@ Ohai.plugin(:DMI) do
 
           dmi_record = { type: Ohai::Common::DMI.id_lookup(handle[2]) }
 
-          dmi[dmi_record[:type]] = Mash.new unless dmi.key?(dmi_record[:type])
-          dmi[dmi_record[:type]][:all_records] = [] unless dmi[dmi_record[:type]].key?(:all_records)
+          dmi[dmi_record[:type]] ||= Mash.new
+          dmi[dmi_record[:type]][:all_records] ||= []
           dmi_record[:position] = dmi[dmi_record[:type]][:all_records].length
           dmi[dmi_record[:type]][:all_records].push(Mash.new)
           dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:record_id] = handle[1]