RubyGems - ohai - Versions diffs - 16.6.5 → 16.7.18 - Mend

@@ -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>)

data/lib/ohai/plugins/passwd.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Ohai.plugin(:Passwd) do
   provides "etc", "current_user"

data/lib/ohai/plugins/perl.rb CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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

data/lib/ohai/plugins/root_group.rb CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Jonathan Amiez (<jonathan.amiez@gmail.com>)
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/scsi.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Phil Dibowitz <phil@ipom.com>
 # Copyright:: Copyright (c) 2018 Facebook, Inc.

data/lib/ohai/plugins/shard.rb CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Benjamin Black (<nostromo@gmail.com>)
 # Copyright:: Copyright (c) Chef Software Inc.

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

@@ -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 CHANGED

@@ -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],

data/lib/ohai/plugins/ssh_host_key.rb CHANGED

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

data/lib/ohai/plugins/sysconf.rb CHANGED

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

data/lib/ohai/plugins/timezone.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: John Bellone (<jbellone@bloomberg.net>)
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/train.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/uptime.rb CHANGED

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

data/lib/ohai/plugins/virtualbox.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Smith <tsmith@chef.io>
 # Author:: Joshua Colson <joshua.colson@gmail.com>

data/lib/ohai/plugins/vmware.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: "Dan Robinson" <drobinson@chef.io>
 # Author:: "Christopher M. Luciano" <cmlucian@us.ibm.com>

data/lib/ohai/plugins/windows/dmi.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Pete Higgins (pete@peterhiggins.org)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/windows/drivers.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/windows/memory.rb CHANGED

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

data/lib/ohai/plugins/windows/network.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: James Gartrell (<jgartrel@gmail.com>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -205,7 +206,7 @@ Ohai.plugin(:Network) do
     so = shell_out("arp -a")
     if so.exitstatus == 0
       so.stdout.lines do |line|
-        if line =~ /^Interface:\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+[-]+\s+(0x\S+)/
+        if line =~ /^Interface:\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+-+\s+(0x\S+)/
           cint = $2.downcase
         end
         next unless iface[cint]

data/lib/ohai/plugins/windows/platform.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: James Gartrell (<jgartrel@gmail.com>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/windows/system_enclosure.rb CHANGED

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

data/lib/ohai/plugins/windows/virtualization.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Pavel Yudin (<pyudin@parallels.com>)
 # Author:: Tim Smith (<tsmith@chef.io>)

data/lib/ohai/plugins/zpools.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Jason J. W. Williams (williamsjj@digitar.com)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -65,7 +66,9 @@ Ohai.plugin(:Zpools) do
       if platform_family == "solaris2"
         command = "su adm -c \"zpool status #{pool}\""
       else
-        command = "zpool status #{pool}"
+        # -L is used to give us real device names not label or uuid
+        # for example sda instead of ata-WDC_WD60EZAZ-00SF3B0_WD-WX32D203UXYK
+        command = "zpool status #{pool} -L"
       end
       so = shell_out(command)
@@ -74,7 +77,7 @@ Ohai.plugin(:Zpools) do
         # linux: http://rubular.com/r/J3wQC6E2lH
         # solaris: http://rubular.com/r/FqOBzUQQ4p
         # freebsd: http://rubular.com/r/RYkMNlytXl
-        when /^\s+((sd|c|ad|da)[-_a-zA-Z0-9]+)\s+([-_a-zA-Z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)$/
+        when /^\s+((sd|c|ad|da|nvme|xvd)[-_a-zA-Z0-9]+)\s+([-_a-zA-Z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)$/
           logger.trace("Plugin Zpools: Parsing zpool status line: #{line.chomp}")
           pools[pool][:devices][$1] = Mash.new
           pools[pool][:devices][$1][:state] = $3

data/lib/ohai/provides_map.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Daniel DeLeo (<dan@chef.io>)

data/lib/ohai/runner.rb CHANGED

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Claire McQuin (<claire@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -57,15 +58,13 @@ module Ohai
           else
             raise Ohai::Exceptions::InvalidPlugin, "Invalid plugin version #{plugin.version} for plugin #{plugin}"
           end
-        rescue Ohai::Exceptions::Error # rubocop: disable Lint/ShadowedException
-          raise
-        rescue SystemExit # abort or exit from plug-in should exit Ohai with failure code
+        rescue Ohai::Exceptions::Error, SystemExit # SystemExit: abort or exit from plug-in should exit Ohai with failure code
           raise
         rescue Exception => e
           logger.trace("Plugin #{plugin.name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
         end
       end
-      logger.trace("Plugin #{plugin.name} took #{elapsed} seconds to run.")
+      logger.trace("Plugin #{plugin.name} took #{"%f" % elapsed.truncate(6)} seconds to run.")
     end
     # @param [Ohai::DSL::Plugin] plugin