rubyipmi 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/rubyipmi/commands/basecommand.rb

@@ -1,10 +1,12 @@
 require "observer"
+require 'tempfile'
 
 module Rubyipmi
 
   class BaseCommand
     include Observable
 
+
     attr_reader :cmd
     attr_accessor :options
     attr_reader :lastcall
@@ -13,6 +15,15 @@ module Rubyipmi
       # override in subclass
     end
 
+    def setpass
+      @passfile = Tempfile.new('')
+      @passfile.open
+    end
+
+    def removepass
+      @passfile.close!
+    end
+
     def to_s
       makecommand
     end
@@ -86,6 +97,7 @@ module Rubyipmi
 
 
     def run(debug=false)
+      setpass
       @result = nil
       command = makecommand
       if debug
@@ -94,6 +106,7 @@ module Rubyipmi
 
       @lastcall = "#{command}"
       @result = `#{command} 2>&1`
+      removepass
       #puts "Last Call: #{@lastcall}"
 
       # sometimes the command tool doesnt return the correct result
@@ -108,12 +121,14 @@ module Rubyipmi
 
 
     def run_without_opts(args=[], debug=false)
+      setpass
       @result = ""
       if debug
         return "#{cmd} #{args.join(" ")}"
       else
         @lastcall = "#{cmd} #{args.join(" ")}"
         @result = `#{cmd} #{args.join(" ")} 2>&1`
+        removepass
       end
 
       process_status = validate_status($?)

data/lib/rubyipmi/freeipmi/commands/basecommand.rb

@@ -2,6 +2,15 @@ module Rubyipmi::Freeipmi
 
   class BaseCommand < Rubyipmi::BaseCommand
 
+    def setpass
+      super
+      @options["config-file"] = @passfile.path
+      @passfile.puts "password #{@options["password"]}\n"
+      @passfile.puts "username #{@options["username"]}"
+
+      @passfile.close
+    end
+
     def makecommand
       # need to format the options to freeipmi format
       args = @options.collect { |k, v|
@@ -11,6 +20,10 @@ module Rubyipmi::Freeipmi
           "--#{k}=#{v}"
         end
       }.join(" ")
+      # must remove from command line as its handled via conf file
+      args.delete("--password")
+      args.delete("--username")
+
 
       return "#{cmd} #{args}"
     end

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

@@ -0,0 +1,59 @@
+module Rubyipmi::Freeipmi
+
+  class Fru < Rubyipmi::Freeipmi::BaseCommand
+
+    def initialize(opts = ObservableHash.new)
+          super("ipmi-fru", opts)
+    end
+
+    # return the list of fru information in a hash
+    def list
+      @list ||= parse(command)
+    end
+
+    def serial
+      list["chassis_serial_number"]
+    end
+
+    def manufacturer
+      list["board_manufacturer"]
+    end
+
+    def product
+      list["board_product_name"]
+    end
+
+    private
+
+    def method_missing(method, *args, &block)
+          if not list.has_key?(method.to_s)
+            raise NoMethodError
+          else
+            list[method.to_s]
+          end
+     end
+
+    # parse the fru information
+    def parse(data)
+      datalist = {}
+      data.lines.each do |line|
+        key, value = line.split(':')
+        next if key =~ /\n/
+        value = value.strip
+        key = key.gsub(/FRU/, '').strip.gsub(/\ /, '_').downcase
+        datalist[key] = value.strip
+      end
+      return datalist
+    end
+
+    # run the command and return result
+    def command
+       value = runcmd
+       if value
+         return @result
+       end
+    end
+
+  end
+
+end

data/lib/rubyipmi/freeipmi/connection.rb

@@ -30,6 +30,10 @@ module Rubyipmi
         return "freeipmi"
       end
 
+      def fru
+        @fru ||= Rubyipmi::Freeipmi::Fru.new(@options)
+      end
+
       def bmc
         @bmc ||= Rubyipmi::Freeipmi::Bmc.new(@options)
       end

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

@@ -2,6 +2,15 @@ module Rubyipmi::Ipmitool
 
   class BaseCommand < Rubyipmi::BaseCommand
 
+    def setpass
+      super
+      @options["f"] = @passfile.path
+      @passfile.puts "#{@options["P"]}"
+      @passfile.close
+
+
+    end
+
     def makecommand
       args = ""
       # need to format the options to ipmitool format
@@ -9,6 +18,9 @@ module Rubyipmi::Ipmitool
         next if k == "cmdargs"
         args << "-#{k} #{v} "
       end
+      # must remove from command line as its handled via conf file
+      args.delete("-P")
+
       # since ipmitool requires commands to be in specific order
       args << " " + options["cmdargs"]
 

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

@@ -0,0 +1,63 @@
+module Rubyipmi::Ipmitool
+
+  class Fru < Rubyipmi::Ipmitool::BaseCommand
+
+    def initialize(opts = ObservableHash.new)
+      super("ipmitool", opts)
+    end
+
+    # return the list of fru information in a hash
+    def list
+      @list ||= parse(command)
+    end
+
+    # returns the serial of the board
+    def serial
+       list["board_serial"]
+    end
+
+    # returns the manufacturer of the server
+    def manufacturer
+       list["product_manufacturer"]
+    end
+
+    # returns the product name of the server
+    def product
+       list["product_name"]
+    end
+
+   private
+
+    def method_missing(method, *args, &block)
+          if not list.has_key?(method.to_s)
+            raise NoMethodError
+          else
+            list[method.to_s]
+          end
+     end
+
+    # parse the fru information
+    def parse(data)
+      datalist = {}
+      data.lines.each do |line|
+        key, value = line.split(':')
+        next if key =~ /\n/
+        key = key.strip.gsub(/\ /, '_').downcase
+        datalist[key] = value.strip
+      end
+      return datalist
+    end
+
+    # run the command and return result
+    def command
+       @options["cmdargs"] = "fru"
+       value = runcmd
+       @options.delete_notify("cmdargs")
+       if value
+         return @result
+       end
+    end
+
+  end
+
+end

data/lib/rubyipmi/ipmitool/connection.rb

@@ -29,6 +29,10 @@ module Rubyipmi
         #getWorkArounds
       end
 
+      def fru
+        @fru ||= Rubyipmi::Ipmitool::Fru.new(@options)
+      end
+
       def provider
         return "ipmitool"
       end

data/lib/rubyipmi.rb

@@ -1,5 +1,7 @@
 require 'rubyipmi/ipmitool/connection'
 require 'rubyipmi/freeipmi/connection'
+require 'net/smtp'
+
 
 module Rubyipmi
 
@@ -77,4 +79,13 @@ module Rubyipmi
       end
       return available
     end
-  end
+
+    def self.printdiag(user, pass, host)
+      @conn = Rubyipmi::connect(user, pass, host)
+      puts "Product: #{@conn.fru.product}"
+      puts "Manufacturer: #{@conn.fru.manufacturer}"
+      puts "BMC Info #{@conn.bmc.info.inspect}\n"
+      puts "Please email to corey@logicminds.biz when troubleshooting"
+      return true
+    end
+end

data/rubyipmi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rubyipmi"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corey Osman"]
-  s.date = "2012-08-27"
+  s.date = "2012-08-28"
   s.description = "A ruby wrapper for ipmi command line tools that supports ipmitool and freeipmi"
   s.email = "corey@logicminds.biz"
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/rubyipmi/freeipmi/commands/bmcinfo.rb",
     "lib/rubyipmi/freeipmi/commands/chassis.rb",
     "lib/rubyipmi/freeipmi/commands/chassisconfig.rb",
+    "lib/rubyipmi/freeipmi/commands/fru.rb",
     "lib/rubyipmi/freeipmi/commands/lan.rb",
     "lib/rubyipmi/freeipmi/commands/power.rb",
     "lib/rubyipmi/freeipmi/commands/sensors.rb",
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
     "lib/rubyipmi/ipmitool/commands/bmc.rb",
     "lib/rubyipmi/ipmitool/commands/chassis.rb",
     "lib/rubyipmi/ipmitool/commands/chassisconfig.rb",
+    "lib/rubyipmi/ipmitool/commands/fru.rb",
     "lib/rubyipmi/ipmitool/commands/lan.rb",
     "lib/rubyipmi/ipmitool/commands/power.rb",
     "lib/rubyipmi/ipmitool/commands/sensors.rb",
@@ -55,6 +57,7 @@ Gem::Specification.new do |s|
     "spec/chassis_config_spec.rb",
     "spec/chassis_spec.rb",
     "spec/connection_spec.rb",
+    "spec/fru_spec.rb",
     "spec/lan_spec.rb",
     "spec/power_spec.rb",
     "spec/rubyipmi_spec.rb",

data/spec/fru_spec.rb

@@ -0,0 +1,38 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Fru" do
+
+  attr_accessor :provider
+   before :each do
+     user = ENV["ipmiuser"]
+     pass = ENV["ipmipass"]
+     host = ENV["ipmihost"]
+     provider = ENV["ipmiprovider"]
+     @conn = Rubyipmi.connect(user, pass, host, provider)
+
+   end
+
+   it "test should return manufacturer" do
+     @conn.fru.manufacturer.should_not be nil
+   end
+
+   it "test should return serial" do
+     @conn.fru.serial.should_not be nil
+   end
+
+   it "test should return product name" do
+     @conn.fru.product.should_not be nil
+   end
+
+   it "test should return fru list" do
+     @conn.fru.list.length.should be > 1
+   end
+
+   it "test missing method with known good method" do
+     @conn.fru.chassis_type.should_not be nil
+   end
+
+   it "test missing method with known bad method" do
+     expect {@conn.fru.blah}.to raise_exception
+   end
+end

data/spec/rubyipmi_spec.rb

@@ -53,6 +53,10 @@ describe "rubyipmi" do
     Rubyipmi.providers_installed?.length.should be > 0
   end
 
+  it "test printdiag report" do
+    Rubyipmi.printdiag(@user, @pass, @host).should be_true
+  end
+
 
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyipmi
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Corey Osman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-27 00:00:00 Z
+date: 2012-08-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -122,6 +122,7 @@ files:
 - lib/rubyipmi/freeipmi/commands/bmcinfo.rb
 - lib/rubyipmi/freeipmi/commands/chassis.rb
 - lib/rubyipmi/freeipmi/commands/chassisconfig.rb
+- lib/rubyipmi/freeipmi/commands/fru.rb
 - lib/rubyipmi/freeipmi/commands/lan.rb
 - lib/rubyipmi/freeipmi/commands/power.rb
 - lib/rubyipmi/freeipmi/commands/sensors.rb
@@ -131,6 +132,7 @@ files:
 - lib/rubyipmi/ipmitool/commands/bmc.rb
 - lib/rubyipmi/ipmitool/commands/chassis.rb
 - lib/rubyipmi/ipmitool/commands/chassisconfig.rb
+- lib/rubyipmi/ipmitool/commands/fru.rb
 - lib/rubyipmi/ipmitool/commands/lan.rb
 - lib/rubyipmi/ipmitool/commands/power.rb
 - lib/rubyipmi/ipmitool/commands/sensors.rb
@@ -142,6 +144,7 @@ files:
 - spec/chassis_config_spec.rb
 - spec/chassis_spec.rb
 - spec/connection_spec.rb
+- spec/fru_spec.rb
 - spec/lan_spec.rb
 - spec/power_spec.rb
 - spec/rubyipmi_spec.rb