ohai 13.4.0 → 13.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65368dc9cbcaede4fadbcbf469c90fb68a64b4c0
-  data.tar.gz: 6c5a528d552e9cf11a81f6b5181ad86f226ff6cc
+  metadata.gz: e65f269d28a4e10d57a696348f63e3ab208e6d55
+  data.tar.gz: 75ed053be1baa6c94abe967f350d8e5469f68a91
 SHA512:
-  metadata.gz: 8b4557d434f813f5b4320274d48a14791a5bd6111c2163ffbc7934efe68d43a71d64d067196da68ca31895dd0947d0e021b80e936a9216e3a01bd398f6d80208
-  data.tar.gz: 848d151c7ff1b30b15971d9d4b7d2e9a34f239f9f256df3f7cc1324b39cb811bf7245f1e15ce39e7ede589f30e3412e4093f27043bd0e4b02da2aa39262ca2dd
+  metadata.gz: 6240f2a183fef7382c07416c887595d6855ff5210c453acbde845b3fb240f8efdbf3a8c41c8e51c39b887a744a34d9d7fe6b8511a9a45697e29fbf60da8957ca
+  data.tar.gz: 56e191347c743a0070b0f82e9f4f99928e954c9376d1778ddfbc4952271972645782fd6ee1b09e0f075e6e1c4233c18450a24e02979923a899e86af6cc182ab5

data/lib/ohai/application.rb

@@ -20,6 +20,7 @@ require "chef-config/workstation_config_loader"
 require "ohai"
 require "ohai/log"
 require "mixlib/cli"
+require "benchmark"
 
 class Ohai::Application
   include Mixlib::CLI
@@ -74,8 +75,11 @@ class Ohai::Application
   end
 
   def run
-    configure_ohai
-    run_application
+    elapsed = Benchmark.measure do
+      configure_ohai
+      run_application
+    end
+    Ohai::Log.debug("Ohai took #{elapsed.total} total seconds to run.")
   end
 
   def configure_ohai

data/lib/ohai/plugins/ec2.rb

@@ -70,7 +70,7 @@ Ohai.plugin(:EC2) do
   # @return [Boolean] do we have a Xen Identifying Number or not?
   def has_ec2_identifying_number?
     if RUBY_PLATFORM =~ /mswin|mingw32|windows/
-    #  require "wmi-lite/wmi"
+      require "wmi-lite/wmi"
       wmi = WmiLite::Wmi.new
       if wmi.first_of("Win32_ComputerSystemProduct")["identifyingnumber"] =~ /^ec2/
         Ohai::Log.debug("Plugin EC2: has_ec2_identifying_number? == true")

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

@@ -104,7 +104,8 @@ Ohai.plugin(:Network) do
         route_entry = Mash.new(:destination => route_dest,
                                :family => family[:name])
         %w{via scope metric proto src}.each do |k|
-          route_entry[k] = $1 if route_ending =~ /\b#{k}\s+([^\s]+)\b/
+          # http://rubular.com/r/pwTNp65VFf
+          route_entry[k] = $1 if route_ending =~ /\b#{k}\s+([^\s]+)/
         end
 
         # a sanity check, especially for Linux-VServer, OpenVZ and LXC:

data/lib/ohai/runner.rb

@@ -18,6 +18,7 @@
 #
 
 require "ohai/dsl"
+require "benchmark"
 
 module Ohai
   class Runner
@@ -33,26 +34,29 @@ module Ohai
     # If force is set to true, then this plugin and its dependencies
     # will be run even if they have been run before.
     def run_plugin(plugin)
-      unless plugin.kind_of?(Ohai::DSL::Plugin)
-        raise Ohai::Exceptions::InvalidPlugin, "Invalid plugin #{plugin} (must be an Ohai::DSL::Plugin or subclass)"
-      end
+      elapsed = Benchmark.measure do
+        unless plugin.kind_of?(Ohai::DSL::Plugin)
+          raise Ohai::Exceptions::InvalidPlugin, "Invalid plugin #{plugin} (must be an Ohai::DSL::Plugin or subclass)"
+        end
 
-      begin
-        case plugin.version
-        when :version7
-          run_v7_plugin(plugin)
-        when :version6
-          run_v6_plugin(plugin)
-        else
-          raise Ohai::Exceptions::InvalidPlugin, "Invalid plugin version #{plugin.version} for plugin #{plugin}"
+        begin
+          case plugin.version
+          when :version7
+            run_v7_plugin(plugin)
+          when :version6
+            run_v6_plugin(plugin)
+          else
+            raise Ohai::Exceptions::InvalidPlugin, "Invalid plugin version #{plugin.version} for plugin #{plugin}"
+          end
+        rescue Ohai::Exceptions::Error
+          raise
+        rescue SystemExit # abort or exit from plug-in should exit Ohai with failure code
+          raise
+        rescue Exception, Errno::ENOENT => e
+          Ohai::Log.debug("Plugin #{plugin.name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
         end
-      rescue Ohai::Exceptions::Error
-        raise
-      rescue SystemExit # abort or exit from plug-in should exit Ohai with failure code
-        raise
-      rescue Exception, Errno::ENOENT => e
-        Ohai::Log.debug("Plugin #{plugin.name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
       end
+      Ohai::Log.debug("Plugin #{plugin.name} took #{elapsed.total} seconds to run.")
     end
 
     def run_v6_plugin(plugin)

data/lib/ohai/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 13.4.0
+  version: 13.5.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu