ohai 15.2.5 → 15.3.1

data/spec/unit/plugins/packages_spec.rb

@@ -33,7 +33,7 @@ describe Ohai::System, "plugin packages" do
       File.read(File.join(SPEC_PLUGIN_PATH, "dpkg-query.output"))
     end
 
-    before(:each) do
+    before do
       allow(plugin).to receive(:collect_os).and_return(:linux)
       allow(plugin).to receive(:shell_out)
         .with("dpkg-query -W -f='#{format}'")
@@ -72,7 +72,7 @@ describe Ohai::System, "plugin packages" do
       File.read(File.join(SPEC_PLUGIN_PATH, "rpmquery.output"))
     end
 
-    before(:each) do
+    before do
       allow(plugin).to receive(:collect_os).and_return(:linux)
       allow(plugin).to receive(:shell_out).with("rpm -qa --qf '#{format}'").and_return(mock_shell_out(0, stdout, ""))
       plugin.run
@@ -133,7 +133,7 @@ describe Ohai::System, "plugin packages" do
       File.read(File.join(SPEC_PLUGIN_PATH, "pacman.output"))
     end
 
-    before(:each) do
+    before do
       allow(plugin).to receive(:collect_os).and_return(:linux)
       allow(plugin).to receive(:shell_out).with("LANG=C pacman -Qi").and_return(mock_shell_out(0, stdout, ""))
       plugin.run
@@ -209,7 +209,7 @@ describe Ohai::System, "plugin packages" do
       end
     end
 
-    before(:each) do
+    before do
       allow(plugin).to receive(:collect_os).and_return(:windows)
       allow(win_reg_double).to receive(:open).with(win_reg_keys[0]).and_return(win_reg_output[0])
       allow(win_reg_double).to receive(:open).with(win_reg_keys[1]).and_return(win_reg_output[1])
@@ -222,6 +222,7 @@ describe Ohai::System, "plugin packages" do
         allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with('Software\Microsoft\Windows\CurrentVersion\Uninstall', i386_reg_type).and_yield(win_reg_double)
         allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with('Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall', i386_reg_type).and_yield(win_reg_double)
       end
+
       it_behaves_like "windows_package_plugin"
     end
 
@@ -231,6 +232,7 @@ describe Ohai::System, "plugin packages" do
         allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with('Software\Microsoft\Windows\CurrentVersion\Uninstall', x86_64_reg_type).and_yield(win_reg_double)
         allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with('Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall', x86_64_reg_type).and_yield(win_reg_double)
       end
+
       it_behaves_like "windows_package_plugin"
     end
 
@@ -240,6 +242,7 @@ describe Ohai::System, "plugin packages" do
         allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with('Software\Microsoft\Windows\CurrentVersion\Uninstall', Win32::Registry::KEY_READ).and_yield(win_reg_double)
         allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with('Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall', Win32::Registry::KEY_READ).and_yield(win_reg_double)
       end
+
       it_behaves_like "windows_package_plugin"
     end
   end
@@ -251,7 +254,7 @@ describe Ohai::System, "plugin packages" do
       File.read(File.join(SPEC_PLUGIN_PATH, "lslpp.output"))
     end
 
-    before(:each) do
+    before do
       allow(plugin).to receive(:collect_os).and_return(:aix)
       allow(plugin).to receive(:shell_out).with("lslpp -L -q -c").and_return(mock_shell_out(0, stdout, ""))
       plugin.run
@@ -280,7 +283,7 @@ describe Ohai::System, "plugin packages" do
       File.read(File.join(SPEC_PLUGIN_PATH, "pkg-query.output"))
     end
 
-    before(:each) do
+    before do
       allow(plugin).to receive(:collect_os).and_return(:freebsd)
       allow(plugin).to receive(:shell_out).with('pkg query -a "%n %v"').and_return(mock_shell_out(0, stdout, ""))
       plugin.run
@@ -309,7 +312,7 @@ describe Ohai::System, "plugin packages" do
       File.read(File.join(SPEC_PLUGIN_PATH, "pkginfo.output"))
     end
 
-    before(:each) do
+    before do
       allow(plugin).to receive(:collect_os).and_return(:solaris2)
       allow(plugin).to receive(:shell_out).with("pkg list -H").and_return(mock_shell_out(0, pkglist_output, ""))
       allow(plugin).to receive(:shell_out).with("pkginfo -l").and_return(mock_shell_out(0, pkginfo_output, ""))

data/spec/unit/plugins/passwd_spec.rb

@@ -1,5 +1,6 @@
 #
 # License:: Apache License, Version 2.0
+# Copyright:: 2019 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,40 +18,38 @@
 require "spec_helper"
 
 describe Ohai::System, "plugin etc", :unix_only do
-  before(:each) do
-    @plugin = get_plugin("passwd")
-  end
+  let(:plugin) { get_plugin("passwd") }
 
   PasswdEntry = Struct.new(:name, :uid, :gid, :dir, :shell, :gecos)
   GroupEntry = Struct.new(:name, :gid, :mem)
 
-  it "should include a list of all users" do
+  it "includes 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"))
-    @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"))
+    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"))
   end
 
-  it "should ignore duplicate users" do
+  it "ignores 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"))
-    @plugin.run
-    expect(@plugin[:etc][:passwd]["root"]).to eq(Mash.new(shell: "/bin/zsh", gecos: "BOFH", gid: 1, uid: 1, dir: "/root"))
+    plugin.run
+    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
+  it "sets the current user" do
     expect(Process).to receive(:euid).and_return("31337")
     expect(Etc).to receive(:getpwuid).and_return(PasswdEntry.new("chef", 31337, 31337, "/home/chef", "/bin/ksh", "Julia Child"))
-    @plugin.run
-    expect(@plugin[:current_user]).to eq("chef")
+    plugin.run
+    expect(plugin[:current_user]).to eq("chef")
   end
 
-  it "should set the available groups" do
+  it "sets 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}))
+    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}))
   end
 
   if "".respond_to?(:force_encoding)
@@ -58,8 +57,8 @@ describe Ohai::System, "plugin etc", :unix_only do
       fields = ["root", 1, 1, "/root", "/bin/zsh", "BOFH"]
       fields.each { |f| f.force_encoding(Encoding::ASCII_8BIT) if f.respond_to?(:force_encoding) }
       allow(Etc).to receive(:passwd).and_yield(PasswdEntry.new(*fields))
-      @plugin.run
-      root = @plugin[:etc][:passwd]["root"]
+      plugin.run
+      root = plugin[:etc][:passwd]["root"]
       expect(root["gecos"].encoding).to eq(Encoding.default_external)
     end
   end

data/spec/unit/plugins/perl_spec.rb

@@ -22,7 +22,7 @@ require "spec_helper"
 describe Ohai::System, "plugin perl" do
   let(:plugin) { get_plugin("perl") }
 
-  before(:each) do
+  before do
     plugin[:languages] = Mash.new
     @stdout = "version='5.8.8';#{$/}archname='darwin-thread-multi-2level';"
     allow(plugin).to receive(:shell_out).with("perl -V:version -V:archname").and_return(mock_shell_out(0, @stdout, ""))

data/spec/unit/plugins/php_spec.rb

@@ -23,7 +23,7 @@ require "spec_helper"
 describe Ohai::System, "plugin php" do
   let(:plugin) { get_plugin("php") }
 
-  before(:each) do
+  before do
     plugin[:languages] = Mash.new
     @stdout = <<~OUT
       PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)

data/spec/unit/plugins/platform_spec.rb

@@ -19,45 +19,45 @@
 require "spec_helper"
 
 describe Ohai::System, "plugin platform" do
-  before(:each) do
+  before do
     @plugin = get_plugin("platform")
     allow(@plugin).to receive(:collect_os).and_return(:default)
     @plugin[:os] = "monkey"
     @plugin[:os_version] = "poop"
   end
 
-  it "should set the platform and platform family to the os if it was not set earlier" do
+  it "sets the platform and platform family to the os if it was not set earlier" do
     @plugin.run
     expect(@plugin[:platform]).to eql("monkey")
     expect(@plugin[:platform_family]).to eql("monkey")
   end
 
-  it "should not set the platform to the os if it was set earlier" do
+  it "does not set the platform to the os if it was set earlier" do
     @plugin[:platform] = "lars"
     @plugin.run
     expect(@plugin[:platform]).to eql("lars")
   end
 
-  it "should set the platform_family to the platform if platform was set earlier but not platform_family" do
+  it "sets the platform_family to the platform if platform was set earlier but not platform_family" do
     @plugin[:platform] = "lars"
     @plugin[:platform_family] = "jack"
     @plugin.run
     expect(@plugin[:platform_family]).to eql("jack")
   end
 
-  it "should not set the platform_family if the platform_family was set earlier." do
+  it "does not set the platform_family if the platform_family was set earlier." do
     @plugin[:platform] = "lars"
     @plugin.run
     expect(@plugin[:platform]).to eql("lars")
     expect(@plugin[:platform_family]).to eql("lars")
   end
 
-  it "should set the platform_version to the os_version if it was not set earlier" do
+  it "sets the platform_version to the os_version if it was not set earlier" do
     @plugin.run
     expect(@plugin[:os_version]).to eql("poop")
   end
 
-  it "should not set the platform to the os if it was set earlier" do
+  it "does not set the platform to the os if it was set earlier" do
     @plugin[:platform_version] = "ulrich"
     @plugin.run
     expect(@plugin[:platform_version]).to eql("ulrich")

data/spec/unit/plugins/powershell_spec.rb

@@ -24,7 +24,7 @@ describe Ohai::System, "plugin powershell" do
     stub_const("::RbConfig::CONFIG", { "host_os" => "windows" })
   end
 
-  before(:each) do
+  before do
     plugin[:languages] = Mash.new
   end
 

data/spec/unit/plugins/rackspace_spec.rb

@@ -21,7 +21,7 @@ require "spec_helper"
 describe Ohai::System, "plugin rackspace" do
   let(:plugin) { get_plugin("rackspace") }
 
-  before(:each) do
+  before do
     allow(Resolv).to receive(:getname).and_return("1.2.3.4")
 
     plugin[:hostname] = "katie"
@@ -184,15 +184,15 @@ describe Ohai::System, "plugin rackspace" do
   end
 
   describe "with rackspace hint file" do
-    it_behaves_like "rackspace"
-
-    before(:each) do
+    before do
       allow(Resolv).to receive(:getname).and_raise(Resolv::ResolvError)
       allow(File).to receive(:exist?).with("/etc/resolv.conf").and_return(true)
       allow(File).to receive(:read).with("/etc/resolv.conf").and_return("")
       allow(plugin).to receive(:hint?).with("rackspace").and_return(true)
     end
 
+    it_behaves_like "rackspace"
+
     describe "with no public interfaces (empty eth0)" do
       before do
         # unset public (eth0) addresses
@@ -216,55 +216,60 @@ describe Ohai::System, "plugin rackspace" do
   end
 
   describe "without hint file" do
-    it_behaves_like "!rackspace"
-
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("rackspace").and_return(false)
     end
+
+    it_behaves_like "!rackspace"
+
   end
 
   describe "with Rackspace windows manufacturer data" do
+    before do
+      allow(plugin).to receive(:hint?).with("rackspace").and_return(false)
+      allow(plugin).to receive(:has_rackspace_manufacturer?).and_return(true)
+    end
+
     it "has rackspace attribute" do
       plugin.run
       expect(plugin[:rackspace]).not_to be_nil
     end
 
-    before(:each) do
-      allow(plugin).to receive(:hint?).with("rackspace").and_return(false)
-      allow(plugin).to receive(:has_rackspace_manufacturer?).and_return(true)
-    end
   end
 
   describe "xenstore provider returns rackspace" do
-    it_behaves_like "rackspace"
-
-    before(:each) do
+    before do
       stdout = "Rackspace\n"
       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_return(mock_shell_out(0, stdout, "" ))
     end
+
+    it_behaves_like "rackspace"
+
   end
 
   describe "xenstore provider does not return rackspace" do
-    it_behaves_like "!rackspace"
-
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("rackspace").and_return(false)
       stdout = "cumulonimbus\n"
       allow(plugin).to receive(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
     end
-  end
 
-  describe "xenstore provider does not exist" do
     it_behaves_like "!rackspace"
 
-    before(:each) do
+  end
+
+  describe "xenstore provider does not exist" do
+    before 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)
     end
+
+    it_behaves_like "!rackspace"
+
   end
 
   describe "when private networks shell out fails" do

data/spec/unit/plugins/root_group_spec.rb

@@ -19,12 +19,12 @@
 require "spec_helper"
 
 describe Ohai::System, "root_group" do
-  before(:each) do
+  before do
     @plugin = get_plugin("root_group")
   end
 
   describe "unix platform", :unix_only do
-    before(:each) do
+    before do
       # this is deeply intertwingled. unfortunately, the law of demeter
       # apparently didn't apply to this api. we're just trying to fake
       # Etc.getgrgid(Etc.getpwnam('root').gid).name
@@ -36,30 +36,33 @@ describe Ohai::System, "root_group" do
     end
 
     describe "with wheel group" do
-      before(:each) do
+      before do
         allow(@grgid).to receive(:name).and_return("wheel")
       end
-      it "should have a root_group of wheel" do
+
+      it "has a root_group of wheel" do
         @plugin.run
         expect(@plugin[:root_group]).to eq("wheel")
       end
     end
 
     describe "with root group" do
-      before(:each) do
+      before do
         allow(@grgid).to receive(:name).and_return("root")
       end
-      it "should have a root_group of root" do
+
+      it "has a root_group of root" do
         @plugin.run
         expect(@plugin[:root_group]).to eq("root")
       end
     end
 
     describe "platform aix with system group" do
-      before(:each) do
+      before do
         allow(@grgid).to receive(:name).and_return("system")
       end
-      it "should have a root_group of system" do
+
+      it "has a root_group of system" do
         @plugin.run
         expect(@plugin[:root_group]).to eq("system")
       end
@@ -70,11 +73,12 @@ describe Ohai::System, "root_group" do
 
     let(:wmi) { double("wmi", { query: "" }) }
 
-    before(:each) do
+    before do
       allow(WmiLite::Wmi).to receive(:new).and_return(wmi)
       allow(@plugin).to receive(:collect_os).and_return(:windows)
     end
-    it "should return the group Administrators" do
+
+    it "returns the group Administrators" do
       expect(wmi)
         .to receive(:query)
         .with("select * from Win32_Group where sid like 'S-1-5-32-544' and LocalAccount=True")

data/spec/unit/plugins/ruby_spec.rb

@@ -30,7 +30,7 @@ describe Ohai::System, "plugin ruby" do
     @ruby_ohai_data_pristine = @plugin[:languages][:ruby]
   end
 
-  before(:each) do
+  before do
     @ruby_ohai_data = @ruby_ohai_data_pristine.dup
   end
 
@@ -52,7 +52,7 @@ describe Ohai::System, "plugin ruby" do
     end.find { |bin| ::File.exist? bin },
     ruby_bin: ruby_bin,
   }.each do |attribute, value|
-    it "should have #{attribute} set to #{value.inspect}" do
+    it "has #{attribute} set to #{value.inspect}" do
       expect(@ruby_ohai_data[attribute]).to eql(value)
     end
   end

data/spec/unit/plugins/rust_spec.rb

@@ -25,17 +25,17 @@ describe Ohai::System, "plugin rust" do
     plugin
   end
 
-  it "should get the rust version" do
+  it "gets the rust version" do
     expect(plugin).to receive(:shell_out).with("rustc --version").and_return(mock_shell_out(0, stdout, ""))
     plugin.run
   end
 
-  it "should set languages[:rust][:version]" do
+  it "sets languages[:rust][:version]" do
     plugin.run
     expect(plugin.languages[:rust][:version]).to eql("1.0.0-nightly")
   end
 
-  it "should not set the languages[:rust] if rust command fails" do
+  it "does not set the languages[:rust] if rust command fails" do
     allow(plugin).to receive(:shell_out).with("rustc --version").and_return(mock_shell_out(1, stdout, ""))
     plugin.run
     expect(plugin.languages).not_to have_key(:rust)