ohai 8.10.0 → 8.11.1

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

@@ -38,8 +38,8 @@ Ohai.plugin(:Platform) do
   def read_os_release_info(file)
     return nil unless File.exist?(file)
     File.read(file).split.inject({}) do |map, line|
-      key, value = line.split('=')
-      map[key] = value.gsub(/\A"|"\Z/, '') if value
+      key, value = line.split("=")
+      map[key] = value.gsub(/\A"|"\Z/, "") if value
       map
     end
   end
@@ -54,8 +54,8 @@ Ohai.plugin(:Platform) do
   def os_release_info
     @os_release_info ||=
       begin
-        os_release_info = read_os_release_info('/etc/os-release')
-        cisco_release_info = os_release_info['CISCO_RELEASE_INFO'] if os_release_info
+        os_release_info = read_os_release_info("/etc/os-release")
+        cisco_release_info = os_release_info["CISCO_RELEASE_INFO"] if os_release_info
         if cisco_release_info && File.exist?(cisco_release_info)
           os_release_info.merge!(read_os_release_info(cisco_release_info))
         end
@@ -69,7 +69,7 @@ Ohai.plugin(:Platform) do
   # @returns [Boolean] if we are Cisco according to /etc/os-release
   #
   def os_release_file_is_cisco?
-    File.exist?('/etc/os-release') && os_release_info['CISCO_RELEASE_INFO']
+    File.exist?("/etc/os-release") && os_release_info["CISCO_RELEASE_INFO"]
   end
 
   collect_data(:linux) do
@@ -105,8 +105,8 @@ Ohai.plugin(:Platform) do
       platform_version contents.match(/(\d\.\d\.\d)/)[0]
     elsif File.exist?("/etc/redhat-release")
       if os_release_file_is_cisco? # Cisco guestshell
-        platform 'nexus_centos'
-        platform_version os_release_info['VERSION']
+        platform "nexus_centos"
+        platform_version os_release_info["VERSION"]
       else
         contents = File.read("/etc/redhat-release").chomp
         platform get_redhatish_platform(contents)
@@ -116,10 +116,10 @@ Ohai.plugin(:Platform) do
       contents = File.read("/etc/system-release").chomp
       platform get_redhatish_platform(contents)
       platform_version get_redhatish_version(contents)
-    elsif File.exist?('/etc/gentoo-release')
+    elsif File.exist?("/etc/gentoo-release")
       platform "gentoo"
-      platform_version File.read('/etc/gentoo-release').scan(/(\d+|\.+)/).join
-    elsif File.exist?('/etc/SuSE-release')
+      platform_version File.read("/etc/gentoo-release").scan(/(\d+|\.+)/).join
+    elsif File.exist?("/etc/SuSE-release")
       suse_release = File.read("/etc/SuSE-release")
       suse_version = suse_release.scan(/VERSION = (\d+)\nPATCHLEVEL = (\d+)/).flatten.join(".")
       suse_version = suse_release[/VERSION = ([\d\.]{2,})/, 1] if suse_version == ""
@@ -129,37 +129,37 @@ Ohai.plugin(:Platform) do
       else
         platform "suse"
       end
-    elsif File.exist?('/etc/slackware-version')
+    elsif File.exist?("/etc/slackware-version")
       platform "slackware"
       platform_version File.read("/etc/slackware-version").scan(/(\d+|\.+)/).join
-    elsif File.exist?('/etc/arch-release')
+    elsif File.exist?("/etc/arch-release")
       platform "arch"
       # no way to determine platform_version in a rolling release distribution
       # kernel release will be used - ex. 2.6.32-ARCH
       platform_version `uname -r`.strip
-    elsif File.exist?('/etc/exherbo-release')
+    elsif File.exist?("/etc/exherbo-release")
       platform "exherbo"
       # no way to determine platform_version in a rolling release distribution
       # kernel release will be used - ex. 3.13
       platform_version `uname -r`.strip
-    elsif File.exist?('/etc/alpine-release')
+    elsif File.exist?("/etc/alpine-release")
       platform "alpine"
       platform_version File.read("/etc/alpine-release").strip()
     elsif os_release_file_is_cisco?
-      raise 'unknown Cisco /etc/os-release or /etc/cisco-release ID_LIKE field' if
-        os_release_info['ID_LIKE'].nil? || ! os_release_info['ID_LIKE'].include?('wrlinux')
+      raise "unknown Cisco /etc/os-release or /etc/cisco-release ID_LIKE field" if
+        os_release_info["ID_LIKE"].nil? || ! os_release_info["ID_LIKE"].include?("wrlinux")
 
-      case os_release_info['ID']
-      when 'nexus'
-        platform 'nexus'
-      when 'ios_xr'
-        platform 'ios_xr'
+      case os_release_info["ID"]
+      when "nexus"
+        platform "nexus"
+      when "ios_xr"
+        platform "ios_xr"
       else
-        raise 'unknown Cisco /etc/os-release or /etc/cisco-release ID field'
+        raise "unknown Cisco /etc/os-release or /etc/cisco-release ID field"
       end
 
-      platform_family 'wrlinux'
-      platform_version os_release_info['VERSION']
+      platform_family "wrlinux"
+      platform_version os_release_info["VERSION"]
     elsif lsb[:id] =~ /RedHat/i
       platform "redhat"
       platform_version lsb[:release]

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

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'ohai/util/file_helper'
-require 'ohai/mixin/dmi_decode'
+require "ohai/util/file_helper"
+require "ohai/mixin/dmi_decode"
 
 include Ohai::Util::FileHelper
 include Ohai::Mixin::DmiDecode
@@ -26,11 +26,11 @@ Ohai.plugin(:Virtualization) do
   provides "virtualization"
 
   def lxc_version_exists?
-    which('lxc-version')
+    which("lxc-version")
   end
 
   def docker_exists?
-    which('docker')
+    which("docker")
   end
 
   collect_data(:linux) do
@@ -118,11 +118,11 @@ Ohai.plugin(:Virtualization) do
 
     # parse dmidecode to discover various virtualization guests
     if File.exist?("/usr/sbin/dmidecode")
-      guest = guest_from_dmi(shell_out('dmidecode').stdout)
+      guest = guest_from_dmi(shell_out("dmidecode").stdout)
       if guest
         virtualization[:system] = guest
-        virtualization[:role] = 'guest'
-        virtualization[:systems][guest.to_sym] = 'guest'
+        virtualization[:role] = "guest"
+        virtualization[:systems][guest.to_sym] = "guest"
       end
     end
 
@@ -163,7 +163,7 @@ Ohai.plugin(:Virtualization) do
     if File.exist?("/proc/self/cgroup")
       cgroup_content = File.read("/proc/self/cgroup")
       if cgroup_content =~ %r{^\d+:[^:]+:/(lxc|docker)/.+$} ||
-         cgroup_content =~ %r{^\d+:[^:]+:/[^/]+/(lxc|docker)-.+$}
+          cgroup_content =~ %r{^\d+:[^:]+:/[^/]+/(lxc|docker)-.+$}
         virtualization[:system] = $1
         virtualization[:role] = "guest"
         virtualization[:systems][$1.to_sym] = "guest"

data/lib/ohai/plugins/mono.rb

@@ -33,7 +33,7 @@ Ohai.plugin(:Mono) do
         mono[:version] = output[4]
       end
       if output.length >= 11
-        mono[:builddate] = "%s %s %s %s" % [output[6],output[7],output[8],output[11].gsub!(/\)/,'')]
+        mono[:builddate] = "%s %s %s %s" % [output[6], output[7], output[8], output[11].gsub!(/\)/, "")]
       end
       languages[:mono] = mono if mono[:version]
     end

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

@@ -17,7 +17,7 @@
 #
 
 Ohai.plugin(:CPU) do
-  provides 'cpu'
+  provides "cpu"
 
   collect_data(:netbsd) do
     cpuinfo = Mash.new

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

@@ -58,7 +58,7 @@ Ohai.plugin(:Network) do
       if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
         iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
         # convert the netmask to decimal for consistency
-        netmask = "#{$2[2,2].hex}.#{$2[4,2].hex}.#{$2[6,2].hex}.#{$2[8,2].hex}"
+        netmask = "#{$2[2, 2].hex}.#{$2[4, 2].hex}.#{$2[6, 2].hex}.#{$2[8, 2].hex}"
         if $3.empty?
           iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask }
         else
@@ -76,7 +76,7 @@ Ohai.plugin(:Network) do
         end
       end
       if line =~ /flags=\d+<(.+)>/
-        flags = $1.split(',')
+        flags = $1.split(",")
         iface[cint][:flags] = flags if flags.length > 0
       end
       if line =~ /metric: (\d+) mtu: (\d+)/

data/lib/ohai/plugins/network.rb

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'ipaddress'
-require 'ohai/mixin/network_constants'
+require "ipaddress"
+require "ohai/mixin/network_constants"
 
 Ohai.plugin(:NetworkAddresses) do
   include Ohai::Mixin::NetworkConstants
@@ -29,21 +29,21 @@ Ohai.plugin(:NetworkAddresses) do
   # from interface data create array of hashes with ipaddress, scope, and iface
   # sorted by scope, prefixlen and then ipaddress where longest prefixes first
   def sorted_ips(family = "inet")
-    fail "bad family #{family}" unless %w(inet inet6).include? family
+    raise "bad family #{family}" unless %w{inet inet6}.include? family
 
     # priority of ipv6 link scopes to sort by later
     scope_prio = [ "global", "site", "link", "host", "node", nil ]
 
     # grab ipaddress, scope, and iface for sorting later
     ipaddresses = []
-    Mash[network['interfaces']].each do |iface, iface_v|
-      next if iface_v.nil? || !iface_v.has_key?('addresses')
-      iface_v['addresses'].each do |addr, addr_v|
-        next if addr_v.nil? or not addr_v.has_key? "family" or addr_v['family'] != family
+    Mash[network["interfaces"]].each do |iface, iface_v|
+      next if iface_v.nil? || !iface_v.has_key?("addresses")
+      iface_v["addresses"].each do |addr, addr_v|
+        next if addr_v.nil? or not addr_v.has_key? "family" or addr_v["family"] != family
         ipaddresses << {
           :ipaddress => addr_v["prefixlen"] ? IPAddress("#{addr}/#{addr_v["prefixlen"]}") : IPAddress("#{addr}/#{addr_v["netmask"]}"),
           :scope => addr_v["scope"].nil? ? nil : addr_v["scope"].downcase,
-          :iface => iface
+          :iface => iface,
         }
       end
     end
@@ -53,7 +53,7 @@ Ohai.plugin(:NetworkAddresses) do
     ipaddresses.sort_by do |v|
       [ ( scope_prio.index(v[:scope]) || 999999 ),
         128 - v[:ipaddress].prefix.to_i,
-        ( family == "inet" ? v[:ipaddress].to_u32 : v[:ipaddress].to_u128 )
+        ( family == "inet" ? v[:ipaddress].to_u32 : v[:ipaddress].to_u128 ),
       ]
     end
   end
@@ -68,7 +68,7 @@ Ohai.plugin(:NetworkAddresses) do
     return [ nil, nil ] if ips.empty?
 
     # shortcuts to access default #{family} interface and gateway
-    int_attr = Ohai::Mixin::NetworkConstants::FAMILIES[family] +"_interface"
+    int_attr = Ohai::Mixin::NetworkConstants::FAMILIES[family] + "_interface"
     gw_attr = Ohai::Mixin::NetworkConstants::FAMILIES[family] + "_gateway"
 
     if network[int_attr]
@@ -113,7 +113,7 @@ Ohai.plugin(:NetworkAddresses) do
 
   # select mac address of first interface with family of lladdr
   def find_mac_from_iface(iface)
-    r = network["interfaces"][iface]["addresses"].select{|k,v| v["family"] == "lladdr"}
+    r = network["interfaces"][iface]["addresses"].select { |k, v| v["family"] == "lladdr" }
     r.nil? || r.first.nil? ? nil : r.first.first
   end
 

data/lib/ohai/plugins/network_listeners.rb

@@ -22,35 +22,39 @@ Ohai.plugin(:NetworkListeners) do
   depends "network", "counters/network"
 
   collect_data do
-    require 'sigar'
-    flags = Sigar::NETCONN_TCP|Sigar::NETCONN_SERVER
+    begin
+      require "sigar"
+      flags = Sigar::NETCONN_TCP | Sigar::NETCONN_SERVER
 
-    network Mash.new unless network
-    listeners = Mash.new
+      network Mash.new unless network
+      listeners = Mash.new
 
-    sigar = Sigar.new
-    sigar.net_connection_list(flags).each do |conn|
-      port = conn.local_port
-      addr = conn.local_address.to_s
-      if addr == "0.0.0.0" || addr == "::"
-        addr = "*"
+      sigar = Sigar.new
+      sigar.net_connection_list(flags).each do |conn|
+        port = conn.local_port
+        addr = conn.local_address.to_s
+        if addr == "0.0.0.0" || addr == "::"
+          addr = "*"
+        end
+        listeners[port] = Mash.new
+        listeners[port][:address] = addr
+        begin
+          pid = sigar.proc_port(conn.type, port)
+          # workaround for a failure of proc_state to throw
+          # after the first 0 has been supplied to it
+          #
+          # no longer required when hyperic/sigar#48 is fixed
+          throw ArgumentError.new("No such process") if pid == 0
+          listeners[port][:pid] = pid
+          listeners[port][:name] = sigar.proc_state(pid).name
+        rescue
+        end
       end
-      listeners[port] = Mash.new
-      listeners[port][:address] = addr
-      begin
-        pid = sigar.proc_port(conn.type, port)
-        # workaround for a failure of proc_state to throw
-        # after the first 0 has been supplied to it
-        #
-        # no longer required when hyperic/sigar#48 is fixed
-        throw ArgumentError.new("No such process") if pid == 0
-        listeners[port][:pid] = pid
-        listeners[port][:name] = sigar.proc_state(pid).name
-      rescue
-      end
-    end
 
-    network[:listeners] = Mash.new
-    network[:listeners][:tcp] = listeners
+      network[:listeners] = Mash.new
+      network[:listeners][:tcp] = listeners
+    rescue LoadError
+      Ohai::Log.debug("Could not load sigar gem. Skipping NetworkListeners plugin")
+    end
   end
 end

data/lib/ohai/plugins/ohai.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.
@@ -20,7 +20,7 @@ Ohai.plugin(:Ohai) do
   provides "chef_packages/ohai"
 
   collect_data do
-    require 'ohai'
+    require "ohai"
 
     chef_packages Mash.new unless chef_packages
     chef_packages[:ohai] = Mash.new

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

@@ -17,19 +17,19 @@
 #
 
 Ohai.plugin(:CPU) do
-  provides 'cpu'
+  provides "cpu"
 
   collect_data(:openbsd) do
     cpuinfo = Mash.new
 
-    # OpenBSD provides most cpu information via sysctl, the only thing we need to 
-    # to scrape from dmesg.boot is the cpu feature list. 
+    # OpenBSD provides most cpu information via sysctl, the only thing we need to
+    # to scrape from dmesg.boot is the cpu feature list.
     # cpu0: FPU,V86,DE,PSE,TSC,MSR,MCE,CX8,SEP,MTRR,PGE,MCA,CMOV,PAT,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,TM,SBF,EST,TM2
 
     File.open("/var/run/dmesg.boot").each do |line|
       case line
       when /cpu\d+:\s+([A-Z]+$|[A-Z]+,.*$)/
-        cpuinfo["flags"] = $1.downcase.split(',')
+        cpuinfo["flags"] = $1.downcase.split(",")
       end
     end
 

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

@@ -71,13 +71,13 @@ Ohai.plugin(:Memory) do
         memory[:page_count] = $1
         memory[:total] = memory[:page_size].to_i * memory[:page_count].to_i
       when /(\d+) pages free/
-        memory[:free] = memory[:page_size].to_i * $1.to_i 
+        memory[:free] = memory[:page_size].to_i * $1.to_i
       when /(\d+) pages active/
-        memory[:active] = memory[:page_size].to_i * $1.to_i 
+        memory[:active] = memory[:page_size].to_i * $1.to_i
       when /(\d+) pages inactive/
-        memory[:inactive] = memory[:page_size].to_i * $1.to_i 
+        memory[:inactive] = memory[:page_size].to_i * $1.to_i
       when /(\d+) pages wired/
-        memory[:wired] = memory[:page_size].to_i * $1.to_i 
+        memory[:wired] = memory[:page_size].to_i * $1.to_i
       end
     end
 

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

@@ -58,7 +58,7 @@ Ohai.plugin(:Network) do
       if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
         iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
         # convert the netmask to decimal for consistency
-        netmask = "#{$2[2,2].hex}.#{$2[4,2].hex}.#{$2[6,2].hex}.#{$2[8,2].hex}"
+        netmask = "#{$2[2, 2].hex}.#{$2[4, 2].hex}.#{$2[6, 2].hex}.#{$2[8, 2].hex}"
         if $3.empty?
           iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask }
         else
@@ -76,7 +76,7 @@ Ohai.plugin(:Network) do
         end
       end
       if line =~ /flags=\d+<(.+)>/
-        flags = $1.split(',')
+        flags = $1.split(",")
         iface[cint][:flags] = flags if flags.length > 0
       end
       if line =~ /metric: (\d+) mtu: (\d+)/
@@ -100,7 +100,7 @@ Ohai.plugin(:Network) do
     # From netstat(1), not sure of the implications:
     # Show the state of all network interfaces or a single interface
     # which have been auto-configured (interfaces statically configured
-    # into a system, but not located at boot time are not shown). 
+    # into a system, but not located at boot time are not shown).
     so = shell_out("netstat -idn")
     so.stdout.lines do |line|
       # Name    Mtu Network       Address              Ipkts Ierrs    Opkts Oerrs  Coll Drop

data/lib/ohai/plugins/openstack.rb

@@ -15,22 +15,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'ohai/mixin/ec2_metadata'
+require "ohai/mixin/ec2_metadata"
 
 Ohai.plugin(:Openstack) do
   provides "openstack"
 
   include Ohai::Mixin::Ec2Metadata
 
-  def collect_openstack_metadata(addr = Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, api_version = '2013-04-04')
+  def collect_openstack_metadata(addr = Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, api_version = "2013-04-04")
     path = "/openstack/#{api_version}/meta_data.json"
     uri = "http://#{addr}#{path}"
     begin
-      response = http_client.get_response(URI.parse(uri),nil,nil)
+      response = http_client.get_response(URI.parse(uri), nil, nil)
       case response.code
-      when '200'
+      when "200"
         FFI_Yajl::Parser.parse(response.body)
-      when '404'
+      when "404"
         Ohai::Log.debug("Encountered 404 response retreiving OpenStack specific metadata path: #{path} ; continuing.")
         nil
       else
@@ -44,20 +44,20 @@ Ohai.plugin(:Openstack) do
 
   collect_data do
     # Adds openstack Mash
-    if hint?('openstack') || hint?('hp')
+    if hint?("openstack") || hint?("hp")
       Ohai::Log.debug("ohai openstack")
 
-      if can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR,80)
+      if can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
         openstack Mash.new
         Ohai::Log.debug("connecting to the OpenStack metadata service")
-        fetch_metadata.each {|k, v| openstack[k] = v }
+        fetch_metadata.each { |k, v| openstack[k] = v }
 
-        if hint?('hp')
-          openstack['provider'] = 'hp'
+        if hint?("hp")
+          openstack["provider"] = "hp"
         else
-          openstack['provider'] = 'openstack'
+          openstack["provider"] = "openstack"
           Ohai::Log.debug("connecting to the OpenStack specific metadata service")
-          openstack['metadata'] = collect_openstack_metadata
+          openstack["metadata"] = collect_openstack_metadata
         end
 
       else