ohai 8.10.0 → 8.11.1

data/spec/unit/mixin/command_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 
 describe Ohai::Mixin::Command, "popen4" do
   break if RUBY_PLATFORM =~ /(win|w)32$/
@@ -30,7 +30,7 @@ describe Ohai::Mixin::Command, "popen4" do
   end
 
   it "should respect locale when specified explicitly" do
-    Ohai::Mixin::Command.popen4("echo $LC_ALL", :environment => {"LC_ALL" => "es"}) do |pid, stdin, stdout, stderr|
+    Ohai::Mixin::Command.popen4("echo $LC_ALL", :environment => { "LC_ALL" => "es" }) do |pid, stdin, stdout, stderr|
       stdin.close
       expect(stdout.read.strip).to eq("es")
     end
@@ -52,14 +52,14 @@ describe Ohai::Mixin::Command, "popen4" do
 
       it "should force encode the string to UTF-8" do
         extend Ohai::Mixin::Command
-        snowy = run_command(:command => ("echo '" + ('☃' * 8096) + "'"))[1]
+        snowy = run_command(:command => ("echo '" + ("☃" * 8096) + "'"))[1]
         expect(snowy.encoding).to eq(Encoding::UTF_8)
       end
     end
 
     it "should force encode the string to UTF-8" do
       extend Ohai::Mixin::Command
-      snowy = run_command(:command => ("echo '" + ('☃' * 8096) + "'"))[1]
+      snowy = run_command(:command => ("echo '" + ("☃" * 8096) + "'"))[1]
       expect(snowy.encoding).to eq(Encoding::UTF_8)
     end
   end
@@ -72,7 +72,7 @@ describe Ohai::Mixin::Command, "popen4" do
     created_procs = 0
     100.times do
       begin
-        Ohai::Mixin::Command.popen4("/bin/this-is-not-a-real-command") {|p,i,o,e| nil }
+        Ohai::Mixin::Command.popen4("/bin/this-is-not-a-real-command") { |p, i, o, e| nil }
       rescue Ohai::Exceptions::Exec
         created_procs += 1
       end

data/spec/unit/mixin/ec2_metadata_spec.rb

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
-require 'ohai/mixin/ec2_metadata'
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require "ohai/mixin/ec2_metadata"
 
 describe Ohai::Mixin::Ec2Metadata do
   let(:mixin) {
@@ -49,7 +49,7 @@ describe Ohai::Mixin::Ec2Metadata do
       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)
+        expect { mixin.best_api_version }.to raise_error(RuntimeError)
       end
     end
 
@@ -58,7 +58,7 @@ describe Ohai::Mixin::Ec2Metadata do
       let(:response) { double("Net::HTTP Response", :code => "404") }
 
       it "returns 'latest' as the version" do
-        expect(mixin.best_api_version).to eq('latest')
+        expect(mixin.best_api_version).to eq("latest")
       end
     end
 
@@ -66,7 +66,7 @@ describe Ohai::Mixin::Ec2Metadata do
       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)
+        expect { mixin.best_api_version }.to raise_error(RuntimeError)
       end
     end
   end
@@ -76,7 +76,7 @@ describe Ohai::Mixin::Ec2Metadata do
       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)
+        expect { mixin.metadata_get("", "2012-01-12") }.to raise_error(RuntimeError)
       end
     end
   end

data/spec/unit/mixin/softlayer_metadata_spec.rb

@@ -17,9 +17,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
-require 'ohai/mixin/softlayer_metadata'
-
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require "ohai/mixin/softlayer_metadata"
 
 describe ::Ohai::Mixin::SoftlayerMetadata do
 
@@ -33,39 +32,36 @@ 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
+  context "fetch_metadata" do
     it "riases error if softlayer api query results with error" do
-      http_mock = double('http', {:ssl_version= => true, :use_ssl= => true, :ca_file= => true})
+      http_mock = double("http", { :ssl_version= => true, :use_ssl= => true, :ca_file= => true })
       allow(http_mock).to receive(:get).and_raise(StandardError.new("API return fake error"))
-      allow(::Net::HTTP).to receive(:new).with('api.service.softlayer.com', 443).and_return(http_mock)
+      allow(::Net::HTTP).to receive(:new).with("api.service.softlayer.com", 443).and_return(http_mock)
 
       expect(::Ohai::Log).to receive(:error).at_least(:once)
-      expect{mixin.fetch_metadata}.to raise_error(StandardError)
+      expect { mixin.fetch_metadata }.to raise_error(StandardError)
     end
 
     it "query api service" do
-      http_mock = double('http', {:ssl_version= => true, :use_ssl= => true, :ca_file= => true})
-      allow(::Net::HTTP).to receive(:new).with('api.service.softlayer.com', 443).and_return(http_mock)
-
-      expect(http_mock).to receive(:get).with(make_request('getFullyQualifiedDomainName.txt')).and_return(make_res('abc.host.org')).once
-      expect(http_mock).to receive(:get).with(make_request('getPrimaryBackendIpAddress.txt')).and_return(make_res('10.0.1.10')).once
-      expect(http_mock).to receive(:get).with(make_request('getPrimaryIpAddress.txt')).and_return(make_res('8.8.8.8')).once
-      expect(http_mock).to receive(:get).with(make_request('getId.txt')).and_return(make_res('1111')).once
-      expect(http_mock).to receive(:get).with(make_request('getDatacenter.txt')).and_return(make_res('dal05')).once
+      http_mock = double("http", { :ssl_version= => true, :use_ssl= => true, :ca_file= => true })
+      allow(::Net::HTTP).to receive(:new).with("api.service.softlayer.com", 443).and_return(http_mock)
 
+      expect(http_mock).to receive(:get).with(make_request("getFullyQualifiedDomainName.txt")).and_return(make_res("abc.host.org")).once
+      expect(http_mock).to receive(:get).with(make_request("getPrimaryBackendIpAddress.txt")).and_return(make_res("10.0.1.10")).once
+      expect(http_mock).to receive(:get).with(make_request("getPrimaryIpAddress.txt")).and_return(make_res("8.8.8.8")).once
+      expect(http_mock).to receive(:get).with(make_request("getId.txt")).and_return(make_res("1111")).once
+      expect(http_mock).to receive(:get).with(make_request("getDatacenter.txt")).and_return(make_res("dal05")).once
 
       metadata = mixin.fetch_metadata
       expect(metadata).not_to be_nil
-      expect(metadata["public_fqdn"]).to eq('abc.host.org')
-      expect(metadata["local_ipv4"]).to  eq('10.0.1.10')
-      expect(metadata["instance_id"]).to eq('1111')
-      expect(metadata["region"]).to      eq('dal05')
-      expect(metadata["public_ipv4"]).to eq('8.8.8.8')
+      expect(metadata["public_fqdn"]).to eq("abc.host.org")
+      expect(metadata["local_ipv4"]).to  eq("10.0.1.10")
+      expect(metadata["instance_id"]).to eq("1111")
+      expect(metadata["region"]).to      eq("dal05")
+      expect(metadata["public_ipv4"]).to eq("8.8.8.8")
     end
   end
 end
-

data/spec/unit/plugin_config_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require_relative '../spec_helper'
+require_relative "../spec_helper"
 
-require 'ohai/plugin_config'
+require "ohai/plugin_config"
 
 describe "Ohai::PluginConfig" do
 
@@ -56,7 +56,7 @@ describe "Ohai::PluginConfig" do
             {
               :bar0 => true,
               :bar1 => [ :baz0, :baz1, :baz2 ],
-              :bar2 => { :qux0 => true, :qux1 => false }
+              :bar2 => { :qux0 => true, :qux1 => false },
             }
           }
 
@@ -70,7 +70,7 @@ describe "Ohai::PluginConfig" do
             {
               :bar0 => true,
               "bar1" => [ :baz0, :baz1, :baz2 ],
-              :bar2 => { :qux0 => true, :qux1 => false }
+              :bar2 => { :qux0 => true, :qux1 => false },
             }
           }
 
@@ -84,7 +84,7 @@ describe "Ohai::PluginConfig" do
             {
               :bar0 => true,
               :bar1 => [ :baz0, :baz1, :baz2 ],
-              :bar2 => { :qux0 => true, "qux1" => false }
+              :bar2 => { :qux0 => true, "qux1" => false },
             }
           }
 

data/spec/unit/plugins/abort_spec.rb

@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb'))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "/spec_helper.rb"))
 
-tmp = ENV['TMPDIR'] || ENV['TMP'] || ENV['TEMP'] || '/tmp'
+tmp = ENV["TMPDIR"] || ENV["TMP"] || ENV["TEMP"] || "/tmp"
 
 abortstr = <<EOF
 Ohai.plugin(:Abort) do
@@ -66,4 +66,4 @@ describe "a plug-in that aborts execution" do
     @plugin = @loader.load_plugin("#{tmp}/plugins/abort.rb")
     expect { @runner.run_plugin(@plugin) }.to raise_error(SystemExit)
   end
-end
+end

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

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 describe Ohai::System, "AIX cpu plugin" do
   before(:each) do

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

@@ -15,7 +15,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 describe Ohai::System, "AIX filesystem plugin" do
   before(:each) do
@@ -89,7 +89,7 @@ MOUNT
     @plugin[:filesystem] = Mash.new
   end
 
-  context 'when run within an LPAR' do
+  context "when run within an LPAR" do
     before do
       allow(@plugin).to receive(:shell_out).with("df -Pk").and_return(mock_shell_out(0, @df_Pk_LPAR, nil))
       allow(@plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, @mount_LPAR, nil))
@@ -99,59 +99,59 @@ MOUNT
     describe "df -Pk" do
 
       it "returns the filesystem block size" do
-        expect(@plugin[:filesystem]["/dev/hd4"]['kb_size']).to eq("2097152")
+        expect(@plugin[:filesystem]["/dev/hd4"]["kb_size"]).to eq("2097152")
       end
 
       it "returns the filesystem used space in kb" do
-        expect(@plugin[:filesystem]["/dev/hd4"]['kb_used']).to eq("219796")
+        expect(@plugin[:filesystem]["/dev/hd4"]["kb_used"]).to eq("219796")
       end
 
       it "returns the filesystem available space in kb" do
-        expect(@plugin[:filesystem]["/dev/hd4"]['kb_available']).to eq("1877356")
+        expect(@plugin[:filesystem]["/dev/hd4"]["kb_available"]).to eq("1877356")
       end
 
       it "returns the filesystem capacity in percentage" do
-        expect(@plugin[:filesystem]["/dev/hd4"]['percent_used']).to eq("11%")
+        expect(@plugin[:filesystem]["/dev/hd4"]["percent_used"]).to eq("11%")
       end
 
       it "returns the filesystem mounted location" do
-        expect(@plugin[:filesystem]["/dev/hd4"]['mount']).to eq("/")
+        expect(@plugin[:filesystem]["/dev/hd4"]["mount"]).to eq("/")
       end
     end
 
     describe "mount" do
 
       it "returns the filesystem mount location" do
-        expect(@plugin[:filesystem]["/dev/hd4"]['mount']).to eq("/")
+        expect(@plugin[:filesystem]["/dev/hd4"]["mount"]).to eq("/")
       end
 
       it "returns the filesystem type" do
-        expect(@plugin[:filesystem]["/dev/hd4"]['fs_type']).to eq("jfs2")
+        expect(@plugin[:filesystem]["/dev/hd4"]["fs_type"]).to eq("jfs2")
       end
 
       it "returns the filesystem mount options" do
-        expect(@plugin[:filesystem]["/dev/hd4"]['mount_options']).to eq(["rw", "log=/dev/hd8"])
+        expect(@plugin[:filesystem]["/dev/hd4"]["mount_options"]).to eq(["rw", "log=/dev/hd8"])
       end
 
       # For entries like 192.168.1.11 /stage/middleware /stage/middleware nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
       context "having node values" do
 
         it "returns the filesystem mount location" do
-          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['mount']).to eq("/stage/middleware")
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]["mount"]).to eq("/stage/middleware")
         end
 
         it "returns the filesystem type" do
-          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['fs_type']).to eq("nfs3")
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]["fs_type"]).to eq("nfs3")
         end
 
         it "returns the filesystem mount options" do
-          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['mount_options']).to eq(["ro", "bg", "hard", "intr", "sec=sys"])
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]["mount_options"]).to eq(["ro", "bg", "hard", "intr", "sec=sys"])
         end
       end
     end
   end
 
-  context 'when run within a WPAR' do
+  context "when run within a WPAR" do
     before do
       allow(@plugin).to receive(:shell_out).with("df -Pk").and_return(mock_shell_out(0, @df_Pk_WPAR, nil))
       allow(@plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, @mount_WPAR, nil))
@@ -161,53 +161,53 @@ MOUNT
     describe "df -Pk" do
 
       it "returns the filesystem block size" do
-        expect(@plugin[:filesystem]["Global:/"]['kb_size']).to eq("10485760")
+        expect(@plugin[:filesystem]["Global:/"]["kb_size"]).to eq("10485760")
       end
 
       it "returns the filesystem used space in kb" do
-        expect(@plugin[:filesystem]["Global:/"]['kb_used']).to eq("130872")
+        expect(@plugin[:filesystem]["Global:/"]["kb_used"]).to eq("130872")
       end
 
       it "returns the filesystem available space in kb" do
-        expect(@plugin[:filesystem]["Global:/"]['kb_available']).to eq("10354888")
+        expect(@plugin[:filesystem]["Global:/"]["kb_available"]).to eq("10354888")
       end
 
       it "returns the filesystem capacity in percentage" do
-        expect(@plugin[:filesystem]["Global:/"]['percent_used']).to eq("2%")
+        expect(@plugin[:filesystem]["Global:/"]["percent_used"]).to eq("2%")
       end
 
       it "returns the filesystem mounted location" do
-        expect(@plugin[:filesystem]["Global:/"]['mount']).to eq("/")
+        expect(@plugin[:filesystem]["Global:/"]["mount"]).to eq("/")
       end
     end
 
     describe "mount" do
 
       it "returns the filesystem mount location" do
-        expect(@plugin[:filesystem]["Global:/"]['mount']).to eq("/")
+        expect(@plugin[:filesystem]["Global:/"]["mount"]).to eq("/")
       end
 
       it "returns the filesystem type" do
-        expect(@plugin[:filesystem]["Global:/"]['fs_type']).to eq("jfs2")
+        expect(@plugin[:filesystem]["Global:/"]["fs_type"]).to eq("jfs2")
       end
 
       it "returns the filesystem mount options" do
-        expect(@plugin[:filesystem]["Global:/"]['mount_options']).to eq(["rw", "log=NULL"])
+        expect(@plugin[:filesystem]["Global:/"]["mount_options"]).to eq(["rw", "log=NULL"])
       end
 
       # For entries like 192.168.1.11 /stage/middleware /stage/middleware nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
       context "having node values" do
 
         it "returns the filesystem mount location" do
-          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['mount']).to eq("/stage/middleware")
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]["mount"]).to eq("/stage/middleware")
         end
 
         it "returns the filesystem type" do
-          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['fs_type']).to eq("nfs3")
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]["fs_type"]).to eq("nfs3")
         end
 
         it "returns the filesystem mount options" do
-          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]['mount_options']).to eq(["ro", "bg", "hard", "intr", "sec=sys"])
+          expect(@plugin[:filesystem]["192.168.1.11:/stage/middleware"]["mount_options"]).to eq(["ro", "bg", "hard", "intr", "sec=sys"])
         end
       end
     end

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

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 describe Ohai::System, "AIX hostname plugin" do
   before(:each) do
@@ -31,4 +31,3 @@ describe Ohai::System, "AIX hostname plugin" do
     expect(@plugin[:machinename]).to eql("aix_admin")
   end
 end
-

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

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 describe Ohai::System, "AIX kernel plugin" do
   before(:each) do
@@ -54,8 +54,8 @@ describe Ohai::System, "AIX kernel plugin" do
   it "detects the modules" do
     expect(@plugin[:kernel][:modules]["/usr/lib/drivers/cluster"]["text"]).to eq({ "address" => "f1000000c0338000", "size" => "77000" })
     expect(@plugin[:kernel][:modules]["/usr/lib/drivers/cluster"]["data"]).to eq({ "address" => "f1000000c0390000", "size" => "1ec8c" })
-    expect(@plugin[:kernel][:modules]["/usr/lib/drivers/if_en"]["text"]).to eq({ "address" => "6390000", "size" => "20000"})
-    expect(@plugin[:kernel][:modules]["/usr/lib/drivers/if_en"]["data"]).to eq({ "address" => "63a0000", "size" => "ba8"})
+    expect(@plugin[:kernel][:modules]["/usr/lib/drivers/if_en"]["text"]).to eq({ "address" => "6390000", "size" => "20000" })
+    expect(@plugin[:kernel][:modules]["/usr/lib/drivers/if_en"]["data"]).to eq({ "address" => "63a0000", "size" => "ba8" })
 
   end
 end

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

@@ -16,34 +16,34 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
 
 describe Ohai::System, "AIX memory plugin" do
-   before(:each) do
+  before(:each) do
     @plugin = get_plugin("aix/memory")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
     allow(@plugin).to receive(:shell_out).with("svmon -G -O unit=MB,summary=longreal | grep '[0-9]'").and_return(mock_shell_out(0, " 513280.00 340034.17 173245.83   62535.17 230400.05 276950.14  70176.00\n", nil))
     @swap_s = "allocated  =    23887872 blocks    used  =   288912 blocks      free  =    23598960 blocks\n"
-    allow(@plugin).to receive(:shell_out).with("swap -s").and_return(mock_shell_out(0,@swap_s, nil))
-   end
+    allow(@plugin).to receive(:shell_out).with("swap -s").and_return(mock_shell_out(0, @swap_s, nil))
+  end
 
   it "should get total memory" do
     @plugin.run
-    expect(@plugin['memory']['total']).to eql("#{513280 * 1024}kB")
+    expect(@plugin["memory"]["total"]).to eql("#{513280 * 1024}kB")
   end
 
   it "should get free memory" do
     @plugin.run
-    expect(@plugin['memory']['free']).to eql("#{173245.83.to_i * 1024}kB")
+    expect(@plugin["memory"]["free"]).to eql("#{173245.83.to_i * 1024}kB")
   end
 
   it "should get total swap" do
     @plugin.run
-    expect(@plugin['memory']['swap']['total']).to eql( "#{23887872 * 4}kB")
+    expect(@plugin["memory"]["swap"]["total"]).to eql( "#{23887872 * 4}kB")
   end
 
   it "should get free swap" do
     @plugin.run
-    expect(@plugin['memory']['swap']['free']).to eql( "#{23598960 * 4}kB")
+    expect(@plugin["memory"]["swap"]["free"]).to eql( "#{23598960 * 4}kB")
   end
 end