rubyipmi 0.8.1 → 0.9.0

data/lib/rubyipmi/ipmitool/commands/chassis.rb

@@ -44,6 +44,7 @@ module Rubyipmi::Ipmitool
         end
 
       else
+        logger.debug("Device with name: #{device} is not a valid boot device for host #{options["hostname"]}") if logger
         raise "Device with name: #{device} is not a valid boot device for host #{options["hostname"]}"
       end
       return bootstatus

data/lib/rubyipmi/ipmitool/commands/fru.rb

@@ -6,7 +6,6 @@ module Rubyipmi::Ipmitool
 
     DEFAULT_FRU = 'builtin_fru_device'
 
-
     def initialize(opts = ObservableHash.new)
       super("ipmitool", opts)
       @list = {}
@@ -101,9 +100,6 @@ module Rubyipmi::Ipmitool
 
   end
 
-
-
-
   class FruData < Hash
 
     def name
@@ -138,8 +134,5 @@ module Rubyipmi::Ipmitool
     def method_missing(method, *args, &block)
       self.fetch(method.to_s, nil)
     end
-
   end
-
-
 end

data/lib/rubyipmi/ipmitool/connection.rb

@@ -12,11 +12,10 @@ module Rubyipmi
 
     class Connection
 
-      attr_accessor :options, :debug
+      attr_accessor :options
 
 
       def initialize(user, pass, host, opts)
-        @debug = opts[:debug]
         @options = Rubyipmi::ObservableHash.new
         raise("Must provide a host to connect to") unless host
         @options["H"] = host
@@ -32,6 +31,11 @@ module Rubyipmi
         @options['I'] = drivers_map[opts[:driver]] unless drivers_map[opts[:driver]].nil?
       end
 
+      # test the connection to ensure we can at least make a single call
+      def connection_works?
+         status = ! (bmc.info.nil? || bmc.info.empty? )
+      end
+
       def drivers_map
         {
           'lan15' => 'lan',
@@ -62,18 +66,13 @@ module Rubyipmi
 
       def get_diag
         data = {}
-        data['provider'] = provider
-        if @fru
-          data['frus'] = @fru.getfrus
-        end
-        if @sensors
-          data['sensors'] = @sensors.getsensors
-        end
-        if @bmc
-          data['bmc_info'] = @bmc.info
-        end
+        data[:provider] = provider
+        data[:frus]     = fru.getfrus
+        data[:sensors]  = sensors.getsensors
+        data[:bmc_info] = bmc.info
+        data[:version]  = bmc.version
+        data
       end
-
     end
   end
 end

data/lib/rubyipmi/ipmitool/errorcodes.rb

@@ -5,7 +5,8 @@ module Rubyipmi
       @@codes = {
           "Authentication type NONE not supported\nAuthentication type NONE not supported\n" +
               "Error: Unable to establish LAN session\nGet Device ID command failed\n" => {"I" => "lanplus"},
-         "Authentication type NONE not supported" => {"I" => "lanplus"}
+         "Authentication type NONE not supported" => {"I" => "lanplus"},
+          "Error: Unable to establish LAN session\nGet Device ID command failed\n" => {"I" => "lanplus"}
 
 
       }

data/rubyipmi.gemspec

@@ -2,28 +2,26 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rubyipmi 0.8.1 ruby lib
+# stub: rubyipmi 0.9.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rubyipmi"
-  s.version = "0.8.1"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Corey Osman"]
-  s.date = "2014-10-02"
+  s.date = "2015-03-09"
   s.description = "Provides a library for controlling IPMI devices using pure ruby code"
   s.email = "corey@logicminds.biz"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.md",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     "Gemfile",
     "LICENSE.txt",
     "README.md",
-    "README.rdoc",
     "RELEASE_NOTES.md",
     "Rakefile",
     "VERSION",
@@ -104,35 +102,44 @@ Gem::Specification.new do |s|
     "spec/vagrant.pub"
   ]
   s.homepage = "http://github.com/logicminds/rubyipmi"
-  s.licenses = ["GPLv3"]
-  s.rubygems_version = "2.2.1"
+  s.licenses = ["LGPLv2.1"]
+  s.rubygems_version = "2.4.5"
   s.summary = "A ruby wrapper for ipmi command line tools that supports ipmitool and freeipmi"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["<= 2.8.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.1"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.1.5"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<highline>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<coveralls>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
+      s.add_development_dependency(%q<pry-rescue>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, ["<= 2.8.0"])
+      s.add_dependency(%q<rspec>, ["~> 3.1"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.1.5"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_dependency(%q<highline>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<coveralls>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<pry-rescue>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["<= 2.8.0"])
+    s.add_dependency(%q<rspec>, ["~> 3.1"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.1.5"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     s.add_dependency(%q<highline>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<coveralls>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<pry-rescue>, [">= 0"])
   end
 end
 

data/spec/integration/bmc_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
+
 describe "Bmc" do
 
   before :each do
@@ -11,27 +12,26 @@ describe "Bmc" do
   end
 
   it "creates a bmc object" do
-    @conn.bmc.should_not be_nil
-
+    expect(@conn.bmc).not_to be_nil
   end
 
   it "options should change after calling info" do
     before = @conn.bmc.options.clone
     info = @conn.bmc.info
     after = @conn.bmc.options.clone
-    before.length.should be < after.length
+    expect(before.length).to be < after.length
   end
 
   it 'should retrun a max retry count' do
-    @conn.bmc.max_retry_count.should > 0
+    expect(@conn.bmc.max_retry_count).to be > 0
   end
 
   it "should reset the bmc device" do
-    @conn.bmc.reset('cold').should_not be_nil
+    expect(@conn.bmc.reset('cold')).not_to be_nil
   end
 
   it "should reset the bmc device warmly" do
-    @conn.bmc.reset('warm').should_not be_nil
+    expect(@conn.bmc.reset('warm')).not_to be_nil
   end
 
   it "reset should fail when type is wrong" do
@@ -39,11 +39,10 @@ describe "Bmc" do
   end
 
   it "is able to retrieve the bmc info" do
-    @conn.bmc.info.should_not be_nil
+    expect(@conn.bmc.info).not_to be_nil
   end
 
   it "is able to retrieve the guid" do
-    @conn.bmc.guid.should_not be_nil
+    expect(@conn.bmc.guid).not_to be_nil
   end
-
 end

data/spec/integration/chassis_config_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
+
 
 describe "Chassis Config" do
 
@@ -12,19 +13,19 @@ describe "Chassis Config" do
   end
 
   it "test to set booting from PXE" do
-    @conn.chassis.config.bootpxe.should == true
+    expect(@conn.chassis.config.bootpxe).to eq(true)
   end
 
   it "test to set booting from Disk" do
-      @conn.chassis.config.bootdisk.should == true
+      expect(@conn.chassis.config.bootdisk).to eq(true)
   end
 
   it "test to set booting from Cdrom" do
-      @conn.chassis.config.bootcdrom.should == true
+      expect(@conn.chassis.config.bootcdrom).to eq(true)
   end
 
   it "test to set booting from bios" do
-      @conn.chassis.config.bootbios.should == true
+      expect(@conn.chassis.config.bootbios).to eq(true)
   end
 
   it "test to set boot persistent value" do
@@ -34,7 +35,4 @@ describe "Chassis Config" do
   it "test to checkout the entire chassis config" do
 
   end
-
-
-
 end

data/spec/integration/chassis_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe "Chassis" do
 
@@ -14,13 +14,13 @@ describe "Chassis" do
   it "test to turn uid light on for 5 seconds" do
     value = @conn.chassis.identify(true, 5)
     sleep(6)
-    value.should == true
+    expect(value).to eq(true)
   end
 
   it "test to turn uid light on then off" do
     @conn.chassis.identify(true)
     sleep(2)
-    @conn.chassis.identify(false).should == true
+    expect(@conn.chassis.identify(false)).to eq(true)
   end
 
 end

data/spec/integration/connection_spec.rb

@@ -1,35 +1,36 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
+
 describe "Connection" do
 
   before :each do
     user ||= ENV["ipmiuser"] || "admin"
     pass ||= ENV["ipmipass"] || "password"
-    host ||= ENV["ipmihost"] || "10.0.1.16"
+    host ||= ENV["ipmihost"] || "192.168.1.16"
     provider ||= ENV["ipmiprovider"] || "ipmitool"
     @conn = Rubyipmi.connect(user, pass, host, provider)
-
   end
 
   it "creates a new object" do
-     @conn.should_not be_nil
-
+     expect(@conn).to be_truthy
   end
 
   it 'creates a bmc object' do
-    @conn.bmc.should_not be_nil
-    puts "Last Call: #{@conn.bmc.lastcall.inspect}"
-
+    expect(@conn.bmc).to be_truthy
   end
 
   it 'creates a chassis object' do
-    @conn.chassis.should_not be_nil
-    puts "Last Call: #{@conn.chassis.lastcall.inspect}"
+    expect(@conn.chassis).to be_truthy
+  end
 
+  it 'can test the connection' do
+    expect(@conn.connection_works?).to eq true
   end
 
+  it 'can get diag info' do
+    expect(@conn.get_diag.keys).to eq([:provider, :frus, :sensors, :bmc_info, :version])
+  end
 
-end
-#it "raises an error if host is unreachable" do
-#  conn = Freeipmi.connect("admin", "creative", "192.168.1.181")
-#
-#end
+  it 'can get version info' do
+    expect(@conn.bmc.version).to match(/[\d\.]{3,4}/)
+  end
+end

data/spec/integration/fru_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
+require 'spec_helper'
 describe "Fru" do
 
   attr_accessor :provider
@@ -13,24 +12,24 @@ describe "Fru" do
    end
 
   it "test should return manufacturer" do
-    @conn.fru.manufacturer.should_not be nil
+    expect(@conn.fru.manufacturer).not_to be nil
 
    end
 
    it "test should return serial" do
-     @conn.fru.board_serial.should_not be nil
+     expect(@conn.fru.board_serial).not_to be nil
    end
 
    it "test should return product name" do
-     @conn.fru.model.should_not be nil
+     expect(@conn.fru.model).not_to be nil
    end
 
    it "test should return fru list" do
-     @conn.fru.list.length.should be >= 1
+     expect(@conn.fru.list.length).to be >= 1
    end
 
    it "test missing method with known good method" do
-     @conn.fru.chassis_type.should_not be nil
+     expect(@conn.fru.chassis_type).not_to be nil
    end
 
    it "test missing method with known bad method" do

data/spec/integration/lan_spec.rb

@@ -1,63 +1,50 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
+require 'spec_helper'
 describe "Lan" do
-
-  before :each do
-    user ||= ENV["ipmiuser"] || "admin"
-    pass ||= ENV["ipmipass"] || "password"
-    host ||= ENV["ipmihost"] || "10.0.1.16"
-    provider ||= ENV["ipmiprovider"] || "ipmitool"
-    @conn = Rubyipmi.connect(user, pass, host, provider)
-
-
-
+  before :all do
+    @user ||= ENV["ipmiuser"] || "admin"
+    @pass ||= ENV["ipmipass"] || "password"
+    @host ||= ENV["ipmihost"] || "10.0.1.16"
+    @provider ||= ENV["ipmiprovider"] || "ipmitool"
   end
+  let(:conn) { Rubyipmi.connect(@user, @pass, @host, @provider) }
 
   it "get ip address" do
-      @conn.bmc.lan.ip.should_not be nil
+    expect(conn.bmc.lan.ip).to eq(@host)
   end
 
   it "get netmask" do
-    @conn.bmc.lan.netmask.should_not be nil
+    expect(conn.bmc.lan.netmask).to be_truthy
   end
 
   it "get gateway address" do
-    @conn.bmc.lan.gateway.should_not be nil
+    expect(conn.bmc.lan.gateway).to be_truthy
   end
 
   it "get mac address" do
-    @conn.bmc.lan.mac.should_not be nil
+    expect(conn.bmc.lan.mac).to be_truthy
   end
 
   it "get static or dhcp" do
-    @conn.bmc.lan.dhcp?.should_not be nil
+    expect(conn.bmc.lan.dhcp?).to be_truthy
   end
 
   it "static should be opposite of dhcp" do
-    @conn.bmc.lan.dhcp?.should_not == @conn.bmc.lan.static?
+    expect(conn.bmc.lan.dhcp? ).to_not eq(conn.bmc.lan.static?)
   end
 
-  it "dhcp should be opposite of static" do
-      @conn.bmc.lan.static?.should_not == @conn.bmc.lan.dhcp?
-  end
-
-
   it "should set gateway address" do
-    gw = @conn.bmc.lan.gateway
-    @conn.bmc.lan.gateway = gw
-   (@conn.bmc.lan.gateway = gw).should_not be nil
-
+    gw = conn.bmc.lan.gateway
+    conn.bmc.lan.gateway = gw
+    expect(conn.bmc.lan.gateway = gw).to be_truthy
   end
 
   it "should set netmask" do
-    netmask = @conn.bmc.lan.netmask
-    (@conn.bmc.lan.netmask = netmask).should_not be nil
+    netmask = conn.bmc.lan.netmask
+    expect(conn.bmc.lan.netmask = netmask).to be_truthy
   end
 
   it "should set ip address" do
-    ip = @conn.bmc.lan.ip
-    (@conn.bmc.lan.ip = ip).should_not be nil
+    ip = conn.bmc.lan.ip
+    expect(conn.bmc.lan.ip = ip).to be_truthy
   end
-
-
-end
+end