ohai 15.1.5 → 15.2.5

data/spec/unit/plugins/packages_spec.rb

@@ -100,6 +100,26 @@ describe Ohai::System, "plugin packages" do
       expect(plugin[:packages]["tzdata"][:installdate]).to eq("1463486618")
       expect(plugin[:packages]["tzdata"][:arch]).to eq("noarch")
     end
+
+    it "handles multiple packages with the same name" do
+      expect(plugin[:packages]["kernel"][:version]).to eq("3.10.0")
+      expect(plugin[:packages]["kernel"][:release]).to eq("862.el7")
+      expect(plugin[:packages]["kernel"][:epoch]).to eq("0")
+      expect(plugin[:packages]["kernel"][:installdate]).to eq("1521745632")
+      expect(plugin[:packages]["kernel"][:arch]).to eq("x86_64")
+      # and now the version list:
+      expect(plugin[:packages]["kernel"]["versions"].first[:version]).to eq("3.10.0")
+      expect(plugin[:packages]["kernel"]["versions"].first[:release]).to eq("862.2.3.el7")
+      expect(plugin[:packages]["kernel"]["versions"].first[:epoch]).to eq("0")
+      expect(plugin[:packages]["kernel"]["versions"].first[:installdate]).to eq("1526310781")
+      expect(plugin[:packages]["kernel"]["versions"].first[:arch]).to eq("x86_64")
+      expect(plugin[:packages]["kernel"]["versions"].last[:version]).to eq("3.10.0")
+      expect(plugin[:packages]["kernel"]["versions"].last[:release]).to eq("862.el7")
+      expect(plugin[:packages]["kernel"]["versions"].last[:epoch]).to eq("0")
+      expect(plugin[:packages]["kernel"]["versions"].last[:installdate]).to eq("1521745632")
+      expect(plugin[:packages]["kernel"]["versions"].last[:arch]).to eq("x86_64")
+
+    end
   end
 
   context "on arch" do

data/spec/unit/plugins/ruby_spec.rb

@@ -48,7 +48,7 @@ describe Ohai::System, "plugin ruby" do
     host_vendor: ::RbConfig::CONFIG["host_vendor"],
     gems_dir: `#{ruby_bin} #{::RbConfig::CONFIG["bindir"]}/gem env gemdir`.chomp,
     gem_bin: [ ::Gem.default_exec_format % "gem", "gem" ].map do |bin|
-      "#{::RbConfig::CONFIG['bindir']}/#{bin}"
+      "#{::RbConfig::CONFIG["bindir"]}/#{bin}"
     end.find { |bin| ::File.exist? bin },
     ruby_bin: ruby_bin,
   }.each do |attribute, value|

data/spec/unit/plugins/scsi_spec.rb

@@ -31,7 +31,8 @@ describe Ohai::System, "lsscsi plugin" do
       [6:2:4:0]    disk    LSI      MR9286CV-8e      3.41  /dev/sdf
     LSSCSI
     allow(plugin).to receive(:shell_out).with("lsscsi").and_return(
-      mock_shell_out(0, @stdout, ""))
+      mock_shell_out(0, @stdout, "")
+    )
     plugin.run
   end
 

data/spec/unit/plugins/shard_spec.rb

@@ -93,7 +93,7 @@ describe Ohai::System, "shard plugin" do
     end
 
     it "should allow os_serial source" do
-      Ohai.config[:plugin][:shard_seed][:sources] = [:machinename, :os_serial, :uuid]
+      Ohai.config[:plugin][:shard_seed][:sources] = %i{machinename os_serial uuid}
       # Different from above.
       expect(subject).to eq(178738102)
     end

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

@@ -43,7 +43,7 @@ describe Ohai::System, "Windows Filesystem Plugin", :windows_only do
         "freespace" => "100000",
         "name" => "D:",
         # Lets not pass "volumename" for this drive
-      }
+      },
     ]
   end
 
@@ -56,7 +56,7 @@ describe Ohai::System, "Windows Filesystem Plugin", :windows_only do
       {
         "conversionstatus" => 2,
         "driveletter" => "D:",
-      }
+      },
     ]
   end
 

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

@@ -34,7 +34,7 @@ describe Ohai::System, "Windows kernel plugin", :windows_only do
     os_properties = [ caption, version, build_number, csd_version, os_type, product_type, operating_system_sku ]
 
     os = double( "WIN32OLE",
-                  properties_: os_properties)
+      properties_: os_properties)
 
     allow(os).to receive(:invoke).with(build_number.name).and_return("7601")
     allow(os).to receive(:invoke).with(csd_version.name).and_return("Service Pack 1")
@@ -53,7 +53,7 @@ describe Ohai::System, "Windows kernel plugin", :windows_only do
     cs_properties = [ system_type, pc_system_type, free_virtual_memory]
 
     cs = double("WIN32OLE",
-                properties_: cs_properties)
+      properties_: cs_properties)
 
     allow(cs).to receive(:invoke).with(system_type.name).and_return("x64-based PC")
     allow(cs).to receive(:invoke).with(pc_system_type.name).and_return(2)

data/spec/unit/runner_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Claire McQuin (<claire@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -34,7 +34,7 @@ describe Ohai::Runner, "run_plugin" do
   end
 
   describe "when running a plugin" do
-    let(:plugin) { double("Ohai::DSL::Plugin", kind_of?: true, version: version, name: :Test, has_run?: has_run, dependencies: [ ]) }
+    let(:plugin) { double("Ohai::DSL::Plugin", is_a?: true, version: version, name: :Test, has_run?: has_run, dependencies: [ ]) }
     let(:version) { :version7 }
     let(:has_run) { false }
 

data/spec/unit/system_spec.rb

@@ -37,9 +37,9 @@ describe "Ohai::System" do
 
     it "merges provided configuration options into the ohai config context" do
       config = {
-        disabled_plugins: [ :Foo, :Baz ],
+        disabled_plugins: %i{Foo Baz},
         directory: ["/some/extra/plugins"],
-        critical_plugins: [ :Foo, :Bar ],
+        critical_plugins: %i{Foo Bar},
       }
       Ohai::System.new(config)
       config.each do |option, value|
@@ -249,7 +249,7 @@ describe "Ohai::System" do
         it "should fail when critical plugins fail" do
           Ohai.config[:plugin_path] = [ path_to(".") ]
           expect { ohai.all_plugins }.to raise_error(Ohai::Exceptions::CriticalPluginFailure,
-                                                     "The following Ohai plugins marked as critical failed: [:Fails]. Failing Chef run.")
+            "The following Ohai plugins marked as critical failed: [:Fails]. Failing Chef run.")
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 15.1.5
+  version: 15.2.5
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-22 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu