ohai 16.3.2 → 16.5.6

data/lib/ohai/mixin/softlayer_metadata.rb

@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "net/https"
+require "net/http" unless defined?(Net::HTTP)
 require "uri" unless defined?(URI)
 
 # https://softlayer.github.io/reference/services/SoftLayer_Resource_Metadata/

data/lib/ohai/mixin/string.rb

@@ -1,6 +1,6 @@
 #
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/mixin/which.rb

@@ -0,0 +1,38 @@
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "chef-utils/dsl/which" unless defined?(ChefUtils::DSL::Which)
+require "chef-utils/dsl/default_paths" unless defined?(ChefUtils::DSL::DefaultPaths)
+require_relative "chef_utils_wiring" unless defined?(Ohai::Mixin::ChefUtilsWiring)
+
+module Ohai
+  module Mixin
+    module Which
+      include ChefUtils::DSL::Which
+      include ChefUtils::DSL::DefaultPaths
+      include ChefUtilsWiring
+
+      private
+
+      # we dep-inject default paths into this API for historical reasons
+      #
+      # @api private
+      def __extra_path
+        __default_paths
+      end
+    end
+  end
+end

data/lib/ohai/plugin_config.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,7 +1,7 @@
 #
 # Author:: Joshua Timberman <joshua@chef.io>
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,7 +1,7 @@
 #
 # Author:: Joshua Timberman <joshua@chef.io>
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +30,7 @@ Ohai.plugin(:Memory) do
     memory[:free] = "#{free_in_mb.to_i * 1024}kB"
 
     swap_info = shell_out("swap -s").stdout.split # returns swap info in 4K blocks
-    memory[:swap]["total"] = "#{(swap_info[2].to_i) * 4}kB"
-    memory[:swap]["free"] = "#{(swap_info[10].to_i) * 4}kB"
+    memory[:swap]["total"] = "#{swap_info[2].to_i * 4}kB"
+    memory[:swap]["free"] = "#{swap_info[10].to_i * 4}kB"
   end
 end

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

@@ -2,7 +2,7 @@
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,6 @@
 #
 
 Ohai.plugin(:Network) do
-  require "ipaddr"
   require_relative "../../mixin/network_helper"
 
   provides "network", "counters/network", "macaddress"
@@ -27,6 +26,8 @@ Ohai.plugin(:Network) do
   include Ohai::Mixin::NetworkHelper
 
   collect_data(:aix) do
+    require "ipaddr" unless defined?(IPAddr)
+
     # Loads following information.
     # :default_interface, :default_gateway - route -n get 0
     # :interfaces

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

@@ -1,7 +1,7 @@
 #
 # Author:: Joshua Timberman <joshua@chef.io>
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,7 +1,7 @@
 #
 # Author:: Kurt Yoder (<ktyopscode@yoderhome.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@ Ohai.plugin(:Uptime) do
   provides "uptime", "uptime_seconds"
 
   collect_data(:aix) do
-    require "date"
+    require "date" unless defined?(DateTime)
     # below we're going to assume that PID 1 is init (this is true 99.99999% of the time)
     # output will look like this
     # 1148-20:54:50

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

@@ -1,7 +1,7 @@
 #
 # Author:: Julian C. Dunn (<jdunn@chef.io>)
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/azure.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright 2013-2017 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,7 +1,7 @@
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
-# Copyright:: Copyright (c) 2015-2018 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -49,7 +49,7 @@ Ohai.plugin(:Virtualization) do
     end
 
     # detect from modules
-    so = shell_out((Ohai.abs_path("/sbin/kldstat")).to_s)
+    so = shell_out(Ohai.abs_path("/sbin/kldstat").to_s)
     so.stdout.lines do |line|
       case line
       when /vboxdrv/

data/lib/ohai/plugins/cloud.rb

@@ -100,7 +100,7 @@ Ohai.plugin(:Cloud) do
       @cloud[:local_ipv6] = @cloud[:local_ipv6_addrs][0] if @cloud[:local_ipv6_addrs]
 
       # if empty, return nil
-      (@cloud.empty?) ? nil : @cloud
+      @cloud.empty? ? nil : @cloud
     end
 
     private
@@ -320,7 +320,7 @@ Ohai.plugin(:Cloud) do
   end
 
   collect_data do
-    require "ipaddr"
+    require "ipaddr" unless defined?(IPAddr)
 
     @cloud_attr_obj = CloudAttrs.new
 

data/lib/ohai/plugins/command.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/cpu.rb

@@ -8,7 +8,7 @@
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
 # Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2008-2018 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -61,7 +61,7 @@ Ohai.plugin(:CPU) do
         cpu_number += 1
       when /vendor_id\s+:\s(.+)/
         vendor_id = $1
-        if vendor_id =~ (%r{IBM/S390})
+        if vendor_id.include?("IBM/S390")
           cpuinfo["vendor_id"] = vendor_id
         else
           cpuinfo[current_cpu]["vendor_id"] = vendor_id
@@ -377,7 +377,7 @@ Ohai.plugin(:CPU) do
   end
 
   collect_data(:windows) do
-    require "wmi-lite/wmi"
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
 
     cpu Mash.new
     cores = 0

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

@@ -1,6 +1,6 @@
 #
 # Author:: Patrick Collins (<pat@burned.com>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,6 +1,6 @@
 #
 # Author:: Benjamin Black (<bb@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_build", "platform_family"
 
   collect_data(:darwin) do
-    so = shell_out((Ohai.abs_path( "/usr/bin/sw_vers" )).to_s)
+    so = shell_out(Ohai.abs_path( "/usr/bin/sw_vers" ).to_s)
     so.stdout.lines do |line|
       case line
       when /^ProductVersion:\s+(.+)$/

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

@@ -2,7 +2,7 @@
 # Author:: Pavel Yudin (<pyudin@parallels.com>)
 # Author:: Tim Smith (<tsmith@chef.io>)
 # Copyright:: Copyright (c) 2015 Pavel Yudin
-# Copyright:: Copyright (c) 2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/docker.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: 2018 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,6 @@
 #
 
 Ohai.plugin(:Docker) do
-  require "json"
-
   provides "docker"
   depends "virtualization"
 
@@ -50,6 +48,8 @@ Ohai.plugin(:Docker) do
   end
 
   collect_data do
+    require "json" unless defined?(JSON)
+
     if virtualization[:systems][:docker]
       docker_ohai_data(docker_info_json)
     end

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

@@ -20,10 +20,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:dragonflybsd) do
-    so = shell_out("uname -s")
-    platform so.stdout.split($/)[0].downcase
-    so = shell_out("uname -r")
-    platform_version so.stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.split($/)[0].downcase
+    platform_version shell_out("uname -r").stdout.split($/)[0]
     platform_family "dragonflybsd"
   end
 end

data/lib/ohai/plugins/ec2.rb

@@ -3,7 +3,7 @@
 # Author:: Benjamin Black (<bb@chef.io>)
 # Author:: Christopher Brown (<cb@chef.io>)
 # Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +28,6 @@
 Ohai.plugin(:EC2) do
   require_relative "../mixin/ec2_metadata"
   require_relative "../mixin/http_helper"
-  require "base64"
 
   include Ohai::Mixin::Ec2Metadata
   include Ohai::Mixin::HttpHelper
@@ -82,7 +81,7 @@ Ohai.plugin(:EC2) do
   # @return [Boolean] do we have a Xen Identifying Number or not?
   def has_ec2_identifying_number?
     if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
-      require "wmi-lite/wmi"
+      require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
       wmi = WmiLite::Wmi.new
       if /^ec2/.match?(wmi.first_of("Win32_ComputerSystemProduct")["identifyingnumber"])
         logger.trace("Plugin EC2: has_ec2_identifying_number? == true")
@@ -115,6 +114,8 @@ Ohai.plugin(:EC2) do
   end
 
   collect_data do
+    require "base64" unless defined?(Base64)
+
     if looks_like_ec2?
       logger.trace("Plugin EC2: looks_like_ec2? == true")
       ec2 Mash.new

data/lib/ohai/plugins/erlang.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Joe Williams (<joe@joetify.com>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/eucalyptus.rb

@@ -2,7 +2,7 @@
 # Author:: Tim Dysinger (<tim@dysinger.net>)
 # Author:: Benjamin Black (<bb@chef.io>)
 # Author:: Christopher Brown (<cb@chef.io>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/filesystem.rb

@@ -6,7 +6,7 @@
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) 2008-2020 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # Copyright:: Copyright (c) 2015 Facebook, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -23,8 +23,6 @@
 # limitations under the License.
 #
 
-require "set"
-
 Ohai.plugin(:Filesystem) do
   provides "filesystem"
 
@@ -286,12 +284,10 @@ Ohai.plugin(:Filesystem) do
 
     # Grab filesystem data from df
     run_with_check("df") do
-      so = shell_out("df -P")
-      fs.merge!(parse_common_df(so.stdout))
+      fs.merge!(parse_common_df(shell_out("df -P").stdout))
 
       # Grab filesystem inode data from df
-      so = shell_out("df -iP")
-      so.stdout.each_line do |line|
+      shell_out("df -iP").stdout.each_line do |line|
         case line
         when /^Filesystem\s+Inodes/
           next
@@ -310,8 +306,7 @@ Ohai.plugin(:Filesystem) do
 
     # Grab mount information from /bin/mount
     run_with_check("mount") do
-      so = shell_out("mount")
-      so.stdout.each_line do |line|
+      shell_out("mount").stdout.each_line do |line|
         if line =~ /^(.+?) on (.+?) type (.+?) \((.+?)\)$/
           key = "#{$1},#{$2}"
           fs[key] ||= Mash.new
@@ -346,8 +341,7 @@ Ohai.plugin(:Filesystem) do
       # this is to allow machines with large amounts of attached LUNs
       # to respond back to the command successfully
       run_with_check(cmdtype) do
-        so = shell_out(cmd, timeout: 60)
-        so.stdout.each_line do |line|
+        shell_out(cmd, timeout: 60).stdout.each_line do |line|
           parsed = parse_line(line, cmdtype)
           next if parsed.nil?
 
@@ -383,7 +377,6 @@ Ohai.plugin(:Filesystem) do
       # we have to non-block read dev files. Ew.
       f = File.open("/proc/mounts")
       loop do
-
         data = f.read_nonblock(4096)
         mounts << data
       # We should just catch EOFError, but the kernel had a period of
@@ -392,9 +385,9 @@ Ohai.plugin(:Filesystem) do
       # whatever data we might have
       rescue Exception
         break
-
       end
       f.close
+
       mounts.each_line do |line|
         if line =~ /^(\S+) (\S+) (\S+) (\S+) \S+ \S+$/
           key = "#{$1},#{$2}"
@@ -718,7 +711,8 @@ Ohai.plugin(:Filesystem) do
   end
 
   collect_data(:windows) do
-    require "wmi-lite/wmi"
+    require "set" unless defined?(Set)
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
     require_relative "../mash"
 
     fs = merge_info(logical_info, encryptable_info)