rubyipmi 0.8.1 → 0.9.0

data/spec/integration/power_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe "Power" do
 
@@ -13,13 +13,13 @@ describe "Power" do
   end
 
   it "test to turn power on" do
-    @conn.chassis.power.on.should be_true
+    expect(@conn.chassis.power.on).to be_truthy
     sleep(2)
-    @conn.chassis.power.status.should eq('on')
+    expect(@conn.chassis.power.status).to eq('on')
   end
 
   it "test power status" do
-    @conn.chassis.power.status.should eq('off')
+    expect(@conn.chassis.power.status).to eq('off')
 
   end
 
@@ -34,7 +34,7 @@ describe "Power" do
         max_count = max_count - 1
       end
     end
-    @conn.chassis.power.off?.should be_true
+    expect(@conn.chassis.power.off?).to be true
   end
 
 end

data/spec/integration/rubyipmi_spec.rb

@@ -1,4 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
+require 'fileutils'
+require 'logger'
 
 describe "rubyipmi" do
   before :each do
@@ -11,22 +13,22 @@ describe "rubyipmi" do
     end
   it "creates a connection object" do
     conn = Rubyipmi.connect(@user, @pass, @host, @provider)
-    conn.should_not be_nil
+    expect(conn).to be_truthy
   end
 
   it "should test if a provider is present" do
     value = Rubyipmi.is_provider_installed?("ipmitool")
     value2 = Rubyipmi.is_provider_installed?("freeipmi")
-    (value|value2).should_not be false
+    expect((value|value2)).to eq true
 
   end
 
     it "should create a connection object if freeipmi is present" do
       begin
         conn = Rubyipmi.connect(@user, @pass, @host, "freeipmi")
-        conn.kind_of?(Rubyipmi::Freeipmi::Connection).should be_true
+        expect(conn.kind_of?(Rubyipmi::Freeipmi::Connection)).to eq true
       rescue Exception => e
-        e.message.match(/freeipmi\ is\ not\ installed/).should be_true
+        expect(e.message.match(/freeipmi\ is\ not\ installed/)).to eq true
         puts "#{e.message}"
       end
     end
@@ -35,26 +37,78 @@ describe "rubyipmi" do
       begin
         conn = Rubyipmi.connect(@user, @pass, @host, "ipmitool")
       rescue Exception => e
-        e.message.match(/ipmitool\ is\ not\ installed/).should be_true
+        expect(e.message).to match(/ipmitool\ is\ not\ installed/)
         puts "#{e.message}"
         return true
       end
-      conn.kind_of?(Rubyipmi::Ipmitool::Connection).should be_true
+      expect(conn.kind_of?(Rubyipmi::Ipmitool::Connection)).to eq true
     end
 
   it "should not create a connection object if a provider is not present" do
     begin
       conn = Rubyipmi.connect(@user, @pass, @host, "bogus")
     rescue Exception => e
-        e.message.match(/Invalid/).should be_true
+        expect(e.message).to match(/Invalid/)
     end
   end
 
   it "check to find any available installed providers" do
-    Rubyipmi.providers_installed?.length.should be > 0
+    expect(Rubyipmi.providers_installed?.length).to be > 0
   end
 
+  it 'can get diag info' do
+    # must have both freeipmi and ipmitool for this to pass
+    Rubyipmi.get_diag(@user,@pass,@host)
+    expect(File.exists?('/tmp/rubyipmi_diag_data.txt')).to be true
+    FileUtils.rm('/tmp/rubyipmi_diag_data.txt')
+  end
+
+  describe :logger do
+    before :each do
+      FileUtils.rm_f('/tmp/rubyipmi.log')
+      Rubyipmi.log_level = nil
+      Rubyipmi.logger = nil
+    end
+
+    it 'should only create an info log level' do
+      Rubyipmi.log_level = Logger::INFO
+      Rubyipmi.get_diag(@user,@pass,@host)
+      expect(File.exists?('/tmp/rubyipmi.log')).to be true
+      size = File.open('/tmp/rubyipmi.log', 'r') {|f| f.read.length}
+      expect(size).to be_within(60).of(100)
+    end
+
+    it 'should create a log with debug level' do
+      Rubyipmi.log_level = Logger::DEBUG
+      Rubyipmi.get_diag(@user,@pass,@host)
+      expect(File.exists?('/tmp/rubyipmi.log')).to be true
+      size = File.open('/tmp/rubyipmi.log', 'r') {|f| f.read.length}
+      expect(size).to be > 100
+    end
+
+    it 'should use custom logger' do
+      FileUtils.rm_f('/tmp/rubyipmi_custom.log')
+      logger = Logger.new('/tmp/rubyipmi_custom.log')
+      logger.level = Logger::DEBUG
+      Rubyipmi.logger = logger
+      Rubyipmi.get_diag(@user,@pass,@host)
+      expect(File.exists?('/tmp/rubyipmi_custom.log')).to be true
+      size = File.open('/tmp/rubyipmi_custom.log', 'r') {|f| f.read.length}
+      expect(size).to be > 100
+      FileUtils.rm_f('/tmp/rubyipmi_custom.log')
+    end
 
+    it 'should not create a log file when log level is nil' do
+      Rubyipmi.get_diag(@user,@pass,@host)
+      expect(Rubyipmi.logger.instance_of?(NullLogger)).to be true
+      expect(File.exists?('/tmp/rubyipmi.log')).to be false
+    end
 
+    it 'should not create a log file when logger is set to nil and log_level is nil' do
+      Rubyipmi.get_diag(@user,@pass,@host)
+      expect(Rubyipmi.logger.instance_of?(NullLogger)).to be true
+      expect(File.exists?('/tmp/rubyipmi.log')).to be false
+    end
+  end
 end
 

data/spec/integration/sensor_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
+require 'spec_helper'
 describe "Sensors" do
 
   attr_accessor :provider
@@ -13,30 +12,30 @@ describe "Sensors" do
   end
 
   it "test get all sensors" do
-    @conn.sensors.list.count.should be > 1
+    expect(@conn.sensors.list.count).to be > 1
   end
 
   it "test should refresh data" do
     old = @conn.sensors.list
     @conn.sensors.refresh
     new = @conn.sensors.list
-    old.should_not equal(new)
+    expect(old).not_to equal(new)
   end
 
   it "test should return count greater than 1" do
-    @conn.sensors.count.should be > 1
+    expect(@conn.sensors.count).to be > 1
   end
 
   it "test should return names" do
-    @conn.sensors.names.count.should be > 1
+    expect(@conn.sensors.names.count).to be > 1
   end
 
   it "test should return list of fans" do
-    @conn.sensors.fanlist.count.should be > 1
+    expect(@conn.sensors.fanlist.count).to be > 1
   end
 
   it "test should return list of temps" do
-    @conn.sensors.templist.count.should be > 1
+    expect(@conn.sensors.templist.count).to be > 1
   end
 
 

data/spec/spec_helper.rb

@@ -2,7 +2,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'rubyipmi'
-
+require 'coveralls'
+Coveralls.wear!
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 
@@ -17,28 +18,30 @@ end
 def verify_freeipmi_command(cmdobj, exp_args_count, expcmd)
   actual = cmdobj.lastcall
   actual.scan(/(^#{Regexp.escape(expcmd)})/) do |cmd_match|
-    cmd_match.first.should eq(expcmd)
+    expect(cmd_match.first).to eq(expcmd)
   end
   args_match = actual.scan(/(\-{2}[\w-]*=?[-\w\/]*)/)
   # not sure how to exactly test for arguments since they could vary, so we will need to use count for now
   #args_match.should =~ exp_args
-  args_match.count.should eq(exp_args_count)
+  expect(args_match.count).to eq(exp_args_count)
 end
 
 
 def verify_ipmitool_command(cmdobj, exp_args_count, expcmd, required_args)
   actual = cmdobj.lastcall
   actual.scan(/(^#{Regexp.escape(expcmd)})/) do |cmd_match|
-    cmd_match.first.should eq(expcmd)
+    expect(cmd_match.first).to eq(expcmd)
   end
   args_match = actual.scan(/(-\w\s[\w\d\S]*)/)
-  actual.include?(required_args).should be_true
+  expect(actual.include?(required_args)).to eq true
   # not sure how to exactly test for arguments since they could vary, so we will need to use count for now
   #args_match.should =~ exp_args
-  args_match.count.should eq(exp_args_count)
+  expect(args_match.count).to eq(exp_args_count)
 end
 
 
 RSpec.configure do |config|
-
+  config.expect_with :rspec do |c|
+    c.syntax = [:expect]
+  end
 end

data/spec/unit/freeipmi/bmc-info_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
+require 'spec_helper'
 
 
 describe "Bmc" do
@@ -13,7 +12,7 @@ describe "Bmc" do
     user = "ipmiuser"
     pass = "impipass"
     host = "ipmihost"
-    Rubyipmi.stub(:locate_command).with('ipmipower').and_return("#{@path}/ipmipower")
+    allow(Rubyipmi).to receive(:locate_command).with('ipmipower').and_return("#{@path}/ipmipower")
 
     @conn = Rubyipmi.connect(user, pass, host, provider, {:debug => true})
     @bmcinfo = @conn.bmc.information
@@ -21,9 +20,9 @@ describe "Bmc" do
     File.open("spec/fixtures/#{provider}/bmc_info.txt",'r') do |file|
       data = file.read
     end
-    @bmcinfo.stub(:locate_command).with('bmc-info').and_return("#{@path}/bmc-info")
-    @bmcinfo.stub(:`).and_return(data)
-    $?.stub(:success?).and_return(true)
+    allow(@bmcinfo).to receive(:locate_command).with('bmc-info').and_return("#{@path}/bmc-info")
+    allow(@bmcinfo).to receive(:`).and_return(data)
+    allow($?).to receive(:success?).and_return(true)
   end
 
   it "cmd should be bmc-info with correct number of arguments" do

data/spec/unit/freeipmi/bmc_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
+require 'spec_helper'
 
 
 describe "Bmc" do
@@ -13,7 +12,7 @@ describe "Bmc" do
     user = "ipmiuser"
     pass = "impipass"
     host = "ipmihost"
-    Rubyipmi.stub(:locate_command).with('ipmipower').and_return("#{@path}/ipmipower")
+    allow(Rubyipmi).to receive(:locate_command).with('ipmipower').and_return("#{@path}/ipmipower")
 
     @conn = Rubyipmi.connect(user, pass, host, provider,{:debug => true})
     @bmc = @conn.bmc
@@ -21,24 +20,24 @@ describe "Bmc" do
     File.open("spec/fixtures/#{provider}/bmc_info.txt",'r') do |file|
       data = file.read
     end
-    @bmc.stub(:guid).and_return("guid")
-    @bmc.stub(:info).and_return("info")
+    allow(@bmc).to receive(:guid).and_return("guid")
+    allow(@bmc).to receive(:info).and_return("info")
   end
 
   it "bmc should not be nil" do
-    @bmc.should_not be nil
+    expect(@bmc).not_to be nil
   end
 
   it "lan should not be nil" do
-    @bmc.lan.should_not be_nil
+    expect(@bmc.lan).not_to be_nil
   end
 
   it "guid should not be nil" do
-     @bmc.guid.should_not be_nil
+     expect(@bmc.guid).not_to be_nil
   end
 
   it "info should not be nill" do
-    @bmc.info.should_not be_nil
+    expect(@bmc.info).not_to be_nil
   end
 
 end

data/spec/unit/freeipmi/connection_spec.rb

@@ -1,8 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
 require 'spec_helper'
 
-
 describe "Bmc" do
 
   before :all do
@@ -16,7 +13,7 @@ describe "Bmc" do
  before :each do
 
 
-    Rubyipmi.stub(:locate_command).with('ipmipower').and_return("#{@path}/ipmipower")
+    allow(Rubyipmi).to receive(:locate_command).with('ipmipower').and_return("#{@path}/ipmipower")
 
     @conn = Rubyipmi.connect(@user, @pass, @host, @provider,{:debug => true})
 
@@ -24,56 +21,52 @@ describe "Bmc" do
   end
 
   it "connection should not be nil" do
-    @conn.should_not be_nil
+    expect(@conn).not_to be_nil
   end
 
   it "fru should not be nil" do
-    @conn.fru.should_not be_nil
+    expect(@conn.fru).not_to be_nil
   end
 
   it "provider should not be nil" do
-    @conn.provider.should_not be_nil
+    expect(@conn.provider).not_to be_nil
   end
 
   it "provider should be freeipmi" do
-    @conn.provider.should == "freeipmi"
+    expect(@conn.provider).to eq("freeipmi")
   end
 
   it "bmc should not be nil" do
-    @conn.bmc.should_not be_nil
+    expect(@conn.bmc).not_to be_nil
   end
 
   it "sensors should not be nil" do
-    @conn.sensors.should_not be_nil
+    expect(@conn.sensors).not_to be_nil
 
   end
 
   it "chassis should not be nill" do
-    @conn.chassis.should_not be_nil
+    expect(@conn.chassis).not_to be_nil
 
   end
 
-  it 'object should have debug set to true' do
-    @conn.debug.should be_true
-  end
-
   it 'object should have driver set to auto if not specified' do
-    @conn.options.has_key?('driver-type').should be_false
+    expect(@conn.options.has_key?('driver-type')).to eq false
   end
 
   it 'object should have driver set to auto if not specified' do
     @conn = Rubyipmi.connect(@user, @pass, @host, @provider,{:debug => true, :driver => 'auto'})
-    @conn.options.has_key?('driver-type').should be_false
+    expect(@conn.options.has_key?('driver-type')).to eq false
   end
 
   it 'object should have priv type set to ADMINISTRATOR if not specified' do
     @conn = Rubyipmi.connect(@user, @pass, @host, @provider,{:debug => true, :driver => 'auto'})
-    @conn.options.has_key?('privilege-level').should be_false
+    expect(@conn.options.has_key?('privilege-level')).to eq false
   end
 
   it 'object should have priv type set to USER ' do
     @conn = Rubyipmi.connect(@user, @pass, @host, @provider,{:privilege => 'USER', :debug => true, :driver => 'auto'})
-    @conn.options.fetch('privilege-level').should eq('USER')
+    expect(@conn.options.fetch('privilege-level')).to eq('USER')
   end
 
   it 'should raise exception if invalid privilege type' do
@@ -86,17 +79,42 @@ describe "Bmc" do
 
   it 'object should have driver set to lan_2_0' do
     @conn = Rubyipmi.connect(@user, @pass, @host, @provider,{:debug => true, :driver => 'lan20'})
-    @conn.options['driver-type'].should eq('LAN_2_0')
+    expect(@conn.options['driver-type']).to eq('LAN_2_0')
   end
 
   it 'object should have driver set to lan' do
     @conn = Rubyipmi.connect(@user, @pass, @host, @provider,{:debug => true, :driver => 'lan15'})
-    @conn.options['driver-type'].should eq('LAN')
+    expect(@conn.options['driver-type']).to eq('LAN')
   end
 
   it 'object should have driver set to openipmi' do
     @conn = Rubyipmi.connect(@user, @pass, @host, @provider,{:debug => true, :driver => 'open'})
-    @conn.options['driver-type'].should eq('OPENIPMI')
+    expect(@conn.options['driver-type']).to eq('OPENIPMI')
+  end
+
+  describe 'test' do
+    it 'should retrun boolean on test connection when result is not a hash' do
+      conn = Rubyipmi.connect(@user, @pass, @host, @provider,{:debug => true, :driver => 'auto'})
+      bmc = double()
+      allow(bmc).to receive(:info).and_return('')
+      allow(conn).to receive(:bmc).and_return(bmc)
+      expect(conn.connection_works?).to eq false
+    end
+
+    it 'should retrun boolean on test connection when result is a hash' do
+      conn = Rubyipmi.connect(@user, @pass, @host, @provider,{:debug => true, :driver => 'auto'})
+      bmc = double()
+      allow(bmc).to receive(:info).and_return({:test => true})
+      allow(conn).to receive(:bmc).and_return(bmc)
+      expect(conn.connection_works?).to eq true
+    end
+
+    it 'should retrun boolean on test connection when nil' do
+      conn = Rubyipmi.connect(@user, @pass, @host, @provider,{:debug => true, :driver => 'auto'})
+      bmc = double()
+      allow(bmc).to receive(:info).and_return(nil)
+      allow(conn).to receive(:bmc).and_return(bmc)
+      expect(conn.connection_works?).to eq false
+    end
   end
-
 end

data/spec/unit/freeipmi/errorcodes_spec.rb

@@ -1,22 +1,19 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 #require 'rubyipmi/Freeipmi/errorcodes'
 
 describe "Errorcodes" do
-
-
-
   it 'should return the length of fix hash' do
-    Rubyipmi::Freeipmi::ErrorCodes.length.should be >= 1
+    expect(Rubyipmi::Freeipmi::ErrorCodes.length).to be >= 1
   end
 
   it 'should return a hash of codes' do
-    Rubyipmi::Freeipmi::ErrorCodes.code.should be_an_instance_of Hash
+    expect(Rubyipmi::Freeipmi::ErrorCodes.code).to be_an_instance_of Hash
 
   end
 
   it 'should return a fix if code is found' do
     code = 'authentication type unavailable for attempted privilege level'
-    Rubyipmi::Freeipmi::ErrorCodes.search(code).should eq({"driver-type" => "LAN_2_0"})
+    expect(Rubyipmi::Freeipmi::ErrorCodes.search(code)).to eq({"driver-type" => "LAN_2_0"})
   end
 
   it 'should throw and error if no fix is found' do
@@ -28,7 +25,4 @@ describe "Errorcodes" do
     code = nil
     expect {Rubyipmi::Freeipmi::ErrorCodes.search(code)}.to raise_error
   end
-
-
-
 end