ohai 14.2.0 → 14.3.0

data/spec/unit/plugins/virtualbox_spec.rb

@@ -17,34 +17,34 @@
 
 require_relative "../../spec_helper.rb"
 
-vbox_output = <<EOF
-Oracle VM VirtualBox Guest Additions Command Line Management Interface Version 5.0.2
-(C) 2008-2015 Oracle Corporation
-All rights reserved.
+vbox_output = <<~EOF
+  Oracle VM VirtualBox Guest Additions Command Line Management Interface Version 5.0.2
+  (C) 2008-2015 Oracle Corporation
+  All rights reserved.
 
-Name: /VirtualBox/GuestInfo/OS/Product, value: Linux, timestamp: 1448390422246549000, flags: <NULL>
-Name: /VirtualBox/GuestInfo/Net/0/V4/IP, value: 10.0.2.15, timestamp: 1448390422248366000, flags: <NULL>
-Name: /VirtualBox/HostInfo/GUI/LanguageID, value: en_US, timestamp: 1448390412061749000, flags: <NULL>
-Name: /VirtualBox/GuestInfo/Net/0/MAC, value: 080027FBB38C, timestamp: 1448390422248652000, flags: <NULL>
-Name: /VirtualBox/GuestInfo/OS/ServicePack, value: <NULL>, timestamp: 1448390422246976000, flags: <NULL>
-Name: /VirtualBox/HostInfo/VBoxVerExt, value: 5.0.10, timestamp: 1448390411701508000, flags: TRANSIENT, RDONLYGUEST
-Name: /VirtualBox/GuestInfo/Net/0/V4/Netmask, value: 255.255.255.0, timestamp: 1448390422248569000, flags: <NULL>
-Name: /VirtualBox/GuestInfo/OS/Version, value: #36~14.04.1-Ubuntu SMP Thu Oct 8 10:21:08 UTC 2015, timestamp: 1448390422246810000, flags: <NULL>
-Name: /VirtualBox/GuestAdd/VersionExt, value: 5.0.2, timestamp: 1448390422247220000, flags: <NULL>
-Name: /VirtualBox/GuestAdd/Revision, value: 102096, timestamp: 1448390422247266000, flags: <NULL>
-Name: /VirtualBox/HostGuest/SysprepExec, value: <NULL>, timestamp: 1448390411701168000, flags: TRANSIENT, RDONLYGUEST
-Name: /VirtualBox/GuestInfo/OS/LoggedInUsers, value: 1, timestamp: 1448390452251425000, flags: TRANSIENT, TRANSRESET
-Name: /VirtualBox/GuestInfo/Net/0/Status, value: Up, timestamp: 1448390422248755000, flags: <NULL>
-Name: /VirtualBox/GuestInfo/Net/0/Name, value: eth0, timestamp: 1448390422248814000, flags: <NULL>
-Name: /VirtualBox/HostGuest/SysprepArgs, value: <NULL>, timestamp: 1448390411701220000, flags: TRANSIENT, RDONLYGUEST
-Name: /VirtualBox/GuestAdd/Version, value: 5.0.2, timestamp: 1448390422247066000, flags: <NULL>
-Name: /VirtualBox/HostInfo/VBoxRev, value: 104061, timestamp: 1448390411701536000, flags: TRANSIENT, RDONLYGUEST
-Name: /VirtualBox/GuestInfo/Net/0/V4/Broadcast, value: 10.0.2.255, timestamp: 1448390422248498000, flags: <NULL>
-Name: /VirtualBox/HostInfo/VBoxVer, value: 5.0.10, timestamp: 1448390411701485000, flags: TRANSIENT, RDONLYGUEST
-Name: /VirtualBox/GuestInfo/OS/LoggedInUsersList, value: tim, timestamp: 1448390452251274000, flags: TRANSIENT, TRANSRESET
-Name: /VirtualBox/GuestInfo/Net/Count, value: 1, timestamp: 1448391352440445000, flags: <NULL>
-Name: /VirtualBox/GuestInfo/OS/Release, value: 3.19.0-31-generic, timestamp: 1448390422246638000, flags: <NULL>
-Name: /VirtualBox/GuestInfo/OS/NoLoggedInUsers, value: false, timestamp: 1448390452251532000, flags: TRANSIENT, TRANSRESET
+  Name: /VirtualBox/GuestInfo/OS/Product, value: Linux, timestamp: 1448390422246549000, flags: <NULL>
+  Name: /VirtualBox/GuestInfo/Net/0/V4/IP, value: 10.0.2.15, timestamp: 1448390422248366000, flags: <NULL>
+  Name: /VirtualBox/HostInfo/GUI/LanguageID, value: en_US, timestamp: 1448390412061749000, flags: <NULL>
+  Name: /VirtualBox/GuestInfo/Net/0/MAC, value: 080027FBB38C, timestamp: 1448390422248652000, flags: <NULL>
+  Name: /VirtualBox/GuestInfo/OS/ServicePack, value: <NULL>, timestamp: 1448390422246976000, flags: <NULL>
+  Name: /VirtualBox/HostInfo/VBoxVerExt, value: 5.0.10, timestamp: 1448390411701508000, flags: TRANSIENT, RDONLYGUEST
+  Name: /VirtualBox/GuestInfo/Net/0/V4/Netmask, value: 255.255.255.0, timestamp: 1448390422248569000, flags: <NULL>
+  Name: /VirtualBox/GuestInfo/OS/Version, value: #36~14.04.1-Ubuntu SMP Thu Oct 8 10:21:08 UTC 2015, timestamp: 1448390422246810000, flags: <NULL>
+  Name: /VirtualBox/GuestAdd/VersionExt, value: 5.0.2, timestamp: 1448390422247220000, flags: <NULL>
+  Name: /VirtualBox/GuestAdd/Revision, value: 102096, timestamp: 1448390422247266000, flags: <NULL>
+  Name: /VirtualBox/HostGuest/SysprepExec, value: <NULL>, timestamp: 1448390411701168000, flags: TRANSIENT, RDONLYGUEST
+  Name: /VirtualBox/GuestInfo/OS/LoggedInUsers, value: 1, timestamp: 1448390452251425000, flags: TRANSIENT, TRANSRESET
+  Name: /VirtualBox/GuestInfo/Net/0/Status, value: Up, timestamp: 1448390422248755000, flags: <NULL>
+  Name: /VirtualBox/GuestInfo/Net/0/Name, value: eth0, timestamp: 1448390422248814000, flags: <NULL>
+  Name: /VirtualBox/HostGuest/SysprepArgs, value: <NULL>, timestamp: 1448390411701220000, flags: TRANSIENT, RDONLYGUEST
+  Name: /VirtualBox/GuestAdd/Version, value: 5.0.2, timestamp: 1448390422247066000, flags: <NULL>
+  Name: /VirtualBox/HostInfo/VBoxRev, value: 104061, timestamp: 1448390411701536000, flags: TRANSIENT, RDONLYGUEST
+  Name: /VirtualBox/GuestInfo/Net/0/V4/Broadcast, value: 10.0.2.255, timestamp: 1448390422248498000, flags: <NULL>
+  Name: /VirtualBox/HostInfo/VBoxVer, value: 5.0.10, timestamp: 1448390411701485000, flags: TRANSIENT, RDONLYGUEST
+  Name: /VirtualBox/GuestInfo/OS/LoggedInUsersList, value: tim, timestamp: 1448390452251274000, flags: TRANSIENT, TRANSRESET
+  Name: /VirtualBox/GuestInfo/Net/Count, value: 1, timestamp: 1448391352440445000, flags: <NULL>
+  Name: /VirtualBox/GuestInfo/OS/Release, value: 3.19.0-31-generic, timestamp: 1448390422246638000, flags: <NULL>
+  Name: /VirtualBox/GuestInfo/OS/NoLoggedInUsers, value: false, timestamp: 1448390452251532000, flags: TRANSIENT, TRANSRESET
 EOF
 
 describe Ohai::System, "plugin virtualbox" do

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

@@ -21,41 +21,41 @@ require_relative "../../../spec_helper.rb"
 shared_examples "a cpu" do |cpu_no|
   describe "cpu #{cpu_no}" do
     it "should set physical_id to CPU#{cpu_no}" do
-      expect(@plugin[:cpu]["#{cpu_no}"][:physical_id]).to eq("CPU#{cpu_no}")
+      expect(@plugin[:cpu][cpu_no.to_s][:physical_id]).to eq("CPU#{cpu_no}")
     end
 
     it "should set mhz to 2793" do
-      expect(@plugin[:cpu]["#{cpu_no}"][:mhz]).to eq("2793")
+      expect(@plugin[:cpu][cpu_no.to_s][:mhz]).to eq("2793")
     end
 
     it "should set vendor_id to GenuineIntel" do
-      expect(@plugin[:cpu]["#{cpu_no}"][:vendor_id]).to eq("GenuineIntel")
+      expect(@plugin[:cpu][cpu_no.to_s][:vendor_id]).to eq("GenuineIntel")
     end
 
     it "should set model_name to Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz" do
-      expect(@plugin[:cpu]["#{cpu_no}"][:model_name])
+      expect(@plugin[:cpu][cpu_no.to_s][:model_name])
         .to eq("Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz")
     end
 
     it "should set description to Intel64 Family 6 Model 70 Stepping 1" do
-      expect(@plugin[:cpu]["#{cpu_no}"][:description])
+      expect(@plugin[:cpu][cpu_no.to_s][:description])
         .to eq("Intel64 Family 6 Model 70 Stepping 1")
     end
 
     it "should set model to 17921" do
-      expect(@plugin[:cpu]["#{cpu_no}"][:model]).to eq("17921")
+      expect(@plugin[:cpu][cpu_no.to_s][:model]).to eq("17921")
     end
 
     it "should set family to 2" do
-      expect(@plugin[:cpu]["#{cpu_no}"][:family]).to eq("2")
+      expect(@plugin[:cpu][cpu_no.to_s][:family]).to eq("2")
     end
 
     it "should set stepping to 9" do
-      expect(@plugin[:cpu]["#{cpu_no}"][:stepping]).to eq(9)
+      expect(@plugin[:cpu][cpu_no.to_s][:stepping]).to eq(9)
     end
 
     it "should set cache_size to 64 KB" do
-      expect(@plugin[:cpu]["#{cpu_no}"][:cache_size]).to eq("64 KB")
+      expect(@plugin[:cpu][cpu_no.to_s][:cache_size]).to eq("64 KB")
     end
   end
 end

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

@@ -24,17 +24,17 @@ describe Ohai::System, "Windows kernel plugin", :windows_only do
     require "wmi-lite/wmi"
 
     # Mock a Win32_OperatingSystem OLE32 WMI object
-    caption = double("WIN32OLE", :name => "Caption")
-    version = double("WIN32OLE", :name => "Version")
-    build_number = double("WIN32OLE", :name => "BuildNumber")
-    csd_version  = double("WIN32OLE", :name => "CsdVersion")
-    os_type = double("WIN32OLE", :name => "OsType")
-    product_type = double("WIN32OLE", :name => "ProductType")
-    operating_system_sku = double("WIN32OLE", :name => "OperatingSystemSKU")
+    caption = double("WIN32OLE", name: "Caption")
+    version = double("WIN32OLE", name: "Version")
+    build_number = double("WIN32OLE", name: "BuildNumber")
+    csd_version  = double("WIN32OLE", name: "CsdVersion")
+    os_type = double("WIN32OLE", name: "OsType")
+    product_type = double("WIN32OLE", name: "ProductType")
+    operating_system_sku = double("WIN32OLE", name: "OperatingSystemSKU")
     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")
@@ -47,13 +47,13 @@ describe Ohai::System, "Windows kernel plugin", :windows_only do
     os_wmi = WmiLite::Wmi::Instance.new(os)
     expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with("Win32_OperatingSystem").and_return(os_wmi)
 
-    system_type = double("WIN32OLE", :name => "SystemType")
-    pc_system_type = double("WIN32OLE", :name => "PCSystemType")
-    free_virtual_memory = double("WIN32OLE", :name => "FreeVirtualMemory")
+    system_type = double("WIN32OLE", name: "SystemType")
+    pc_system_type = double("WIN32OLE", name: "PCSystemType")
+    free_virtual_memory = double("WIN32OLE", name: "FreeVirtualMemory")
     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/plugins/windows/uptime_spec.rb

@@ -21,7 +21,7 @@ require_relative "../../../spec_helper.rb"
 describe Ohai::System, "Windows plugin uptime" do
 
   let(:plugin) { get_plugin("uptime") }
-  let(:wmi) { double("wmi", { :first_of => "" }) }
+  let(:wmi) { double("wmi", { first_of: "" }) }
 
   before(:each) do
     allow(WmiLite::Wmi).to receive(:new).and_return(wmi)

data/spec/unit/plugins/zpools_spec.rb

@@ -45,9 +45,9 @@ describe Ohai::System, "zpools plugin" do
 EOST
     end
     let(:zpool_out) do
-      <<-EOZO
-rpool	109G	66.2G	42.8G	60%	1.00x	ONLINE	-
-tank	130T	4.91M	130T	0%	1.00x	ONLINE	-
+      <<~EOZO
+        rpool	109G	66.2G	42.8G	60%	1.00x	ONLINE	-
+        tank	130T	4.91M	130T	0%	1.00x	ONLINE	-
 EOZO
     end
     let(:zpool_status_rpool) do
@@ -131,50 +131,50 @@ EOSR
 
   context "on Solaris2" do
     let(:zpool_status_tank) do
-      <<-EOST
-pool: tank
-state: ONLINE
-scan: scrub repaired 0 in 0h0m with 0 errors on Fri Jun  6 14:43:40 2014
-config:
-
-      NAME                       STATE     READ WRITE CKSUM
-      tank                       ONLINE       0     0     0
-        raidz2-0                 ONLINE       0     0     0
-          c1t50014EE209D1DBA9d0  ONLINE       0     0     0
-          c1t50014EE20A0ECED2d0  ONLINE       0     0     0
-          c1t50014EE20A106BFFd0  ONLINE       0     0     0
-          c1t50014EE20A1423E8d0  ONLINE       0     0     0
-          c1t50014EE20A145447d0  ONLINE       0     0     0
-          c1t50014EE20A29EE56d0  ONLINE       0     0     0
-        raidz2-1                 ONLINE       0     0     0
-          c1t50014EE20A2B984Cd0  ONLINE       0     0     0
-          c1t50014EE20A2BBC78d0  ONLINE       0     0     0
-          c1t50014EE20A2BDCA9d0  ONLINE       0     0     0
-          c1t50014EE25F697DC4d0  ONLINE       0     0     0
-          c1t50014EE25F698BECd0  ONLINE       0     0     0
-          c1t50014EE25F6998DAd0  ONLINE       0     0     0
+      <<~EOST
+        pool: tank
+        state: ONLINE
+        scan: scrub repaired 0 in 0h0m with 0 errors on Fri Jun  6 14:43:40 2014
+        config:
+
+              NAME                       STATE     READ WRITE CKSUM
+              tank                       ONLINE       0     0     0
+                raidz2-0                 ONLINE       0     0     0
+                  c1t50014EE209D1DBA9d0  ONLINE       0     0     0
+                  c1t50014EE20A0ECED2d0  ONLINE       0     0     0
+                  c1t50014EE20A106BFFd0  ONLINE       0     0     0
+                  c1t50014EE20A1423E8d0  ONLINE       0     0     0
+                  c1t50014EE20A145447d0  ONLINE       0     0     0
+                  c1t50014EE20A29EE56d0  ONLINE       0     0     0
+                raidz2-1                 ONLINE       0     0     0
+                  c1t50014EE20A2B984Cd0  ONLINE       0     0     0
+                  c1t50014EE20A2BBC78d0  ONLINE       0     0     0
+                  c1t50014EE20A2BDCA9d0  ONLINE       0     0     0
+                  c1t50014EE25F697DC4d0  ONLINE       0     0     0
+                  c1t50014EE25F698BECd0  ONLINE       0     0     0
+                  c1t50014EE25F6998DAd0  ONLINE       0     0     0
 EOST
     end
     let(:zpool_out) do
-      <<-EOZO
-rpool   109G    66.2G   42.8G   60%     1.00x   ONLINE  34
-tank    130T    4.91M   130T    0%      1.00x   ONLINE  34
+      <<~EOZO
+        rpool   109G    66.2G   42.8G   60%     1.00x   ONLINE  34
+        tank    130T    4.91M   130T    0%      1.00x   ONLINE  34
 EOZO
     end
     let(:zpool_status_rpool) do
-      <<-EOSR
-pool: rpool
-state: ONLINE
-scan: resilvered 65.6G in 0h8m with 0 errors on Fri Jun  6 14:22:40 2014
-config:
-
-      NAME          STATE     READ WRITE CKSUM
-      rpool         ONLINE       0     0     0
-        mirror-0    ONLINE       0     0     0
-          c3t5d0s0  ONLINE       0     0     0
-          c3t4d0s0  ONLINE       0     0     0
-
-errors: No known data errors
+      <<~EOSR
+        pool: rpool
+        state: ONLINE
+        scan: resilvered 65.6G in 0h8m with 0 errors on Fri Jun  6 14:22:40 2014
+        config:
+
+              NAME          STATE     READ WRITE CKSUM
+              rpool         ONLINE       0     0     0
+                mirror-0    ONLINE       0     0     0
+                  c3t5d0s0  ONLINE       0     0     0
+                  c3t4d0s0  ONLINE       0     0     0
+
+        errors: No known data errors
 EOSR
     end
     before do

data/spec/unit/runner_spec.rb

@@ -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", kind_of?: true, version: version, name: :Test, has_run?: has_run, dependencies: [ ]) }
     let(:version) { :version7 }
     let(:has_run) { false }
 
@@ -334,7 +334,7 @@ describe Ohai::Runner, "fetch_plugins" do
   before(:each) do
     @provides_map = Ohai::ProvidesMap.new
     @data = Mash.new
-    @ohai = double("Ohai::System", :data => @data, :provides_map => @provides_map, logger: Ohai::Log.with_child)
+    @ohai = double("Ohai::System", data: @data, provides_map: @provides_map, logger: Ohai::Log.with_child)
     @runner = Ohai::Runner.new(@ohai, true)
   end
 

data/spec/unit/system_spec.rb

@@ -87,28 +87,28 @@ describe "Ohai::System" do
   end
 
   when_plugins_directory "contains directories inside" do
-    with_plugin("repo1/zoo.rb", <<EOF)
-Ohai.plugin(:Zoo) do
-  provides 'seals'
-end
+    with_plugin("repo1/zoo.rb", <<~EOF)
+      Ohai.plugin(:Zoo) do
+        provides 'seals'
+      end
 EOF
 
-    with_plugin("repo1/lake.rb", <<EOF)
-Ohai.plugin(:Nature) do
-provides 'fish'
-end
+    with_plugin("repo1/lake.rb", <<~EOF)
+      Ohai.plugin(:Nature) do
+      provides 'fish'
+      end
 EOF
 
-    with_plugin("repo2/nature.rb", <<EOF)
-Ohai.plugin(:Nature) do
-  provides 'crabs'
-end
+    with_plugin("repo2/nature.rb", <<~EOF)
+      Ohai.plugin(:Nature) do
+        provides 'crabs'
+      end
 EOF
 
-    with_plugin("repo2/mountain.rb", <<EOF)
-Ohai.plugin(:Nature) do
-provides 'bear'
-end
+    with_plugin("repo2/mountain.rb", <<~EOF)
+      Ohai.plugin(:Nature) do
+      provides 'bear'
+      end
 EOF
 
     before do
@@ -127,18 +127,18 @@ EOF
 
   describe "when running plugins" do
     when_plugins_directory "contains a v7 plugins with :default and platform specific blocks" do
-      with_plugin("message.rb", <<EOF)
-Ohai.plugin(:Message) do
-  provides 'message'
+      with_plugin("message.rb", <<~EOF)
+        Ohai.plugin(:Message) do
+          provides 'message'
 
-  collect_data(:default) do
-    message("default")
-  end
+          collect_data(:default) do
+            message("default")
+          end
 
-  collect_data(:#{Ohai::Mixin::OS.collect_os}) do
-    message("platform_specific_message")
-  end
-end
+          collect_data(:#{Ohai::Mixin::OS.collect_os}) do
+            message("platform_specific_message")
+          end
+        end
 EOF
 
       it "should collect platform specific" do
@@ -149,43 +149,43 @@ EOF
     end
 
     when_plugins_directory "contains v7 plugins only" do
-      with_plugin("zoo.rb", <<EOF)
-Ohai.plugin(:Zoo) do
-  provides 'zoo'
+      with_plugin("zoo.rb", <<~EOF)
+        Ohai.plugin(:Zoo) do
+          provides 'zoo'
 
-  collect_data(:default) do
-    zoo("animals")
-  end
-end
+          collect_data(:default) do
+            zoo("animals")
+          end
+        end
 EOF
 
-      with_plugin("park.rb", <<EOF)
-Ohai.plugin(:Park) do
-  provides 'park'
-  collect_data(:default) do
-    park("plants")
-  end
-end
+      with_plugin("park.rb", <<~EOF)
+        Ohai.plugin(:Park) do
+          provides 'park'
+          collect_data(:default) do
+            park("plants")
+          end
+        end
 EOF
 
-      with_plugin("fails.rb", <<EOF)
-Ohai.plugin(:Fails) do
-  provides 'fails'
-  collect_data(:default) do
-    fail 'thing'
-  end
-end
+      with_plugin("fails.rb", <<~EOF)
+        Ohai.plugin(:Fails) do
+          provides 'fails'
+          collect_data(:default) do
+            fail 'thing'
+          end
+        end
 EOF
 
-      with_plugin("optional.rb", <<EOF)
-Ohai.plugin(:Optional) do
-  provides 'optional'
-  optional true
+      with_plugin("optional.rb", <<~EOF)
+        Ohai.plugin(:Optional) do
+          provides 'optional'
+          optional true
 
-  collect_data(:default) do
-    optional("canteloupe")
-  end
-end
+          collect_data(:default) do
+            optional("canteloupe")
+          end
+        end
 EOF
 
       it "should collect data from all the plugins" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 14.2.0
+  version: 14.3.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -188,7 +188,6 @@ files:
 - README.md
 - Rakefile
 - bin/ohai
-- docs/man/man1/ohai.1
 - lib/ohai.rb
 - lib/ohai/application.rb
 - lib/ohai/common/dmi.rb
@@ -542,7 +541,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON