ohai 15.2.5 → 15.3.1

data/spec/unit/plugins/windows/fips_spec.rb

@@ -20,16 +20,16 @@ require "spec_helper"
 require "openssl"
 
 describe Ohai::System, "plugin fips" do
-  let(:enabled) { 0 }
-  let(:plugin) { get_plugin("windows/fips") }
-  let(:openssl_test_mode) { false }
-
   subject do
     plugin.run
     plugin["fips"]["kernel"]["enabled"]
   end
 
-  before(:each) do
+  let(:enabled) { 0 }
+  let(:plugin) { get_plugin("windows/fips") }
+  let(:openssl_test_mode) { false }
+
+  before do
     allow(plugin).to receive(:collect_os).and_return(:windows)
   end
 
@@ -44,6 +44,7 @@ describe Ohai::System, "plugin fips" do
 
   context "with OpenSSL.fips_mode == false" do
     before { allow(OpenSSL).to receive(:fips_mode).and_return(false) }
+
     it "does not set fips plugin" do
       expect(subject).to be(false)
     end
@@ -51,6 +52,7 @@ describe Ohai::System, "plugin fips" do
 
   context "with OpenSSL.fips_mode == true" do
     before { allow(OpenSSL).to receive(:fips_mode).and_return(true) }
+
     it "sets fips plugin" do
       expect(subject).to be(true)
     end

data/spec/unit/plugins/windows/kernel_spec.rb

@@ -65,7 +65,7 @@ describe Ohai::System, "Windows kernel plugin", :windows_only do
     plugin.run
   end
 
-  it "should set the correct system information" do
+  it "sets the correct system information" do
     expect(plugin[:kernel][:name]).to eq("Microsoft Windows 7 Ultimate")
     expect(plugin[:kernel][:release]).to eq("6.1.7601")
     expect(plugin[:kernel][:version]).to eq("6.1.7601 Service Pack 1 Build 7601")

data/spec/unit/plugins/windows/memory_spec.rb

@@ -29,22 +29,22 @@ describe Ohai::System, "Windows memory plugin", :windows_only do
     expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with("Win32_OperatingSystem").and_return(mock_os)
   end
 
-  it "should get total memory" do
+  it "gets total memory" do
     @plugin.run
     expect(@plugin["memory"]["total"]).to eql("10485760kB")
   end
 
-  it "should get free memory" do
+  it "gets free memory" do
     @plugin.run
     expect(@plugin["memory"]["free"]).to eql("5242880kB")
   end
 
-  it "should get total swap" do
+  it "gets total swap" do
     @plugin.run
     expect(@plugin["memory"]["swap"]["total"]).to eql("20971520kB")
   end
 
-  it "should get free memory" do
+  it "gets free memory" do
     @plugin.run
     expect(@plugin["memory"]["swap"]["free"]).to eql("15728640kB")
   end

data/spec/unit/plugins/windows/network_spec.rb

@@ -22,7 +22,7 @@ require "ipaddress"
 describe Ohai::System, "Windows Network Plugin" do
   let(:plugin) { get_plugin("windows/network") }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return(:windows)
   end
 

data/spec/unit/plugins/windows/system_enclosure_spec.rb

@@ -33,12 +33,12 @@ describe Ohai::System, "System Enclosure", :windows_only do
     expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with(("Win32_SystemEnclosure")).and_return(wmi_object)
   end
 
-  it "should return the manufacturer" do
+  it "returns the manufacturer" do
     @plugin.run
     expect(@plugin["system_enclosure"]["manufacturer"]).to eql("My Fake Manufacturer")
   end
 
-  it "should return a serial number" do
+  it "returns a serial number" do
     @plugin.run
     expect(@plugin["system_enclosure"]["serialnumber"]).to eql("1234123412341234")
   end

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

@@ -23,7 +23,7 @@ describe Ohai::System, "Windows plugin uptime" do
   let(:plugin) { get_plugin("uptime") }
   let(:wmi) { double("wmi", { first_of: "" }) }
 
-  before(:each) do
+  before do
     allow(WmiLite::Wmi).to receive(:new).and_return(wmi)
     allow(plugin).to receive(:collect_os).and_return(:windows)
   end

data/spec/unit/plugins/windows/virtualization_spec.rb

@@ -24,7 +24,7 @@ describe Ohai::System, "Windows virtualization platform" do
   let(:plugin) { get_plugin("windows/virtualization") }
   let(:wmi) { double("WmiLite::Wmi") }
 
-  before(:each) do
+  before do
     allow(WmiLite::Wmi).to receive(:new).and_return(wmi)
     allow(plugin).to receive(:collect_os).and_return(:windows)
   end

data/spec/unit/plugins/zpools_spec.rb

@@ -66,6 +66,7 @@ describe Ohai::System, "zpools plugin" do
   errors: No known data errors
       EOSR
     end
+
     before do
       allow(plugin).to receive(:platform_family).and_return("rhel")
       allow(plugin).to receive(:collect_os).and_return(:linux)
@@ -177,6 +178,7 @@ describe Ohai::System, "zpools plugin" do
         errors: No known data errors
       EOSR
     end
+
     before do
       allow(plugin).to receive(:platform_family).and_return("solaris2")
       allow(plugin).to receive(:collect_os).and_return(:solaris2)

data/spec/unit/provides_map_spec.rb

@@ -30,13 +30,13 @@ describe Ohai::ProvidesMap do
 
   describe "when looking up providing plugins for a single attribute" do
     describe "when the attribute does not exist" do
-      it "should raise Ohai::Exceptions::AttributeNotFound error" do
+      it "raises Ohai::Exceptions::AttributeNotFound error" do
         expect { provides_map.find_providers_for(["single"]) }.to raise_error(Ohai::Exceptions::AttributeNotFound, "No such attribute: 'single'")
       end
     end
 
     describe "when the attribute does not have a provider" do
-      it "should raise Ohai::Exceptions::ProviderNotFound error" do
+      it "raises Ohai::Exceptions::ProviderNotFound error" do
         provides_map.set_providers_for(plugin_1, ["first/second"])
         expect { provides_map.find_providers_for(["first"]) }.to raise_error(Ohai::Exceptions::ProviderNotFound, "Cannot find plugin providing attribute: 'first'")
       end
@@ -47,7 +47,7 @@ describe Ohai::ProvidesMap do
         provides_map.set_providers_for(plugin_1, ["single"])
       end
 
-      it "should return the provider" do
+      it "returns the provider" do
         expect(provides_map.find_providers_for(["single"])).to eq([plugin_1])
       end
     end
@@ -58,7 +58,7 @@ describe Ohai::ProvidesMap do
         provides_map.set_providers_for(plugin_2, ["single"])
       end
 
-      it "should return all providers" do
+      it "returns all providers" do
         expect(provides_map.find_providers_for(["single"])).to eq([plugin_1, plugin_2])
       end
     end
@@ -72,7 +72,7 @@ describe Ohai::ProvidesMap do
         provides_map.set_providers_for(plugin_2, ["two"])
       end
 
-      it "should return each provider" do
+      it "returns each provider" do
         expect(provides_map.find_providers_for(%w{one two})).to eq([plugin_1, plugin_2])
       end
     end
@@ -84,7 +84,7 @@ describe Ohai::ProvidesMap do
         provides_map.set_providers_for(plugin_1, ["one_again"])
       end
 
-      it "should return unique providers" do
+      it "returns unique providers" do
         expect(provides_map.find_providers_for(%w{one one_again})).to eq([plugin_1])
       end
     end
@@ -96,7 +96,7 @@ describe Ohai::ProvidesMap do
         provides_map.set_providers_for(plugin_1, ["top/middle/bottom"])
       end
 
-      it "should collect the provider" do
+      it "collects the provider" do
         expect(provides_map.find_providers_for(["top/middle/bottom"])).to eq([plugin_1])
       end
     end
@@ -104,13 +104,13 @@ describe Ohai::ProvidesMap do
 
   describe "when setting multi-level attributes" do
     describe "when the attribute contains //" do
-      it "should raise an Ohai::Exceptions::AttributeSyntaxError" do
+      it "raises an Ohai::Exceptions::AttributeSyntaxError" do
         expect { provides_map.set_providers_for(plugin_1, ["this/plugin//is/bad"]) }.to raise_error(Ohai::Exceptions::AttributeSyntaxError, "Attribute contains duplicate '/' characters: this/plugin//is/bad")
       end
     end
 
     describe "when the attribute has a trailing slash" do
-      it "should raise an Ohai::Exceptions::AttributeSyntaxError" do
+      it "raises an Ohai::Exceptions::AttributeSyntaxError" do
         expect { provides_map.set_providers_for(plugin_1, ["this/plugin/is/bad/"]) }.to raise_error(Ohai::Exceptions::AttributeSyntaxError, "Attribute contains a trailing '/': this/plugin/is/bad/")
       end
     end
@@ -123,7 +123,7 @@ describe Ohai::ProvidesMap do
       provides_map.set_providers_for(plugin_3, ["cat/mouth/teeth"])
     end
 
-    it "should find providers for subattributes if any exists when the attribute doesn't have a provider" do
+    it "finds providers for subattributes if any exists when the attribute doesn't have a provider" do
       providers = provides_map.deep_find_providers_for(["cat"])
       expect(providers).to have(3).plugins
       expect(providers).to include(plugin_1)
@@ -131,7 +131,7 @@ describe Ohai::ProvidesMap do
       expect(providers).to include(plugin_3)
     end
 
-    it "should find providers for the first parent attribute when the attribute or any subattributes doesn't have a provider" do
+    it "finds providers for the first parent attribute when the attribute or any subattributes doesn't have a provider" do
       providers = provides_map.deep_find_providers_for(["cat/paws/front"])
       expect(providers).to eq([plugin_2])
     end
@@ -143,7 +143,7 @@ describe Ohai::ProvidesMap do
         provides_map.set_providers_for(plugin_1, ["do/not/eat/metal"])
       end
 
-      it "should return the provider of the full attribute" do
+      it "returns the provider of the full attribute" do
         expect(provides_map.find_closest_providers_for(["do/not/eat/metal"])).to eql([plugin_1])
       end
     end
@@ -153,34 +153,34 @@ describe Ohai::ProvidesMap do
         provides_map.set_providers_for(plugin_1, ["do/not/eat"])
       end
 
-      it "should not raise error if a parent attribute is provided" do
+      it "does not raise error if a parent attribute is provided" do
         expect { provides_map.find_closest_providers_for(["do/not/eat/plastic"]) }.not_to raise_error
       end
 
-      it "should return the providers of the closest parent attribute" do
+      it "returns the providers of the closest parent attribute" do
         provides_map.set_providers_for(plugin_2, ["do/not"]) # set a less-specific parent
         expect(provides_map.find_closest_providers_for(["do/not/eat/glass"])).to eql([plugin_1])
       end
 
-      it "should raise error if the least-specific parent is not an attribute" do
+      it "raises error if the least-specific parent is not an attribute" do
         expect { provides_map.find_closest_providers_for(["please/eat/your/vegetables"]) }.to raise_error(Ohai::Exceptions::AttributeNotFound, "No such attribute: 'please/eat/your/vegetables'")
       end
 
-      it "should raise error if no parent attribute has a provider" do
+      it "raises error if no parent attribute has a provider" do
         expect { provides_map.find_closest_providers_for(["do/not"]) }.to raise_error(Ohai::Exceptions::ProviderNotFound, "Cannot find plugin providing attribute: 'do/not'")
       end
     end
   end
 
   describe "when listing all plugins" do
-    before(:each) do
+    before do
       provides_map.set_providers_for(plugin_1, ["one"])
       provides_map.set_providers_for(plugin_2, ["two"])
       provides_map.set_providers_for(plugin_3, ["stub/three"])
       provides_map.set_providers_for(plugin_4, ["foo/bar/four", "also/this/four"])
     end
 
-    it "should find all the plugins providing attributes" do
+    it "finds all the plugins providing attributes" do
       all_plugins = provides_map.all_plugins
       expect(all_plugins).to have(4).plugins
       expect(all_plugins).to include(plugin_1)

data/spec/unit/runner_spec.rb

@@ -22,13 +22,13 @@ require "spec_helper"
 describe Ohai::Runner, "run_plugin" do
   let(:safe_run) { true }
 
-  before(:each) do
+  before do
     @ohai = Ohai::System.new
     @runner = Ohai::Runner.new(@ohai, safe_run)
   end
 
   describe "when running an invalid plugin" do
-    it "should raise error" do
+    it "raises error" do
       expect { @runner.run_plugin(double("Ohai::NotPlugin")) }.to raise_error(Ohai::Exceptions::InvalidPlugin)
     end
   end
@@ -39,7 +39,7 @@ describe Ohai::Runner, "run_plugin" do
     let(:has_run) { false }
 
     describe "version 7" do
-      it "should call run_v7_plugin" do
+      it "calls run_v7_plugin" do
         expect(@runner).to receive(:run_v7_plugin)
         @runner.run_plugin(plugin)
       end
@@ -47,7 +47,7 @@ describe Ohai::Runner, "run_plugin" do
       describe "if the plugin has run before" do
         let(:has_run) { true }
 
-        it "should not run the plugin" do
+        it "does not run the plugin" do
           expect(plugin).not_to receive(:safe_run)
           @runner.run_plugin(plugin)
         end
@@ -57,7 +57,7 @@ describe Ohai::Runner, "run_plugin" do
     describe "invalid version" do
       let(:version) { :versionBla }
 
-      it "should raise error" do
+      it "raises error" do
         expect { @runner.run_plugin(plugin) }.to raise_error(Ohai::Exceptions::InvalidPlugin)
       end
     end
@@ -74,12 +74,12 @@ describe Ohai::Runner, "run_plugin" do
       klass.new(@ohai.data, @ohai.logger)
     end
 
-    it "should run the plugin" do
+    it "runs the plugin" do
       @runner.run_plugin(plugin)
       expect(plugin.has_run?).to be true
     end
 
-    it "should add plugin data to Ohai::System.data" do
+    it "adds plugin data to Ohai::System.data" do
       @runner.run_plugin(plugin)
       expect(@ohai.data).to have_key(:thing)
       expect(@ohai.data[:thing]).to eql({})
@@ -88,7 +88,7 @@ describe Ohai::Runner, "run_plugin" do
 
   describe "when running a plugin with one dependency" do
     describe "when the dependency does not exist" do
-      before(:each) do
+      before do
         klass = Ohai.plugin(:Test) do
           provides("thing")
           depends("other_thing")
@@ -99,18 +99,18 @@ describe Ohai::Runner, "run_plugin" do
         @plugin = klass.new(@ohai.data, @ohai.logger)
       end
 
-      it "should raise Ohai::Excpetions::AttributeNotFound" do
+      it "raises Ohai::Excpetions::AttributeNotFound" do
         expect { @runner.run_plugin(@plugin) }.to raise_error(Ohai::Exceptions::AttributeNotFound)
       end
 
-      it "should not run the plugin" do
+      it "does not run the plugin" do
         expect { @runner.run_plugin(@plugin) }.to raise_error(Ohai::Exceptions::AttributeNotFound)
         expect(@plugin.has_run?).to be false
       end
     end
 
     describe "when the dependency has a single provider" do
-      before(:each) do
+      before do
         klass1 = Ohai.plugin(:Thing) do
           provides("thing")
           collect_data do
@@ -134,7 +134,7 @@ describe Ohai::Runner, "run_plugin" do
         @ohai.provides_map.set_providers_for(@plugin1, ["thing"])
       end
 
-      it "should run the plugins" do
+      it "runs the plugins" do
         @runner.run_plugin(@plugin2)
         @plugins.each do |plugin|
           expect(plugin.has_run?).to be true
@@ -143,7 +143,7 @@ describe Ohai::Runner, "run_plugin" do
     end
 
     describe "when the dependency has multiple providers" do
-      before(:each) do
+      before do
         klass1 = Ohai.plugin(:Thing) do
           provides("thing")
           collect_data do
@@ -168,7 +168,7 @@ describe Ohai::Runner, "run_plugin" do
         @ohai.provides_map.set_providers_for(@plugin2, ["thing"])
       end
 
-      it "should run the plugins" do
+      it "runs the plugins" do
         @runner.run_plugin(@plugin3)
         @plugins.each do |plugin|
           expect(plugin.has_run?).to be true
@@ -178,7 +178,7 @@ describe Ohai::Runner, "run_plugin" do
   end
 
   describe "when running a plugin with many dependencies" do
-    before(:each) do
+    before do
       @ohai = Ohai::System.new
       @runner = Ohai::Runner.new(@ohai, true)
 
@@ -211,7 +211,7 @@ describe Ohai::Runner, "run_plugin" do
       @ohai.provides_map.set_providers_for(@plugin2, %w{one two})
     end
 
-    it "should run the plugins" do
+    it "runs the plugins" do
       @runner.run_plugin(@plugin3)
       @plugins.each do |plugin|
         expect(plugin.has_run?).to be true
@@ -242,7 +242,7 @@ describe Ohai::Runner, "run_plugin" do
     end
 
     context "when there is one edge in the cycle (A->B and B->A)" do
-      before(:each) do
+      before do
         klass1 = Ohai.plugin(:Thing) do # rubocop disable Lint/UselessAssignment
           provides("thing")
           depends("other")
@@ -266,7 +266,7 @@ describe Ohai::Runner, "run_plugin" do
         @plugin1, @plugin2 = @plugins
       end
 
-      it "should raise Ohai::Exceptions::DependencyCycle" do
+      it "raises Ohai::Exceptions::DependencyCycle" do
         allow(runner).to receive(:fetch_plugins).with(["thing"]).and_return([@plugin1])
         allow(runner).to receive(:fetch_plugins).with(["other"]).and_return([@plugin2])
         expected_error_string = "Dependency cycle detected. Please refer to the following plugins: Thing, Other"
@@ -276,7 +276,7 @@ describe Ohai::Runner, "run_plugin" do
   end
 
   describe "when A depends on B and C, and B depends on C" do
-    before(:each) do
+    before do
       @ohai = Ohai::System.new
       @runner = Ohai::Runner.new(@ohai, true)
 
@@ -302,7 +302,7 @@ describe Ohai::Runner, "run_plugin" do
       @plugin_a, @plugin_b, @plugin_c = @plugins
     end
 
-    it "should not detect a cycle when B is the first provider returned" do
+    it "does not detect a cycle when B is the first provider returned" do
       @ohai.provides_map.set_providers_for(@plugin_a, ["A"])
       @ohai.provides_map.set_providers_for(@plugin_b, ["B"])
       @ohai.provides_map.set_providers_for(@plugin_c, ["C"])
@@ -315,7 +315,7 @@ describe Ohai::Runner, "run_plugin" do
       end
     end
 
-    it "should not detect a cycle when C is the first provider returned" do
+    it "does not detect a cycle when C is the first provider returned" do
       @ohai.provides_map.set_providers_for(@plugin_a, ["A"])
       @ohai.provides_map.set_providers_for(@plugin_c, ["C"])
       @ohai.provides_map.set_providers_for(@plugin_b, ["B"])
@@ -331,14 +331,14 @@ describe Ohai::Runner, "run_plugin" do
 end
 
 describe Ohai::Runner, "fetch_plugins" do
-  before(:each) do
+  before do
     @provides_map = Ohai::ProvidesMap.new
     @data = Mash.new
     @ohai = double("Ohai::System", data: @data, provides_map: @provides_map, logger: Ohai::Log.with_child)
     @runner = Ohai::Runner.new(@ohai, true)
   end
 
-  it "should collect the provider" do
+  it "collects the provider" do
     plugin = Ohai::DSL::Plugin.new(@ohai.data, @ohai.logger)
     @ohai.provides_map.set_providers_for(plugin, ["top/middle/bottom"])
 
@@ -348,7 +348,7 @@ describe Ohai::Runner, "fetch_plugins" do
 
   describe "when the attribute is not provided by any plugin" do
     describe "and some parent attribute has providers" do
-      it "should return the providers for the parent" do
+      it "returns the providers for the parent" do
         plugin = Ohai::DSL::Plugin.new(@ohai.data, @ohai.logger)
         @provides_map.set_providers_for(plugin, ["test/attribute"])
         expect(@runner.fetch_plugins(["test/attribute/too_far"])).to eql([plugin])
@@ -356,14 +356,14 @@ describe Ohai::Runner, "fetch_plugins" do
     end
 
     describe "and no parent attribute has providers" do
-      it "should raise Ohai::Exceptions::AttributeNotFound exception" do
+      it "raises Ohai::Exceptions::AttributeNotFound exception" do
         # provides map is empty
         expect { @runner.fetch_plugins(["false/attribute"]) }.to raise_error(Ohai::Exceptions::AttributeNotFound, "No such attribute: 'false/attribute'")
       end
     end
   end
 
-  it "should return unique providers" do
+  it "returns unique providers" do
     plugin = Ohai::DSL::Plugin.new(@ohai.data, @ohai.logger)
     @provides_map.set_providers_for(plugin, ["test", "test/too_far/way_too_far"])
     expect(@runner.fetch_plugins(["test", "test/too_far/way_too_far"])).to eql([plugin])
@@ -371,7 +371,7 @@ describe Ohai::Runner, "fetch_plugins" do
 end
 
 describe Ohai::Runner, "#get_cycle" do
-  before(:each) do
+  before do
     @ohai = Ohai::System.new
     @runner = Ohai::Runner.new(@ohai, true)
 
@@ -404,7 +404,7 @@ describe Ohai::Runner, "#get_cycle" do
     @plugin1, @plugin2, @plugin3 = plugins
   end
 
-  it "should return the sources for the plugins in the cycle, when given an exact cycle" do
+  it "returns the sources for the plugins in the cycle, when given an exact cycle" do
     cycle = [@plugin1, @plugin2]
     cycle_start = @plugin1
 
@@ -412,7 +412,7 @@ describe Ohai::Runner, "#get_cycle" do
     expect(cycle_names).to eql([@plugin1.name, @plugin2.name])
   end
 
-  it "should return the sources for only the plugins in the cycle, when there are plugins before the cycle begins" do
+  it "returns the sources for only the plugins in the cycle, when there are plugins before the cycle begins" do
     cycle = [@plugin3, @plugin1, @plugin2]
     cycle_start = @plugin1