ohai 7.6.0.rc.1 → 8.0.1

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

@@ -21,9 +21,9 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "Solaris2.X hostname plugin" do
   before(:each) do
     @plugin = get_plugin("hostname")
-    @plugin.stub(:collect_os).and_return(:solaris2)
-    @plugin.stub(:resolve_fqdn).and_return("kitteh.inurfridge.eatinurfoodz")
-    @plugin.stub(:shell_out).with("hostname").and_return(mock_shell_out(0, "kitteh\n", ""))
+    allow(@plugin).to receive(:collect_os).and_return(:solaris2)
+    allow(@plugin).to receive(:resolve_fqdn).and_return("kitteh.inurfridge.eatinurfoodz")
+    allow(@plugin).to receive(:shell_out).with("hostname").and_return(mock_shell_out(0, "kitteh\n", ""))
 #    Socket.stub(:getaddrinfo).and_return( [["AF_INET", 0, "kitteh.inurfridge.eatinurfoodz", "10.1.2.3", 2, 0, 0]] );
   end
 
@@ -31,7 +31,7 @@ describe Ohai::System, "Solaris2.X hostname plugin" do
 
   it "should get the fqdn value from #resolve_fqdn" do
     @plugin.run
-    @plugin["fqdn"].should == "kitteh.inurfridge.eatinurfoodz"
+    expect(@plugin["fqdn"]).to eq("kitteh.inurfridge.eatinurfoodz")
   end
 
 end

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

@@ -135,10 +135,10 @@ describe Ohai::System, "Solaris2.X kernel plugin" do
 
   before(:each) do
     @plugin = get_plugin("kernel")
-    @plugin.stub(:collect_os).and_return(:solaris2)
-    @plugin.stub(:init_kernel).and_return({})
-    @plugin.stub(:shell_out).with("uname -s").and_return(mock_shell_out(0, "SunOS\n", ""))
-    @plugin.stub(:shell_out).with("modinfo").and_return(mock_shell_out(0, MODINFO, ""))
+    allow(@plugin).to receive(:collect_os).and_return(:solaris2)
+    allow(@plugin).to receive(:init_kernel).and_return({})
+    allow(@plugin).to receive(:shell_out).with("uname -s").and_return(mock_shell_out(0, "SunOS\n", ""))
+    allow(@plugin).to receive(:shell_out).with("modinfo").and_return(mock_shell_out(0, MODINFO, ""))
   end
 
   it_should_check_from_deep_mash("solaris2::kernel", "kernel", "os", "uname -s", [0, "SunOS\n", ""])
@@ -146,15 +146,15 @@ describe Ohai::System, "Solaris2.X kernel plugin" do
   it "gives excruciating detail about kernel modules" do
     @plugin.run
 
-    @plugin[:kernel][:modules].should have(107).modules
+    expect(@plugin[:kernel][:modules]).to have(107).modules
 
     # Teh daterz
     # Id Loadaddr   Size Info Rev Module Name
     #  6  1180000   4623   1   1  specfs (filesystem for specfs)
     teh_daterz = { "id" => 6, "loadaddr" => "1180000", "size" =>  17955, "description" => "filesystem for specfs"}
-    @plugin[:kernel][:modules].keys.should include("specfs")
-    @plugin[:kernel][:modules].keys.should_not include("Module")
-    @plugin[:kernel][:modules]["specfs"].should == teh_daterz
+    expect(@plugin[:kernel][:modules].keys).to include("specfs")
+    expect(@plugin[:kernel][:modules].keys).not_to include("Module")
+    expect(@plugin[:kernel][:modules]["specfs"]).to eq(teh_daterz)
   end
 
 end

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

@@ -19,12 +19,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "Solaris2.X memory plugin" do
   before(:each) do
     @plugin = get_plugin("solaris2/memory")
-    @plugin.stub(:collect_os).and_return("solaris2")
-    @plugin.stub(:shell_out).with("prtconf -m").and_return(mock_shell_out(0, "8194\n", ""))
+    allow(@plugin).to receive(:collect_os).and_return("solaris2")
+    allow(@plugin).to receive(:shell_out).with("prtconf -m").and_return(mock_shell_out(0, "8194\n", ""))
   end
 
   it "should get the total memory" do
     @plugin.run
-    @plugin['memory']['total'].should eql(8194)
+    expect(@plugin['memory']['total']).to eql(8194)
   end
 end

data/spec/unit/plugins/solaris2/network_spec.rb

@@ -112,40 +112,40 @@ ROUTE_GET
     @ifconfig_lines = @solaris_ifconfig.split("\n")
 
     @plugin = get_plugin("solaris2/network")
-    @plugin.stub(:collect_os).and_return(:solaris2)
+    allow(@plugin).to receive(:collect_os).and_return(:solaris2)
     @plugin[:network] = Mash.new
 
-    @plugin.stub(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, @solaris_route_get, ""))
-    @plugin.stub(:shell_out).with("arp -an").and_return(mock_shell_out(0, @solaris_arp_rn, ""))
-    @plugin.stub(:shell_out).with("route -n get default").and_return(mock_shell_out(0, @soalris_route_get, ""))
+    allow(@plugin).to receive(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, @solaris_route_get, ""))
+    allow(@plugin).to receive(:shell_out).with("arp -an").and_return(mock_shell_out(0, @solaris_arp_rn, ""))
+    allow(@plugin).to receive(:shell_out).with("route -n get default").and_return(mock_shell_out(0, @soalris_route_get, ""))
   end
 
   describe "gathering IP layer address info" do
     before do
       @stdout = double("Pipe, stdout, cmd=`route get default`", :read => @solaris_route_get)
-      @plugin.stub(:shell_out).with("route -n get default").and_return(mock_shell_out(0, @solaris_route_get, ""))
-      @plugin.stub(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, @solaris_ifconfig, ""))
+      allow(@plugin).to receive(:shell_out).with("route -n get default").and_return(mock_shell_out(0, @solaris_route_get, ""))
+      allow(@plugin).to receive(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, @solaris_ifconfig, ""))
       @plugin.run
     end
 
     it "completes the run" do
-      @plugin['network'].should_not be_nil
+      expect(@plugin['network']).not_to be_nil
     end
 
     it "detects the interfaces" do
-      @plugin['network']['interfaces'].keys.sort.should == ["e1000g0:3", "e1000g2:1", "eri0", "ip.tun0", "ip.tun0:1", "lo0", "lo0:3","net0", "qfe1"]
+      expect(@plugin['network']['interfaces'].keys.sort).to eq(["e1000g0:3", "e1000g2:1", "eri0", "ip.tun0", "ip.tun0:1", "lo0", "lo0:3","net0", "qfe1"])
     end
 
     it "detects the ip addresses of the interfaces" do
-      @plugin['network']['interfaces']['e1000g0:3']['addresses'].keys.should include('72.2.115.28')
+      expect(@plugin['network']['interfaces']['e1000g0:3']['addresses'].keys).to include('72.2.115.28')
     end
 
     it "detects the encapsulation type of the interfaces" do
-      @plugin['network']['interfaces']['e1000g0:3']['encapsulation'].should == 'Ethernet'
+      expect(@plugin['network']['interfaces']['e1000g0:3']['encapsulation']).to eq('Ethernet')
     end
     
     it "detects the L3PROTECT network flag" do
-      @plugin['network']['interfaces']['net0']['flags'].should include('L3PROTECT')
+      expect(@plugin['network']['interfaces']['net0']['flags']).to include('L3PROTECT')
     end
   end
 
@@ -154,12 +154,12 @@ ROUTE_GET
   describe "setting the node's default IP address attribute" do
     before do
       @stdout = double("Pipe, stdout, cmd=`route get default`", :read => @solaris_route_get)
-      @plugin.stub(:shell_out).with("route -n get default").and_return(mock_shell_out(0, @solaris_route_get, ""))
+      allow(@plugin).to receive(:shell_out).with("route -n get default").and_return(mock_shell_out(0, @solaris_route_get, ""))
       @plugin.run
     end
 
     it "finds the default interface by asking which iface has the default route" do
-      @plugin[:network][:default_interface].should == 'e1000g0'
+      expect(@plugin[:network][:default_interface]).to eq('e1000g0')
     end
   end
 end

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

@@ -21,8 +21,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "Solaris plugin platform" do
   before(:each) do
     @plugin = get_plugin("solaris2/platform")
-    @plugin.stub(:collect_os).and_return(:solaris2)
-    @plugin.stub(:shell_out).with("/sbin/uname -X")
+    allow(@plugin).to receive(:collect_os).and_return(:solaris2)
+    allow(@plugin).to receive(:shell_out).with("/sbin/uname -X")
   end
   
   describe "on SmartOS" do
@@ -41,26 +41,26 @@ Origin# = 1
 NumCPU = 16
 UNAME_X
 
-      File.stub(:exists?).with("/sbin/uname").and_return(true)
-      @plugin.stub(:shell_out).with("/sbin/uname -X").and_return(mock_shell_out(0, @uname_x, ""))
+      allow(File).to receive(:exists?).with("/sbin/uname").and_return(true)
+      allow(@plugin).to receive(:shell_out).with("/sbin/uname -X").and_return(mock_shell_out(0, @uname_x, ""))
       
       @release = StringIO.new("  SmartOS 20120130T201844Z x86_64\n")
-      File.stub(:open).with("/etc/release").and_yield(@release)
+      allow(File).to receive(:open).with("/etc/release").and_yield(@release)
     end
 
     it "should run uname and set platform and build" do 
       @plugin.run
-      @plugin[:platform_build].should == "joyent_20120130T201844Z"
+      expect(@plugin[:platform_build]).to eq("joyent_20120130T201844Z")
     end
 
     it "should set the platform" do
       @plugin.run
-      @plugin[:platform].should == "smartos"
+      expect(@plugin[:platform]).to eq("smartos")
     end
     
     it "should set the platform_version" do
       @plugin.run
-      @plugin[:platform_version].should == "5.11"
+      expect(@plugin[:platform_version]).to eq("5.11")
     end
 
   end
@@ -81,26 +81,26 @@ Origin# = 1
 NumCPU = 1
 UNAME_X
 
-      File.stub(:exists?).with("/sbin/uname").and_return(true)
-      @plugin.stub(:shell_out).with("/sbin/uname -X").and_return(mock_shell_out(0, @uname_x, ""))
+      allow(File).to receive(:exists?).with("/sbin/uname").and_return(true)
+      allow(@plugin).to receive(:shell_out).with("/sbin/uname -X").and_return(mock_shell_out(0, @uname_x, ""))
 
       @release = StringIO.new("                             Oracle Solaris 11.1 X86\n")
-      File.stub(:open).with("/etc/release").and_yield(@release)
+      allow(File).to receive(:open).with("/etc/release").and_yield(@release)
     end
 
     it "should run uname and set platform and build" do
       @plugin.run
-      @plugin[:platform_build].should == "11.1"
+      expect(@plugin[:platform_build]).to eq("11.1")
     end
 
     it "should set the platform" do
       @plugin.run
-      @plugin[:platform].should == "solaris2"
+      expect(@plugin[:platform]).to eq("solaris2")
     end
 
     it "should set the platform_version" do
       @plugin.run
-      @plugin[:platform_version].should == "5.11"
+      expect(@plugin[:platform_version]).to eq("5.11")
     end
 
   end

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

@@ -27,47 +27,47 @@ The physical processor has 1 virtual processor (0)
 PSRINFO_PV
 
     @plugin = get_plugin("solaris2/virtualization")
-    @plugin.stub(:collect_os).and_return(:solaris2)
+    allow(@plugin).to receive(:collect_os).and_return(:solaris2)
 
     # default to all requested Files not existing
-    File.stub(:exists?).with("/usr/sbin/psrinfo").and_return(false)
-    File.stub(:exists?).with("/usr/sbin/smbios").and_return(false)
-    File.stub(:exists?).with("/usr/sbin/zoneadm").and_return(false)
-    @plugin.stub(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, "", ""))
-    @plugin.stub(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "", ""))
+    allow(File).to receive(:exists?).with("/usr/sbin/psrinfo").and_return(false)
+    allow(File).to receive(:exists?).with("/usr/sbin/smbios").and_return(false)
+    allow(File).to receive(:exists?).with("/usr/sbin/zoneadm").and_return(false)
+    allow(@plugin).to receive(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, "", ""))
+    allow(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "", ""))
   end
 
   describe "when we are checking for kvm" do
     before(:each) do
-      File.should_receive(:exists?).with("/usr/sbin/psrinfo").and_return(true)
+      expect(File).to receive(:exists?).with("/usr/sbin/psrinfo").and_return(true)
     end
 
     it "should run psrinfo -pv" do
-      @plugin.should_receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv")
+      expect(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv")
       @plugin.run
     end
 
     it "Should set kvm guest if psrinfo -pv contains QEMU Virtual CPU" do
-      @plugin.stub(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "QEMU Virtual CPU", ""))
+      allow(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "QEMU Virtual CPU", ""))
       @plugin.run
-      @plugin[:virtualization][:system].should == "kvm"
-      @plugin[:virtualization][:role].should == "guest"
+      expect(@plugin[:virtualization][:system]).to eq("kvm")
+      expect(@plugin[:virtualization][:role]).to eq("guest")
     end
 
     it "should not set virtualization if kvm isn't there" do
-      @plugin.should_receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, @psrinfo_pv, ""))
+      expect(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, @psrinfo_pv, ""))
       @plugin.run
-      @plugin[:virtualization].should == {}
+      expect(@plugin[:virtualization]).to eq({})
     end
   end
 
   describe "when we are parsing smbios" do
     before(:each) do
-      File.should_receive(:exists?).with("/usr/sbin/smbios").and_return(true)
+      expect(File).to receive(:exists?).with("/usr/sbin/smbios").and_return(true)
     end
 
     it "should run smbios" do
-      @plugin.should_receive(:shell_out).with("/usr/sbin/smbios")
+      expect(@plugin).to receive(:shell_out).with("/usr/sbin/smbios")
       @plugin.run
     end
 
@@ -84,10 +84,10 @@ ID    SIZE TYPE
   UUID: D29974A4-BE51-044C-BDC6-EFBC4B87A8E9
   Wake-Up Event: 0x6 (power switch)
 MSVPC
-      @plugin.stub(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, ms_vpc_smbios, ""))
+      allow(@plugin).to receive(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, ms_vpc_smbios, ""))
       @plugin.run
-      @plugin[:virtualization][:system].should == "virtualpc"
-      @plugin[:virtualization][:role].should == "guest"
+      expect(@plugin[:virtualization][:system]).to eq("virtualpc")
+      expect(@plugin[:virtualization][:role]).to eq("guest")
     end
 
     it "should set vmware guest if smbios detects VMware Virtual Platform" do
@@ -103,22 +103,22 @@ ID    SIZE TYPE
   UUID: a86cc405-e1b9-447b-ad05-6f8db39d876a
   Wake-Up Event: 0x6 (power switch)
 VMWARE
-      @plugin.stub(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, vmware_smbios, ""))
+      allow(@plugin).to receive(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, vmware_smbios, ""))
       @plugin.run
-      @plugin[:virtualization][:system].should == "vmware"
-      @plugin[:virtualization][:role].should == "guest"
+      expect(@plugin[:virtualization][:system]).to eq("vmware")
+      expect(@plugin[:virtualization][:role]).to eq("guest")
     end
 
     it "should run smbios and not set virtualization if nothing is detected" do
-      @plugin.should_receive(:shell_out).with("/usr/sbin/smbios")
+      expect(@plugin).to receive(:shell_out).with("/usr/sbin/smbios")
       @plugin.run
-      @plugin[:virtualization].should == {}
+      expect(@plugin[:virtualization]).to eq({})
     end
   end
 
   it "should not set virtualization if no tests match" do
     @plugin.run
-    @plugin[:virtualization].should == {}
+    expect(@plugin[:virtualization]).to eq({})
   end
 end
 

data/spec/unit/plugins/solaris2/zpools_spec.rb

@@ -18,7 +18,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "Solaris 2.x zpool plugin" do
   before(:each) do
     @plugin = get_plugin("solaris2/zpools")
-    @plugin.stub(:collect_os).and_return(:solaris2)
+    allow(@plugin).to receive(:collect_os).and_return(:solaris2)
 
     @zpool_status_rpool = <<-EOSR
 pool: rpool
@@ -62,9 +62,9 @@ EOST
 rpool   109G    66.2G   42.8G   60%     1.00x   ONLINE  34
 tank    130T    4.91M   130T    0%      1.00x   ONLINE  34
 EOZO
-    @plugin.stub(:shell_out).with("zpool list -H -o name,size,alloc,free,cap,dedup,health,version").and_return(mock_shell_out(0,@zpool_out,""))
-    @plugin.stub(:shell_out).with("su adm -c \"zpool status rpool\"").and_return(mock_shell_out(0,@zpool_status_rpool,""))
-    @plugin.stub(:shell_out).with("su adm -c \"zpool status tank\"").and_return(mock_shell_out(0,@zpool_status_tank,""))
+    allow(@plugin).to receive(:shell_out).with("zpool list -H -o name,size,alloc,free,cap,dedup,health,version").and_return(mock_shell_out(0,@zpool_out,""))
+    allow(@plugin).to receive(:shell_out).with("su adm -c \"zpool status rpool\"").and_return(mock_shell_out(0,@zpool_status_rpool,""))
+    allow(@plugin).to receive(:shell_out).with("su adm -c \"zpool status tank\"").and_return(mock_shell_out(0,@zpool_status_tank,""))
   end
 
   describe "On Solaris2 Common" do
@@ -123,7 +123,7 @@ EOZO
 rpool   109G    66.2G   42.8G   60%     1.00x   ONLINE  -
 tank    130T    4.91M   130T    0%      1.00x   ONLINE  -
 EOZO
-      @plugin.stub(:shell_out).with("zpool list -H -o name,size,alloc,free,cap,dedup,health,version").and_return(mock_shell_out(0,@zpool_out,""))
+      allow(@plugin).to receive(:shell_out).with("zpool list -H -o name,size,alloc,free,cap,dedup,health,version").and_return(mock_shell_out(0,@zpool_out,""))
     end
 
     it "Won't have a version number" do
@@ -140,7 +140,7 @@ EOZO
 rpool   109G    66.2G   42.8G   60%     1.00x   ONLINE  34
 tank    130T    4.91M   130T    0%      1.00x   ONLINE  34
 EOZO
-      @plugin.stub(:shell_out).with("zpool list -H -o name,size,alloc,free,cap,dedup,health,version").and_return(mock_shell_out(0,@zpool_out,""))
+      allow(@plugin).to receive(:shell_out).with("zpool list -H -o name,size,alloc,free,cap,dedup,health,version").and_return(mock_shell_out(0,@zpool_out,""))
     end
 
     it "Should have a version number" do

data/spec/unit/plugins/ssh_host_keys_spec.rb

@@ -24,43 +24,43 @@ describe Ohai::System, "ssh_host_key plugin" do
     @plugin = get_plugin("ssh_host_key")
     @plugin[:keys] = Mash.new
 
-    File.stub(:exists?).with("/etc/ssh/sshd_config").and_return(true)
-    File.stub(:open).with("/etc/ssh/sshd_config").and_yield(sshd_config_file)
-    File.stub(:exists?).and_return(true)
-    File.stub(:exists?).with("/etc/ssh/ssh_host_dsa_key.pub").and_return(true)
-    File.stub(:exists?).with("/etc/ssh/ssh_host_rsa_key.pub").and_return(true)
-    File.stub(:exists?).with("/etc/ssh/ssh_host_ecdsa_key.pub").and_return(true)
+    allow(File).to receive(:exists?).with("/etc/ssh/sshd_config").and_return(true)
+    allow(File).to receive(:open).with("/etc/ssh/sshd_config").and_yield(sshd_config_file)
+    allow(File).to receive(:exists?).and_return(true)
+    allow(File).to receive(:exists?).with("/etc/ssh/ssh_host_dsa_key.pub").and_return(true)
+    allow(File).to receive(:exists?).with("/etc/ssh/ssh_host_rsa_key.pub").and_return(true)
+    allow(File).to receive(:exists?).with("/etc/ssh/ssh_host_ecdsa_key.pub").and_return(true)
 
     # Ensure we can still use IO.read
     io_read = IO.method(:read)
-    IO.stub(:read) { |file| io_read.call(file) }
+    allow(IO).to receive(:read) { |file| io_read.call(file) }
 
     # Return fake public key files so we don't have to go digging for them in unit tests
     @dsa_key = "ssh-dss AAAAB3NzaC1kc3MAAACBAMHlT02xN8kietxPfhcb98xHueTzKCOTz6dZlP/dmKILHrQOAExuSEeNiA2uvmhHNVQvs/cBsRiDxgSKux3ie2q8+MB6vHCiSpSkoPjrL75iT57YDilCB4/sytt6IJpj+H42wRDWTX0/QRybMHUvmnmEL0cwZXykSvrIum0BKB6hAAAAFQDsi6WUCClhtZIiTY9uh8eAre+SbQAAAIEAgNnuw0uEuqtcVif+AYd/bCZvL9FPqg7DrmTkamNEcVinhUGwsPGJTLJf+o5ens1X4RzQoi1R6Y6zCTL2FN/hZgINJNO0z9BN402wWrZmQd+Vb1U5DyDtveuvipqyQS+fm9neRwdLuv36Fc9f9nkZ7YHpkGPJp+yJpG4OoeREhwgAAACBAIf9kKLf2XiXnlByzlJ2Naa55d/hp2E059VKCRsBS++xFKYKvSqjnDQBFiMtAUhb8EdTyBGyalqOgqogDQVtwHfTZWZwqHAhry9aM06y92Eu/xSey4tWjKeknOsnRe640KC4zmKDBRTrjjkuAdrKPN9k3jl+OCc669JHlIfo6kqf oppa"
     @rsa_key = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuhcVXV+nNapkyUC5p4TH1ymRxUjtMBKqYWmwyI29gVFnUNeHkKFHWon0KFeGJP2Rm8BfTiZa9ER9e8pRr4Nd+z1C1o0kVoxEEfB9tpSdTlpk1GG83D94l57fij8THRVIwuCEosViUlg1gDgC4SpxbqfdBkUN2qyf6JDOh7t2QpYh7berpDEWeBpb7BKdLEDT57uw7ijKzSNyaXqq8KkB9I+UFrRwpuos4W7ilX+PQ+mWLi2ZZJfTYZMxxVS+qJwiDtNxGCRwTOQZG03kI7eLBZG+igupr0uD4o6qeftPOr0kxgjoPU4nEKvYiGq8Rqd2vYrhiaJHLk9QB6xStQvS3Q== oppa"
     @ecdsa_key = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBx8VgvxmHxs/sIn/ATh0iUcuz1I2Xc0e1ejXCGHBMZ98IE3FBt1ezlqCpNMcHVV2skQQ8vyLbKxzweyZuNSDU8= oppa"
-    IO.stub(:read).with("/etc/ssh/ssh_host_dsa_key.pub").and_return(@dsa_key)
-    IO.stub(:read).with("/etc/ssh/ssh_host_rsa_key.pub").and_return(@rsa_key)
-    IO.stub(:read).with("/etc/ssh/ssh_host_ecdsa_key.pub").and_return(@ecdsa_key)
+    allow(IO).to receive(:read).with("/etc/ssh/ssh_host_dsa_key.pub").and_return(@dsa_key)
+    allow(IO).to receive(:read).with("/etc/ssh/ssh_host_rsa_key.pub").and_return(@rsa_key)
+    allow(IO).to receive(:read).with("/etc/ssh/ssh_host_ecdsa_key.pub").and_return(@ecdsa_key)
   end
 
   shared_examples "loads keys" do
     it "reads the key and sets the dsa attribute correctly" do
       @plugin.run
-      @plugin[:keys][:ssh][:host_dsa_public].should eql(@dsa_key.split[1])
-      @plugin[:keys][:ssh][:host_dsa_type].should be_nil
+      expect(@plugin[:keys][:ssh][:host_dsa_public]).to eql(@dsa_key.split[1])
+      expect(@plugin[:keys][:ssh][:host_dsa_type]).to be_nil
     end
 
     it "reads the key and sets the rsa attribute correctly" do
       @plugin.run
-      @plugin[:keys][:ssh][:host_rsa_public].should eql(@rsa_key.split[1])
-      @plugin[:keys][:ssh][:host_rsa_type].should be_nil
+      expect(@plugin[:keys][:ssh][:host_rsa_public]).to eql(@rsa_key.split[1])
+      expect(@plugin[:keys][:ssh][:host_rsa_type]).to be_nil
     end
 
     it "reads the key and sets the ecdsa attribute correctly" do
       @plugin.run
-      @plugin[:keys][:ssh][:host_ecdsa_public].should eql(@ecdsa_key.split[1])
-      @plugin[:keys][:ssh][:host_ecdsa_type].should eql(@ecdsa_key.split[0])
+      expect(@plugin[:keys][:ssh][:host_ecdsa_public]).to eql(@ecdsa_key.split[1])
+      expect(@plugin[:keys][:ssh][:host_ecdsa_type]).to eql(@ecdsa_key.split[0])
     end
   end
 
@@ -93,8 +93,8 @@ EOS
       nil
     end
     before do
-      File.stub(:exists?).with("/etc/ssh/sshd_config").and_return(false)
-      File.stub(:exists?).with("/etc/sshd_config").and_return(false)
+      allow(File).to receive(:exists?).with("/etc/ssh/sshd_config").and_return(false)
+      allow(File).to receive(:exists?).with("/etc/sshd_config").and_return(false)
     end
 
     it_behaves_like "loads keys"

data/spec/unit/runner_spec.rb

@@ -29,7 +29,7 @@ describe Ohai::Runner, "run_plugin" do
 
   describe "when running an invalid plugin" do
     it "should raise error" do
-      lambda { @runner.run_plugin(double("Ohai::NotPlugin")) }.should raise_error(Ohai::Exceptions::InvalidPlugin)
+      expect { @runner.run_plugin(double("Ohai::NotPlugin")) }.to raise_error(Ohai::Exceptions::InvalidPlugin)
     end
   end
 
@@ -40,7 +40,7 @@ describe Ohai::Runner, "run_plugin" do
 
     describe "version 7" do
       it "should call run_v7_plugin" do
-        @runner.should_receive(:run_v7_plugin)
+        expect(@runner).to receive(:run_v7_plugin)
         @runner.run_plugin(plugin)
       end
 
@@ -48,7 +48,7 @@ describe Ohai::Runner, "run_plugin" do
         let(:has_run) { true }
 
         it "should not run the plugin" do
-          plugin.should_not_receive(:safe_run)
+          expect(plugin).not_to receive(:safe_run)
           @runner.run_plugin(plugin)
         end
       end
@@ -58,14 +58,14 @@ describe Ohai::Runner, "run_plugin" do
       let(:version) { :version6 }
 
       it "should call run_v6_plugin" do
-        @runner.should_receive(:run_v6_plugin)
+        expect(@runner).to receive(:run_v6_plugin)
         @runner.run_plugin(plugin)
       end
 
       describe "if the plugin has not run before" do
         describe "if safe_run is not set" do
           it "safe_run should be called" do
-            plugin.should_receive(:safe_run)
+            expect(plugin).to receive(:safe_run)
             @runner.run_plugin(plugin)
           end
         end
@@ -74,7 +74,7 @@ describe Ohai::Runner, "run_plugin" do
           let(:safe_run) { false }
 
           it "run should be called" do
-            plugin.should_receive(:run)
+            expect(plugin).to receive(:run)
             @runner.run_plugin(plugin)
           end
         end
@@ -84,7 +84,7 @@ describe Ohai::Runner, "run_plugin" do
         let(:has_run) { true }
 
         it "should not run" do
-          plugin.should_not_receive(:safe_run)
+          expect(plugin).not_to receive(:safe_run)
           @runner.run_plugin(plugin)
         end
 
@@ -95,7 +95,7 @@ describe Ohai::Runner, "run_plugin" do
       let(:version) { :versionBla }
 
       it "should raise error" do
-        lambda { @runner.run_plugin(plugin) }.should raise_error(Ohai::Exceptions::InvalidPlugin)
+        expect { @runner.run_plugin(plugin) }.to raise_error(Ohai::Exceptions::InvalidPlugin)
       end
     end
   end
@@ -113,13 +113,13 @@ describe Ohai::Runner, "run_plugin" do
 
     it "should run the plugin" do
       @runner.run_plugin(plugin)
-      plugin.has_run?.should be true
+      expect(plugin.has_run?).to be true
     end
 
     it "should add plugin data to Ohai::System.data" do
       @runner.run_plugin(plugin)
-      @ohai.data.should have_key(:thing)
-      @ohai.data[:thing].should eql({})
+      expect(@ohai.data).to have_key(:thing)
+      expect(@ohai.data[:thing]).to eql({})
     end
   end
 
@@ -142,7 +142,7 @@ describe Ohai::Runner, "run_plugin" do
 
       it "should not run the plugin" do
         expect{ @runner.run_plugin(@plugin) }.to raise_error
-        @plugin.has_run?.should be false
+        expect(@plugin.has_run?).to be false
       end
     end
 
@@ -174,7 +174,7 @@ describe Ohai::Runner, "run_plugin" do
       it "should run the plugins" do
         @runner.run_plugin(@plugin2)
         @plugins.each do |plugin|
-          plugin.has_run?.should be true
+          expect(plugin.has_run?).to be true
         end
       end
     end
@@ -208,7 +208,7 @@ describe Ohai::Runner, "run_plugin" do
       it "should run the plugins" do
         @runner.run_plugin(@plugin3)
         @plugins.each do |plugin|
-          plugin.has_run?.should be true
+          expect(plugin.has_run?).to be true
         end
       end
     end
@@ -251,7 +251,7 @@ describe Ohai::Runner, "run_plugin" do
     it "should run the plugins" do
       @runner.run_plugin(@plugin3)
       @plugins.each do |plugin|
-        plugin.has_run?.should be true
+        expect(plugin.has_run?).to be true
       end
     end
   end
@@ -306,8 +306,8 @@ describe Ohai::Runner, "run_plugin" do
       end
 
       it "should raise Ohai::Exceptions::DependencyCycle" do
-        runner.stub(:fetch_plugins).with(["thing"]).and_return([@plugin1])
-        runner.stub(:fetch_plugins).with(["other"]).and_return([@plugin2])
+        allow(runner).to receive(:fetch_plugins).with(["thing"]).and_return([@plugin1])
+        allow(runner).to receive(:fetch_plugins).with(["other"]).and_return([@plugin2])
         expected_error_string = "Dependency cycle detected. Please refer to the following plugins: Thing, Other"
         expect { runner.run_plugin(@plugin1) }.to raise_error(Ohai::Exceptions::DependencyCycle, expected_error_string)
       end
@@ -346,11 +346,11 @@ describe Ohai::Runner, "run_plugin" do
       @ohai.provides_map.set_providers_for(@pluginB, ["B"])
       @ohai.provides_map.set_providers_for(@pluginC, ["C"])
 
-      Ohai::Log.should_not_receive(:error).with(/DependencyCycleError/)
+      expect(Ohai::Log).not_to receive(:error).with(/DependencyCycleError/)
       @runner.run_plugin(@pluginA)
 
       @plugins.each do |plugin|
-        plugin.has_run?.should be true
+        expect(plugin.has_run?).to be true
       end
     end
 
@@ -359,11 +359,11 @@ describe Ohai::Runner, "run_plugin" do
       @ohai.provides_map.set_providers_for(@pluginC, ["C"])
       @ohai.provides_map.set_providers_for(@pluginB, ["B"])
 
-      Ohai::Log.should_not_receive(:error).with(/DependencyCycleError/)
+      expect(Ohai::Log).not_to receive(:error).with(/DependencyCycleError/)
       @runner.run_plugin(@pluginA)
 
       @plugins.each do |plugin|
-        plugin.has_run?.should be true
+        expect(plugin.has_run?).to be true
       end
     end
   end
@@ -382,7 +382,7 @@ describe Ohai::Runner, "fetch_plugins" do
     @ohai.provides_map.set_providers_for(plugin, ["top/middle/bottom"])
 
     dependency_providers = @runner.fetch_plugins(["top/middle/bottom"])
-    dependency_providers.should eql([plugin])
+    expect(dependency_providers).to eql([plugin])
   end
 
   describe "when the attribute is not provided by any plugin" do
@@ -390,7 +390,7 @@ describe Ohai::Runner, "fetch_plugins" do
       it "should return the providers for the parent" do
         plugin = Ohai::DSL::Plugin.new(@ohai.data)
         @provides_map.set_providers_for(plugin, ["test/attribute"])
-        @runner.fetch_plugins(["test/attribute/too_far"]).should eql([plugin])
+        expect(@runner.fetch_plugins(["test/attribute/too_far"])).to eql([plugin])
       end
     end
 
@@ -405,7 +405,7 @@ describe Ohai::Runner, "fetch_plugins" do
   it "should return unique providers" do
     plugin = Ohai::DSL::Plugin.new(@ohai.data)
     @provides_map.set_providers_for(plugin, ["test", "test/too_far/way_too_far"])
-    @runner.fetch_plugins(["test", "test/too_far/way_too_far"]).should eql([plugin])
+    expect(@runner.fetch_plugins(["test", "test/too_far/way_too_far"])).to eql([plugin])
   end
 end
 
@@ -448,7 +448,7 @@ describe Ohai::Runner, "#get_cycle" do
     cycle_start = @plugin1
 
     cycle_names = @runner.get_cycle(cycle, cycle_start)
-    cycle_names.should eql([@plugin1.name, @plugin2.name])
+    expect(cycle_names).to eql([@plugin1.name, @plugin2.name])
   end
 
   it "should return the sources for only the plugins in the cycle, when there are plugins before the cycle begins" do
@@ -456,6 +456,6 @@ describe Ohai::Runner, "#get_cycle" do
     cycle_start = @plugin1
 
     cycle_names = @runner.get_cycle(cycle, cycle_start)
-    cycle_names.should eql([@plugin1.name, @plugin2.name])
+    expect(cycle_names).to eql([@plugin1.name, @plugin2.name])
   end
 end