ohai 8.10.0 → 8.11.1

data/lib/ohai/plugins/os.rb

@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require 'ohai/mixin/os'
+require "ohai/mixin/os"
 
 Ohai.plugin(:OS) do
   provides "os", "os_version"
-  depends 'kernel'
+  depends "kernel"
 
   collect_data do
     os collect_os

data/lib/ohai/plugins/packages.rb

@@ -19,30 +19,30 @@
 #
 #
 Ohai.plugin(:Packages) do
-  provides 'packages'
-  depends 'platform_family'
+  provides "packages"
+  depends "platform_family"
 
   collect_data(:linux) do
     if configuration(:enabled)
       packages Mash.new
-      if %w(debian).include? platform_family
-        so = shell_out('dpkg-query -W')
+      if %w{debian}.include? platform_family
+        so = shell_out("dpkg-query -W")
         pkgs = so.stdout.lines
 
         pkgs.each do |pkg|
           name, version = pkg.split
-          packages[name] = { 'version' => version }
+          packages[name] = { "version" => version }
         end
 
-      elsif %w(rhel fedora suse).include? platform_family
-        require 'shellwords'
+      elsif %w{rhel fedora suse}.include? platform_family
+        require "shellwords"
         format = Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n'
         so = shell_out("rpm -qa --queryformat #{format}")
         pkgs = so.stdout.lines
 
         pkgs.each do |pkg|
           name, version, release = pkg.split
-          packages[name] = { 'version' => version, 'release' => release }
+          packages[name] = { "version" => version, "release" => release }
         end
       end
     end
@@ -51,15 +51,15 @@ Ohai.plugin(:Packages) do
   collect_data(:windows) do
     if configuration(:enabled)
       packages Mash.new
-      require 'wmi-lite'
+      require "wmi-lite"
 
       wmi = WmiLite::Wmi.new
-      w32_product = wmi.instances_of('Win32_Product')
+      w32_product = wmi.instances_of("Win32_Product")
 
       w32_product.find_all.each do |product|
-        name = product['name']
+        name = product["name"]
         package = packages[name] = Mash.new
-        %w(version vendor installdate).each do |attr|
+        %w{version vendor installdate}.each do |attr|
           package[attr] = product[attr]
         end
       end
@@ -69,21 +69,21 @@ Ohai.plugin(:Packages) do
   collect_data(:aix) do
     if configuration(:enabled)
       packages Mash.new
-      so = shell_out('lslpp -L -q -c')
+      so = shell_out("lslpp -L -q -c")
       pkgs = so.stdout.lines
 
       # Output format is
       # Package Name:Fileset:Level
       # On aix, filesets are packages and levels are versions
       pkgs.each do |pkg|
-        _, name, version = pkg.split(':')
-        packages[name] = { 'version' => version }
+        _, name, version = pkg.split(":")
+        packages[name] = { "version" => version }
       end
     end
   end
 
   def collect_ips_packages
-    so = shell_out('pkg list -H')
+    so = shell_out("pkg list -H")
     # Output format is
     # NAME (PUBLISHER)    VERSION    IFO
     so.stdout.lines.each do |pkg|
@@ -94,13 +94,13 @@ Ohai.plugin(:Packages) do
         name, publisher, version, = tokens
         publisher = publisher[1..-2]
       end
-      packages[name] = { 'version' => version }
-      packages[name]['publisher'] = publisher if publisher
+      packages[name] = { "version" => version }
+      packages[name]["publisher"] = publisher if publisher
     end
   end
 
   def collect_sysv_packages
-    so = shell_out('pkginfo -l')
+    so = shell_out("pkginfo -l")
     # Each package info is separated by a blank line
     chunked_lines = so.stdout.lines.map(&:strip).chunk do |line|
       !line.empty? || nil
@@ -108,12 +108,12 @@ Ohai.plugin(:Packages) do
     chunked_lines.each do |_, lines|
       package = {}
       lines.each do |line|
-        key, value = line.split(':', 2)
+        key, value = line.split(":", 2)
         package[key.strip.downcase] = value.strip unless value.nil?
       end
       # pkginst is the installed package name
-      packages[package['pkginst']] = package.tap do |p|
-        p.delete('pkginst')
+      packages[package["pkginst"]] = package.tap do |p|
+        p.delete("pkginst")
       end
     end
   end

data/lib/ohai/plugins/passwd.rb

@@ -1,8 +1,8 @@
 
-require 'etc'
+require "etc"
 
 Ohai.plugin(:Passwd) do
-  provides 'etc', 'current_user'
+  provides "etc", "current_user"
 
   def fix_encoding(str)
     str.force_encoding(Encoding.default_external) if str.respond_to?(:force_encoding)
@@ -18,14 +18,14 @@ Ohai.plugin(:Passwd) do
 
       Etc.passwd do |entry|
         user_passwd_entry = Mash.new(:dir => entry.dir, :gid => entry.gid, :uid => entry.uid, :shell => entry.shell, :gecos => entry.gecos)
-        user_passwd_entry.each_value {|v| fix_encoding(v)}
+        user_passwd_entry.each_value { |v| fix_encoding(v) }
         entry_name = fix_encoding(entry.name)
         etc[:passwd][entry_name] = user_passwd_entry unless etc[:passwd].has_key?(entry_name)
       end
 
       Etc.group do |entry|
         group_entry = Mash.new(:gid => entry.gid,
-                               :members => entry.mem.map {|u| fix_encoding(u)})
+                               :members => entry.mem.map { |u| fix_encoding(u) })
 
         etc[:group][fix_encoding(entry.name)] = group_entry
       end

data/lib/ohai/plugins/powershell.rb

@@ -40,21 +40,21 @@ Ohai.plugin(:Powershell) do
         kv = line.strip.split(/\s+/, 2)
         version_info[kv[0]] = kv[1] if kv.length == 2
       end
-      powershell[:version] = version_info['PSVersion']
-      powershell[:ws_man_stack_version] = version_info['WSManStackVersion']
-      powershell[:serialization_version] = version_info['SerializationVersion']
-      powershell[:clr_version] = version_info['CLRVersion']
-      powershell[:build_version] = version_info['BuildVersion']
-      powershell[:compatible_versions] = parse_compatible_versions(version_info['PSCompatibleVersions'])
-      powershell[:remoting_protocol_version] = version_info['PSRemotingProtocolVersion']
+      powershell[:version] = version_info["PSVersion"]
+      powershell[:ws_man_stack_version] = version_info["WSManStackVersion"]
+      powershell[:serialization_version] = version_info["SerializationVersion"]
+      powershell[:clr_version] = version_info["CLRVersion"]
+      powershell[:build_version] = version_info["BuildVersion"]
+      powershell[:compatible_versions] = parse_compatible_versions(version_info["PSCompatibleVersions"])
+      powershell[:remoting_protocol_version] = version_info["PSRemotingProtocolVersion"]
       languages[:powershell] = powershell if powershell[:version]
     end
   end
 
   def parse_compatible_versions(versions_str)
     if versions_str
-      if versions_str.strip.start_with?('{') && versions_str.end_with?('}')
-        versions = versions_str.gsub(/[{}\s]+/,'').split(',')
+      if versions_str.strip.start_with?("{") && versions_str.end_with?("}")
+        versions = versions_str.gsub(/[{}\s]+/, "").split(",")
         versions if versions.length
       end
     end

data/lib/ohai/plugins/ps.rb

@@ -24,11 +24,11 @@ Ohai.plugin(:PS) do
   depends "command"
 
   collect_data(:aix, :darwin, :hpux, :linux, :solaris2) do
-    command[:ps] = 'ps -ef'
+    command[:ps] = "ps -ef"
   end
 
   collect_data(:freebsd, :netbsd, :openbsd, :dragonflybsd) do
     # ps -e requires procfs
-    command[:ps] = 'ps -axww'
+    command[:ps] = "ps -axww"
   end
 end

data/lib/ohai/plugins/python.rb

@@ -32,7 +32,7 @@ Ohai.plugin(:Python) do
       output = so.stdout.split
       python[:version] = output[0]
       if output.length >= 6
-        python[:builddate] = "%s %s %s %s" % [output[2],output[3],output[4],output[5].gsub!(/\)/,'')]
+        python[:builddate] = "%s %s %s %s" % [output[2], output[3], output[4], output[5].gsub!(/\)/, "")]
       end
 
       languages[:python] = python if python[:version] and python[:builddate]

data/lib/ohai/plugins/rackspace.rb

@@ -27,7 +27,7 @@ Ohai.plugin(:Rackspace) do
   # true:: If kernel name matches
   # false:: Otherwise
   def has_rackspace_kernel?
-    kernel[:release].split('-').last.eql?("rscloud")
+    kernel[:release].split("-").last.eql?("rscloud")
   end
 
   # Checks for rackspace provider attribute
@@ -38,7 +38,7 @@ Ohai.plugin(:Rackspace) do
   def has_rackspace_metadata?
     so = shell_out("xenstore-read vm-data/provider_data/provider")
     if so.exitstatus == 0
-      so.stdout.strip.downcase == 'rackspace'
+      so.stdout.strip.downcase == "rackspace"
     end
   rescue Errno::ENOENT
     false
@@ -50,7 +50,7 @@ Ohai.plugin(:Rackspace) do
   # true:: If the rackspace cloud can be identified
   # false:: Otherwise
   def looks_like_rackspace?
-    hint?('rackspace') || has_rackspace_metadata? || has_rackspace_kernel?
+    hint?("rackspace") || has_rackspace_metadata? || has_rackspace_kernel?
   end
 
   # Names rackspace ip address
@@ -60,7 +60,7 @@ Ohai.plugin(:Rackspace) do
   # eth<Symbol>:: Interface name of public or private ip
   def get_ip_address(name, eth)
     network[:interfaces][eth][:addresses].each do |key, info|
-      if info['family'] == 'inet'
+      if info["family"] == "inet"
         rackspace[name] = key
         break # break when we found an address
       end
@@ -75,7 +75,7 @@ Ohai.plugin(:Rackspace) do
   def get_global_ipv6_address(name, eth)
     network[:interfaces][eth][:addresses].each do |key, info|
       # check if we got an ipv6 address and if its in global scope
-      if info['family'] == 'inet6' && info['scope'] == 'Global'
+      if info["family"] == "inet6" && info["scope"] == "Global"
         rackspace[name] = key
         break # break when we found an address
       end
@@ -92,7 +92,7 @@ Ohai.plugin(:Rackspace) do
       end
     end
   rescue Errno::ENOENT
-    Ohai::Log.debug("Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
+    Ohai::Log.debug("rackspace plugin: Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
     nil
   end
 
@@ -104,31 +104,31 @@ Ohai.plugin(:Rackspace) do
       rackspace[:instance_id] = so.stdout.gsub(/instance-/, "")
     end
   rescue Errno::ENOENT
-    Ohai::Log.debug("Unable to find xenstore-read, cannot capture instance ID information for Rackspace cloud")
+    Ohai::Log.debug("rackspace plugin: Unable to find xenstore-read, cannot capture instance ID information for Rackspace cloud")
     nil
   end
 
   # Get the rackspace private networks
   #
   def get_private_networks()
-    so = shell_out('xenstore-ls vm-data/networking')
+    so = shell_out("xenstore-ls vm-data/networking")
     if so.exitstatus == 0
       networks = []
-      so.stdout.split("\n").map{|l| l.split('=').first.strip }.map do |item|
+      so.stdout.split("\n").map { |l| l.split("=").first.strip }.map do |item|
         _so = shell_out("xenstore-read vm-data/networking/#{item}")
         if _so.exitstatus == 0
           networks.push(FFI_Yajl::Parser.new.parse(_so.stdout))
         else
-          Ohai::Log.debug('Unable to capture custom private networking information for Rackspace cloud')
+          Ohai::Log.debug("rackspace plugin: Unable to capture custom private networking information for Rackspace cloud")
           return false
         end
       end
       # these networks are already known to ohai, and are not 'private networks'
-      networks.delete_if { |hash| hash['label'] == 'private' }
-      networks.delete_if { |hash| hash['label'] == 'public' }
+      networks.delete_if { |hash| hash["label"] == "private" }
+      networks.delete_if { |hash| hash["label"] == "public" }
     end
   rescue Errno::ENOENT
-    Ohai::Log.debug('Unable to capture custom private networking information for Rackspace cloud')
+    Ohai::Log.debug("rackspace plugin: Unable to capture custom private networking information for Rackspace cloud")
     nil
   end
 

data/lib/ohai/plugins/root_group.rb

@@ -16,17 +16,17 @@
 # limitations under the License.
 
 Ohai.plugin(:RootGroup) do
-  provides 'root_group'
+  provides "root_group"
 
-  require 'ohai/util/win32/group_helper' if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+  require "ohai/util/win32/group_helper" if RUBY_PLATFORM =~ /mswin|mingw32|windows/
 
   collect_data do
-    case ::RbConfig::CONFIG['host_os']
+    case ::RbConfig::CONFIG["host_os"]
     when /mswin|mingw32|windows/
       group = Ohai::Util::Win32::GroupHelper.windows_root_group_name
       root_group group
     else
-      root_group Etc.getgrgid(Etc.getpwnam('root').gid).name
+      root_group Etc.getgrgid(Etc.getpwnam("root").gid).name
     end
   end
 end

data/lib/ohai/plugins/ruby.rb

@@ -43,7 +43,7 @@ Ohai.plugin(:Ruby) do
       :host_os => "RbConfig::CONFIG['host_os']",
       :host_vendor => "RbConfig::CONFIG['host_vendor']",
       :bin_dir => "RbConfig::CONFIG['bindir']",
-      :ruby_bin => "::File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])"
+      :ruby_bin => "::File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])",
     }
 
     # Create a query string from above hash
@@ -56,8 +56,8 @@ Ohai.plugin(:Ruby) do
     result = run_ruby "puts %Q(#{env_string})"
 
     # Parse results to plugin hash
-    result.split(',').each do |entry|
-      key, value = entry.split('=')
+    result.split(",").each do |entry|
+      key, value = entry.split("=")
       languages[:ruby][key.to_sym] = value || ""
     end
 
@@ -66,9 +66,9 @@ Ohai.plugin(:Ruby) do
     ruby_bin = languages[:ruby][:ruby_bin]
     gem_binaries = [
                     run_ruby("require 'rubygems'; puts ::Gem.default_exec_format % 'gem'"),
-                    "gem"
-                   ].map {|bin| ::File.join(bin_dir, bin)}
-    gem_binary = gem_binaries.find {|bin| ::File.exists? bin }
+                    "gem",
+                   ].map { |bin| ::File.join(bin_dir, bin) }
+    gem_binary = gem_binaries.find { |bin| ::File.exists? bin }
     if gem_binary
       languages[:ruby][:gems_dir] = run_ruby "puts %x{#{ruby_bin} #{gem_binary} env gemdir}.chomp!"
       languages[:ruby][:gem_bin] = gem_binary

data/lib/ohai/plugins/rust.rb

@@ -24,7 +24,7 @@ Ohai.plugin(:Rust) do
     rust = Mash.new
     so = shell_out("rustc --version")
     if so.exitstatus == 0
-      output =  so.stdout.split
+      output = so.stdout.split
       rust[:version] = output[1]
       languages[:rust] = rust if rust[:version]
     end

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

@@ -20,7 +20,7 @@ Ohai.plugin(:CPU) do
   provides "cpu"
 
   collect_data(:hpux, :default) do
-    require 'sigar'
+    require "sigar"
 
     sigar = Sigar.new
 

data/lib/ohai/plugins/sigar/filesystem.rb

@@ -36,7 +36,7 @@ Ohai.plugin(:Filesystem) do
         fs[filesystem][:kb_size] = (usage.total / 1024).to_s
         fs[filesystem][:kb_used] = ((usage.total - usage.free) / 1024).to_s
         fs[filesystem][:kb_available] = (usage.free / 1024).to_s
-        fs[filesystem][:percent_used] = (usage.use_percent * 100).to_s + '%'
+        fs[filesystem][:percent_used] = (usage.use_percent * 100).to_s + "%"
       rescue SystemExit => e
         raise
       rescue Exception => e

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'ohai/mixin/network_constants'
+require "ohai/mixin/network_constants"
 
 Ohai.plugin(:Network) do
   include Ohai::Mixin::NetworkConstants
@@ -57,8 +57,8 @@ Ohai.plugin(:Network) do
       if ifconfig.address != "0.0.0.0"
         iface[cint][:addresses][ifconfig.address] = { "family" => "inet" }
         # Backwards compat: no broadcast on tunnel or loopback dev
-        if (((ifconfig.flags & Sigar::IFF_POINTOPOINT) == 0) &&
-            ((ifconfig.flags & Sigar::IFF_LOOPBACK) == 0))
+        if ((ifconfig.flags & Sigar::IFF_POINTOPOINT) == 0) &&
+            ((ifconfig.flags & Sigar::IFF_LOOPBACK) == 0)
           iface[cint][:addresses][ifconfig.address]["broadcast"] = ifconfig.broadcast
         end
         iface[cint][:addresses][ifconfig.address]["netmask"] = ifconfig.netmask
@@ -70,20 +70,20 @@ Ohai.plugin(:Network) do
         iface[cint][:addresses][ifconfig.address6]["scope"] = Sigar.net_scope_to_s(ifconfig.scope6)
       end
 
-      iface[cint][:flags] = Sigar.net_interface_flags_to_s(ifconfig.flags).split(' ')
+      iface[cint][:flags] = Sigar.net_interface_flags_to_s(ifconfig.flags).split(" ")
       iface[cint][:mtu] = ifconfig.mtu.to_s
       iface[cint][:queuelen] = ifconfig.tx_queue_len.to_s
 
       net_counters[cint] = Mash.new unless net_counters[cint]
-      if (!cint.include?(":"))
+      if !cint.include?(":")
         ifstat = sigar.net_interface_stat(cint)
         net_counters[cint][:rx] = { "packets" => ifstat.rx_packets.to_s, "errors"     => ifstat.rx_errors.to_s,
-          "drop"    => ifstat.rx_dropped.to_s, "overrun"    => ifstat.rx_overruns.to_s,
-          "frame"   => ifstat.rx_frame.to_s,   "bytes"      => ifstat.rx_bytes.to_s }
+                                    "drop"    => ifstat.rx_dropped.to_s, "overrun"    => ifstat.rx_overruns.to_s,
+                                    "frame"   => ifstat.rx_frame.to_s,   "bytes"      => ifstat.rx_bytes.to_s }
         net_counters[cint][:tx] = { "packets" => ifstat.tx_packets.to_s, "errors"     => ifstat.tx_errors.to_s,
-          "drop"    => ifstat.tx_dropped.to_s, "overrun"    => ifstat.tx_overruns.to_s,
-          "carrier" => ifstat.tx_carrier.to_s, "collisions" => ifstat.tx_collisions.to_s,
-          "bytes"   => ifstat.tx_bytes.to_s }
+                                    "drop"    => ifstat.tx_dropped.to_s, "overrun"    => ifstat.tx_overruns.to_s,
+                                    "carrier" => ifstat.tx_carrier.to_s, "collisions" => ifstat.tx_collisions.to_s,
+                                    "bytes"   => ifstat.tx_bytes.to_s }
       end
     end
 
@@ -154,12 +154,12 @@ Ohai.plugin(:Network) do
       next unless network[:interfaces][route.ifname] # this
       # should never happen
       network[:interfaces][route.ifname][:route] = Mash.new unless network[:interfaces][route.ifname][:route]
-      route_data={}
+      route_data = {}
       Ohai::Mixin::NetworkConstants::SIGAR_ROUTE_METHODS.each do |m|
         if(m == :flags)
-          route_data[m]=flags(route.send(m))
+          route_data[m] = flags(route.send(m))
         else
-          route_data[m]=route.send(m)
+          route_data[m] = route.send(m)
         end
       end
       network[:interfaces][route.ifname][:route][route.destination] = route_data