ohai 16.2.1 → 16.4.12

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

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

@@ -93,7 +93,7 @@ Ohai.plugin(:Network) do
 
   # Selects default interface and returns its information
   #
-  # @note Interface with least metric value should be prefered as default_route
+  # @note Interface with least metric value should be preferred as default_route
   #
   # @param configuration [Mash] Configuration of interfaces as iface_config
   #   [<interface_index> => {<interface_configurations>}]
@@ -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
@@ -171,7 +171,7 @@ Ohai.plugin(:Network) do
           iface[cint][:addresses][ip] = Mash.new(prefixlen: ip2.prefix)
           if ip2.ipv6?
             iface[cint][:addresses][ip][:family] = "inet6"
-            iface[cint][:addresses][ip][:scope] = "Link" if ip =~ /^fe80/i
+            iface[cint][:addresses][ip][:scope] = "Link" if /^fe80/i.match?(ip)
           else
             if iface[cint][:configuration][:ip_subnet]
               iface[cint][:addresses][ip][:netmask] = ip2.netmask.to_s

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-# After long discussion in IRC the "powers that be" have come to a concensus
+# After long discussion in IRC the "powers that be" have come to a consensus
 # that there is no other Windows platforms exist that were not based on the
 # Windows_NT kernel, so we herby decree that "windows" will refer to all
 # platforms built upon the Windows_NT kernel and have access to win32 or win64

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

@@ -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/provides_map.rb

@@ -136,8 +136,8 @@ module Ohai
     private
 
     def normalize_and_validate(attribute)
-      raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains duplicate '/' characters: #{attribute}" if attribute =~ %r{//+}
-      raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains a trailing '/': #{attribute}" if attribute =~ %r{/$}
+      raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains duplicate '/' characters: #{attribute}" if %r{//+}.match?(attribute)
+      raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains a trailing '/': #{attribute}" if %r{/$}.match?(attribute)
 
       parts = attribute.split("/")
       parts.shift if parts.length != 0 && parts[0].length == 0 # attribute begins with a '/'

data/lib/ohai/runner.rb

@@ -18,7 +18,7 @@
 #
 
 require_relative "dsl"
-require "benchmark"
+require "benchmark" unless defined?(Benchmark)
 
 module Ohai
   class Runner

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

@@ -19,7 +19,7 @@
 module Ohai
   module Util
     module Win32
-      if RUBY_PLATFORM =~ /mswin|mingw|windows/
+      if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
 
         require "ffi" unless defined?(FFI)
 

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "16.2.1".freeze
+  VERSION = "16.4.12".freeze
 end

data/ohai.gemspec

@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.5"
 
-  s.add_dependency "systemu", "~> 2.6.4"
   s.add_dependency "ffi-yajl", "~> 2.2"
   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"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 16.2.1
+  version: 16.4.12
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: systemu
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.4
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement