ohai 14.2.0 → 14.3.0

data/spec/unit/plugins/mono_spec.rb

@@ -23,17 +23,17 @@ describe Ohai::System, "plugin mono" do
 
   before(:each) do
     plugin[:languages] = Mash.new
-    @stdout = <<-OUT
-Mono JIT compiler version 4.2.3 (Stable 4.2.3.4/832de4b Wed Mar 30 13:57:48 PDT 2016)
-Copyright (C) 2002-2014 Novell, Inc, Xamarin Inc and Contributors. www.mono-project.com
-	TLS:           normal
-	SIGSEGV:       altstack
-	Notification:  kqueue
-	Architecture:  amd64
-	Disabled:      none
-	Misc:          softdebug
-	LLVM:          supported, not enabled.
-	GC:            sgen
+    @stdout = <<~OUT
+      Mono JIT compiler version 4.2.3 (Stable 4.2.3.4/832de4b Wed Mar 30 13:57:48 PDT 2016)
+      Copyright (C) 2002-2014 Novell, Inc, Xamarin Inc and Contributors. www.mono-project.com
+      	TLS:           normal
+      	SIGSEGV:       altstack
+      	Notification:  kqueue
+      	Architecture:  amd64
+      	Disabled:      none
+      	Misc:          softdebug
+      	LLVM:          supported, not enabled.
+      	GC:            sgen
 OUT
     allow(plugin).to receive(:shell_out).with("mono -V").and_return(mock_shell_out(0, @stdout, ""))
   end

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

@@ -25,7 +25,7 @@ describe Ohai::System, "NetBSD kernel plugin" do
     allow(@plugin).to receive(:init_kernel).and_return({})
     allow(@plugin).to receive(:shell_out).with("uname -i").and_return(mock_shell_out(0, "foo", ""))
     allow(@plugin).to receive(:shell_out).with("sysctl kern.securelevel").and_return(mock_shell_out(0, "kern.securelevel: 1\n", ""))
-    allow(@plugin).to receive(:shell_out).with("#{Ohai.abs_path( "/usr/bin/modstat" )}").and_return(mock_shell_out(0, "  1    7 0xc0400000 97f830   kernel", ""))
+    allow(@plugin).to receive(:shell_out).with((Ohai.abs_path( "/usr/bin/modstat" )).to_s).and_return(mock_shell_out(0, "  1    7 0xc0400000 97f830   kernel", ""))
   end
 
   it "should set the kernel_os to the kernel_name value" do

data/spec/unit/plugins/network_spec.rb

@@ -929,7 +929,7 @@ describe Ohai::System, "Network Plugin" do
               @plugin["network"]["default_gateway"] = nil
               @plugin["network"]["default_interface"] = nil
               @plugin["network"]["interfaces"].each_value do |val|
-                if val.has_key? "addresses"
+                if val.key? "addresses"
                   val["addresses"].delete_if { |k, kv| kv["family"] == "inet" }
                 end
               end
@@ -1014,7 +1014,7 @@ describe Ohai::System, "Network Plugin" do
               @plugin["network"]["default_gateway"] = nil
               @plugin["network"]["default_interface"] = nil
               @plugin["network"]["interfaces"].each_value do |val|
-                if val.has_key? "addresses"
+                if val.key? "addresses"
                   val["addresses"].delete_if { |k, kv| kv["family"] == "inet" }
                 end
               end

data/spec/unit/plugins/openstack_spec.rb

@@ -37,16 +37,16 @@ describe Ohai::System, "plugin openstack" do
   context "when DMI data is Openstack" do
     context "and the metadata service is not available" do
       before do
-        allow(plugin).to receive(:can_socket_connect?).
-          with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80).
-          and_return(false)
+        allow(plugin).to receive(:can_socket_connect?)
+          .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
+          .and_return(false)
         plugin[:dmi] = dmi_data
         plugin.run
       end
 
       context "with normal openstack metadata" do
         let(:dmi_data) do
-          { :system => { :all_records => [ { :Manufacturer => "OpenStack Foundation" } ] } }
+          { system: { all_records: [ { Manufacturer: "OpenStack Foundation" } ] } }
         end
 
         it "sets openstack attribute" do
@@ -59,7 +59,7 @@ describe Ohai::System, "plugin openstack" do
       end
       context "with Red Hat openstack metadata" do
         let(:dmi_data) do
-          { :system => { :manufacturer => "Red Hat", :product_name => "OpenStack Compute" } }
+          { system: { manufacturer: "Red Hat", product_name: "OpenStack Compute" } }
         end
 
         it "sets openstack attribute" do
@@ -76,10 +76,10 @@ describe Ohai::System, "plugin openstack" do
   context "when running on dreamhost" do
     it "sets openstack provider attribute to dreamhost" do
       plugin["etc"] = { "passwd" => { "dhc-user" => {} } }
-      allow(plugin).to receive(:can_socket_connect?).
-        with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80).
-        and_return(false)
-      plugin[:dmi] = { :system => { :all_records => [ { :Manufacturer => "OpenStack Foundation" } ] } }
+      allow(plugin).to receive(:can_socket_connect?)
+        .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
+        .and_return(false)
+      plugin[:dmi] = { system: { all_records: [ { Manufacturer: "OpenStack Foundation" } ] } }
       plugin.run
       expect(plugin[:openstack][:provider]).to eq("dreamhost")
     end
@@ -88,9 +88,9 @@ describe Ohai::System, "plugin openstack" do
   context "when the hint is present" do
     context "and the metadata service is not available" do
       before do
-        allow(plugin).to receive(:can_socket_connect?).
-          with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80).
-          and_return(false)
+        allow(plugin).to receive(:can_socket_connect?)
+          .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
+          .and_return(false)
         allow(plugin).to receive(:hint?).with("openstack").and_return(true)
         plugin.run
       end
@@ -109,25 +109,25 @@ describe Ohai::System, "plugin openstack" do
       let(:metadata_version) { "2009-04-04" }
 
       let(:metadata_root) do
-        <<EOM
-reservation-id
-public-keys/
-security-groups
-public-ipv4
-ami-manifest-path
-instance-type
-instance-id
-local-ipv4
-ari-id
-local-hostname
-placement/
-ami-launch-index
-public-hostname
-hostname
-ami-id
-instance-action
-aki-id
-block-device-mapping/
+        <<~EOM
+          reservation-id
+          public-keys/
+          security-groups
+          public-ipv4
+          ami-manifest-path
+          instance-type
+          instance-id
+          local-ipv4
+          ari-id
+          local-hostname
+          placement/
+          ami-launch-index
+          public-hostname
+          hostname
+          ami-id
+          instance-action
+          aki-id
+          block-device-mapping/
 EOM
       end
 
@@ -182,26 +182,26 @@ EOM
       let(:http_client) { double("Net::HTTP", { :read_timeout= => nil, :keep_alive_timeout= => nil } ) }
 
       def allow_get(url, response_body)
-        allow(http_client).to receive(:get).
-          with(url).
-          and_return(double("HTTP Response", :code => "200", :body => response_body))
+        allow(http_client).to receive(:get)
+          .with(url)
+          .and_return(double("HTTP Response", code: "200", body: response_body))
       end
 
       def allow_get_response(url, response_body)
-        allow(http_client).to receive(:get_response).
-          with(url, nil, nil).
-          and_return(double("HTTP Response", :code => "200", :body => response_body))
+        allow(http_client).to receive(:get_response)
+          .with(url, nil, nil)
+          .and_return(double("HTTP Response", code: "200", body: response_body))
       end
 
       before do
         allow(plugin).to receive(:hint?).with("openstack").and_return(true)
-        allow(plugin).to receive(:can_socket_connect?).
-          with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80).
-          and_return(true)
+        allow(plugin).to receive(:can_socket_connect?)
+          .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
+          .and_return(true)
 
-        allow(Net::HTTP).to receive(:start).
-          with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR).
-          and_return(http_client)
+        allow(Net::HTTP).to receive(:start)
+          .with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR)
+          .and_return(http_client)
 
         allow(plugin).to receive(:best_api_version).and_return(metadata_version)
 

data/spec/unit/plugins/os_spec.rb

@@ -60,7 +60,7 @@ describe Ohai::System, "plugin os" do
 
   describe "on solaris" do
     before do
-      ::RbConfig::CONFIG["host_os"] = "solaris2.42" #heh
+      ::RbConfig::CONFIG["host_os"] = "solaris2.42" # heh
     end
 
     it "sets the os to solaris2" do

data/spec/unit/plugins/passwd_spec.rb

@@ -25,18 +25,18 @@ describe Ohai::System, "plugin etc", :unix_only do
   GroupEntry = Struct.new(:name, :gid, :mem)
 
   it "should include a list of all users" do
-    expect(Etc).to receive(:passwd).and_yield(PasswdEntry.new("root", 1, 1, "/root", "/bin/zsh", "BOFH")).
-      and_yield(PasswdEntry.new("www", 800, 800, "/var/www", "/bin/false", "Serving the web since 1970"))
+    expect(Etc).to receive(:passwd).and_yield(PasswdEntry.new("root", 1, 1, "/root", "/bin/zsh", "BOFH"))
+      .and_yield(PasswdEntry.new("www", 800, 800, "/var/www", "/bin/false", "Serving the web since 1970"))
     @plugin.run
-    expect(@plugin[:etc][:passwd]["root"]).to eq(Mash.new(:shell => "/bin/zsh", :gecos => "BOFH", :gid => 1, :uid => 1, :dir => "/root"))
-    expect(@plugin[:etc][:passwd]["www"]).to eq(Mash.new(:shell => "/bin/false", :gecos => "Serving the web since 1970", :gid => 800, :uid => 800, :dir => "/var/www"))
+    expect(@plugin[:etc][:passwd]["root"]).to eq(Mash.new(shell: "/bin/zsh", gecos: "BOFH", gid: 1, uid: 1, dir: "/root"))
+    expect(@plugin[:etc][:passwd]["www"]).to eq(Mash.new(shell: "/bin/false", gecos: "Serving the web since 1970", gid: 800, uid: 800, dir: "/var/www"))
   end
 
   it "should ignore duplicate users" do
-    expect(Etc).to receive(:passwd).and_yield(PasswdEntry.new("root", 1, 1, "/root", "/bin/zsh", "BOFH")).
-      and_yield(PasswdEntry.new("root", 1, 1, "/", "/bin/false", "I do not belong"))
+    expect(Etc).to receive(:passwd).and_yield(PasswdEntry.new("root", 1, 1, "/root", "/bin/zsh", "BOFH"))
+      .and_yield(PasswdEntry.new("root", 1, 1, "/", "/bin/false", "I do not belong"))
     @plugin.run
-    expect(@plugin[:etc][:passwd]["root"]).to eq(Mash.new(:shell => "/bin/zsh", :gecos => "BOFH", :gid => 1, :uid => 1, :dir => "/root"))
+    expect(@plugin[:etc][:passwd]["root"]).to eq(Mash.new(shell: "/bin/zsh", gecos: "BOFH", gid: 1, uid: 1, dir: "/root"))
   end
 
   it "should set the current user" do
@@ -49,8 +49,8 @@ describe Ohai::System, "plugin etc", :unix_only do
   it "should set the available groups" do
     expect(Etc).to receive(:group).and_yield(GroupEntry.new("admin", 100, %w{root chef})).and_yield(GroupEntry.new("www", 800, %w{www deploy}))
     @plugin.run
-    expect(@plugin[:etc][:group]["admin"]).to eq(Mash.new(:gid => 100, :members => %w{root chef}))
-    expect(@plugin[:etc][:group]["www"]).to eq(Mash.new(:gid => 800, :members => %w{www deploy}))
+    expect(@plugin[:etc][:group]["admin"]).to eq(Mash.new(gid: 100, members: %w{root chef}))
+    expect(@plugin[:etc][:group]["www"]).to eq(Mash.new(gid: 800, members: %w{www deploy}))
   end
 
   if "".respond_to?(:force_encoding)

data/spec/unit/plugins/php_spec.rb

@@ -25,10 +25,10 @@ describe Ohai::System, "plugin php" do
 
   before(:each) do
     plugin[:languages] = Mash.new
-    @stdout = <<-OUT
-PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)
-Copyright (c) 1997-2006 The PHP Group
-Zend Engine v2.1.0, Copyright (c) 1998-2006 Zend Technologies
+    @stdout = <<~OUT
+      PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)
+      Copyright (c) 1997-2006 The PHP Group
+      Zend Engine v2.1.0, Copyright (c) 1998-2006 Zend Technologies
 OUT
     allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, ""))
   end
@@ -44,11 +44,11 @@ OUT
   end
 
   it "sets languages[:php][:version] on PHP 7.0" do
-    stdout = <<-OUT
-PHP 7.0.4-7ubuntu2.1 (cli) ( NTS )
-Copyright (c) 1997-2016 The PHP Group
-Zend Engine v3.0.0, Copyright (c) 1998-2016 Zend Technologies
-    with Zend OPcache v7.0.6-dev, Copyright (c) 1999-2016, by Zend Technologies
+    stdout = <<~OUT
+      PHP 7.0.4-7ubuntu2.1 (cli) ( NTS )
+      Copyright (c) 1997-2016 The PHP Group
+      Zend Engine v3.0.0, Copyright (c) 1998-2016 Zend Technologies
+          with Zend OPcache v7.0.6-dev, Copyright (c) 1999-2016, by Zend Technologies
 OUT
     allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, stdout, ""))
     plugin.run
@@ -62,10 +62,10 @@ OUT
   end
 
   it "parses builddate even if PHP is Suhosin patched" do
-    stdout = <<-OUT
-PHP 5.3.27 with Suhosin-Patch (cli) (built: Aug 30 2013 04:30:30)
-Copyright (c) 1997-2013 The PHP Group
-Zend Engine v2.3.0, Copyright (c) 1998-2013 Zend Technologies
+    stdout = <<~OUT
+      PHP 5.3.27 with Suhosin-Patch (cli) (built: Aug 30 2013 04:30:30)
+      Copyright (c) 1997-2013 The PHP Group
+      Zend Engine v2.3.0, Copyright (c) 1998-2013 Zend Technologies
 OUT
     allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, stdout, ""))
     plugin.run
@@ -73,10 +73,10 @@ OUT
   end
 
   it "does not set zend_optcache_version if not compiled with opcache" do
-    stdout = <<-OUT
-PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)
-Copyright (c) 1997-2006 The PHP Group
-Zend Engine v2.1.0, Copyright (c) 1998-2006 Zend Technologies
+    stdout = <<~OUT
+      PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)
+      Copyright (c) 1997-2006 The PHP Group
+      Zend Engine v2.1.0, Copyright (c) 1998-2006 Zend Technologies
 OUT
     allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, stdout, ""))
     plugin.run
@@ -84,11 +84,11 @@ OUT
   end
 
   it "sets zend_optcache_version if compiled with opcache" do
-    stdout = <<-OUT
-PHP 5.5.9-1ubuntu4.5 (cli) (built: Oct 29 2014 11:59:10)
-Copyright (c) 1997-2014 The PHP Group
-Zend Engine v2.5.0, Copyright (c) 1998-2014 Zend Technologies
-    with Zend OPcache v7.0.3, Copyright (c) 1999-2014, by Zend Technologies
+    stdout = <<~OUT
+      PHP 5.5.9-1ubuntu4.5 (cli) (built: Oct 29 2014 11:59:10)
+      Copyright (c) 1997-2014 The PHP Group
+      Zend Engine v2.5.0, Copyright (c) 1998-2014 Zend Technologies
+          with Zend OPcache v7.0.3, Copyright (c) 1999-2014, by Zend Technologies
 OUT
     allow(plugin).to receive(:shell_out).with("php -v").and_return(mock_shell_out(0, stdout, ""))
     plugin.run

data/spec/unit/plugins/powershell_spec.rb

@@ -30,17 +30,17 @@ describe Ohai::System, "plugin powershell" do
 
   it "sets languages[:powershell][:version] for v4" do
 
-    v4_output = <<END
+    v4_output = <<~END
 
-Name                           Value
-----                           -----
-PSVersion                      4.0
-WSManStackVersion              3.0
-SerializationVersion           1.1.0.1
-CLRVersion                     4.0.30319.34014
-BuildVersion                   6.3.9600.16394
-PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0}
-PSRemotingProtocolVersion      2.2
+      Name                           Value
+      ----                           -----
+      PSVersion                      4.0
+      WSManStackVersion              3.0
+      SerializationVersion           1.1.0.1
+      CLRVersion                     4.0.30319.34014
+      BuildVersion                   6.3.9600.16394
+      PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0}
+      PSRemotingProtocolVersion      2.2
 
 END
     compat_version_array = ["1.0", "2.0", "3.0", "4.0"]
@@ -58,9 +58,9 @@ END
   end
 
   it "does not set the languages[:powershell] tree up if powershell command fails" do
-    error_output = <<END
-'powershell.exe' is not recognized as an internal or external command,
-operable program or batch file.
+    error_output = <<~END
+      'powershell.exe' is not recognized as an internal or external command,
+      operable program or batch file.
 END
 
     allow(plugin).to receive(:shell_out).with(anything).and_return(mock_shell_out(1, error_output, ""))

data/spec/unit/plugins/rackspace_spec.rb

@@ -27,8 +27,8 @@ describe Ohai::System, "plugin rackspace" do
     plugin[:hostname] = "katie"
 
     plugin[:network] = {
-      :interfaces => {
-        :eth0 => {
+      interfaces: {
+        eth0: {
           "addresses" => {
             "1.2.3.4" => {
               "broadcast" => "67.23.20.255",
@@ -54,7 +54,7 @@ describe Ohai::System, "plugin rackspace" do
     }
 
     plugin[:network][:interfaces][:eth1] = {
-      :addresses => {
+      addresses: {
         "fe80::4240:f5ff:feab:2836" => {
           "scope" => "Link",
           "prefixlen" => "64",
@@ -73,7 +73,7 @@ describe Ohai::System, "plugin rackspace" do
 
     # In olden days we could detect rackspace by a -rscloud suffix on the kernel
     # This is here to make #has_rackspace_kernel? fail until we remove that check
-    plugin[:kernel] = { :release => "1.2.13-not-rackspace" }
+    plugin[:kernel] = { release: "1.2.13-not-rackspace" }
 
     # We need a generic stub here for the later stubs with arguments to work
     # Because, magic.
@@ -131,12 +131,12 @@ describe Ohai::System, "plugin rackspace" do
     end
 
     it "captures region information" do
-      provider_data = <<-OUT
-provider = "Rackspace"
-service_type = "cloudServers"
-server_id = "21301000"
-created_at = "2012-12-06T22:08:16Z"
-region = "dfw"
+      provider_data = <<~OUT
+        provider = "Rackspace"
+        service_type = "cloudServers"
+        server_id = "21301000"
+        created_at = "2012-12-06T22:08:16Z"
+        region = "dfw"
 OUT
       allow(plugin).to receive(:shell_out).with("xenstore-ls vm-data/provider_data").and_return(mock_shell_out(0, provider_data, ""))
       plugin.run
@@ -144,14 +144,14 @@ OUT
     end
 
     it "logs a debug message when region info cannot be collected" do
-      expect(plugin).
-        to receive(:shell_out).
-        with("xenstore-ls vm-data/provider_data").
-        and_raise(Ohai::Exceptions::Exec)
-
-      expect(plugin.logger).
-        to receive(:trace).
-        with("Plugin Rackspace: Unable to find xenstore-ls, cannot capture " \
+      expect(plugin)
+        .to receive(:shell_out)
+        .with("xenstore-ls vm-data/provider_data")
+        .and_raise(Ohai::Exceptions::Exec)
+
+      expect(plugin.logger)
+        .to receive(:trace)
+        .with("Plugin Rackspace: Unable to find xenstore-ls, cannot capture " \
              "region information for Rackspace cloud")
 
       plugin.run
@@ -167,14 +167,14 @@ OUT
     end
 
     it "logs error if instance id cannot be found" do
-      expect(plugin).
-        to receive(:shell_out).
-        with("xenstore-read name").
-        and_raise(Ohai::Exceptions::Exec)
-
-      expect(plugin.logger).
-        to receive(:trace).
-        with("Plugin Rackspace: Unable to find xenstore-read, cannot capture " \
+      expect(plugin)
+        .to receive(:shell_out)
+        .with("xenstore-read name")
+        .and_raise(Ohai::Exceptions::Exec)
+
+      expect(plugin.logger)
+        .to receive(:trace)
+        .with("Plugin Rackspace: Unable to find xenstore-read, cannot capture " \
              "instance ID information for Rackspace cloud")
 
       plugin.run
@@ -260,10 +260,10 @@ OUT
 
     before(:each) do
       allow(plugin).to receive(:hint?).with("rackspace").and_return(false)
-      allow(plugin).
-        to receive(:shell_out).
-        with("xenstore-read vm-data/provider_data/provider").
-        and_raise(Ohai::Exceptions::Exec)
+      allow(plugin)
+        .to receive(:shell_out)
+        .with("xenstore-read vm-data/provider_data/provider")
+        .and_raise(Ohai::Exceptions::Exec)
     end
   end
 
@@ -271,14 +271,14 @@ OUT
     it "logs an error and does not collect private_networks" do
       allow(plugin).to receive(:hint?).with("rackspace").and_return(true)
 
-      expect(plugin).
-        to receive(:shell_out).
-        with("xenstore-ls vm-data/networking").
-        and_raise(Ohai::Exceptions::Exec)
+      expect(plugin)
+        .to receive(:shell_out)
+        .with("xenstore-ls vm-data/networking")
+        .and_raise(Ohai::Exceptions::Exec)
 
-      expect(plugin.logger).
-        to receive(:trace).
-        with("Plugin Rackspace: Unable to capture custom private networking " \
+      expect(plugin.logger)
+        .to receive(:trace)
+        .with("Plugin Rackspace: Unable to capture custom private networking " \
              "information for Rackspace cloud")
 
       plugin.run
@@ -305,7 +305,7 @@ OUT
   describe "has private networks" do
     before do
       plugin[:network][:interfaces][:eth2] = {
-        :addresses => {
+        addresses: {
           "fe80::be76:4eff:fe20:422b" => {
             "scope" => "Link",
             "prefixlen" => "64",