ohai 16.3.2 → 16.5.6

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

@@ -1,6 +1,6 @@
 #
 # Author:: Benjamin Black (<nostromo@gmail.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");
@@ -26,8 +26,7 @@ Ohai.plugin(:Platform) do
       uname_exec = "uname"
     end
 
-    so = shell_out("#{uname_exec} -X")
-    so.stdout.lines do |line|
+    shell_out("#{uname_exec} -X").stdout.lines do |line|
       case line
       when /^Release =\s+(.+)$/
         platform_version $1

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

@@ -1,7 +1,7 @@
 #
 # Author:: Sean Walbran (<seanwalbran@gmail.com>)
 # Author:: Kurt Yoder (<ktyopscode@yoderhome.com>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # Copyright:: Copyright (c) 2010 Kurt Yoder
 # License:: Apache License, Version 2.0
 #
@@ -25,9 +25,7 @@ Ohai.plugin(:Virtualization) do
   depends "dmi"
 
   def collect_solaris_guestid
-    command = "/usr/sbin/zoneadm list -p"
-    so = shell_out(command)
-    so.stdout.split(":").first
+    shell_out("/usr/sbin/zoneadm list -p").stdout.split(":").first
   end
 
   collect_data(:solaris2) do
@@ -56,8 +54,7 @@ Ohai.plugin(:Virtualization) do
 
     if File.executable?("/usr/sbin/zoneadm")
       zones = Mash.new
-      so = shell_out("zoneadm list -pc")
-      so.stdout.lines do |line|
+      shell_out("zoneadm list -pc").stdout.lines do |line|
         info = line.chomp.split(/:/)
         zones[info[1]] = {
           "id" => info[0],

data/lib/ohai/plugins/ssh_host_key.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan <btm@chef.io>
-# Copyright:: Copyright (c) 2012-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/uptime.rb

@@ -5,7 +5,7 @@
 # Author:: Doug MacEachern (<dougm@vmware.com>)
 # Author:: Kurt Yoder (<ktyopscode@yoderhome.com>)
 # Author:: Paul Mooring (<paul@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # Copyright:: Copyright (c) 2010 VMware, Inc.
 # License:: Apache License, Version 2.0
@@ -84,7 +84,7 @@ Ohai.plugin(:Uptime) do
   end
 
   collect_data(:windows) do
-    require "wmi-lite/wmi"
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
     wmi = WmiLite::Wmi.new
     last_boot_up_time = wmi.first_of("Win32_OperatingSystem")["lastbootuptime"]
     uptime_seconds Time.new.to_i - Time.parse(last_boot_up_time).to_i

data/lib/ohai/plugins/virtualbox.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Tim Smith <tsmith@chef.io>
 # Author:: Joshua Colson <joshua.colson@gmail.com>
-# Copyright:: 2015-2019 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # Copyright:: 2019 Joshua Colson
 # License:: Apache License, Version 2.0
 #

data/lib/ohai/plugins/vmware.rb

@@ -1,7 +1,7 @@
 #
 # Author:: "Dan Robinson" <drobinson@chef.io>
 # Author:: "Christopher M. Luciano" <cmlucian@us.ibm.com>
-# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # Copyright (C) 2015 IBM Corp.
 # License:: Apache License, Version 2.0
 #

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

@@ -45,8 +45,8 @@ Ohai.plugin(:DMI) do
   ].freeze
 
   collect_data(:windows) do
-    require "ohai/common/dmi"
-    require "wmi-lite/wmi"
+    require_relative "../../common/dmi"
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
     wmi = WmiLite::Wmi.new
 
     dmi Mash.new

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

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@ Ohai.plugin(:Drivers) do
   collect_data(:windows) do
     if configuration(:enabled)
 
-      require "wmi-lite/wmi"
+      require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
 
       kext = Mash.new
       pnp_drivers = Mash.new

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

@@ -17,7 +17,7 @@ Ohai.plugin(:Memory) do
   provides "memory"
 
   collect_data(:windows) do
-    require "wmi-lite/wmi"
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
 
     memory Mash.new
     memory[:swap] = Mash.new

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

@@ -1,6 +1,6 @@
 #
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) 2008-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");
@@ -117,8 +117,8 @@ Ohai.plugin(:Network) do
   end
 
   collect_data(:windows) do
-
-    require "wmi-lite/wmi"
+    require "ipaddress" unless defined?(IPAddress)
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
 
     iface = Mash.new
     iface_config = Mash.new

data/lib/ohai/plugins/windows/platform.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/plugins/windows/system_enclosure.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Stuart Preston (<stuart@chef.io>)
-# Copyright:: Copyright (c) 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");

data/lib/ohai/plugins/windows/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) 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");
@@ -24,7 +24,7 @@ Ohai.plugin(:Virtualization) do
   include Ohai::Mixin::DmiDecode
 
   collect_data(:windows) do
-    require "wmi-lite/wmi"
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
 
     virtualization Mash.new unless virtualization
     virtualization[:systems] ||= Mash.new

data/lib/ohai/plugins/zpools.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jason J. W. Williams (williamsjj@digitar.com)
-# Copyright:: Copyright (c) 2011-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/provides_map.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Daniel DeLeo (<dan@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/runner.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Claire McQuin (<claire@chef.io>)
-# Copyright:: Copyright (c) 2013-2019, 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"); you
@@ -18,7 +18,7 @@
 #
 
 require_relative "dsl"
-require "benchmark"
+require "benchmark" unless defined?(Benchmark)
 
 module Ohai
   class Runner

data/lib/ohai/system.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2019, 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");
@@ -22,13 +22,12 @@ require_relative "log"
 require_relative "mash"
 require_relative "runner"
 require_relative "dsl"
-require_relative "mixin/command"
+require_relative "mixin/shell_out"
 require_relative "mixin/os"
 require_relative "mixin/string"
 require_relative "mixin/constant_helper"
 require_relative "provides_map"
 require_relative "hints"
-require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT)
 require_relative "config"
 require "ffi_yajl" unless defined?(FFI_Yajl)
 

data/lib/ohai/util/file_helper.rb

@@ -1,38 +1,5 @@
-# Author:: Lamont Granquist (<lamont@chef.io>)
-#
-# Copyright:: Copyright (c) 2013-14 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.
-
-# Copied from chef/lib/chef/util/selinux.rb
-
-module Ohai
-  module Util
-    module FileHelper
-      def which(cmd)
-        paths = ENV["PATH"].split(File::PATH_SEPARATOR) + [ "/bin", "/usr/bin", "/sbin", "/usr/sbin" ]
-        paths.each do |path|
-          filename = File.join(path, cmd)
-          if File.executable?(filename)
-            logger.trace("Plugin #{name}: found #{cmd} at #{filename}")
-            return filename
-          end
-        end
-        logger.trace("Plugin #{name}: did not find #{cmd}")
-        false
-      end
-    end
-  end
+$stderr.puts "WARN: Ohai::Util::FileHelper is deprecated, please use Ohai::Mixin::Which or remove if the reference is unnecessary"
+require_relative "../mixin/which"
+module Ohai::Util
+  FileHelper = Ohai::Mixin::Which
 end

data/lib/ohai/util/ip_helper.rb

@@ -14,11 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "ipaddress"
-
 module Ohai
   module Util
     module IpHelper
+      require "ipaddress" unless defined?(IPAddress)
+
       # Corresponding to RFC 4192 + RFC 4193
       IPV6_LINK_LOCAL_UNICAST_BLOCK = IPAddress("fe80::/10")
       IPV6_PRIVATE_ADDRESS_BLOCK = IPAddress("fc00::/7")

data/lib/ohai/util/win32.rb

@@ -1,6 +1,6 @@
 # Author:: Adam Edwards (<adamed@chef.io>)
 #
-# Copyright:: Copyright (c) 2013-14 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 #
 # License:: Apache License, Version 2.0
 #

data/lib/ohai/version.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# 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");
@@ -17,6 +17,6 @@
 #
 
 module Ohai
-  OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "16.3.2".freeze
+  OHAI_ROOT = File.expand_path(__dir__)
+  VERSION = "16.5.6".freeze
 end

data/ohai.gemspec

@@ -1,5 +1,4 @@
-
-$:.unshift File.expand_path("../lib", __FILE__)
+$:.unshift File.expand_path("lib", __dir__)
 require "ohai/version"
 
 Gem::Specification.new do |s|
@@ -14,18 +13,17 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.5"
 
-  s.add_dependency "systemu", "~> 2.6.4"
+  s.add_dependency "chef-config", ">= 12.8", "< 17"
+  s.add_dependency "chef-utils", ">= 16.0", "< 17"
+  s.add_dependency "ffi", "~> 1.9"
   s.add_dependency "ffi-yajl", "~> 2.2"
+  s.add_dependency "ipaddress"
   s.add_dependency "mixlib-cli", ">= 1.7.0" # 1.7+ needed to support passing multiple options
   s.add_dependency "mixlib-config", ">= 2.0", "< 4.0"
   s.add_dependency "mixlib-log", ">= 2.0.1", "< 4.0"
   s.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
   s.add_dependency "plist", "~> 3.1"
-  s.add_dependency "ipaddress"
   s.add_dependency "wmi-lite", "~> 1.0"
-  s.add_dependency "ffi", "~> 1.9"
-  s.add_dependency "chef-config", ">= 12.8", "< 17"
-  s.add_dependency "chef-utils", ">= 16.0", "< 17"
   # Note for ohai developers: If chef-config causes you grief, try:
   #     bundle install --with development
   # this should work as long as chef is a development dependency in Gemfile.

metadata

@@ -1,29 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 16.3.2
+  version: 16.5.6
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: systemu
+  name: chef-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '12.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '12.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '17'
+- !ruby/object:Gem::Dependency
+  name: chef-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '16.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '16.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '17'
+- !ruby/object:Gem::Dependency
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.4
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.4
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +78,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: ipaddress
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -126,20 +180,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: ipaddress
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: wmi-lite
   requirement: !ruby/object:Gem::Requirement
@@ -154,60 +194,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: chef-config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '12.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '17'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '12.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '17'
-- !ruby/object:Gem::Dependency
-  name: chef-utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '16.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '17'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '16.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '17'
 description: Ohai profiles your system and emits JSON
 email: adam@chef.io
 executables:
@@ -231,6 +217,7 @@ files:
 - lib/ohai/log.rb
 - lib/ohai/mash.rb
 - lib/ohai/mixin/azure_metadata.rb
+- lib/ohai/mixin/chef_utils_wiring.rb
 - lib/ohai/mixin/command.rb
 - lib/ohai/mixin/constant_helper.rb
 - lib/ohai/mixin/dmi_decode.rb
@@ -242,8 +229,10 @@ files:
 - lib/ohai/mixin/os.rb
 - lib/ohai/mixin/scaleway_metadata.rb
 - lib/ohai/mixin/seconds_to_human.rb
+- lib/ohai/mixin/shell_out.rb
 - lib/ohai/mixin/softlayer_metadata.rb
 - lib/ohai/mixin/string.rb
+- lib/ohai/mixin/which.rb
 - lib/ohai/plugin_config.rb
 - lib/ohai/plugins/aix/kernel.rb
 - lib/ohai/plugins/aix/memory.rb