moob 0.3.0 → 0.3.1

data/COPYING

@@ -1,4 +1,4 @@
 Copyright (c) 2011, Pierre Carrier <pierre@gcarrier.fr>
 
-Permission is granted to copy, modify and/or distribute this work and/or
-license, without conditions.
+Permission is granted to use, copy, modify and/or distribute this work
+and/or license, without conditions.

data/bin/moob

@@ -94,6 +94,7 @@ begin
         end
 
         lom.logout
+        Moob.inform "Logged out of #{h}."
     end
     puts 'There might be a delay before Java Web Start shows up...' if options[:action] == :jnlp
 

data/lib/moob.rb

@@ -1,5 +1,5 @@
 module Moob
-    VERSION = [0,3,0]
+    VERSION = [0,3,1]
 
     class ResponseError < Exception
         def initialize response
@@ -14,11 +14,13 @@ module Moob
     autoload :Idrac6,     'moob/idrac6.rb'
     autoload :Megatrends, 'moob/megatrends.rb'
     autoload :SunILom,    'moob/sunilom.rb'
+    autoload :IbmEServer, 'moob/ibmeserver.rb'
 
     TYPES = {
         :idrac6     => Idrac6,
         :megatrends => Megatrends,
-        :sun        => SunILom
+        :sun        => SunILom,
+        :ibm        => IbmEServer
     }
 
     def self.lom type, hostname, options = {}

data/lib/moob/baselom.rb

@@ -19,6 +19,7 @@ class Moob::BaseLom
         @session.connect_timeout = 10_000
         @session.timeout = 10_000
         @session.insecure = true
+        @session.default_response_charset = 'ISO-8859-1'
     end
 
     def logout

data/lib/moob/ibmeserver.rb

@@ -0,0 +1,75 @@
+module Moob
+class IbmEServer < BaseLom
+    @name = 'IBM eServer Remote Supervisor Adapter'
+
+    def initialize hostname, options = {}
+        super hostname, options
+        @username ||= 'USERID'
+        @password ||= 'PASSW0RD'
+    end
+
+    def authenticate
+        @session.handle_cookies nil
+
+        home = @session.get ''
+        raise ResponseError.new home unless home.status == 200
+
+        auth = @session.post 'private/check_userlogin', {
+            'userid' => @username,
+            'passwd' => @password
+        }
+        raise ResponseError.new auth unless auth.status == 200
+
+        init = @session.post 'private/start_menus', {
+          'JUNK' => '1',
+          'TIMEOUT' => '05'
+        }
+        raise ResponseError.new init unless init.status == 200
+
+        return self
+    end
+
+    action :infos, 'Vital Product Data'
+    def infos
+      return JSON.pretty_generate get_infos
+    end
+
+    def detect
+        begin
+            home = @session.get 'private/userlogin.ssi'
+            home.body =~ /Remote Supervisor Adapter/
+        rescue
+            false
+        end
+    end
+
+    def logout
+      page = @session.get 'private/logoff'
+      raise ResponseError.new page unless page.status == 200
+    end
+
+    def get_infos
+      page = @session.get 'private/vpd.ssi'
+      raise ResponseError.new page unless page.status == 200
+
+      infos = {}
+
+      infos[:macs] = Hash[
+        page.body.scan /<TR><TD[^>]*>MAC ([^:]*):<\/TD><TD[^>]*>([^<]*)<\/TD><\/TR>/
+      ]
+
+      infos[:type]   = grab page.body, 'Machine type'
+      infos[:model]  = grab page.body, 'Machine model'
+      infos[:serial] = grab page.body, 'Serial number'
+      infos[:uuid]   = grab page.body, 'UUID'
+    end
+
+    private
+    def grab contents, name
+      if contents =~ /<TR><TD[^>]*>#{name}:<\/TD><TD[^>]*>([^<]*)<\/TD><\/TR>/
+        return $1
+      end
+    end
+
+end
+end

data/lib/moob/idrac6.rb

@@ -167,21 +167,6 @@ class Idrac6 < BaseLom
         class_eval %{def #{name}; boot_on #{code}; end}
     end
 
-    def get_infos keys
-        infos = @session.post "data?get=#{keys.join(',')}", {}
-
-        raise ResponseError.new infos unless infos.status == 200
-        raise Exception.new "The status isn't OK" unless infos.body =~ /<status>ok<\/status>/
-
-        return Hash[keys.collect do |k|
-            if infos.body =~ /<#{k}>(.*?)<\/#{k}>/
-                [k, $1]
-            else
-                [k, nil]
-            end
-        end]
-    end
-
     action :pstatus, 'Power status'
     def pstatus
         case get_infos(['pwState'])['pwState']
@@ -198,5 +183,20 @@ class Idrac6 < BaseLom
     def infos
         return JSON.pretty_generate get_infos INFO_FIELDS
     end
+
+    def get_infos keys
+        infos = @session.post "data?get=#{keys.join(',')}", {}
+
+        raise ResponseError.new infos unless infos.status == 200
+        raise Exception.new "The status isn't OK" unless infos.body =~ /<status>ok<\/status>/
+
+        return Hash[keys.collect do |k|
+            if infos.body =~ /<#{k}>(.*?)<\/#{k}>/
+                [k, $1]
+            else
+                [k, nil]
+            end
+        end]
+    end
 end
 end

data/lib/moob/megatrends.rb

@@ -30,7 +30,7 @@ class Megatrends < BaseLom
     def detect
         begin
             home = @session.get 'page/login.html'
-            home.body =~ /\.\.\/res\/banner_right.png/
+            home.body =~ /\.\.\/res\/banner_right\.png/
         rescue
             false
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Pierre Carrier
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-30 00:00:00 +02:00
+date: 2012-02-23 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,7 @@ extra_rdoc_files: []
 files: 
 - bin/moob
 - lib/moob/baselom.rb
+- lib/moob/ibmeserver.rb
 - lib/moob/idrac6.rb
 - lib/moob/megatrends.rb
 - lib/moob/sunilom.rb