moob 0.2.0 → 0.3.0

data/bin/moob

@@ -4,7 +4,7 @@ require 'optparse'
 require 'moob'
 
 options = {
-    :action => :jnlp,
+    :actions => [:jnlp],
     :type => :auto,
     :machines => [],
     :password => ENV['password']
@@ -24,10 +24,10 @@ OptionParser.new do |opts|
         end
     end
 
-    opts.on '-a', '--action t',
-    'Action to perform, \'list\' to list',
+    opts.on '-a', '--actions a,b,c', Array,
+    'Actions to perform, \'list\' to list',
     'Defaults to jnlp' do |a|
-        if a == 'list'
+        if a == ['list']
             Moob::TYPES.each do |sym, klass|
                 if klass.actions
                     puts "#{sym}:"
@@ -40,7 +40,7 @@ OptionParser.new do |opts|
             end
             exit 0
         else
-            options[:action] = a.to_sym
+            options[:actions] = a
         end
     end
 
@@ -76,22 +76,29 @@ begin
     options[:machines].each do |h|
         lom = Moob.lom options[:type], h, options
 
-        puts "Trying to authenticate to #{h}..." if $VERBOSE
+        Moob.inform "Trying to authenticate to #{h}..."
         lom.authenticate
-        puts "Authenticated on #{h}." if $VERBOSE
+        Moob.inform "Authenticated on #{h}."
 
-        case options[:action]
-        when :jnlp
-            Moob.start_jnlp lom
-        else
-            res = lom.send options[:action]
-            puts res if res
+        options[:actions].each do |action|
+            action = action.to_sym
+            Moob.inform "Trying to perform #{action} on #{h}..."
+            case action
+            when :jnlp
+                Moob.start_jnlp lom
+            else
+                res = lom.send action
+                puts res if res
+            end
+            Moob.inform "Performed #{action} on #{h}."
         end
+
+        lom.logout
     end
     puts 'There might be a delay before Java Web Start shows up...' if options[:action] == :jnlp
 
 rescue Exception => e
-    $stderr.puts "\033[31mFailure (#{e.class}): #{e}\033[0m\n\n" \
+    $stderr.puts "\033[31mFailure: #{e.class} (#{e})\033[0m\n\n" \
         "Backtrace to provide in any support request:\033[2;34m"
     $stderr.puts e.backtrace
     $stderr.puts "\033[0m"

data/lib/moob.rb

@@ -1,5 +1,5 @@
 module Moob
-    VERSION = [0,2,0]
+    VERSION = [0,3,0]
 
     class ResponseError < Exception
         def initialize response
@@ -25,10 +25,10 @@ module Moob
         case type
         when :auto
             TYPES.find do |sym, klass|
-                puts "Trying type #{sym}..." if $VERBOSE
+                Moob.inform "Trying type #{sym}..."
                 lom = klass.new hostname, options
                 if lom.detect
-                    puts "Type #{sym} detected." if $VERBOSE
+                    Moob.inform "Type #{sym} detected."
                     return lom
                 end
                 false
@@ -46,11 +46,15 @@ module Moob
             raise RuntimeError.new "Invalid JNLP file (\"#{jnlp}\")"
         end
 
-        filepath = "/tmp/#{lom.hostname}.jnlp"
+        filepath = "/tmp/#{lom.hostname}_#{Time.now.to_i}.jnlp"
         File.open filepath, 'w' do |f|
             f.write jnlp
         end
 
-        raise Exception.new "javaws failed" unless system "javaws #{filepath} &"
+        raise Exception.new "javaws failed" unless system "javaws -wait #{filepath}"
+    end
+
+    def self.inform msg
+        $stderr.puts "\033[36m#{msg}\033[0m" if $VERBOSE
     end
 end

data/lib/moob/baselom.rb

@@ -1,6 +1,7 @@
 require 'socket'
 require 'cgi'
 require 'patron'
+require 'json'
 require 'set'
 
 class Moob::BaseLom
@@ -20,6 +21,9 @@ class Moob::BaseLom
         @session.insecure = true
     end
 
+    def logout
+    end
+
     attr_reader :hostname, :username
 
     def detect
@@ -35,7 +39,7 @@ class Moob::BaseLom
     end
 
     def self.action sym, descr
-        @actions ||= {}
-        @actions[sym] = descr
+        @actions ||= []
+        @actions << [sym, descr]
     end
 end

data/lib/moob/idrac6.rb

@@ -52,6 +52,8 @@ class Idrac6 < BaseLom
         v6DHCPServers
         v6DNS1
         v6DNS2
+        vmBootOnce
+        firstBootDevice
         NicEtherMac1
         NicEtherMac2
         NicEtherMac3
@@ -87,6 +89,12 @@ class Idrac6 < BaseLom
         return self
     end
 
+    def logout
+        out = @session.get 'data/logout'
+        raise ResponseError.new out unless out.status == 200
+        return self
+    end
+
     def detect
         begin
             home = @session.get 'login.html'
@@ -118,26 +126,46 @@ class Idrac6 < BaseLom
         return viewer.body
     end
 
-    def power_action action
+    def power_control action
         req = @session.post "data?set=pwState:#{action}", {}
         raise ResponseError.new req unless req.status == 200
-        raise Exception.new 'The answer looks wrong' unless req.body =~ /<status>ok<\/status>/
         return nil
     end
 
-    action :poff,    'Power Off System'
-    action :pon,     'Power On System'
-    action :pcycle,  'Power Cycle System (cold boot)'
-    action :reboot,  'Reset System (warm boot)'
-    action :nmi,     'NMI (Non-Masking Interrupt)'
-    action :shudown, 'Graceful Shutdown'
+    def boot_on level
+        req = @session.post "data?set=vmBootOnce:1,firstBootDevice:#{level}", {}
+        raise ResponseError.new req unless req.status == 200
+        return nil
+    end
+
+    [
+        [0, :poff,     'Power Off System'],
+        [1, :pon,      'Power On System'],
+        [2, :pcycle,   'Power Cycle System (cold boot)'],
+        [3, :preset,   'Reset System (warm boot)'],
+        [4, :nmi,      'NMI (Non-Masking Interrupt)'],
+        [5, :shutdown, 'Graceful Shutdown']
+    ].each do |code, name, desc|
+        action name, desc
+        class_eval %{def #{name}; power_control #{code}; end}
+    end
 
-    def poff;     power_action 0; end
-    def pon;      power_action 1; end
-    def pcycle;   power_action 2; end
-    def reboot;   power_action 3; end
-    def nmi;      power_action 4; end
-    def shutdown; power_action 5; end
+    [
+        [0,  :bnone,    'Do not change the next boot'],
+        [1,  :bpxe,     'Boot on PXE once'],
+        [6,  :bbios,    'Boot on BIOS setup once'],
+        [15, :blfloppy, 'Boot on Local Floppy/Primary Removable Media once'],
+        [5,  :blcd,     'Boot on Local CD/DVD once'],
+        [2,  :blhd,     'Boot on Hard Drive once'],
+        [9,  :biscsi,   'Boot on NIC BEV iSCSI once'],
+        [7,  :bvfloppy, 'Boot on Virtual Floppy once'],
+        [8,  :bvcd,     'Boot on Virtual CD/DVD/ISO once'],
+        [16, :blsd,     'Boot on Local SD Card once'],
+        [11, :bvflash,  'Boot on vFlash once']
+    ].each do |code, name, desc|
+        action name, desc
+        class_eval %{def #{name}; boot_on #{code}; end}
+    end
 
     def get_infos keys
         infos = @session.post "data?get=#{keys.join(',')}", {}
@@ -168,9 +196,7 @@ class Idrac6 < BaseLom
 
     action :infos, 'Get system information'
     def infos
-        return get_infos(INFO_FIELDS).collect do |k,v|
-            "#{k}: #{v}"
-        end.join "\n"
+        return JSON.pretty_generate get_infos INFO_FIELDS
     end
 end
 end

data/lib/moob/megatrends.rb

@@ -56,11 +56,11 @@ class Megatrends < BaseLom
         return nil
     end
 
-    action :poff,      'Power Off'
-    action :pon,       'Power On'
-    action :pcycle,    'Power Cycle'
-    action :preset,    'Power Reset'
-    action :soft_poff, 'Soft Power Off'
+    action :poff,     'Power Off'
+    action :pon,      'Power On'
+    action :pcycle,   'Power Cycle'
+    action :preset,   'Power Reset'
+    action :shutdown, 'Soft Power Off'
     def poff;      power_action 0; end
     def pon;       power_action 1; end
     def pcycle;    power_action 2; end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: moob
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Pierre Carrier
@@ -22,11 +21,9 @@ dependencies:
   name: patron
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 4
@@ -34,6 +31,20 @@ dependencies:
         version: 0.4.14
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 3
+        version: 1.5.3
+  type: :runtime
+  version_requirements: *id002
 description: Control systems using Web-based out-of-band managers without a browser
 email: 
 - pierre@gcarrier.fr
@@ -61,20 +72,16 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 31
       segments: 
       - 1
       - 2
@@ -83,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: moob
-rubygems_version: 1.6.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Manage Out-Of-Band!