ohai 15.2.5 → 15.3.1

data/spec/unit/plugins/darwin/virtualization_spec.rb

@@ -23,7 +23,7 @@ require "spec_helper"
 describe Ohai::System, "Darwin virtualization platform" do
   let(:plugin) { get_plugin("darwin/virtualization") }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:collect_os).and_return(:darwin)
     allow(plugin).to receive(:prlctl_exists?).and_return(false)
     allow(plugin).to receive(:ioreg_exists?).and_return(false)
@@ -35,12 +35,12 @@ describe Ohai::System, "Darwin virtualization platform" do
   end
 
   describe "when detecting OS X virtualization" do
-    it "should not set virtualization keys if no binaries are found" do
+    it "does not set virtualization keys if no binaries are found" do
       plugin.run
       expect(plugin[:virtualization]).to eq({ "systems" => {} })
     end
 
-    it "should set docker host if docker exists" do
+    it "sets docker host if docker exists" do
       allow(plugin).to receive(:docker_exists?).and_return(true)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("docker")
@@ -48,7 +48,7 @@ describe Ohai::System, "Darwin virtualization platform" do
       expect(plugin[:virtualization][:systems][:docker]).to eq("host")
     end
 
-    it "should set vmware host if /Applications/VMware\ Fusion.app exists" do
+    it "sets vmware host if /Applications/VMware\ Fusion.app exists" do
       allow(plugin).to receive(:fusion_exists?).and_return(true)
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("vmware")
@@ -56,7 +56,7 @@ describe Ohai::System, "Darwin virtualization platform" do
       expect(plugin[:virtualization][:systems][:vmware]).to eq("host")
     end
 
-    it "should set vmware guest if hardware attributes mention vmware" do
+    it "sets vmware guest if hardware attributes mention vmware" do
       plugin[:hardware][:boot_rom_version] = "VMW71.00V.6997262.B64.1710270607"
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("vmware")
@@ -64,7 +64,7 @@ describe Ohai::System, "Darwin virtualization platform" do
       expect(plugin[:virtualization][:systems][:vmware]).to eq("guest")
     end
 
-    it "should set vbox host if /usr/local/bin/VBoxManage exists" do
+    it "sets vbox host if /usr/local/bin/VBoxManage exists" do
       allow(plugin).to receive(:vboxmanage_exists?).and_return("/usr/local/bin/VBoxManage")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("vbox")
@@ -72,7 +72,7 @@ describe Ohai::System, "Darwin virtualization platform" do
       expect(plugin[:virtualization][:systems][:vbox]).to eq("host")
     end
 
-    it "should set vbox guest if hardware attributes mention virtualbox" do
+    it "sets vbox guest if hardware attributes mention virtualbox" do
       plugin[:hardware][:boot_rom_version] = "VirtualBox"
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("vbox")
@@ -80,7 +80,7 @@ describe Ohai::System, "Darwin virtualization platform" do
       expect(plugin[:virtualization][:systems][:vbox]).to eq("guest")
     end
 
-    it "should set parallels host if /usr/bin/prlctl exists" do
+    it "sets parallels host if /usr/bin/prlctl exists" do
       allow(plugin).to receive(:prlctl_exists?).and_return("/usr/bin/prlctl")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("parallels")
@@ -88,7 +88,7 @@ describe Ohai::System, "Darwin virtualization platform" do
       expect(plugin[:virtualization][:systems][:parallels]).to eq("host")
     end
 
-    it "should set parallels guest if /usr/sbin/ioreg exists and its output contains pci1ab8,4000" do
+    it "sets parallels guest if /usr/sbin/ioreg exists and its output contains pci1ab8,4000" do
       allow(plugin).to receive(:ioreg_exists?).and_return(true)
       ioreg = <<-IOREG
     | |   +-o pci1ab8,4000@3  <class IOPCIDevice, id 0x1000001d1, registered, matched, active, busy 0 (40 ms), retain 9>
@@ -122,7 +122,7 @@ describe Ohai::System, "Darwin virtualization platform" do
       expect(plugin[:virtualization][:systems][:parallels]).to eq("guest")
     end
 
-    it "should not set parallels guest if /usr/sbin/ioreg exists and its output not contain pci1ab8,4000" do
+    it "does not set parallels guest if /usr/sbin/ioreg exists and its output not contain pci1ab8,4000" do
       allow(plugin).to receive(:ioreg_exists?).and_return(true)
       ioreg = <<-IOREG
     | |   +-o pci8086,2445@1F,4  <class IOPCIDevice, id 0x1000001d4, registered, matched, active, busy 0 (974 ms), retain 11>

data/spec/unit/plugins/digital_ocean_spec.rb

@@ -34,12 +34,12 @@ describe Ohai::System, "plugin digital_ocean" do
     }
   end
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:hint?).with("digital_ocean").and_return(false)
   end
 
   shared_examples_for "!digital_ocean" do
-    it "should NOT attempt to fetch the digital_ocean metadata" do
+    it "does not attempt to fetch the digital_ocean metadata" do
       expect(plugin).not_to receive(:http_client)
       expect(plugin[:digital_ocean]).to be_nil
       plugin.run
@@ -47,7 +47,7 @@ describe Ohai::System, "plugin digital_ocean" do
   end
 
   shared_examples_for "digital_ocean" do
-    before(:each) do
+    before do
       @http_client = double("Net::HTTP client")
       allow(plugin).to receive(:http_client).and_return(@http_client)
       allow(IO).to receive(:select).and_return([[], [1], []])
@@ -61,7 +61,7 @@ describe Ohai::System, "plugin digital_ocean" do
       '{"droplet_id":2756924,"hostname":"sample-droplet","vendor_data":"#cloud-config\ndisable_root: false\nmanage_etc_hosts: true\n\n# The modules that run in the \'init\' stage\ncloud_init_modules:\n - migrator\n - ubuntu-init-switch\n - seed_random\n - bootcmd\n - write-files\n - growpart\n - resizefs\n - set_hostname\n - update_hostname\n - [ update_etc_hosts, once-per-instance ]\n - ca-certs\n - rsyslog\n - users-groups\n - ssh\n\n# The modules that run in the \'config\' stage\ncloud_config_modules:\n - disk_setup\n - mounts\n - ssh-import-id\n - locale\n - set-passwords\n - grub-dpkg\n - apt-pipelining\n - apt-configure\n - package-update-upgrade-install\n - landscape\n - timezone\n - puppet\n - chef\n - salt-minion\n - mcollective\n - disable-ec2-metadata\n - runcmd\n - byobu\n\n# The modules that run in the \'final\' stage\ncloud_final_modules:\n - rightscale_userdata\n - scripts-vendor\n - scripts-per-once\n - scripts-per-boot\n - scripts-per-instance\n - scripts-user\n - ssh-authkey-fingerprints\n - keys-to-console\n - phone-home\n - final-message\n - power-state-change\n","public_keys":["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAkMD3PYKHaH0KbDiXrRE6KCBo/OKcFqhM+fmnnb0+LUh4RalJWX4edeJmnT5bxLeqmLV/Yggjlpfq73R+Dy7JB4pbBLuM959mSM9ohBCSnByAGoT2iUPev4aZFZZ/ahUzTCylNxXrhZV/bopD399CvYREt7Q+FlauBv0O8MMuMGR8aC69Z3jNL+r+fGWNq98JVHGFO/UgoNL15wGCaidMhzfRqkt1u+m1nY77SFM5qWJz2R0CEC4fMlOiCg8mWBklnryV4yDEPgiXp2I8Rli1Eu2GHwuY1YX9elMeQS7n3Pzq7l6aIQmSgvcEWx6TgMD2V7nQUWpfcud/8dpp/t7z9UyfzLmNwnULHNmUeEp52sejcH5lYzISnkkWa1LzlKSeIrhF3y45m9AyxIfjEqyh/mlKQtUaW3NVXXLPwrNitxHtMIZPU5b16BODn0wb8bqPxpDNpUYrQd/BS7mWDxNpICP2ObLPhd9LW9KIYRNTzryE+uKwxm9NkMlhRku2fu415fH0G0+7aURsHviNN9SO4zct3Pj6QE5rnbVHqxt3biplUTOScdWxSk2Nv3V2dGdt/lBfu6iRPAV9IAS31s7Po3qK1t2jpEPCJwstaCBOM80kmoi3zAgotiAW50X8CelaWsHNrq5jBBgeHUZWgn/c8BkcI61pUE9l34Q6gsiEMQ== tsmith84@gmail.com"],"region":"nyc3","interfaces":{"public":[{"ipv4":{"ip_address":"159.203.92.161","netmask":"255.255.240.0","gateway":"159.203.80.1"},"ipv6":{"ip_address":"2604:A880:0800:00A1:0000:0000:0201:0001","cidr":64,"gateway":"2604:A880:0800:00A1:0000:0000:0000:0001"},"anchor_ipv4":{"ip_address":"10.17.0.5","netmask":"255.255.0.0","gateway":"10.17.0.1"},"mac":"04:01:e5:14:03:01","type":"public"}]},"floating_ip":{"ipv4":{"active":false}},"dns":{"nameservers":["2001:4860:4860::8844","2001:4860:4860::8888","8.8.8.8"]}}'
     end
 
-    it "should fetch and properly parse json metadata" do
+    it "fetches and properly parse json metadata" do
       expect(@http_client).to receive(:get)
         .with("/metadata/v1.json")
         .and_return(double("Net::HTTP Response", body: body, code: "200"))
@@ -72,7 +72,7 @@ describe Ohai::System, "plugin digital_ocean" do
       expect(plugin[:digital_ocean]["hostname"]).to eq("sample-droplet")
     end
 
-    it "should complete the run despite unavailable metadata" do
+    it "completes the run despite unavailable metadata" do
       expect(@http_client).to receive(:get)
         .with("/metadata/v1.json")
         .and_return(double("Net::HTTP Response", body: "", code: "404"))
@@ -83,22 +83,24 @@ describe Ohai::System, "plugin digital_ocean" do
   end
 
   describe "without hint or dmi data" do
-    it_should_behave_like "!digital_ocean"
+    it_behaves_like "!digital_ocean"
   end
 
   describe "with digital_ocean hint file" do
-    it_should_behave_like "digital_ocean"
-
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("digital_ocean").and_return(true)
     end
+
+    it_behaves_like "digital_ocean"
+
   end
 
   describe "with digital_ocean DMI data" do
-    it_should_behave_like "digital_ocean"
-
-    before(:each) do
+    before do
       plugin[:dmi] = { bios: { all_records: [ { Vendor: "DigitalOcean" } ] } }
     end
+
+    it_behaves_like "digital_ocean"
+
   end
 end

data/spec/unit/plugins/dmi_spec.rb

@@ -104,7 +104,7 @@ describe Ohai::System, "plugin dmi" do
   let(:plugin) { get_plugin("dmi") }
   let(:stdout) { DMI_OUT }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, stdout, ""))
   end
 

data/spec/unit/plugins/docker_spec.rb

@@ -78,7 +78,7 @@ describe Ohai::System, "plugin docker" do
   let(:plugin) { get_plugin("docker") }
 
   context "if the machine does not have docker installed" do
-    it "should not create a docker attribute" do
+    it "does not create a docker attribute" do
       plugin[:virtualization] = Mash.new
       plugin[:virtualization][:systems] = Mash.new
       plugin.run
@@ -87,7 +87,7 @@ describe Ohai::System, "plugin docker" do
   end
 
   context "if the machine has docker installed" do
-    it "should create a docker attribute with correct data" do
+    it "creates a docker attribute with correct data" do
       plugin[:virtualization] = Mash.new
       plugin[:virtualization][:systems] = Mash.new
       plugin[:virtualization][:systems][:docker] = "host"

data/spec/unit/plugins/ec2_spec.rb

@@ -25,7 +25,7 @@ describe Ohai::System, "plugin ec2" do
 
   let(:plugin) { get_plugin("ec2") }
 
-  before(:each) do
+  before do
     allow(plugin).to receive(:hint?).with("ec2").and_return(false)
     allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(false)
     allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_vendor").and_return(false)
@@ -41,7 +41,7 @@ describe Ohai::System, "plugin ec2" do
   end
 
   shared_examples_for "ec2" do
-    before(:each) do
+    before do
       @http_client = double("Net::HTTP client")
       allow(plugin).to receive(:http_client).and_return(@http_client)
       allow(IO).to receive(:select).and_return([[], [1], []])
@@ -335,62 +335,66 @@ describe Ohai::System, "plugin ec2" do
   end # shared examples for ec2
 
   describe "with amazon dmi bios version data" do
-    it_behaves_like "ec2"
-
-    before(:each) do
+    before do
       allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_version").and_return(true)
       allow(File).to receive(:read).with("/sys/class/dmi/id/bios_version").and_return("4.2.amazon\n")
     end
+
+    it_behaves_like "ec2"
+
   end
 
   describe "with non-amazon dmi bios version data" do
-    it_behaves_like "!ec2"
-
-    before(:each) do
+    before do
       allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_version").and_return(true)
       allow(File).to receive(:read).with("/sys/class/dmi/id/bios_version").and_return("1.0\n")
     end
+
+    it_behaves_like "!ec2"
+
   end
 
   describe "with amazon dmi bios vendor data" do
-    it_behaves_like "ec2"
-
-    before(:each) do
+    before do
       allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_vendor").and_return(true)
       allow(File).to receive(:read).with("/sys/class/dmi/id/bios_vendor").and_return("Amazon EC2\n")
     end
+
+    it_behaves_like "ec2"
+
   end
 
   describe "with non-amazon dmi bios vendor data" do
-    it_behaves_like "!ec2"
-
-    before(:each) do
+    before do
       allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_vendor").and_return(true)
       allow(File).to receive(:read).with("/sys/class/dmi/id/bios_vendor").and_return("Xen\n")
     end
+
+    it_behaves_like "!ec2"
+
   end
 
   describe "with EC2 Xen UUID" do
-    it_behaves_like "ec2"
-
-    before(:each) do
+    before do
       allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(true)
       allow(File).to receive(:read).with("/sys/hypervisor/uuid").and_return("ec2a0561-e4d6-8e15-d9c8-2e0e03adcde8\n")
     end
+
+    it_behaves_like "ec2"
+
   end
 
   describe "with non-EC2 Xen UUID" do
-    it_behaves_like "!ec2"
-
-    before(:each) do
+    before do
       allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(true)
       allow(File).to receive(:read).with("/sys/hypervisor/uuid").and_return("123a0561-e4d6-8e15-d9c8-2e0e03adcde8\n")
     end
+
+    it_behaves_like "!ec2"
+
   end
 
   describe "with EC2 Identifying Number", :windows_only do
-    it_behaves_like "ec2"
-
     before do
       allow_any_instance_of(WmiLite::Wmi).to receive(:first_of).and_return(
         { "caption" => "Computer System Product",
@@ -403,11 +407,12 @@ describe Ohai::System, "plugin ec2" do
           "version" => "4.2.amazon" }
       )
     end
+
+    it_behaves_like "ec2"
+
   end
 
   describe "without EC2 Identifying Number", :windows_only do
-    it_behaves_like "!ec2"
-
     before do
       allow_any_instance_of(WmiLite::Wmi).to receive(:first_of).and_return(
         { "caption" => "Computer System Product",
@@ -420,22 +425,28 @@ describe Ohai::System, "plugin ec2" do
           "version" => "1.2.3" }
       )
     end
+
+    it_behaves_like "!ec2"
+
   end
 
   describe "with ec2 hint file" do
-    it_behaves_like "ec2"
-
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("ec2").and_return({})
     end
+
+    it_behaves_like "ec2"
+
   end
-  describe "without any hints that it is an ec2 system" do
-    it_behaves_like "!ec2"
 
-    before(:each) do
+  describe "without any hints that it is an ec2 system" do
+    before do
       allow(plugin).to receive(:hint?).with("ec2").and_return(false)
       plugin[:dmi] = nil
     end
+
+    it_behaves_like "!ec2"
+
   end
 
 end

data/spec/unit/plugins/elixir_spec.rb

@@ -19,11 +19,11 @@ require "spec_helper"
 describe Ohai::System, "plugin elixir" do
   let(:plugin) { get_plugin("elixir") }
 
-  before(:each) do
+  before do
     plugin[:languages] = Mash.new
   end
 
-  it "should shellout to elixir -v" do
+  it "shellouts to elixir -v" do
     expect(plugin).to receive(:shell_out).with("elixir -v").and_return(mock_shell_out(0, "Elixir 1.0.2", ""))
     plugin.run
   end

data/spec/unit/plugins/erlang_spec.rb

@@ -22,7 +22,7 @@ require "spec_helper"
 describe Ohai::System, "plugin erlang" do
   let(:plugin) { get_plugin("erlang") }
 
-  before(:each) do
+  before do
     plugin[:languages] = Mash.new
     erl_v_output = "Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 7.3\n"
     erl_systeminfo_output = "19.1,8.1,2.11"

data/spec/unit/plugins/eucalyptus_spec.rb

@@ -31,7 +31,7 @@ describe Ohai::System, "plugin eucalyptus" do
   end
 
   shared_examples_for "eucalyptus" do
-    before(:each) do
+    before do
       @http_client = double("Net::HTTP client")
       allow(plugin).to receive(:http_client).and_return(@http_client)
 
@@ -69,37 +69,41 @@ describe Ohai::System, "plugin eucalyptus" do
   end
 
   describe "with eucalyptus mac and metadata address connected" do
-    it_behaves_like "eucalyptus"
-
-    before(:each) do
+    before do
       allow(IO).to receive(:select).and_return([[], [1], []])
       plugin[:network] = { "interfaces" => { "eth0" => { "addresses" => { "d0:0d:95:47:6E:ED" => { "family" => "lladdr" } } } } }
     end
+
+    it_behaves_like "eucalyptus"
+
   end
 
   describe "without eucalyptus mac and metadata address connected" do
-    it_behaves_like "!eucalyptus"
-
-    before(:each) do
+    before do
       plugin[:network] = { "interfaces" => { "eth0" => { "addresses" => { "ff:ff:95:47:6E:ED" => { "family" => "lladdr" } } } } }
     end
+
+    it_behaves_like "!eucalyptus"
+
   end
 
   describe "with eucalyptus hint file" do
-    it_behaves_like "eucalyptus"
-
-    before(:each) do
+    before do
       allow(plugin).to receive(:hint?).with("eucalyptus").and_return(true)
     end
+
+    it_behaves_like "eucalyptus"
+
   end
 
   describe "without hint file" do
-    it_behaves_like "!eucalyptus"
-
-    before(:each) do
+    before do
       plugin[:network] = { interfaces: {} }
       allow(plugin).to receive(:hint?).with("eucalyptus").and_return(false)
     end
+
+    it_behaves_like "!eucalyptus"
+
   end
 
 end

data/spec/unit/plugins/fail_spec.rb

@@ -30,13 +30,13 @@ shared_examples "a v7 loading failure" do
 
   end
 
-  before(:each) do
+  before do
     fail_file = File.open("#{tmp}/plugins/fail.rb", "w+")
     fail_file.write(failstr)
     fail_file.close
   end
 
-  after(:each) do
+  after do
     File.delete("#{tmp}/plugins/fail.rb")
   end
 
@@ -48,18 +48,18 @@ shared_examples "a v7 loading failure" do
 
   end
 
-  before(:each) do
+  before do
     @ohai = Ohai::System.new
     @loader = Ohai::Loader.new(@ohai)
   end
 
-  it "should not have attribute keys" do
+  it "does not have attribute keys" do
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
     # @ohai.attributes.should_not have_key("fail")
     expect { @ohai.provides_map.find_providers_for(["fail"]) }.to raise_error(Ohai::Exceptions::AttributeNotFound)
   end
 
-  it "should write to Ohai::Log" do
+  it "writes to Ohai::Log" do
     expect(@loader.logger).to receive(:warn).once
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
   end
@@ -74,13 +74,13 @@ shared_examples "a v7 loading success" do
 
   end
 
-  before(:each) do
+  before do
     fail_file = File.open("#{tmp}/plugins/fail.rb", "w+")
     fail_file.write(failstr)
     fail_file.close
   end
 
-  after(:each) do
+  after do
     File.delete("#{tmp}/plugins/fail.rb")
   end
 
@@ -92,17 +92,17 @@ shared_examples "a v7 loading success" do
 
   end
 
-  before(:each) do
+  before do
     @ohai = Ohai::System.new
     @loader = Ohai::Loader.new(@ohai)
   end
 
-  it "should have attribute keys" do
+  it "has attribute keys" do
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
     expect(@ohai.provides_map).to have_key("fail")
   end
 
-  it "should not write to Ohai::Log" do
+  it "does not write to Ohai::Log" do
     expect(@loader.logger).not_to receive(:warn)
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
   end
@@ -117,13 +117,13 @@ shared_examples "a v7 run failure" do
 
   end
 
-  before(:each) do
+  before do
     fail_file = File.open("#{tmp}/plugins/fail.rb", "w+")
     fail_file.write(failstr)
     fail_file.close
   end
 
-  after(:each) do
+  after do
     File.delete("#{tmp}/plugins/fail.rb")
   end
 
@@ -135,17 +135,17 @@ shared_examples "a v7 run failure" do
 
   end
 
-  before(:each) do
+  before do
     @ohai = Ohai::System.new
     @loader = Ohai::Loader.new(@ohai)
   end
 
-  it "should not have new attribute keys" do
+  it "does not have new attribute keys" do
     @loader.load_plugin("#{tmp}/plugins/fail.rb").new(@ohai).run
     expect(@ohai.provides_map).not_to have_key("other")
   end
 
-  it "should write to Ohai::Log" do
+  it "writes to Ohai::Log" do
     expect(@loader.logger).to receive(:warn).once
     @loader.load_plugin("#{tmp}/plugins/fail.rb").new(@ohai).run
   end