ohai 14.2.0 → 14.3.0

data/spec/unit/mixin/command_spec.rb

@@ -44,20 +44,20 @@ describe Ohai::Mixin::Command, "shell_out" do
 
   describe "when the command runs" do
     it "logs the command and exitstatus" do
-      expect(Mixlib::ShellOut).
-        to receive(:new).
-        with(cmd, options).
-        and_return(shell_out)
+      expect(Mixlib::ShellOut)
+        .to receive(:new)
+        .with(cmd, options)
+        .and_return(shell_out)
 
-      expect(shell_out).
-        to receive(:run_command)
+      expect(shell_out)
+        .to receive(:run_command)
 
-      expect(shell_out).
-        to receive(:exitstatus).
-        and_return(256)
+      expect(shell_out)
+        .to receive(:exitstatus)
+        .and_return(256)
 
-      expect(logger).to receive(:trace).
-        with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and returned 256")
+      expect(logger).to receive(:trace)
+        .with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and returned 256")
 
       Ohai::Mixin::Command.shell_out(cmd)
     end
@@ -65,43 +65,43 @@ describe Ohai::Mixin::Command, "shell_out" do
 
   describe "when the command does not exist" do
     it "logs the command and error message" do
-      expect(Mixlib::ShellOut).
-        to receive(:new).
-        with(cmd, options).
-        and_return(shell_out)
-
-      expect(shell_out).
-        to receive(:run_command).
-        and_raise(Errno::ENOENT, "sparkle-dream")
-
-      expect(logger).
-        to receive(:trace).
-        with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and failed " \
+      expect(Mixlib::ShellOut)
+        .to receive(:new)
+        .with(cmd, options)
+        .and_return(shell_out)
+
+      expect(shell_out)
+        .to receive(:run_command)
+        .and_raise(Errno::ENOENT, "sparkle-dream")
+
+      expect(logger)
+        .to receive(:trace)
+        .with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and failed " \
              "#<Errno::ENOENT: No such file or directory - sparkle-dream>")
 
-      expect { Ohai::Mixin::Command.shell_out(cmd) }.
-        to raise_error(Ohai::Exceptions::Exec)
+      expect { Ohai::Mixin::Command.shell_out(cmd) }
+        .to raise_error(Ohai::Exceptions::Exec)
     end
   end
 
   describe "when the command times out" do
     it "logs the command an timeout error message" do
-      expect(Mixlib::ShellOut).
-        to receive(:new).
-        with(cmd, options).
-        and_return(shell_out)
-
-      expect(shell_out).
-        to receive(:run_command).
-        and_raise(Mixlib::ShellOut::CommandTimeout)
-
-      expect(logger).
-        to receive(:trace).
-        with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and timed " \
+      expect(Mixlib::ShellOut)
+        .to receive(:new)
+        .with(cmd, options)
+        .and_return(shell_out)
+
+      expect(shell_out)
+        .to receive(:run_command)
+        .and_raise(Mixlib::ShellOut::CommandTimeout)
+
+      expect(logger)
+        .to receive(:trace)
+        .with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and timed " \
              "out after 30 seconds")
 
-      expect { Ohai::Mixin::Command.shell_out(cmd) }.
-        to raise_error(Ohai::Exceptions::Exec)
+      expect { Ohai::Mixin::Command.shell_out(cmd) }
+        .to raise_error(Ohai::Exceptions::Exec)
     end
   end
 
@@ -109,42 +109,42 @@ describe Ohai::Mixin::Command, "shell_out" do
     let(:options) { windows? ? { timeout: 10 } : { timeout: 10, env: { "PATH" => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" } } }
 
     it "runs the command with the provided timeout" do
-      expect(Mixlib::ShellOut).
-        to receive(:new).
-        with(cmd, options).
-        and_return(shell_out)
+      expect(Mixlib::ShellOut)
+        .to receive(:new)
+        .with(cmd, options)
+        .and_return(shell_out)
 
-      expect(shell_out).
-        to receive(:run_command)
+      expect(shell_out)
+        .to receive(:run_command)
 
-      expect(shell_out).
-        to receive(:exitstatus).
-        and_return(256)
+      expect(shell_out)
+        .to receive(:exitstatus)
+        .and_return(256)
 
-      expect(logger).to receive(:trace).
-        with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and returned 256")
+      expect(logger).to receive(:trace)
+        .with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and returned 256")
 
       Ohai::Mixin::Command.shell_out(cmd, options)
     end
 
     describe "when the command times out" do
       it "logs the command an timeout error message" do
-        expect(Mixlib::ShellOut).
-          to receive(:new).
-          with(cmd, options).
-          and_return(shell_out)
-
-        expect(shell_out).
-          to receive(:run_command).
-          and_raise(Mixlib::ShellOut::CommandTimeout)
-
-        expect(logger).
-          to receive(:trace).
-          with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and timed " \
+        expect(Mixlib::ShellOut)
+          .to receive(:new)
+          .with(cmd, options)
+          .and_return(shell_out)
+
+        expect(shell_out)
+          .to receive(:run_command)
+          .and_raise(Mixlib::ShellOut::CommandTimeout)
+
+        expect(logger)
+          .to receive(:trace)
+          .with("Plugin OSSparkleDream: ran 'sparkle-dream --version' and timed " \
                "out after 10 seconds")
 
-        expect { Ohai::Mixin::Command.shell_out(cmd, options) }.
-          to raise_error(Ohai::Exceptions::Exec)
+        expect { Ohai::Mixin::Command.shell_out(cmd, options) }
+          .to raise_error(Ohai::Exceptions::Exec)
       end
     end
   end

data/spec/unit/mixin/ec2_metadata_spec.rb

@@ -35,7 +35,7 @@ describe Ohai::Mixin::Ec2Metadata do
 
   context "#best_api_version" do
     context "with a sorted list of metadata versions" do
-      let(:response) { double("Net::HTTP Response", :body => "1.0\n2011-05-01\n2012-01-12\nUnsupported", :code => "200") }
+      let(:response) { double("Net::HTTP Response", body: "1.0\n2011-05-01\n2012-01-12\nUnsupported", code: "200") }
 
       it "returns the most recent version" do
         expect(mixin.best_api_version).to eq("2012-01-12")
@@ -43,7 +43,7 @@ describe Ohai::Mixin::Ec2Metadata do
     end
 
     context "with an unsorted list of metadata versions" do
-      let(:response) { double("Net::HTTP Response", :body => "1.0\n2009-04-04\n2007-03-01\n2011-05-01\n2008-09-01\nUnsupported", :code => "200") }
+      let(:response) { double("Net::HTTP Response", body: "1.0\n2009-04-04\n2007-03-01\n2011-05-01\n2008-09-01\nUnsupported", code: "200") }
 
       it "returns the most recent version (using string sort)" do
         expect(mixin.best_api_version).to eq("2011-05-01")
@@ -51,7 +51,7 @@ describe Ohai::Mixin::Ec2Metadata do
     end
 
     context "when no supported versions are found" do
-      let(:response) { double("Net::HTTP Response", :body => "2020-01-01\nUnsupported", :code => "200") }
+      let(:response) { double("Net::HTTP Response", body: "2020-01-01\nUnsupported", code: "200") }
 
       it "raises an error" do
         expect { mixin.best_api_version }.to raise_error(RuntimeError)
@@ -60,7 +60,7 @@ describe Ohai::Mixin::Ec2Metadata do
 
     # Presume 'latest' when we get a 404 for Eucalyptus back-compat
     context "when the response code is 404" do
-      let(:response) { double("Net::HTTP Response", :code => "404") }
+      let(:response) { double("Net::HTTP Response", code: "404") }
 
       it "returns 'latest' as the version" do
         expect(mixin.best_api_version).to eq("latest")
@@ -68,7 +68,7 @@ describe Ohai::Mixin::Ec2Metadata do
     end
 
     context "when the response code is unexpected" do
-      let(:response) { double("Net::HTTP Response", :body => "1.0\n2011-05-01\n2012-01-12\nUnsupported", :code => "418") }
+      let(:response) { double("Net::HTTP Response", body: "1.0\n2011-05-01\n2012-01-12\nUnsupported", code: "418") }
 
       it "raises an error" do
         expect { mixin.best_api_version }.to raise_error(RuntimeError)
@@ -78,7 +78,7 @@ describe Ohai::Mixin::Ec2Metadata do
 
   context "#metadata_get" do
     context "when the response code is unexpected" do
-      let(:response) { double("Net::HTTP Response", :body => "", :code => "418") }
+      let(:response) { double("Net::HTTP Response", body: "", code: "418") }
 
       it "raises an error" do
         expect { mixin.metadata_get("", "2012-01-12") }.to raise_error(RuntimeError)

data/spec/unit/mixin/softlayer_metadata_spec.rb

@@ -37,7 +37,7 @@ describe ::Ohai::Mixin::SoftlayerMetadata do
   end
 
   def make_res(body)
-    double("response", { :body => body, :code => "200" })
+    double("response", { body: body, code: "200" })
   end
 
   context "fetch_metadata" do

data/spec/unit/plugin_config_spec.rb

@@ -37,8 +37,8 @@ describe "Ohai::PluginConfig" do
     shared_examples_for "failure" do
 
       it "raises an error" do
-        expect { plugin_config[key] = value }.
-          to raise_error(Ohai::Exceptions::PluginConfigError, /Expected Symbol/)
+        expect { plugin_config[key] = value }
+          .to raise_error(Ohai::Exceptions::PluginConfigError, /Expected Symbol/)
       end
 
     end
@@ -53,9 +53,9 @@ describe "Ohai::PluginConfig" do
 
           let(:value) do
             {
-              :bar0 => true,
-              :bar1 => [ :baz0, :baz1, :baz2 ],
-              :bar2 => { :qux0 => true, :qux1 => false },
+              bar0: true,
+              bar1: [ :baz0, :baz1, :baz2 ],
+              bar2: { qux0: true, qux1: false },
             }
           end
 
@@ -69,7 +69,7 @@ describe "Ohai::PluginConfig" do
             {
               :bar0 => true,
               "bar1" => [ :baz0, :baz1, :baz2 ],
-              :bar2 => { :qux0 => true, :qux1 => false },
+              :bar2 => { qux0: true, qux1: false },
             }
           end
 
@@ -81,9 +81,9 @@ describe "Ohai::PluginConfig" do
 
           let(:value) do
             {
-              :bar0 => true,
-              :bar1 => [ :baz0, :baz1, :baz2 ],
-              :bar2 => { :qux0 => true, "qux1" => false },
+              bar0: true,
+              bar1: [ :baz0, :baz1, :baz2 ],
+              bar2: { :qux0 => true, "qux1" => false },
             }
           end
 

data/spec/unit/plugins/abort_spec.rb

@@ -20,13 +20,13 @@ require_relative "../../spec_helper.rb"
 
 tmp = ENV["TMPDIR"] || ENV["TMP"] || ENV["TEMP"] || "/tmp"
 
-abortstr = <<EOF
-Ohai.plugin(:Abort) do
-  provides "abort_test"
-  collect_data do
-    abort
+abortstr = <<~EOF
+  Ohai.plugin(:Abort) do
+    provides "abort_test"
+    collect_data do
+      abort
+    end
   end
-end
 EOF
 
 describe "a plug-in that aborts execution" do

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

@@ -20,24 +20,24 @@ require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "AIX cpu plugin" do
   before(:each) do
-    @lsdev_cc_processor = <<-LSDEV_CC_PROCESSOR
-proc0 Available 00-00 Processor
-proc4 Defined   00-04 Processor
+    @lsdev_cc_processor = <<~LSDEV_CC_PROCESSOR
+      proc0 Available 00-00 Processor
+      proc4 Defined   00-04 Processor
 LSDEV_CC_PROCESSOR
 
-    @lsattr_el_proc0 = <<-LSATTR_EL
-frequency   1654344000     Processor Speed       False
-smt_enabled true           Processor SMT enabled False
-smt_threads 2              Processor SMT threads False
-state       enable         Processor state       False
-type        PowerPC_POWER5 Processor type        False
+    @lsattr_el_proc0 = <<~LSATTR_EL
+      frequency   1654344000     Processor Speed       False
+      smt_enabled true           Processor SMT enabled False
+      smt_threads 2              Processor SMT threads False
+      state       enable         Processor state       False
+      type        PowerPC_POWER5 Processor type        False
 LSATTR_EL
 
-    @pmcycles_m = <<-PMCYCLES_M
-CPU 0 runs at 1654 MHz
-CPU 1 runs at 1654 MHz
-CPU 2 runs at 1654 MHz
-CPU 3 runs at 1654 MHz
+    @pmcycles_m = <<~PMCYCLES_M
+      CPU 0 runs at 1654 MHz
+      CPU 1 runs at 1654 MHz
+      CPU 2 runs at 1654 MHz
+      CPU 3 runs at 1654 MHz
 PMCYCLES_M
 
     @plugin = get_plugin("aix/cpu")
@@ -71,8 +71,8 @@ PMCYCLES_M
     end
 
     it "sets the number of cores" do
-      #from http://www-01.ibm.com/software/passportadvantage/pvu_terminology_for_customers.html
-      #on AIX number of cores and processors are considered same
+      # from http://www-01.ibm.com/software/passportadvantage/pvu_terminology_for_customers.html
+      # on AIX number of cores and processors are considered same
       expect(@plugin[:cpu][:cores]).to eq(@plugin[:cpu][:real])
     end
 

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

@@ -20,69 +20,69 @@ require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "AIX filesystem plugin" do
   before(:each) do
-    @df_pk_lpar = <<-DF_PK
-Filesystem    1024-blocks      Used Available Capacity Mounted on
-/dev/hd4          2097152    219796   1877356      11% /
-/dev/hd2          5242880   2416828   2826052      47% /usr
-/dev/hd9var       5242880    395540   4847340       8% /var
-/dev/hd3          5242880   1539508   3703372      30% /tmp
-/dev/hd1         10485760      1972  10483788       1% /home
-/dev/hd11admin      131072       380    130692       1% /admin
-/proc                   -         -         -       -  /proc
-/dev/hd10opt      5242880   1286720   3956160      25% /opt
-/dev/livedump      262144       368    261776       1% /var/adm/ras/livedump
-/dev/fslv00        524288     45076    479212       9% /wpars/sink-thinker-541ba3
-/dev/fslv01       2097152      8956   2088196       1% /wpars/sink-thinker-541ba3/home
-/dev/fslv02       5242880   1307352   3935528      25% /wpars/sink-thinker-541ba3/opt
-/proc                   -         -         -       -  /wpars/sink-thinker-541ba3/proc
-/dev/fslv03       1048576    168840    879736      17% /wpars/sink-thinker-541ba3/tmp
-/dev/fslv04       5242880   2725040   2517840      52% /wpars/sink-thinker-541ba3/usr
-/dev/fslv05        524288     76000    448288      15% /wpars/sink-thinker-541ba3/var
-/dev/fslv07      10485760    130872  10354888       2% /wpars/toolchain-tester-5c969f
-/dev/fslv08       5242880     39572   5203308       1% /wpars/toolchain-tester-5c969f/home
-/dev/fslv09       5242880   1477164   3765716      29% /wpars/toolchain-tester-5c969f/opt
-/proc                   -         -         -       -  /wpars/toolchain-tester-5c969f/proc
-/dev/fslv10       5242880     42884   5199996       1% /wpars/toolchain-tester-5c969f/tmp
-/dev/fslv11       5242880   2725048   2517832      52% /wpars/toolchain-tester-5c969f/usr
-/dev/fslv12      10485760    272376  10213384       3% /wpars/toolchain-tester-5c969f/var
+    @df_pk_lpar = <<~DF_PK
+      Filesystem    1024-blocks      Used Available Capacity Mounted on
+      /dev/hd4          2097152    219796   1877356      11% /
+      /dev/hd2          5242880   2416828   2826052      47% /usr
+      /dev/hd9var       5242880    395540   4847340       8% /var
+      /dev/hd3          5242880   1539508   3703372      30% /tmp
+      /dev/hd1         10485760      1972  10483788       1% /home
+      /dev/hd11admin      131072       380    130692       1% /admin
+      /proc                   -         -         -       -  /proc
+      /dev/hd10opt      5242880   1286720   3956160      25% /opt
+      /dev/livedump      262144       368    261776       1% /var/adm/ras/livedump
+      /dev/fslv00        524288     45076    479212       9% /wpars/sink-thinker-541ba3
+      /dev/fslv01       2097152      8956   2088196       1% /wpars/sink-thinker-541ba3/home
+      /dev/fslv02       5242880   1307352   3935528      25% /wpars/sink-thinker-541ba3/opt
+      /proc                   -         -         -       -  /wpars/sink-thinker-541ba3/proc
+      /dev/fslv03       1048576    168840    879736      17% /wpars/sink-thinker-541ba3/tmp
+      /dev/fslv04       5242880   2725040   2517840      52% /wpars/sink-thinker-541ba3/usr
+      /dev/fslv05        524288     76000    448288      15% /wpars/sink-thinker-541ba3/var
+      /dev/fslv07      10485760    130872  10354888       2% /wpars/toolchain-tester-5c969f
+      /dev/fslv08       5242880     39572   5203308       1% /wpars/toolchain-tester-5c969f/home
+      /dev/fslv09       5242880   1477164   3765716      29% /wpars/toolchain-tester-5c969f/opt
+      /proc                   -         -         -       -  /wpars/toolchain-tester-5c969f/proc
+      /dev/fslv10       5242880     42884   5199996       1% /wpars/toolchain-tester-5c969f/tmp
+      /dev/fslv11       5242880   2725048   2517832      52% /wpars/toolchain-tester-5c969f/usr
+      /dev/fslv12      10485760    272376  10213384       3% /wpars/toolchain-tester-5c969f/var
 DF_PK
 
-    @df_pk_wpar = <<-DF_PK
-Filesystem    1024-blocks      Used Available Capacity Mounted on
-Global           10485760    130872  10354888       2% /
-Global            5242880     39572   5203308       1% /home
-Global            5242880   1477164   3765716      29% /opt
-Global                  -         -         -       -  /proc
-Global            5242880     42884   5199996       1% /tmp
-Global            5242880   2725048   2517832      52% /usr
-Global           10485760    272376  10213384       3% /var
+    @df_pk_wpar = <<~DF_PK
+      Filesystem    1024-blocks      Used Available Capacity Mounted on
+      Global           10485760    130872  10354888       2% /
+      Global            5242880     39572   5203308       1% /home
+      Global            5242880   1477164   3765716      29% /opt
+      Global                  -         -         -       -  /proc
+      Global            5242880     42884   5199996       1% /tmp
+      Global            5242880   2725048   2517832      52% /usr
+      Global           10485760    272376  10213384       3% /var
 DF_PK
 
-    @mount_lpar = <<-MOUNT
-  node       mounted        mounted over    vfs       date        options
--------- ---------------  ---------------  ------ ------------ ---------------
-         /dev/hd4         /                jfs2   Jul 17 13:22 rw,log=/dev/hd8
-         /dev/hd2         /usr             jfs2   Jul 17 13:22 rw,log=/dev/hd8
-         /dev/hd9var      /var             jfs2   Jul 17 13:22 rw,log=/dev/hd8
-         /dev/hd3         /tmp             jfs2   Jul 17 13:22 rw,log=/dev/hd8
-         /dev/hd1         /home            jfs2   Jul 17 13:22 rw,log=/dev/hd8
-         /dev/hd11admin   /admin           jfs2   Jul 17 13:22 rw,log=/dev/hd8
-         /proc            /proc            procfs Jul 17 13:22 rw
-         /dev/hd10opt     /opt             jfs2   Jul 17 13:22 rw,log=/dev/hd8
-192.168.1.11 /stage/middleware1 /stage/middleware2 nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
+    @mount_lpar = <<~MOUNT
+        node       mounted        mounted over    vfs       date        options
+      -------- ---------------  ---------------  ------ ------------ ---------------
+               /dev/hd4         /                jfs2   Jul 17 13:22 rw,log=/dev/hd8
+               /dev/hd2         /usr             jfs2   Jul 17 13:22 rw,log=/dev/hd8
+               /dev/hd9var      /var             jfs2   Jul 17 13:22 rw,log=/dev/hd8
+               /dev/hd3         /tmp             jfs2   Jul 17 13:22 rw,log=/dev/hd8
+               /dev/hd1         /home            jfs2   Jul 17 13:22 rw,log=/dev/hd8
+               /dev/hd11admin   /admin           jfs2   Jul 17 13:22 rw,log=/dev/hd8
+               /proc            /proc            procfs Jul 17 13:22 rw
+               /dev/hd10opt     /opt             jfs2   Jul 17 13:22 rw,log=/dev/hd8
+      192.168.1.11 /stage/middleware1 /stage/middleware2 nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
 MOUNT
 
-    @mount_wpar = <<-MOUNT
-  node       mounted        mounted over    vfs       date        options
--------- ---------------  ---------------  ------ ------------ ---------------
-         Global           /                jfs2   Nov 23 21:03 rw,log=NULL
-         Global           /home            jfs2   Nov 23 21:03 rw,log=NULL
-         Global           /opt             jfs2   Nov 23 21:03 rw,log=NULL
-         Global           /proc            namefs Nov 23 21:03 rw
-         Global           /tmp             jfs2   Nov 23 21:03 rw,log=NULL
-         Global           /usr             jfs2   Nov 23 21:03 rw,log=NULL
-         Global           /var             jfs2   Nov 23 21:03 rw,log=NULL
-192.168.1.11 /stage/middleware3 /stage/middleware4 nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
+    @mount_wpar = <<~MOUNT
+        node       mounted        mounted over    vfs       date        options
+      -------- ---------------  ---------------  ------ ------------ ---------------
+               Global           /                jfs2   Nov 23 21:03 rw,log=NULL
+               Global           /home            jfs2   Nov 23 21:03 rw,log=NULL
+               Global           /opt             jfs2   Nov 23 21:03 rw,log=NULL
+               Global           /proc            namefs Nov 23 21:03 rw
+               Global           /tmp             jfs2   Nov 23 21:03 rw,log=NULL
+               Global           /usr             jfs2   Nov 23 21:03 rw,log=NULL
+               Global           /var             jfs2   Nov 23 21:03 rw,log=NULL
+      192.168.1.11 /stage/middleware3 /stage/middleware4 nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
 MOUNT
 
     @plugin = get_plugin("aix/filesystem")