ohai 15.2.5 → 15.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98f79af3f1e5744de5e63178fcc9acf038c0d8cc7f684064dac8aabc2d34cbad
-  data.tar.gz: e3a2b907da4cb97b5218b3d9013688c14cce257ef594f3bc47f43ecc84dc1526
+  metadata.gz: 070acba85ad3bc1dd6ea7dddb1ceee6a6d0cb87303c645cd718b5edc9e14005d
+  data.tar.gz: 52dcc619042c133354ac464ab982f4a0ba7080fbc2c5bf8d05940bb2f1e48309
 SHA512:
-  metadata.gz: 9cdc8ca66bdd032d58ddce52f9a99c2a29189b7cdc95aa727ea84cd0b525cb84d8121cd161ab1681a9b0a46309679c46f07a396bfa055847a570cc63edf455ae
-  data.tar.gz: 9fa787535d3ae2229647cb4e589f8a3bded19e25d2457b7858290555ff777258de6d8559bcdd1b8ce31767fd77c8d3f2fdac6c78249ea308350c5ff63dda7fe9
+  metadata.gz: 5cfd43b461e597cd9a9eb4b62e874d7d7618ded26f93604cc8eefa2f537e7ca9c360668b490ce0a6cdef7c450e1c975b6b4600ded5b60bc766ac07eed211fd23
+  data.tar.gz: 792591a83cd68ed3dd92d96a329392f95fcd82ef23e3e9843d47018ccb7f8ede208cad19d18588352cc60cb15d958c0cd2db8bbd2a5038b9facd7323a3b74816

data/lib/ohai/application.rb

@@ -77,11 +77,11 @@ class Ohai::Application
   #
   # @return void
   def run
-    elapsed = Benchmark.measure do
+    elapsed = Benchmark.realtime do
       configure_ohai
       run_application
     end
-    Ohai::Log.debug("Ohai took #{elapsed.total} total seconds to run.")
+    Ohai::Log.debug("Ohai took #{elapsed} total seconds to run.")
   end
 
   # parses the CLI options, loads the config file if present, and initializes logging

data/lib/ohai/mixin/dmi_decode.rb

@@ -19,6 +19,8 @@
 module ::Ohai::Mixin::DmiDecode
   def guest_from_dmi_data(manufacturer, product, version)
     case manufacturer
+    when /OpenStack/
+      return "openstack"
     when /Xen/
       return "xen"
     when /VMware/
@@ -38,13 +40,14 @@ module ::Ohai::Mixin::DmiDecode
     case product
     when /VirtualBox/
       return "vbox"
-    when /OpenStack/
+    when /OpenStack/ # yes this is here twice. Product catches Redhat's version
       return "openstack"
     when /(KVM|RHEV)/
       return "kvm"
     when /BHYVE/
       return "bhyve"
     end
+
     nil # doesn't look like a virt
   end
 end

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

@@ -0,0 +1,38 @@
+#
+# Author:: Joshua Miller <joshmiller@fb.com>
+# Copyright:: Copyright (c) 2019 Facebook
+# 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.
+#
+
+Ohai.plugin(:Sysctl) do
+  provides "sysctl"
+  optional true
+
+  collect_data(:linux) do
+    sysctl_path = which("sysctl")
+    if sysctl_path
+      sysctl_cmd = shell_out("#{sysctl_path} -a")
+
+      if sysctl_cmd.exitstatus == 0
+        sysctl Mash.new unless sysctl
+
+        sysctl_cmd.stdout.lines.each do |line|
+          k, v = line.split("=").map(&:strip)
+          sysctl[k] = v
+        end
+      end
+    end
+  end
+end

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

@@ -116,6 +116,17 @@ Ohai.plugin(:Virtualization) do
       end
     end
 
+    # parse dmi to discover various virtualization guests
+    # we do this *after* the kvm detection so that OpenStack isn't detected as KVM
+    logger.trace("Looking up DMI data manufacturer: '#{get_attribute(:dmi, :system, :manufacturer)}' product: '#{get_attribute(:dmi, :system, :product)}' version: '#{get_attribute(:dmi, :system, :version)}'")
+    guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product), get_attribute(:dmi, :system, :version))
+    if guest
+      logger.trace("Plugin Virtualization: DMI data indicates #{guest} guest")
+      virtualization[:system] = guest
+      virtualization[:role] = "guest"
+      virtualization[:systems][guest.to_sym] = "guest"
+    end
+
     # Detect OpenVZ / Virtuozzo.
     # http://wiki.openvz.org/BC_proc_entries
     if File.exist?("/proc/bc/0")
@@ -130,16 +141,6 @@ Ohai.plugin(:Virtualization) do
       virtualization[:systems][:openvz] = "guest"
     end
 
-    # parse dmi to discover various virtualization guests
-    logger.trace("Looking up #{get_attribute(:dmi, :system, :manufacturer)}, #{get_attribute(:dmi, :system, :product)} #{get_attribute(:dmi, :system, :version)}")
-    guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product), get_attribute(:dmi, :system, :version))
-    if guest
-      logger.trace("Plugin Virtualization: DMI data indicates #{guest} guest")
-      virtualization[:system] = guest
-      virtualization[:role] = "guest"
-      virtualization[:systems][guest.to_sym] = "guest"
-    end
-
     # Detect Hyper-V guest and the hostname of the host
     if File.exist?("/var/lib/hyperv/.kvp_pool_3")
       logger.trace("Plugin Virtualization: /var/lib/hyperv/.kvp_pool_3 contains string indicating Hyper-V guest")

data/lib/ohai/plugins/openstack.rb

@@ -19,16 +19,16 @@
 Ohai.plugin(:Openstack) do
   require_relative "../mixin/ec2_metadata"
   require_relative "../mixin/http_helper"
+  require "etc" unless defined?(Etc)
   include Ohai::Mixin::Ec2Metadata
   include Ohai::Mixin::HttpHelper
 
   provides "openstack"
-  depends "etc"
   depends "virtualization"
 
   # use virtualization data
   def openstack_virtualization?
-    if get_attribute(:virtualization, :system, :guest) == "openstack"
+    if get_attribute(:virtualization, :systems, :openstack)
       logger.trace("Plugin Openstack: has_openstack_virtualization? == true")
       true
     end
@@ -47,8 +47,13 @@ Ohai.plugin(:Openstack) do
 
   # dreamhost systems have the dhc-user on them
   def openstack_provider
-    return "dreamhost" if get_attribute("etc", "passwd", "dhc-user")
+    # dream host doesn't support windows so bail early if we're on windows
+    return "openstack" if RUBY_PLATFORM =~ /mswin|mingw32|windows/
 
+    if Etc.getpwnam("dhc-user")
+      "dreamhost"
+    end
+  rescue ArgumentError # getpwnam raises ArgumentError if the user is not found
     "openstack"
   end
 

data/lib/ohai/plugins/passwd.rb

@@ -4,6 +4,10 @@ Ohai.plugin(:Passwd) do
   provides "etc", "current_user"
   optional true
 
+  # @param [String] str
+  #
+  # @return [String]
+  #
   def fix_encoding(str)
     str.force_encoding(Encoding.default_external) if str.respond_to?(:force_encoding)
     str

data/lib/ohai/version.rb

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

data/spec/functional/application_spec.rb

@@ -25,12 +25,12 @@ RSpec.describe "Ohai::Application" do
   let(:argv) { [] }
   let(:stderr) { StringIO.new }
 
-  before(:each) do
+  before do
     @original_argv = ARGV.dup
     ARGV.replace(argv)
   end
 
-  after(:each) do
+  after do
     ARGV.replace(@original_argv)
   end
 
@@ -40,13 +40,13 @@ RSpec.describe "Ohai::Application" do
     let(:config_dir) { Dir.mktmpdir(".chef") }
     let(:config_location) { File.join(config_dir, "config.rb") }
 
-    before(:each) do
+    before do
       File.open(config_location, "w+") do |f|
         f.write(config_content)
       end
     end
 
-    after(:each) do
+    after do
       FileUtils.rm_rf(config_dir)
     end
 
@@ -74,7 +74,7 @@ RSpec.describe "Ohai::Application" do
       # https://github.com/chef/chef/blob/master/chef-config/lib/chef-config/workstation_config_loader.rb#L102
       let(:env) { { "KNIFE_HOME" => config_dir } }
 
-      before(:each) do
+      before do
         allow_any_instance_of(ChefConfig::WorkstationConfigLoader)
           .to receive(:env).and_return(env)
       end

data/spec/functional/loader_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe "Ohai::Loader" do
       let(:plugin_directory) { Dir.mktmpdir("plugins") }
       let(:plugin_path) { plugin_directory.tr("/", "\\") }
 
-      before(:each) do
+      before do
         Ohai.config[:plugin_path] = plugin_path
 
         plugin_content = <<~EOF
@@ -38,7 +38,7 @@ RSpec.describe "Ohai::Loader" do
         end
       end
 
-      after(:each) do
+      after do
         FileUtils.rm_rf(plugin_directory)
       end
 

data/spec/functional/plugins/powershell_spec.rb

@@ -22,52 +22,58 @@ describe Ohai::System, "languages plugin" do
   VERSION_MATCHING_REGEX = /^(?:[\d]+\.)+[\d]+$/.freeze
   describe "powershell plugin", :windows_only do
     RSpec.shared_examples "a version looking thing" do
-      it "should be present" do
+      it "is present" do
         expect(subject).not_to be_nil
       end
-      it "should look like a version" do
+      it "looks like a version" do
         expect(subject).to match(VERSION_MATCHING_REGEX)
       end
     end
+    subject { @plugin[:languages][:powershell] }
+
     before(:all) do
       @plugin = get_plugin("powershell")
       @plugin[:languages] = Mash.new
       @plugin.run
     end
 
-    subject { @plugin[:languages][:powershell] }
-
-    it "should have information about powershell" do
+    it "has information about powershell" do
       expect(subject).not_to be_nil
     end
 
     describe :version do
       subject { @plugin.languages[:powershell][described_class] }
+
       it_behaves_like "a version looking thing"
     end
 
     describe :ws_man_stack_version do
       subject { @plugin.languages[:powershell][described_class] }
+
       it_behaves_like "a version looking thing"
     end
 
     describe :serialization_version do
       subject { @plugin.languages[:powershell][described_class] }
+
       it_behaves_like "a version looking thing"
     end
 
     describe :clr_version do
       subject { @plugin.languages[:powershell][described_class] }
+
       it_behaves_like "a version looking thing"
     end
 
     describe :build_version do
       subject { @plugin.languages[:powershell][described_class] }
+
       it_behaves_like "a version looking thing"
     end
 
     describe :remoting_protocol_version do
       subject { @plugin.languages[:powershell][described_class] }
+
       it_behaves_like "a version looking thing"
     end
 

data/spec/functional/plugins/root_group_spec.rb

@@ -26,7 +26,7 @@ describe Ohai::System, "root_group plugin" do
   describe "windows platform", :windows_only do
     let(:wmi) { WmiLite::Wmi.new }
 
-    it "should return the system's administrators (root) group" do
+    it "returns the system's administrators (root) group" do
       # Notethat the Win32_Group WMI provider can be slow if your
       # system is domain-joined and has hundreds of thousands of
       # groups in Active Directory -- not a typical test scenario, but

data/spec/functional/plugins/windows/uptime_spec.rb

@@ -32,18 +32,18 @@ describe Ohai::System, "Windows plugin uptime" do
       })
     end
 
-    before(:each) do
+    before do
       allow(uptime_plugin).to receive(:collect_os).and_return(:windows)
       allow(WmiLite::Wmi).to receive(:new).and_return(wmi)
       allow(Time).to receive_message_chain(:new, :to_i).and_return(1473756619)
     end
 
-    it "should set uptime_seconds to uptime" do
+    it "sets uptime_seconds to uptime" do
       uptime_plugin.run
       expect(uptime_plugin[:uptime_seconds]).to be == 80331
     end
 
-    it "should set uptime to a human readable value" do
+    it "sets uptime to a human readable value" do
       uptime_plugin.run
       expect(uptime_plugin[:uptime]).to eq("22 hours 18 minutes 51 seconds")
     end

data/spec/ohai_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Ohai do
 
-  it "should have a version constant defined" do
+  it "has a version constant defined" do
     expect(Ohai::VERSION).to be_a_kind_of(String)
   end
 

data/spec/spec_helper.rb

@@ -16,8 +16,8 @@ PLUGIN_PATH = File.expand_path("../../lib/ohai/plugins", __FILE__)
 SPEC_PLUGIN_PATH = File.expand_path("../data/plugins", __FILE__)
 
 RSpec.configure do |config|
-  config.before(:each) { @object_pristine = Object.clone }
-  config.after(:each) { remove_constants }
+  config.before { @object_pristine = Object.clone }
+  config.after { remove_constants }
 end
 
 include Ohai::Mixin::ConstantHelper
@@ -36,19 +36,19 @@ def convert_windows_output(stdout)
 end
 
 def it_should_check_from(plugin, attribute, from, value)
-  it "should set the #{attribute} to the value from '#{from}'" do
+  it "sets the #{attribute} to the value from '#{from}'" do
     @plugin.run
     expect(@plugin[attribute]).to eq(value)
   end
 end
 
 def it_should_check_from_mash(plugin, attribute, from, value)
-  it "should get the #{plugin}[:#{attribute}] value from '#{from}'" do
+  it "gets the #{plugin}[:#{attribute}] value from '#{from}'" do
     expect(@plugin).to receive(:shell_out).with(from).and_return(mock_shell_out(value[0], value[1], value[2]))
     @plugin.run
   end
 
-  it "should set the #{plugin}[:#{attribute}] to the value from '#{from}'" do
+  it "sets the #{plugin}[:#{attribute}] to the value from '#{from}'" do
     @plugin.run
     expect(@plugin[plugin][attribute]).to eq(value[1].split($/)[0])
   end
@@ -64,12 +64,12 @@ end
 
 # the mash variable may be an array listing multiple levels of Mash hierarchy
 def it_should_check_from_deep_mash(plugin, mash, attribute, from, value)
-  it "should get the #{mash.inspect}[:#{attribute}] value from '#{from}'" do
+  it "gets the #{mash.inspect}[:#{attribute}] value from '#{from}'" do
     expect(@plugin).to receive(:shell_out).with(from).and_return(mock_shell_out(value[0], value[1], value[2]))
     @plugin.run
   end
 
-  it "should set the #{mash.inspect}[:#{attribute}] to the value from '#{from}'" do
+  it "sets the #{mash.inspect}[:#{attribute}] to the value from '#{from}'" do
     @plugin.run
     value = value[1].split($/)[0]
     if mash.is_a?(String)
@@ -114,7 +114,7 @@ RSpec.configure do |config|
 
   config.run_all_when_everything_filtered = true
 
-  config.before :each do
+  config.before do
     # TODO: Change to Ohai.config once Ohai::Config is deprecated fully. Needs
     # to stay Ohai::Config for now so that top-level attributes will get cleared
     # out between tests (config_spec should be the only place where top-level

data/spec/support/integration_helper.rb

@@ -21,11 +21,11 @@ module IntegrationSupport
   def when_plugins_directory(description, &block)
     context "When the plugins directory #{description}" do
 
-      before(:each) do
+      before do
         @plugins_directory = Dir.mktmpdir("ohai-plugins")
       end
 
-      after(:each) do
+      after do
         if @plugins_directory
           begin
             FileUtils.remove_entry_secure(@plugins_directory)
@@ -49,7 +49,7 @@ module IntegrationSupport
       end
 
       def self.with_plugin(plugin_path, contents) # rubocop:disable Lint/NestedMethodDefinition
-        before :each do
+        before do
           with_plugin(plugin_path, contents)
         end
       end

data/spec/unit/application_spec.rb

@@ -24,12 +24,12 @@ RSpec.describe "Ohai::Application" do
   let(:argv) { [] }
   let(:app) { Ohai::Application.new }
 
-  before(:each) do
+  before do
     @original_argv = ARGV
     ARGV.replace(argv)
   end
 
-  after(:each) do
+  after do
     ARGV.replace(@original_argv)
   end
 
@@ -41,7 +41,7 @@ RSpec.describe "Ohai::Application" do
       context "when specified on the command line" do
         let(:argv) { [ "-c", config_file ] }
 
-        before(:each) do
+        before do
           if windows?
             expect(ChefConfig::WorkstationConfigLoader).to receive(:new)
               .with("C:#{config_file}", Ohai::Log)
@@ -68,7 +68,7 @@ RSpec.describe "Ohai::Application" do
       end
 
       context "when a local workstation config exists" do
-        before(:each) do
+        before do
           expect(ChefConfig::WorkstationConfigLoader).to receive(:new)
             .with(nil, Ohai::Log)
             .and_return(config_loader)
@@ -86,7 +86,7 @@ RSpec.describe "Ohai::Application" do
       let(:directory) { "/some/fantastic/plugins" }
 
       it "does not generate deprecated config warnings for cli options" do
-        expect(Ohai::Log).to_not receive(:warn)
+        expect(Ohai::Log).not_to receive(:warn)
           .with(/Ohai::Config\[:directory\] is deprecated/)
         app.configure_ohai
       end