ohai 14.2.0 → 14.3.0

data/spec/unit/plugins/eucalyptus_spec.rb

@@ -35,24 +35,24 @@ describe Ohai::System, "plugin eucalyptus" do
       @http_client = double("Net::HTTP client")
       allow(plugin).to receive(:http_client).and_return(@http_client)
 
-      expect(@http_client).to receive(:get).
-        with("/").
-        and_return(double("Net::HTTP Response", :body => "2012-01-12", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/").
-        and_return(double("Net::HTTP Response", :body => "instance_type\nami_id\nsecurity-groups", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/instance_type").
-        and_return(double("Net::HTTP Response", :body => "c1.medium", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/ami_id").
-        and_return(double("Net::HTTP Response", :body => "ami-5d2dc934", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/meta-data/security-groups").
-        and_return(double("Net::HTTP Response", :body => "group1\ngroup2", :code => "200"))
-      expect(@http_client).to receive(:get).
-        with("/2012-01-12/user-data/").
-        and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
+      expect(@http_client).to receive(:get)
+        .with("/")
+        .and_return(double("Net::HTTP Response", body: "2012-01-12", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/")
+        .and_return(double("Net::HTTP Response", body: "instance_type\nami_id\nsecurity-groups", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/instance_type")
+        .and_return(double("Net::HTTP Response", body: "c1.medium", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/ami_id")
+        .and_return(double("Net::HTTP Response", body: "ami-5d2dc934", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/meta-data/security-groups")
+        .and_return(double("Net::HTTP Response", body: "group1\ngroup2", code: "200"))
+      expect(@http_client).to receive(:get)
+        .with("/2012-01-12/user-data/")
+        .and_return(double("Net::HTTP Response", body: "By the pricking of my thumb...", code: "200"))
     end
 
     it "recursively fetches all the eucalyptus metadata" do
@@ -97,7 +97,7 @@ describe Ohai::System, "plugin eucalyptus" do
     it_behaves_like "!eucalyptus"
 
     before(:each) do
-      plugin[:network] = { :interfaces => {} }
+      plugin[:network] = { interfaces: {} }
       allow(plugin).to receive(:hint?).with("eucalyptus").and_return(false)
     end
   end

data/spec/unit/plugins/fail_spec.rb

@@ -55,7 +55,7 @@ shared_examples "a v7 loading failure" do
 
   it "should not have attribute keys" do
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
-    #@ohai.attributes.should_not have_key("fail")
+    # @ohai.attributes.should_not have_key("fail")
     expect { @ohai.provides_map.find_providers_for(["fail"]) }.to raise_error(Ohai::Exceptions::AttributeNotFound)
   end
 
@@ -152,23 +152,23 @@ shared_examples "a v7 run failure" do
 end
 
 describe "when using DSL commands outside Ohai.plugin block" do
-  failstr1 = <<EOF
-provides "fail"
-Ohai.plugin do
-end
+  failstr1 = <<~EOF
+    provides "fail"
+    Ohai.plugin do
+    end
 EOF
 
-  failstr2 = <<EOF
-depends "fail"
-Ohai.plugin do
-end
+  failstr2 = <<~EOF
+    depends "fail"
+    Ohai.plugin do
+    end
 EOF
 
-  failstr3 = <<EOF
-collect_data do
-end
-Ohai.plugin do
-end
+  failstr3 = <<~EOF
+    collect_data do
+    end
+    Ohai.plugin do
+    end
 EOF
 
   it_behaves_like "a v7 loading failure" do

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

@@ -23,21 +23,21 @@ describe Ohai::System, "FreeBSD cpu plugin on FreeBSD >=10.2" do
     @plugin = get_plugin("freebsd/cpu")
     allow(@plugin).to receive(:collect_os).and_return(:freebsd)
     @double_file = double("/var/run/dmesg.boot")
-    allow(@double_file).to receive(:each).
-      and_yield("CPU: Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz (2793.59-MHz K8-class CPU)").
-      and_yield('  Origin="GenuineIntel"  Id=0x40661  Family=0x6  Model=0x46  Stepping=1').
-      and_yield("  Features=0x783fbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE,SSE2>").
-      and_yield("  Features2=0x5ed8220b<SSE3,PCLMULQDQ,MON,SSSE3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AESNI,XSAVE,OSXSAVE,AVX,RDRAND>").
-      and_yield("  AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>").
-      and_yield("  AMD Features2=0x21<LAHF,ABM>").
-      and_yield("  Structured Extended Features=0x2000<NFPUSG>").
-      and_yield("  TSC: P-state invariant").
-      and_yield("real memory  = 1073676288 (1023 MB)").
-      and_yield("avail memory = 1010253824 (963 MB)").
-      and_yield('Event timer "LAPIC" quality 400').
-      and_yield("ACPI APIC Table: <VBOX   VBOXAPIC>").
-      and_yield("FreeBSD/SMP: Multiprocessor System Detected: 16 CPUs").
-      and_yield("FreeBSD/SMP: 2 package(s) x 4 core(s) x 2 SMT threads")
+    allow(@double_file).to receive(:each)
+      .and_yield("CPU: Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz (2793.59-MHz K8-class CPU)")
+      .and_yield('  Origin="GenuineIntel"  Id=0x40661  Family=0x6  Model=0x46  Stepping=1')
+      .and_yield("  Features=0x783fbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE,SSE2>")
+      .and_yield("  Features2=0x5ed8220b<SSE3,PCLMULQDQ,MON,SSSE3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AESNI,XSAVE,OSXSAVE,AVX,RDRAND>")
+      .and_yield("  AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>")
+      .and_yield("  AMD Features2=0x21<LAHF,ABM>")
+      .and_yield("  Structured Extended Features=0x2000<NFPUSG>")
+      .and_yield("  TSC: P-state invariant")
+      .and_yield("real memory  = 1073676288 (1023 MB)")
+      .and_yield("avail memory = 1010253824 (963 MB)")
+      .and_yield('Event timer "LAPIC" quality 400')
+      .and_yield("ACPI APIC Table: <VBOX   VBOXAPIC>")
+      .and_yield("FreeBSD/SMP: Multiprocessor System Detected: 16 CPUs")
+      .and_yield("FreeBSD/SMP: 2 package(s) x 4 core(s) x 2 SMT threads")
     allow(File).to receive(:open).with("/var/run/dmesg.boot").and_return(@double_file)
   end
 
@@ -99,9 +99,9 @@ describe Ohai::System, "FreeBSD cpu plugin on FreeBSD <=10.1" do
     allow(@plugin).to receive(:collect_os).and_return(:freebsd)
     allow(@plugin).to receive(:shell_out).with("sysctl -n hw.ncpu").and_return(mock_shell_out(0, "2", ""))
     @double_file = double("/var/run/dmesg.boot")
-    allow(@double_file).to receive(:each).
-      and_yield("CPU: Intel(R) Atom(TM) CPU N270   @ 1.60GHz (1596.03-MHz 686-class CPU)").
-      and_yield('  Origin = "GenuineIntel"  Id = 0x106c2  Family = 0x6  Model = 0x1c  Stepping = 2')
+    allow(@double_file).to receive(:each)
+      .and_yield("CPU: Intel(R) Atom(TM) CPU N270   @ 1.60GHz (1596.03-MHz 686-class CPU)")
+      .and_yield('  Origin = "GenuineIntel"  Id = 0x106c2  Family = 0x6  Model = 0x1c  Stepping = 2')
     allow(File).to receive(:open).with("/var/run/dmesg.boot").and_return(@double_file)
   end
 

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

@@ -22,7 +22,7 @@ describe Ohai::System, "FreeBSD kernel plugin" do
   before(:each) do
     @plugin = get_plugin("kernel")
     allow(@plugin).to receive(:collect_os).and_return(:freebsd)
-    allow(@plugin).to receive(:init_kernel).and_return({ :name => "freebsd" })
+    allow(@plugin).to receive(:init_kernel).and_return({ name: "freebsd" })
     allow(@plugin).to receive(:shell_out).with("uname -i").and_return(mock_shell_out(0, "foo\n", ""))
     allow(@plugin).to receive(:shell_out).with("sysctl kern.securelevel").and_return(mock_shell_out(0, "kern.securelevel: 1", ""))
     allow(@plugin).to receive(:shell_out).with( Ohai.abs_path( "/sbin/kldstat" )).and_return(mock_shell_out(0, "  1    7 0xc0400000 97f830   kernel", ""))

data/spec/unit/plugins/gce_spec.rb

@@ -36,7 +36,7 @@ describe Ohai::System, "plugin gce" do
   shared_examples_for "gce" do
     before(:each) do
       @http_get = double("Net::HTTP client")
-      allow(plugin).to receive(:http_get).and_return(double("Net::HTTP Response", :body => '{"instance":{"hostname":"test-host"}}', :code => "200"))
+      allow(plugin).to receive(:http_get).and_return(double("Net::HTTP Response", body: '{"instance":{"hostname":"test-host"}}', code: "200"))
       allow(IO).to receive(:select).and_return([[], [1], []])
       t = double("connection")
       allow(t).to receive(:connect_nonblock).and_raise(Errno::EINPROGRESS)

data/spec/unit/plugins/init_package_spec.rb

@@ -28,7 +28,7 @@ describe Ohai::System, "Init package" do
   let(:proc1_content) { "init\n" }
   let(:proc1_exists) { true }
   let(:proc_1_file_path) { "/proc/1/comm" }
-  let(:proc_1_file) { double(proc_1_file_path, :gets => proc1_content) }
+  let(:proc_1_file) { double(proc_1_file_path, gets: proc1_content) }
 
   before(:each) do
     allow(File).to receive(:exist?).with(proc_1_file_path).and_return(proc1_exists)

data/spec/unit/plugins/java_spec.rb

@@ -193,8 +193,8 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
 
     context "and real Java is installed" do
       before do
-        java_home_status = double(Process::Status, :success? => true)
-        java_home_cmd = double(Mixlib::ShellOut, :status => java_home_status)
+        java_home_status = double(Process::Status, success?: true)
+        java_home_cmd = double(Mixlib::ShellOut, status: java_home_status)
         expect(plugin).to receive(:shell_out).with("/usr/libexec/java_home").and_return(java_home_cmd)
       end
 
@@ -211,8 +211,8 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
 
     context "and the JVM stubs are installed" do
       before do
-        java_home_status = double(Process::Status, :success? => false)
-        java_home_cmd = double(Mixlib::ShellOut, :status => java_home_status)
+        java_home_status = double(Process::Status, success?: false)
+        java_home_cmd = double(Mixlib::ShellOut, status: java_home_status)
         expect(plugin).to receive(:shell_out).with("/usr/libexec/java_home").and_return(java_home_cmd)
       end
 

data/spec/unit/plugins/joyent_spec.rb

@@ -61,17 +61,17 @@ describe Ohai::System, "plugin joyent" do
         plugin[:virtualization][:guest_uuid] = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
         plugin[:virtualization][:guest_id] = "30"
 
-        etc_product = <<-EOS
-Name: Joyent Instance
-Image: pkgbuild 16.3.1
-Documentation: https://docs.joyent.com/images/smartos/pkgbuild
+        etc_product = <<~EOS
+          Name: Joyent Instance
+          Image: pkgbuild 16.3.1
+          Documentation: https://docs.joyent.com/images/smartos/pkgbuild
       EOS
 
-        pkg_install_conf = <<-EOS
-GPG_KEYRING_VERIFY=/opt/local/etc/gnupg/pkgsrc.gpg
-GPG_KEYRING_PKGVULN=/opt/local/share/gnupg/pkgsrc-security.gpg
-PKG_PATH=https://pkgsrc.joyent.com/packages/SmartOS/2016Q3/x86_64/All
-VERIFIED_INSTALLATION=trusted
+        pkg_install_conf = <<~EOS
+          GPG_KEYRING_VERIFY=/opt/local/etc/gnupg/pkgsrc.gpg
+          GPG_KEYRING_PKGVULN=/opt/local/share/gnupg/pkgsrc-security.gpg
+          PKG_PATH=https://pkgsrc.joyent.com/packages/SmartOS/2016Q3/x86_64/All
+          VERIFIED_INSTALLATION=trusted
       EOS
 
         allow(::File).to receive(:read).with("/etc/product").and_return(etc_product)

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

@@ -33,7 +33,7 @@ describe Ohai::System, "Linux Block Device Plugin" do
       "size" => "7806976",
       "removable" => "0",
     },
-  }
+  }.freeze
 
   def file_double(value)
     tmp_double = double

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

@@ -42,20 +42,20 @@ shared_examples "S390 processor info" do |cpu_no, version, identification, machi
   describe "S390 processor" do
     it "has a version for cpu #{cpu_no}" do
       plugin.run
-      expect(plugin[:cpu]["#{cpu_no}"]).to have_key("version")
-      expect(plugin[:cpu]["#{cpu_no}"]["version"]).to eql(version)
+      expect(plugin[:cpu][cpu_no.to_s]).to have_key("version")
+      expect(plugin[:cpu][cpu_no.to_s]["version"]).to eql(version)
     end
 
     it "has a identification for cpu #{cpu_no}" do
       plugin.run
-      expect(plugin[:cpu]["#{cpu_no}"]).to have_key("identification")
-      expect(plugin[:cpu]["#{cpu_no}"]["identification"]).to eql(identification)
+      expect(plugin[:cpu][cpu_no.to_s]).to have_key("identification")
+      expect(plugin[:cpu][cpu_no.to_s]["identification"]).to eql(identification)
     end
 
     it "has a machine for cpu #{cpu_no}" do
       plugin.run
-      expect(plugin[:cpu]["#{cpu_no}"]).to have_key("machine")
-      expect(plugin[:cpu]["#{cpu_no}"]["machine"]).to eql(machine)
+      expect(plugin[:cpu][cpu_no.to_s]).to have_key("machine")
+      expect(plugin[:cpu][cpu_no.to_s]["machine"]).to eql(machine)
     end
   end
 end
@@ -64,14 +64,14 @@ shared_examples "arm64 processor info" do |cpu_no, bogomips, features|
   describe "arm64 processor" do
     it "has bogomips for cpu #{cpu_no}" do
       plugin.run
-      expect(plugin[:cpu]["#{cpu_no}"]).to have_key("bogomips")
-      expect(plugin[:cpu]["#{cpu_no}"]["bogomips"]).to eql(bogomips)
+      expect(plugin[:cpu][cpu_no.to_s]).to have_key("bogomips")
+      expect(plugin[:cpu][cpu_no.to_s]["bogomips"]).to eql(bogomips)
     end
 
     it "has features for cpu #{cpu_no}" do
       plugin.run
-      expect(plugin[:cpu]["#{cpu_no}"]).to have_key("features")
-      expect(plugin[:cpu]["#{cpu_no}"]["features"]).to eql(features)
+      expect(plugin[:cpu][cpu_no.to_s]).to have_key("features")
+      expect(plugin[:cpu][cpu_no.to_s]["features"]).to eql(features)
     end
   end
 end
@@ -126,31 +126,31 @@ describe Ohai::System, "General Linux cpu plugin" do
     end
 
     let(:lscpu) do
-      <<-EOF
-Architecture:          x86_64
-CPU op-mode(s):        32-bit, 64-bit
-Byte Order:            Little Endian
-CPU(s):                1
-On-line CPU(s) list:   0
-Thread(s) per core:    1
-Core(s) per socket:    1
-Socket(s):             1
-NUMA node(s):          1
-Vendor ID:             GenuineIntel
-CPU family:            6
-Model:                 23
-Model name:            Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz
-Stepping:              2
-CPU MHz:               1968.770
-BogoMIPS:              2575.86
-Hypervisor vendor:     Xen
-Virtualization type:   full
-L1d cache:             32K
-L1i cache:             32K
-L2 cache:              256K
-L3 cache:              30720K
-NUMA node0 CPU(s):     0
-Flags:                 fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx rdtscp lm constant_tsc rep_good nopl xtopology pni pclmulqdq ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm fsgsbase bmi1 avx2 smep bmi2 erms invpcid xsaveopt
+      <<~EOF
+        Architecture:          x86_64
+        CPU op-mode(s):        32-bit, 64-bit
+        Byte Order:            Little Endian
+        CPU(s):                1
+        On-line CPU(s) list:   0
+        Thread(s) per core:    1
+        Core(s) per socket:    1
+        Socket(s):             1
+        NUMA node(s):          1
+        Vendor ID:             GenuineIntel
+        CPU family:            6
+        Model:                 23
+        Model name:            Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz
+        Stepping:              2
+        CPU MHz:               1968.770
+        BogoMIPS:              2575.86
+        Hypervisor vendor:     Xen
+        Virtualization type:   full
+        L1d cache:             32K
+        L1i cache:             32K
+        L2 cache:              256K
+        L3 cache:              30720K
+        NUMA node0 CPU(s):     0
+        Flags:                 fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx rdtscp lm constant_tsc rep_good nopl xtopology pni pclmulqdq ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm fsgsbase bmi1 avx2 smep bmi2 erms invpcid xsaveopt
       EOF
     end
 
@@ -235,110 +235,110 @@ Flags:                 fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
   end
   context "with a dual-core hyperthreaded /proc/cpuinfo" do
     let(:cpuinfo_contents) do
-      <<-EOF
-processor   : 0
-vendor_id   : GenuineIntel
-cpu family  : 6
-model       : 69
-model name  : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz
-stepping    : 1
-microcode   : 0x17
-cpu MHz     : 774.000
-cache size  : 4096 KB
-physical id : 0
-siblings    : 4
-core id     : 0
-cpu cores   : 2
-apicid      : 0
-initial apicid  : 0
-fpu     : yes
-fpu_exception   : yes
-cpuid level : 13
-wp      : yes
-flags       : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 fma cx16 xtpr pdcm pcid sse4_1 sse4_2 movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid
-bogomips    : 3591.40
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 39 bits physical, 48 bits virtual
-power management:
-
-processor   : 1
-vendor_id   : GenuineIntel
-cpu family  : 6
-model       : 69
-model name  : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz
-stepping    : 1
-microcode   : 0x17
-cpu MHz     : 1600.000
-cache size  : 4096 KB
-physical id : 0
-siblings    : 4
-core id     : 0
-cpu cores   : 2
-apicid      : 1
-initial apicid  : 1
-fpu     : yes
-fpu_exception   : yes
-cpuid level : 13
-wp      : yes
-flags       : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 fma cx16 xtpr pdcm pcid sse4_1 sse4_2 movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid
-bogomips    : 3591.40
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 39 bits physical, 48 bits virtual
-power management:
-
-processor   : 2
-vendor_id   : GenuineIntel
-cpu family  : 6
-model       : 69
-model name  : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz
-stepping    : 1
-microcode   : 0x17
-cpu MHz     : 800.000
-cache size  : 4096 KB
-physical id : 0
-siblings    : 4
-core id     : 1
-cpu cores   : 2
-apicid      : 2
-initial apicid  : 2
-fpu     : yes
-fpu_exception   : yes
-cpuid level : 13
-wp      : yes
-flags       : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 fma cx16 xtpr pdcm pcid sse4_1 sse4_2 movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid
-bogomips    : 3591.40
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 39 bits physical, 48 bits virtual
-power management:
-
-processor   : 3
-vendor_id   : GenuineIntel
-cpu family  : 6
-model       : 69
-model name  : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz
-stepping    : 1
-microcode   : 0x17
-cpu MHz     : 774.000
-cache size  : 4096 KB
-physical id : 0
-siblings    : 4
-core id     : 1
-cpu cores   : 2
-apicid      : 3
-initial apicid  : 3
-fpu     : yes
-fpu_exception   : yes
-cpuid level : 13
-wp      : yes
-flags       : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 fma cx16 xtpr pdcm pcid sse4_1 sse4_2 movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid
-bogomips    : 3591.40
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 39 bits physical, 48 bits virtual
-power management:
+      <<~EOF
+        processor   : 0
+        vendor_id   : GenuineIntel
+        cpu family  : 6
+        model       : 69
+        model name  : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz
+        stepping    : 1
+        microcode   : 0x17
+        cpu MHz     : 774.000
+        cache size  : 4096 KB
+        physical id : 0
+        siblings    : 4
+        core id     : 0
+        cpu cores   : 2
+        apicid      : 0
+        initial apicid  : 0
+        fpu     : yes
+        fpu_exception   : yes
+        cpuid level : 13
+        wp      : yes
+        flags       : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 fma cx16 xtpr pdcm pcid sse4_1 sse4_2 movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid
+        bogomips    : 3591.40
+        clflush size    : 64
+        cache_alignment : 64
+        address sizes   : 39 bits physical, 48 bits virtual
+        power management:
+
+        processor   : 1
+        vendor_id   : GenuineIntel
+        cpu family  : 6
+        model       : 69
+        model name  : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz
+        stepping    : 1
+        microcode   : 0x17
+        cpu MHz     : 1600.000
+        cache size  : 4096 KB
+        physical id : 0
+        siblings    : 4
+        core id     : 0
+        cpu cores   : 2
+        apicid      : 1
+        initial apicid  : 1
+        fpu     : yes
+        fpu_exception   : yes
+        cpuid level : 13
+        wp      : yes
+        flags       : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 fma cx16 xtpr pdcm pcid sse4_1 sse4_2 movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid
+        bogomips    : 3591.40
+        clflush size    : 64
+        cache_alignment : 64
+        address sizes   : 39 bits physical, 48 bits virtual
+        power management:
+
+        processor   : 2
+        vendor_id   : GenuineIntel
+        cpu family  : 6
+        model       : 69
+        model name  : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz
+        stepping    : 1
+        microcode   : 0x17
+        cpu MHz     : 800.000
+        cache size  : 4096 KB
+        physical id : 0
+        siblings    : 4
+        core id     : 1
+        cpu cores   : 2
+        apicid      : 2
+        initial apicid  : 2
+        fpu     : yes
+        fpu_exception   : yes
+        cpuid level : 13
+        wp      : yes
+        flags       : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 fma cx16 xtpr pdcm pcid sse4_1 sse4_2 movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid
+        bogomips    : 3591.40
+        clflush size    : 64
+        cache_alignment : 64
+        address sizes   : 39 bits physical, 48 bits virtual
+        power management:
+
+        processor   : 3
+        vendor_id   : GenuineIntel
+        cpu family  : 6
+        model       : 69
+        model name  : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz
+        stepping    : 1
+        microcode   : 0x17
+        cpu MHz     : 774.000
+        cache size  : 4096 KB
+        physical id : 0
+        siblings    : 4
+        core id     : 1
+        cpu cores   : 2
+        apicid      : 3
+        initial apicid  : 3
+        fpu     : yes
+        fpu_exception   : yes
+        cpuid level : 13
+        wp      : yes
+        flags       : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 fma cx16 xtpr pdcm pcid sse4_1 sse4_2 movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm ida arat epb xsaveopt pln pts dtherm tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid
+        bogomips    : 3591.40
+        clflush size    : 64
+        cache_alignment : 64
+        address sizes   : 39 bits physical, 48 bits virtual
+        power management:
 
       EOF
     end
@@ -368,13 +368,13 @@ describe Ohai::System, "S390 linux cpu plugin" do
     allow(plugin).to receive(:shell_out).with("lscpu").and_return(mock_shell_out(1, "", ""))
 
     @double_file = double("/proc/cpuinfo")
-    allow(@double_file).to receive(:each).
-      and_yield("vendor_id : IBM/S390").
-      and_yield("# processors : 2").
-      and_yield("bogomips per cpu: 9328.00").
-      and_yield("features : esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs").
-      and_yield("processor 0: version = EE, identification = 06E276, machine = 2717").
-      and_yield("processor 1: version = FF, identification = 06E278, machine = 2818")
+    allow(@double_file).to receive(:each)
+      .and_yield("vendor_id : IBM/S390")
+      .and_yield("# processors : 2")
+      .and_yield("bogomips per cpu: 9328.00")
+      .and_yield("features : esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs")
+      .and_yield("processor 0: version = EE, identification = 06E276, machine = 2717")
+      .and_yield("processor 1: version = FF, identification = 06E278, machine = 2818")
     allow(File).to receive(:open).with("/proc/cpuinfo").and_return(@double_file)
   end
 
@@ -415,15 +415,15 @@ describe Ohai::System, "arm64 linux cpu plugin" do
     allow(plugin).to receive(:shell_out).with("lscpu").and_return(mock_shell_out(1, "", ""))
 
     @double_file = double("/proc/cpuinfo")
-    allow(@double_file).to receive(:each).
-      and_yield("processor	: 0").
-      and_yield("BogoMIPS	: 40.00").
-      and_yield("Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32").
-      and_yield("").
-      and_yield("processor      : 1").
-      and_yield("BogoMIPS       : 40.00").
-      and_yield("Features       : fp asimd evtstrm aes pmull sha1 sha2 crc32").
-      and_yield("")
+    allow(@double_file).to receive(:each)
+      .and_yield("processor	: 0")
+      .and_yield("BogoMIPS	: 40.00")
+      .and_yield("Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32")
+      .and_yield("")
+      .and_yield("processor      : 1")
+      .and_yield("BogoMIPS       : 40.00")
+      .and_yield("Features       : fp asimd evtstrm aes pmull sha1 sha2 crc32")
+      .and_yield("")
     allow(File).to receive(:open).with("/proc/cpuinfo").and_return(@double_file)
   end