ohai 15.2.5 → 15.3.1

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "FreeBSD cpu plugin on FreeBSD >=10.2" do
-  before(:each) do
+  before do
     @plugin = get_plugin("cpu")
     allow(@plugin).to receive(:collect_os).and_return(:freebsd)
     @double_file = double("/var/run/dmesg.boot")
@@ -94,7 +94,7 @@ describe Ohai::System, "FreeBSD cpu plugin on FreeBSD >=10.2" do
 end
 
 describe Ohai::System, "FreeBSD cpu plugin on FreeBSD <=10.1" do
-  before(:each) do
+  before do
     @plugin = get_plugin("cpu")
     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", ""))

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "FreeBSD hostname plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("hostname")
     allow(@plugin).to receive(:collect_os).and_return(:freebsd)
     allow(@plugin).to receive(:shell_out).with("hostname -s").and_return(mock_shell_out(0, "katie", ""))

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Ohai::System, "FreeBSD kernel plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("kernel")
     allow(@plugin).to receive(:collect_os).and_return(:freebsd)
     allow(@plugin).to receive(:init_kernel).and_return({ name: "freebsd" })
@@ -28,7 +28,7 @@ describe Ohai::System, "FreeBSD kernel plugin" do
     allow(@plugin).to receive(:shell_out).with( Ohai.abs_path( "/sbin/kldstat" )).and_return(mock_shell_out(0, "  1    7 0xc0400000 97f830   kernel", ""))
   end
 
-  it "should set the kernel_os to the kernel_name value" do
+  it "sets the kernel_os to the kernel_name value" do
     @plugin.run
     expect(@plugin[:kernel][:os]).to eq(@plugin[:kernel][:name])
   end

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

@@ -19,19 +19,19 @@
 require "spec_helper"
 
 describe Ohai::System, "FreeBSD plugin platform" do
-  before(:each) do
+  before do
     @plugin = get_plugin("freebsd/platform")
     allow(@plugin).to receive(:shell_out).with("uname -s").and_return(mock_shell_out(0, "FreeBSD\n", ""))
     allow(@plugin).to receive(:shell_out).with("uname -r").and_return(mock_shell_out(0, "7.1\n", ""))
     allow(@plugin).to receive(:collect_os).and_return(:freebsd)
   end
 
-  it "should set platform to lowercased lsb[:id]" do
+  it "sets platform to lowercased lsb[:id]" do
     @plugin.run
     expect(@plugin[:platform]).to eq("freebsd")
   end
 
-  it "should set platform_version to lsb[:release]" do
+  it "sets platform_version to lsb[:release]" do
     @plugin.run
     expect(@plugin[:platform_version]).to eq("7.1")
   end

data/spec/unit/plugins/gce_spec.rb

@@ -34,7 +34,7 @@ describe Ohai::System, "plugin gce" do
   end
 
   shared_examples_for "gce" do
-    before(:each) do
+    before 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(IO).to receive(:select).and_return([[], [1], []])
@@ -54,17 +54,16 @@ describe Ohai::System, "plugin gce" do
   end
 
   describe "with hint file and with metadata connection" do
-    it_behaves_like "gce"
-
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("gce").and_return({})
     end
+
+    it_behaves_like "gce"
+
   end
 
   describe "without hint file and without metadata connection" do
-    it_behaves_like "!gce"
-
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("gce").and_return(false)
 
       # Raise Errno::ENOENT to simulate the scenario in which metadata server
@@ -74,6 +73,9 @@ describe Ohai::System, "plugin gce" do
       allow(Socket).to receive(:new).and_return(t)
       allow(Socket).to receive(:pack_sockaddr_in).and_return(nil)
     end
+
+    it_behaves_like "!gce"
+
   end
 
 end

data/spec/unit/plugins/go_spec.rb

@@ -18,13 +18,13 @@ require "spec_helper"
 describe Ohai::System, "plugin go" do
   let(:plugin) { get_plugin("go") }
 
-  before(:each) do
+  before do
     plugin[:languages] = Mash.new
     stdout = "go version go1.6.1 darwin/amd64\n"
     allow(plugin).to receive(:shell_out).with("go version").and_return(mock_shell_out(0, stdout, ""))
   end
 
-  it "it shells out to get the go version" do
+  it "shells out to get the go version" do
     expect(plugin).to receive(:shell_out).with("go version")
     plugin.run
   end

data/spec/unit/plugins/groovy_spec.rb

@@ -21,7 +21,7 @@ require "spec_helper"
 describe Ohai::System, "plugin groovy" do
   let(:plugin) { get_plugin("groovy") }
 
-  before(:each) do
+  before do
     plugin[:languages] = Mash.new
   end
 

data/spec/unit/plugins/haskell_spec.rb

@@ -47,7 +47,7 @@ describe Ohai::System, "plugin haskell" do
 
   context "if haskell/ghc is installed" do
 
-    before(:each) do
+    before do
       setup_plugin
       plugin.run
     end
@@ -63,7 +63,7 @@ describe Ohai::System, "plugin haskell" do
 
   context "if haskell/ghci is installed" do
 
-    before(:each) do
+    before do
       setup_plugin
       plugin.run
     end
@@ -79,7 +79,7 @@ describe Ohai::System, "plugin haskell" do
 
   context "if haskell/cabal is installed" do
 
-    before(:each) do
+    before do
       setup_plugin
       plugin.run
     end
@@ -95,7 +95,7 @@ describe Ohai::System, "plugin haskell" do
 
   context "if haskell/stack is installed" do
 
-    before(:each) do
+    before do
       setup_plugin
       plugin.run
     end
@@ -111,7 +111,7 @@ describe Ohai::System, "plugin haskell" do
 
   context "if haskell/stack prerelease is installed" do
 
-    before(:each) do
+    before do
       setup_plugin
       allow(plugin).to receive(:shell_out)
         .with("stack --version")
@@ -130,7 +130,7 @@ describe Ohai::System, "plugin haskell" do
 
   context "if haskell is NOT installed" do
 
-    before(:each) do
+    before do
       allow(plugin).to receive(:shell_out)
         .and_raise( Ohai::Exceptions::Exec )
       plugin.run
@@ -142,7 +142,7 @@ describe Ohai::System, "plugin haskell" do
   end
 
   context "if haskell/ghc is NOT installed" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:shell_out)
         .with("ghc --version")
         .and_raise( Ohai::Exceptions::Exec )
@@ -164,7 +164,7 @@ describe Ohai::System, "plugin haskell" do
   end
 
   context "if haskell/ghci is NOT installed" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:shell_out)
         .with("ghc --version")
         .and_return(mock_shell_out(0, ghc_out, ""))
@@ -186,7 +186,7 @@ describe Ohai::System, "plugin haskell" do
   end
 
   context "if haskell/cabal is NOT installed" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:shell_out)
         .with("ghc --version")
         .and_return(mock_shell_out(0, ghc_out, ""))
@@ -208,7 +208,7 @@ describe Ohai::System, "plugin haskell" do
   end
 
   context "if haskell/stack is NOT installed" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:shell_out)
         .with("ghc --version")
         .and_return(mock_shell_out(0, ghc_out, ""))

data/spec/unit/plugins/hostname_spec.rb

@@ -21,47 +21,48 @@ require "wmi-lite/wmi"
 require "socket"
 
 describe Ohai::System, "hostname plugin" do
-  before(:each) do
+  before do
     @plugin = get_plugin("hostname")
     allow(@plugin).to receive(:collect_os).and_return(:default)
     allow(@plugin).to receive(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie.local", ""))
   end
 
   context "default behavior"
-  before(:each) do
+  before do
     allow(@plugin).to receive(:resolve_fqdn).and_return("katie.bethell")
   end
+
   it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
 
-  it "should use #resolve_fqdn to find the fqdn" do
+  it "uses #resolve_fqdn to find the fqdn" do
     @plugin.run
     expect(@plugin[:fqdn]).to eq("katie.bethell")
   end
 
-  it "should set the domain to everything after the first dot of the fqdn" do
+  it "sets the domain to everything after the first dot of the fqdn" do
     @plugin.run
     expect(@plugin[:domain]).to eq("bethell")
   end
 
-  it "should set the [short] hostname to everything before the first dot of the fqdn" do
+  it "sets the [short] hostname to everything before the first dot of the fqdn" do
     @plugin.run
     expect(@plugin[:hostname]).to eq("katie")
   end
 
   context "when a system has a bare hostname without a FQDN" do
-    before(:each) do
+    before do
       allow(@plugin).to receive(:collect_os).and_return(:default)
       allow(@plugin).to receive(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie", ""))
     end
 
-    it "should correctly set the [short] hostname" do
+    it "correctlies set the [short] hostname" do
       @plugin.run
       expect(@plugin[:hostname]).to eq("katie")
     end
   end
 
   context "hostname --fqdn when it returns empty string" do
-    before(:each) do
+    before do
       allow(@plugin).to receive(:collect_os).and_return(:linux)
       allow(@plugin).to receive(:shell_out).with("hostname -s").and_return(
         mock_shell_out(0, "katie", "")
@@ -71,14 +72,14 @@ describe Ohai::System, "hostname plugin" do
       )
     end
 
-    it "should be called twice" do
+    it "is called twice" do
       @plugin.run
       expect(@plugin[:fqdn]).to eq("katie.local")
     end
   end
 
   context "hostname --fqdn when it works" do
-    before(:each) do
+    before do
       allow(@plugin).to receive(:collect_os).and_return(:linux)
       allow(@plugin).to receive(:shell_out).with("hostname -s").and_return(
         mock_shell_out(0, "katie", "")
@@ -88,7 +89,7 @@ describe Ohai::System, "hostname plugin" do
       )
     end
 
-    it "should be not be called twice" do
+    it "is not be called twice" do
       @plugin.run
       expect(@plugin[:fqdn]).to eq("katie.local")
     end
@@ -135,7 +136,7 @@ describe Ohai::System, "hostname plugin for windows", :windows_only do
     ]
   end
 
-  before(:each) do
+  before do
     @plugin = get_plugin("hostname")
     allow(WmiLite::Wmi).to receive(:new).and_return(success)
     allow(success).to receive(:first_of).with("Win32_ComputerSystem").and_return(host)
@@ -144,7 +145,7 @@ describe Ohai::System, "hostname plugin for windows", :windows_only do
   end
 
   context "when hostname is not set for the machine" do
-    it "should return short machine name" do
+    it "returns short machine name" do
       allow(Socket).to receive(:gethostbyaddr).with(anything).and_return(local_hostent)
       @plugin.run
       expect(@plugin[:fqdn]).to eq("local")
@@ -152,7 +153,7 @@ describe Ohai::System, "hostname plugin for windows", :windows_only do
   end
 
   context "when hostname is set for the machine" do
-    it "should return the fqdn of the machine" do
+    it "returns the fqdn of the machine" do
       allow(Socket).to receive(:gethostbyaddr).with(anything).and_return(fqdn_hostent)
       @plugin.run
       expect(@plugin[:fqdn]).to eq("local.dx.internal.cloudapp.net")

data/spec/unit/plugins/init_package_spec.rb

@@ -30,12 +30,12 @@ describe Ohai::System, "Init package" do
   let(:proc_1_file_path) { "/proc/1/comm" }
   let(:proc_1_file) { double(proc_1_file_path, gets: proc1_content) }
 
-  before(:each) do
+  before do
     allow(File).to receive(:exist?).with(proc_1_file_path).and_return(proc1_exists)
     allow(File).to receive(:open).with(proc_1_file_path).and_return(proc_1_file)
   end
 
-  it "should set init_package to init" do
+  it "sets init_package to init" do
     plugin.run
     expect(plugin[:init_package]).to eq("init")
   end
@@ -43,7 +43,7 @@ describe Ohai::System, "Init package" do
   describe "when init_package is systemd" do
     let(:proc1_content) { "systemd\n" }
 
-    it "should set init_package to systemd" do
+    it "sets init_package to systemd" do
       plugin.run
       expect(plugin[:init_package]).to eq("systemd")
     end
@@ -52,7 +52,7 @@ describe Ohai::System, "Init package" do
   describe "when /proc/1/comm doesn't exist" do
     let(:proc1_exists) { false }
 
-    it "should set init_package to init" do
+    it "sets init_package to init" do
       plugin.run
       expect(plugin[:init_package]).to eq("init")
     end

data/spec/unit/plugins/java_spec.rb

@@ -22,7 +22,7 @@ require "spec_helper"
 describe Ohai::System, "plugin java (Java5 Client VM)" do
   let(:plugin) { get_plugin("java") }
 
-  before(:each) do
+  before do
     plugin[:languages] = Mash.new
   end
 
@@ -78,7 +78,7 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
 
   shared_examples_for "when the Server JRE is installed" do
 
-    before(:each) do
+    before do
       stderr = "java version \"1.6.0_22\"\nJava(TM) 2 Runtime Environment (build 1.6.0_22-b04)\nJava HotSpot(TM) Server VM (build 17.1-b03, mixed mode)"
       allow(plugin).to receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", stderr))
     end
@@ -123,7 +123,7 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
 
   shared_examples_for "when the openjdk 1.8 is installed" do
 
-    before(:each) do
+    before do
       stderr = "openjdk version \"1.8.0_71\"\nOpenJDK Runtime Environment (build 1.8.0_71-b15)\nOpenJDK 64-Bit Server VM (build 25.71-b15, mixed mode)"
       allow(plugin).to receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", stderr))
     end
@@ -174,9 +174,11 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
     context "and the client JRE is installed" do
       include_examples "when the JRE is installed"
     end
+
     context "and the server JRE is installed" do
       include_examples "when the Server JRE is installed"
     end
+
     context "and the openjdk 1.8 is installed" do
       include_examples "when the openjdk 1.8 is installed"
     end
@@ -201,9 +203,11 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
       context "and the client JRE is installed" do
         include_examples "when the JRE is installed"
       end
+
       context "and the server JRE is installed" do
         include_examples "when the Server JRE is installed"
       end
+
       context "and the openjdk 1.8 is installed" do
         include_examples "when the openjdk 1.8 is installed"
       end

data/spec/unit/plugins/joyent_spec.rb

@@ -20,7 +20,7 @@ describe Ohai::System, "plugin joyent" do
   let(:plugin) { get_plugin("joyent") }
 
   describe "without joyent" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:is_smartos?).and_return(false)
     end
 
@@ -31,7 +31,7 @@ describe Ohai::System, "plugin joyent" do
   end
 
   describe "with joyent" do
-    before(:each) do
+    before do
       allow(plugin).to receive(:is_smartos?).and_return(true)
       plugin[:virtualization] = Mash.new
       plugin[:virtualization][:guest_uuid] = "global"
@@ -43,7 +43,7 @@ describe Ohai::System, "plugin joyent" do
     end
 
     describe "under global zone" do
-      before(:each) do
+      before do
         plugin.run
       end
 
@@ -57,7 +57,7 @@ describe Ohai::System, "plugin joyent" do
     end
 
     describe "under smartmachine" do
-      before(:each) do
+      before do
         plugin[:virtualization][:guest_uuid] = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx"
         plugin[:virtualization][:guest_id] = "30"