ohai 16.6.5 → 16.10.6

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joshua Miller <joshmiller@fb.com>
 # Copyright:: Copyright (c) 2019 Facebook

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca <dcavalca@fb.com>
 # Copyright:: Copyright (c) 2017 Facebook

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Thom May (<thom@clearairturbulence.org>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/lua.rb

@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Lua) do
   provides "languages/lua"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/mono.rb

@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Mono) do
   provides "languages/mono"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
 # Copyright:: Copyright (c) 2009 Bryan McLellan

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
@@ -20,8 +21,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:netbsd) do
-    platform shell_out("uname -s").stdout.split($/)[0].downcase
-    platform_version shell_out("uname -r").stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.strip.downcase
+    platform_version shell_out("uname -r").stdout.strip
     platform_family "netbsd"
   end
 end

data/lib/ohai/plugins/network.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -38,7 +39,7 @@ Ohai.plugin(:NetworkAddresses) do
       next if iface_v.nil? || !iface_v.key?("addresses")
 
       iface_v["addresses"].each do |addr, addr_v|
-        next if addr_v.nil? || (not addr_v.key? "family") || addr_v["family"] != family
+        next if addr_v.nil? || (!addr_v.key? "family") || addr_v["family"] != family
 
         ipaddresses << {
           ipaddress: addr_v["prefixlen"] ? IPAddress("#{addr}/#{addr_v["prefixlen"]}") : IPAddress("#{addr}/#{addr_v["netmask"]}"),

data/lib/ohai/plugins/nodejs.rb

@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Nodejs) do
   provides "languages/nodejs"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/ohai.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tollef Fog Heen <tfheen@err.no>
 # Copyright:: Copyright (c) 2010 Tollef Fog Heen

data/lib/ohai/plugins/ohai_time.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
 # Copyright:: Copyright (c) 2009 Bryan McLellan

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
@@ -20,8 +21,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:openbsd) do
-    platform shell_out("uname -s").stdout.split($/)[0].downcase
-    platform_version shell_out("uname -r").stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.strip.downcase
+    platform_version shell_out("uname -r").stdout.strip
     platform_family "openbsd"
   end
 end

data/lib/ohai/plugins/openstack.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Matt Ray (<matt@chef.io>)
 # Author:: Tim Smith (<tsmith@chef.io>)

data/lib/ohai/plugins/os.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Isa Farnik (<isa@chef.io>)
@@ -34,7 +35,7 @@ Ohai.plugin(:OS) do
 
     # This is __DragonFly_version / __FreeBSD_version. See sys/param.h or
     # http://www.freebsd.org/doc/en/books/porters-handbook/freebsd-versions.html.
-    os_version shell_out("sysctl -n kern.osreldate").stdout.split($/)[0]
+    os_version shell_out("sysctl -n kern.osreldate").stdout.strip
   end
 
   collect_data(:target) do

data/lib/ohai/plugins/packages.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Author:: "Christian Höltje" <choltje@us.ibm.com>
 # Author:: "Christopher M. Luciano" <cmlucian@us.ibm.com>
 # Author:: Shahul Khajamohideen (<skhajamohid1@bloomberg.net>)
@@ -163,7 +164,7 @@ Ohai.plugin(:Packages) do
     # Output format is
     # name version
     so.stdout.lines do |pkg|
-      name, version = pkg.split(" ")
+      name, version = pkg.split
       packages[name] = { "version" => version }
     end
   end

data/lib/ohai/plugins/passwd.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 Ohai.plugin(:Passwd) do
   provides "etc", "current_user"
@@ -90,7 +91,7 @@ Ohai.plugin(:Passwd) do
           if info.keys.any? { |x| x.match?("Win32_UserAccount") }
             mi["type"] = :user
           else
-            # Note: the type here is actually Win32_SystemAccount, because,
+            # NOTE: the type here is actually Win32_SystemAccount, because,
             # that's what groups are in the Windows universe.
             mi["type"] = :group
           end

data/lib/ohai/plugins/perl.rb

@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Perl) do
   provides "languages/perl"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/php.rb

@@ -20,7 +20,7 @@
 
 Ohai.plugin(:PHP) do
   provides "languages/php"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/powershell.rb

@@ -17,7 +17,7 @@
 
 Ohai.plugin(:Powershell) do
   provides "languages/powershell"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data(:windows) do
 

data/lib/ohai/plugins/ps.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Bryan McLellan (<btm@loftninjas.org>)

data/lib/ohai/plugins/python.rb

@@ -19,7 +19,7 @@
 Ohai.plugin(:Python) do
   provides "languages/python"
 
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/rackspace.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Cary Penniman (<cary@rightscale.com>)
 # License:: Apache License, Version 2.0
@@ -25,7 +26,7 @@ Ohai.plugin(:Rackspace) do
   # true:: If kernel name matches
   # false:: Otherwise
   def has_rackspace_kernel?
-    kernel[:release].split("-").last.eql?("rscloud")
+    kernel[:release].end_with?("-rscloud")
   end
 
   # Checks for rackspace provider attribute
@@ -160,10 +161,10 @@ Ohai.plugin(:Rackspace) do
       get_global_ipv6_address(:public_ipv6, :eth0)
       unless rackspace[:public_ip].nil?
         rackspace[:public_hostname] = begin
-                                        Resolv.getname(rackspace[:public_ip])
-        rescue Resolv::ResolvError, Resolv::ResolvTimeout
-          rackspace[:public_ip]
-                                      end
+          Resolv.getname(rackspace[:public_ip])
+                                      rescue Resolv::ResolvError, Resolv::ResolvTimeout
+                                        rackspace[:public_ip]
+        end
       end
       rackspace[:local_ipv4] = rackspace[:private_ip]
       get_global_ipv6_address(:local_ipv6, :eth1)

data/lib/ohai/plugins/root_group.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joseph Anthony Pasquale Holsten (<joseph@josephholsten.com>)
 # Copyright:: Copyright (c) 2013 Joseph Anthony Pasquale Holsten

data/lib/ohai/plugins/ruby.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -48,13 +49,13 @@ Ohai.plugin(:Ruby) do
     }
 
     # Create a query string from above hash
-    env_string = ""
+    env_string = []
     values.each_key do |v|
       env_string << "#{v}=\#{#{values[v]}},"
     end
 
     # Query the system ruby
-    result = run_ruby "require 'rubygems'; puts %Q(#{env_string})"
+    result = run_ruby "require 'rubygems'; puts %Q(#{env_string.join})"
 
     # Parse results to plugin hash
     result.split(",").each do |entry|

data/lib/ohai/plugins/rust.rb

@@ -15,7 +15,7 @@
 
 Ohai.plugin(:Rust) do
   provides "languages/rust"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/scala.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Author:: Christopher M Luciano (<cmlucian@us.ibm.com>)
 # © Copyright IBM Corporation 2015.
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/scaleway.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Jonathan Amiez (<jonathan.amiez@gmail.com>)
 # License:: Apache License, Version 2.0
@@ -43,7 +44,7 @@ Ohai.plugin(:Scaleway) do
     false
   end
 
-  collect_data do
+  collect_data(:linux) do
     if looks_like_scaleway?
       logger.trace("Plugin Scaleway: looks_like_scaleway? == true")
       scaleway Mash.new

data/lib/ohai/plugins/scsi.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Phil Dibowitz <phil@ipom.com>
 # Copyright:: Copyright (c) 2018 Facebook, Inc.
@@ -17,7 +18,6 @@
 #
 
 Ohai.plugin(:Lsscsi) do
-  depends "platform"
   provides "scsi"
   optional true
 

data/lib/ohai/plugins/shard.rb

@@ -18,7 +18,7 @@
 
 Ohai.plugin(:ShardSeed) do
   depends "hostname", "dmi", "machine_id", "machinename", "fips", "hardware", "kernel"
-  provides "shard_seed"
+  provides "shard_seed".freeze
 
   def get_dmi_property(dmi, thing)
     %w{system base_board chassis}.each do |section|

data/lib/ohai/plugins/shells.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Smith (<tsmith@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/softlayer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Alexey Karpik <alexey.karpik@rightscale.com>
 # Author:: Peter Schroeter <peter.schroeter@rightscale.com>

data/lib/ohai/plugins/solaris2/dmi.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Kurt Yoder (ktyopscode@yoderhome.com)
 # Copyright:: Copyright (c) 2010 Kurt Yoder

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # License:: Apache License, Version 2.0
 #

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Benjamin Black (<nostromo@gmail.com>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -126,7 +127,7 @@ Ohai.plugin(:Network) do
       end
       if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask (([0-9a-f]){1,8}) broadcast (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
         iface[cint][:addresses] ||= Mash.new
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => hex_to_dec_netmask($2) , "broadcast" => $4 }
+        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => hex_to_dec_netmask($2), "broadcast" => $4 }
       end
       if line =~ %r{\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*)/(\d+)\s*$}
         iface[cint][:addresses] ||= Mash.new

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Benjamin Black (<nostromo@gmail.com>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -38,23 +39,16 @@ Ohai.plugin(:Platform) do
     file_open("/etc/release") do |file|
       while ( line = file.gets )
         case line
-        when /^.*(SmartOS).*$/
+        when /.*SmartOS.*/
           platform "smartos"
-        when /^\s*(OmniOS).*r(\d+).*$/
+        when /^\s*OmniOS.*r(\d+).*$/
           platform "omnios"
-          platform_version $2
-        when /^\s*(OpenIndiana).*oi_(\d+).*$/
+          platform_version $1
+        when /^\s*OpenIndiana.*(Development oi_|Hipster )(\d\S*)/ # https://rubular.com/r/iMtOBwbnyqDz7u
           platform "openindiana"
           platform_version $2
-        when /^\s*(OpenSolaris).*snv_(\d+).*$/
-          platform "opensolaris"
-          platform_version $2
-        when /^\s*(Oracle Solaris)/
-          platform "solaris2"
-        when /^\s*(Solaris)\s.*$/
+        when /^\s*(Oracle Solaris|Solaris)/
           platform "solaris2"
-        when /^\s*(NexentaCore)\s.*$/
-          platform "nexentacore"
         end
       end
     end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Sean Walbran (<seanwalbran@gmail.com>)
 # Author:: Kurt Yoder (<ktyopscode@yoderhome.com>)
@@ -55,7 +56,7 @@ Ohai.plugin(:Virtualization) do
     if File.executable?("/usr/sbin/zoneadm")
       zones = Mash.new
       shell_out("zoneadm list -pc").stdout.lines do |line|
-        info = line.chomp.split(/:/)
+        info = line.chomp.split(":")
         zones[info[1]] = {
           "id" => info[0],
           "state" => info[2],
@@ -68,12 +69,11 @@ Ohai.plugin(:Virtualization) do
 
       if zones.length == 1
         first_zone = zones.keys[0]
+        virtualization[:system] = "zone"
         if first_zone == "global"
-          virtualization[:system] = "zone"
           virtualization[:role] = "host"
           virtualization[:systems][:zone] = "host"
         else
-          virtualization[:system] = "zone"
           virtualization[:role] = "guest"
           virtualization[:systems][:zone] = "guest"
           virtualization[:guest_uuid] = zones[first_zone]["uuid"]