ohai 14.2.0 → 14.3.0

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

@@ -21,15 +21,15 @@ require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux kernel plugin" do
   before(:each) do
-    @env_lsmod = <<-ENV_LSMOD
-Module                  Size  Used by
-dm_crypt               22321  0
-psmouse                81038  0
-acpiphp                23314  0
-microcode              18286  0
-serio_raw              13031  0
-virtio_balloon         13168  0
-floppy                 55441  0
+    @env_lsmod = <<~ENV_LSMOD
+      Module                  Size  Used by
+      dm_crypt               22321  0
+      psmouse                81038  0
+      acpiphp                23314  0
+      microcode              18286  0
+      serio_raw              13031  0
+      virtio_balloon         13168  0
+      floppy                 55441  0
 ENV_LSMOD
     @version_module = {
       dm_crypt: "",

data/spec/unit/plugins/linux/lsb_spec.rb

@@ -29,11 +29,11 @@ describe Ohai::System, "Linux lsb plugin" do
   describe "on systems with /etc/lsb-release" do
     before(:each) do
       @double_file = double("/etc/lsb-release")
-      allow(@double_file).to receive(:each).
-        and_yield("DISTRIB_ID=Ubuntu").
-        and_yield("DISTRIB_RELEASE=8.04").
-        and_yield("DISTRIB_CODENAME=hardy").
-        and_yield('DISTRIB_DESCRIPTION="Ubuntu 8.04"')
+      allow(@double_file).to receive(:each)
+        .and_yield("DISTRIB_ID=Ubuntu")
+        .and_yield("DISTRIB_RELEASE=8.04")
+        .and_yield("DISTRIB_CODENAME=hardy")
+        .and_yield('DISTRIB_DESCRIPTION="Ubuntu 8.04"')
       allow(File).to receive(:open).with("/etc/lsb-release").and_return(@double_file)
       allow(File).to receive(:exist?).with("/usr/bin/lsb_release").and_return(false)
       allow(File).to receive(:exist?).with("/etc/lsb-release").and_return(true)
@@ -64,7 +64,7 @@ describe Ohai::System, "Linux lsb plugin" do
     before(:each) do
       allow(File).to receive(:exist?).with("/usr/bin/lsb_release").and_return(true)
 
-      @stdin = double("STDIN", { :close => true })
+      @stdin = double("STDIN", { close: true })
       @pid = 10
       @stderr = double("STDERR")
       @stdout = double("STDOUT")
@@ -74,12 +74,12 @@ describe Ohai::System, "Linux lsb plugin" do
 
     describe "on Centos 5.4 correctly" do
       before(:each) do
-        @stdout = <<-LSB_RELEASE
-LSB Version: :core-3.1-ia32:core-3.1-noarch:graphics-3.1-ia32:graphics-3.1-noarch
-Distributor ID: CentOS
-Description:  CentOS release 5.4 (Final)
-Release:  5.4
-Codename: Final
+        @stdout = <<~LSB_RELEASE
+          LSB Version: :core-3.1-ia32:core-3.1-noarch:graphics-3.1-ia32:graphics-3.1-noarch
+          Distributor ID: CentOS
+          Description:  CentOS release 5.4 (Final)
+          Release:  5.4
+          Codename: Final
 LSB_RELEASE
         allow(@plugin).to receive(:shell_out).with("lsb_release -a").and_return(mock_shell_out(0, @stdout, ""))
       end
@@ -107,12 +107,12 @@ LSB_RELEASE
 
     describe "on Fedora 14 correctly" do
       before(:each) do
-        @stdout = <<-LSB_RELEASE
-LSB Version:    :core-4.0-ia32:core-4.0-noarch
-Distributor ID: Fedora
-Description:    Fedora release 14 (Laughlin)
-Release:        14
-Codename:       Laughlin
+        @stdout = <<~LSB_RELEASE
+          LSB Version:    :core-4.0-ia32:core-4.0-noarch
+          Distributor ID: Fedora
+          Description:    Fedora release 14 (Laughlin)
+          Release:        14
+          Codename:       Laughlin
 LSB_RELEASE
         allow(@plugin).to receive(:shell_out).with("lsb_release -a").and_return(mock_shell_out(0, @stdout, ""))
       end

data/spec/unit/plugins/linux/lspci_spec.rb

@@ -22,69 +22,69 @@ describe Ohai::System, "Linux lspci plugin" do
   let(:plugin) { get_plugin("linux/lspci") }
   before(:each) do
     allow(plugin).to receive(:collect_os).and_return(:linux)
-    @stdout = <<LSPCI
-Device:	00:1f.3
-Class:	Audio device [0403]
-Vendor:	Intel Corporation [8086]
-Device:	Sunrise Point-LP HD Audio [9d71]
-SVendor:	Lenovo [17aa]
-SDevice:	Sunrise Point-LP HD Audio [224e]
-Rev:	21
-Driver:	snd_hda_intel
-Module:	snd_hda_intel
-Module:	snd_soc_skl
+    @stdout = <<~LSPCI
+      Device:	00:1f.3
+      Class:	Audio device [0403]
+      Vendor:	Intel Corporation [8086]
+      Device:	Sunrise Point-LP HD Audio [9d71]
+      SVendor:	Lenovo [17aa]
+      SDevice:	Sunrise Point-LP HD Audio [224e]
+      Rev:	21
+      Driver:	snd_hda_intel
+      Module:	snd_hda_intel
+      Module:	snd_soc_skl
 
-Device:	00:1f.4
-Class:	SMBus [0c05]
-Vendor:	Intel Corporation [8086]
-Device:	Sunrise Point-LP SMBus [9d23]
-SVendor:	Lenovo [17aa]
-SDevice:	Sunrise Point-LP SMBus [224e]
-Rev:	21
-Driver:	i801_smbus
-Module:	i2c_i801
+      Device:	00:1f.4
+      Class:	SMBus [0c05]
+      Vendor:	Intel Corporation [8086]
+      Device:	Sunrise Point-LP SMBus [9d23]
+      SVendor:	Lenovo [17aa]
+      SDevice:	Sunrise Point-LP SMBus [224e]
+      Rev:	21
+      Driver:	i801_smbus
+      Module:	i2c_i801
 
-Device:	00:1f.6
-Class:	Ethernet controller [0200]
-Vendor:	Intel Corporation [8086]
-Device:	Ethernet Connection (4) I219-LM [15d7]
-SVendor:	Lenovo [17aa]
-SDevice:	Ethernet Connection (4) I219-LM [224e]
-Rev:	21
-Driver:	e1000e
-Module:	e1000e
+      Device:	00:1f.6
+      Class:	Ethernet controller [0200]
+      Vendor:	Intel Corporation [8086]
+      Device:	Ethernet Connection (4) I219-LM [15d7]
+      SVendor:	Lenovo [17aa]
+      SDevice:	Ethernet Connection (4) I219-LM [224e]
+      Rev:	21
+      Driver:	e1000e
+      Module:	e1000e
 
-Device:	02:00.0
-Class:	Unassigned class [ff00]
-Vendor:	Realtek Semiconductor Co., Ltd. [10ec]
-Device:	RTS525A PCI Express Card Reader [525a]
-SVendor:	Lenovo [17aa]
-SDevice:	RTS525A PCI Express Card Reader [224e]
-Rev:	01
-Driver:	rtsx_pci
-Module:	rtsx_pci
+      Device:	02:00.0
+      Class:	Unassigned class [ff00]
+      Vendor:	Realtek Semiconductor Co., Ltd. [10ec]
+      Device:	RTS525A PCI Express Card Reader [525a]
+      SVendor:	Lenovo [17aa]
+      SDevice:	RTS525A PCI Express Card Reader [224e]
+      Rev:	01
+      Driver:	rtsx_pci
+      Module:	rtsx_pci
 
-Device:	04:00.0
-Class:	Network controller [0280]
-Vendor:	Intel Corporation [8086]
-Device:	Wireless 8265 / 8275 [24fd]
-SVendor:	Intel Corporation [8086]
-SDevice:	Wireless 8265 / 8275 [0130]
-Rev:	88
-Driver:	iwlwifi
-Module:	iwlwifi
+      Device:	04:00.0
+      Class:	Network controller [0280]
+      Vendor:	Intel Corporation [8086]
+      Device:	Wireless 8265 / 8275 [24fd]
+      SVendor:	Intel Corporation [8086]
+      SDevice:	Wireless 8265 / 8275 [0130]
+      Rev:	88
+      Driver:	iwlwifi
+      Module:	iwlwifi
 
-Device:	05:00.0
-Class:	Non-Volatile memory controller [0108]
-Vendor:	Toshiba America Info Systems [1179]
-Device:	Device [0115]
-SVendor:	Toshiba America Info Systems [1179]
-SDevice:	Device [0001]
-Rev:	01
-ProgIf:	02
-Driver:	nvme
-Module:	nvme
-NUMANode:	0
+      Device:	05:00.0
+      Class:	Non-Volatile memory controller [0108]
+      Vendor:	Toshiba America Info Systems [1179]
+      Device:	Device [0115]
+      SVendor:	Toshiba America Info Systems [1179]
+      SDevice:	Device [0001]
+      Rev:	01
+      ProgIf:	02
+      Driver:	nvme
+      Module:	nvme
+      NUMANode:	0
 LSPCI
     allow(plugin).to receive(:shell_out).with("lspci -vnnmk").and_return(
       mock_shell_out(0, @stdout, ""))

data/spec/unit/plugins/linux/mdadm_spec.rb

@@ -20,46 +20,46 @@ require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Linux Mdadm Plugin" do
   before(:each) do
-    @md0 = <<-MD
-/dev/md0:
-        Version : 1.2
-  Creation Time : Thu Jan 30 03:11:40 2014
-     Raid Level : raid10
-     Array Size : 2929893888 (2794.16 GiB 3000.21 GB)
-  Used Dev Size : 976631296 (931.39 GiB 1000.07 GB)
-   Raid Devices : 6
-  Total Devices : 6
-    Persistence : Superblock is persistent
-
-    Update Time : Tue May  6 23:30:32 2014
-          State : clean
- Active Devices : 6
-Working Devices : 6
- Failed Devices : 0
-  Spare Devices : 0
-
-         Layout : near=2
-     Chunk Size : 256K
-
-           Name : host.therealtimsmith.com:3  (local to host host.therealtimsmith.com)
-           UUID : 5ed74d5b:70bfe21d:8cd57792:c1e13d65
-         Events : 155
-
-    Number   Major   Minor   RaidDevice State
-       0       8       32        0      active sync   /dev/sdc
-       1       8       48        1      active sync   /dev/sdd
-       2       8       64        2      active sync   /dev/sde
-       3       8       80        3      active sync   /dev/sdf
-       4       8       96        4      active sync   /dev/sdg
-       5       8      112        5      active sync   /dev/sdh
+    @md0 = <<~MD
+      /dev/md0:
+              Version : 1.2
+        Creation Time : Thu Jan 30 03:11:40 2014
+           Raid Level : raid10
+           Array Size : 2929893888 (2794.16 GiB 3000.21 GB)
+        Used Dev Size : 976631296 (931.39 GiB 1000.07 GB)
+         Raid Devices : 6
+        Total Devices : 6
+          Persistence : Superblock is persistent
+
+          Update Time : Tue May  6 23:30:32 2014
+                State : clean
+       Active Devices : 6
+      Working Devices : 6
+       Failed Devices : 0
+        Spare Devices : 0
+
+               Layout : near=2
+           Chunk Size : 256K
+
+                 Name : host.therealtimsmith.com:3  (local to host host.therealtimsmith.com)
+                 UUID : 5ed74d5b:70bfe21d:8cd57792:c1e13d65
+               Events : 155
+
+          Number   Major   Minor   RaidDevice State
+             0       8       32        0      active sync   /dev/sdc
+             1       8       48        1      active sync   /dev/sdd
+             2       8       64        2      active sync   /dev/sde
+             3       8       80        3      active sync   /dev/sdf
+             4       8       96        4      active sync   /dev/sdg
+             5       8      112        5      active sync   /dev/sdh
 MD
     @plugin = get_plugin("linux/mdadm")
     allow(@plugin).to receive(:collect_os).and_return(:linux)
     @double_file = double("/proc/mdstat")
-    allow(@double_file).to receive(:each).
-      and_yield("Personalities : [raid1] [raid6] [raid5] [raid4] [linear] [multipath] [raid0] [raid10]").
-      and_yield("md0 : active raid10 sdh[5] sdg[4] sdf[3] sde[2] sdd[1] sdc[0]").
-      and_yield("      2929893888 blocks super 1.2 256K chunks 2 near-copies [6/6] [UUUUUU]")
+    allow(@double_file).to receive(:each)
+      .and_yield("Personalities : [raid1] [raid6] [raid5] [raid4] [linear] [multipath] [raid0] [raid10]")
+      .and_yield("md0 : active raid10 sdh[5] sdg[4] sdf[3] sde[2] sdd[1] sdc[0]")
+      .and_yield("      2929893888 blocks super 1.2 256K chunks 2 near-copies [6/6] [UUUUUU]")
     allow(File).to receive(:open).with("/proc/mdstat").and_return(@double_file)
     allow(File).to receive(:exist?).with("/proc/mdstat").and_return(true)
     allow(@plugin).to receive(:shell_out).with("mdadm --detail /dev/md0").and_return(mock_shell_out(0, @md0, ""))
@@ -91,7 +91,7 @@ MD
       expect(@plugin[:mdadm][:md0][:version]).to eq(1.2)
     end
 
-    device_counts = { :raid => 6, :total => 6, :active => 6, :working => 6, :failed => 0, :spare => 0 }
+    device_counts = { raid: 6, total: 6, active: 6, working: 6, failed: 0, spare: 0 }
     device_counts.each_pair do |item, expected_value|
       it "should detect device count of \"#{item}\"" do
         @plugin.run
@@ -108,10 +108,10 @@ MD
 
     it "should detect member devices even if there are multi-digit numbers" do
       new_mdstat = double("/proc/mdstat2")
-      allow(new_mdstat).to receive(:each).
-        and_yield("Personalities : [raid1] [raid6] [raid5] [raid4] [linear] [multipath] [raid0] [raid10]").
-        and_yield("md0 : active raid10 sdj[2010] sdi[99] sdh[5] sdg[4] sdf[3] sde[2] sdd[1] sdc[0]").
-        and_yield("      2929893888 blocks super 1.2 256K chunks 2 near-copies [6/6] [UUUUUU]")
+      allow(new_mdstat).to receive(:each)
+        .and_yield("Personalities : [raid1] [raid6] [raid5] [raid4] [linear] [multipath] [raid0] [raid10]")
+        .and_yield("md0 : active raid10 sdj[2010] sdi[99] sdh[5] sdg[4] sdf[3] sde[2] sdd[1] sdc[0]")
+        .and_yield("      2929893888 blocks super 1.2 256K chunks 2 near-copies [6/6] [UUUUUU]")
       allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
 
       @plugin.run
@@ -122,10 +122,10 @@ MD
 
     it "should detect member devices even if mdstat has extra entries" do
       new_mdstat = double("/proc/mdstat2")
-      allow(new_mdstat).to receive(:each).
-        and_yield("Personalities : [raid1] [raid6] [raid5] [raid4] [linear] [multipath] [raid0] [raid10]").
-        and_yield("md0 : active (somecraphere) <morestuff> raid10 sdh[5] sdg[4] sdf[3] sde[2] sdd[1] sdc[0]").
-        and_yield("      2929893888 blocks super 1.2 256K chunks 2 near-copies [6/6] [UUUUUU]")
+      allow(new_mdstat).to receive(:each)
+        .and_yield("Personalities : [raid1] [raid6] [raid5] [raid4] [linear] [multipath] [raid0] [raid10]")
+        .and_yield("md0 : active (somecraphere) <morestuff> raid10 sdh[5] sdg[4] sdf[3] sde[2] sdd[1] sdc[0]")
+        .and_yield("      2929893888 blocks super 1.2 256K chunks 2 near-copies [6/6] [UUUUUU]")
       allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
 
       @plugin.run
@@ -136,9 +136,9 @@ MD
 
     it "should accurately report inactive arrays" do
       new_mdstat = double("/proc/mdstat_inactive")
-      allow(new_mdstat).to receive(:each).
-        and_yield("Personalities :").
-        and_yield("md0 : inactive nvme2n1p3[2](S)")
+      allow(new_mdstat).to receive(:each)
+        .and_yield("Personalities :")
+        .and_yield("md0 : inactive nvme2n1p3[2](S)")
       allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
 
       @plugin.run
@@ -147,9 +147,9 @@ MD
 
     it "should report journal devices" do
       new_mdstat = double("/proc/mdstat_journal")
-      allow(new_mdstat).to receive(:each).
-        and_yield("Personalies : [raid6]").
-        and_yield("md0 : active (somecraphere) <morestuff raid6 sdbc1[7] sdd1[6] sde1[5] sdd1[4] sde1[3] sdf1[2] sdg1[1] nvme2n1p3[0](J)")
+      allow(new_mdstat).to receive(:each)
+        .and_yield("Personalies : [raid6]")
+        .and_yield("md0 : active (somecraphere) <morestuff raid6 sdbc1[7] sdd1[6] sde1[5] sdd1[4] sde1[3] sdf1[2] sdg1[1] nvme2n1p3[0](J)")
       allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
 
       @plugin.run
@@ -158,9 +158,9 @@ MD
 
     it "should report spare devices" do
       new_mdstat = double("/proc/mdstat_spare")
-      allow(new_mdstat).to receive(:each).
-        and_yield("Personalies : [raid6]").
-        and_yield("md0 : active (somecraphere) <morestuff raid6 sdbc1[7] sdd1[6] sde1[5] sdd1[4] sde1[3] sdf1[2] sdg1[1] sdh1[0](S)")
+      allow(new_mdstat).to receive(:each)
+        .and_yield("Personalies : [raid6]")
+        .and_yield("md0 : active (somecraphere) <morestuff raid6 sdbc1[7] sdd1[6] sde1[5] sdd1[4] sde1[3] sdf1[2] sdg1[1] sdh1[0](S)")
       allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
 
       @plugin.run

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

@@ -21,41 +21,41 @@ describe Ohai::System, "Linux memory plugin" do
     @plugin = get_plugin("linux/memory")
     allow(@plugin).to receive(:collect_os).and_return(:linux)
     @double_file = double("/proc/meminfo")
-    allow(@double_file).to receive(:each).
-      and_yield("MemTotal:     131932120 kB").
-      and_yield("MemFree:       2269032 kB").
-      and_yield("MemAvailable:  9208922 kB").
-      and_yield("Buffers:        646368 kB").
-      and_yield("Cached:       32346556 kB").
-      and_yield("SwapCached:        312 kB").
-      and_yield("Active:       98595796 kB").
-      and_yield("Inactive:     18477320 kB").
-      and_yield("HighTotal:           0 kB").
-      and_yield("HighFree:            0 kB").
-      and_yield("LowTotal:     131932120 kB").
-      and_yield("LowFree:       2269032 kB").
-      and_yield("SwapTotal:    16777208 kB").
-      and_yield("SwapFree:     14127356 kB").
-      and_yield("Dirty:            3212 kB").
-      and_yield("Writeback:           0 kB").
-      and_yield("AnonPages:    84082132 kB").
-      and_yield("Mapped:        3445224 kB").
-      and_yield("Slab:          9892096 kB").
-      and_yield("SReclaimable:     362636 kB").
-      and_yield("SUnreclaim:        18860 kB").
-      and_yield("PageTables:    1759332 kB").
-      and_yield("NFS_Unstable:        0 kB").
-      and_yield("Bounce:              0 kB").
-      and_yield("CommitLimit:  148709328 kB").
-      and_yield("Committed_AS: 333717060 kB").
-      and_yield("VmallocTotal: 34359738367 kB").
-      and_yield("VmallocUsed:    276796 kB").
-      and_yield("VmallocChunk: 34359461515 kB").
-      and_yield("HugePages_Total: 11542").
-      and_yield("HugePages_Free:  11235").
-      and_yield("HugePages_Rsvd:  11226").
-      and_yield("HugePages_Surp:      0").
-      and_yield("Hugepagesize:     2048 kB")
+    allow(@double_file).to receive(:each)
+      .and_yield("MemTotal:     131932120 kB")
+      .and_yield("MemFree:       2269032 kB")
+      .and_yield("MemAvailable:  9208922 kB")
+      .and_yield("Buffers:        646368 kB")
+      .and_yield("Cached:       32346556 kB")
+      .and_yield("SwapCached:        312 kB")
+      .and_yield("Active:       98595796 kB")
+      .and_yield("Inactive:     18477320 kB")
+      .and_yield("HighTotal:           0 kB")
+      .and_yield("HighFree:            0 kB")
+      .and_yield("LowTotal:     131932120 kB")
+      .and_yield("LowFree:       2269032 kB")
+      .and_yield("SwapTotal:    16777208 kB")
+      .and_yield("SwapFree:     14127356 kB")
+      .and_yield("Dirty:            3212 kB")
+      .and_yield("Writeback:           0 kB")
+      .and_yield("AnonPages:    84082132 kB")
+      .and_yield("Mapped:        3445224 kB")
+      .and_yield("Slab:          9892096 kB")
+      .and_yield("SReclaimable:     362636 kB")
+      .and_yield("SUnreclaim:        18860 kB")
+      .and_yield("PageTables:    1759332 kB")
+      .and_yield("NFS_Unstable:        0 kB")
+      .and_yield("Bounce:              0 kB")
+      .and_yield("CommitLimit:  148709328 kB")
+      .and_yield("Committed_AS: 333717060 kB")
+      .and_yield("VmallocTotal: 34359738367 kB")
+      .and_yield("VmallocUsed:    276796 kB")
+      .and_yield("VmallocChunk: 34359461515 kB")
+      .and_yield("HugePages_Total: 11542")
+      .and_yield("HugePages_Free:  11235")
+      .and_yield("HugePages_Rsvd:  11226")
+      .and_yield("HugePages_Surp:      0")
+      .and_yield("Hugepagesize:     2048 kB")
     allow(File).to receive(:open).with("/proc/meminfo").and_return(@double_file)
   end