vi_cli 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,16 @@
+=== 0.1.1 / 2009-06-08
+
+* 1 bug fix
+  * Fix changed login data was not applied
+* 3 major anhancements:
+  * Add checks if task is available for current item state
+  * Add option for tasks with parameters
+  * Massive gui update behavior cleanup
+* 3 minor enhancements:
+  * Display CDROM drive in VM hardware
+  * Prettify date in VM status display
+  * Saved state of vm-tree based on names of folders now
+
 === 0.1.0 / 2009-04-26
 
 * First Public Release

data/lib/VM.rb

@@ -5,22 +5,16 @@ class VM
     @ref = ref
     @session = session
     @name = name
-    @state_vars = ['vm_on','vm_off','is_templ']
-    @state_vars.map! {|i| "@"+i+"=nil" }
-    @color = 'grey'
   end
   def name
     @name.strip
   end
-  def refresh_state
-    @color = 'grey'
-    @state_vars.each {|i| self.instance_eval i } # XXX
-  end
   def draw
     yield [@name, self]
   end
   def color cached=nil
-    return @color if cached
+    @color = @vm_on = @vm_off = @is_templ = nil unless cached.nil?
+    return @color unless @color.nil?
     @color = is_templ ? 'blue' : vm_on ? 'green' : vm_off ? 'red' : 'yellow'
   end
   def vm_on
@@ -54,6 +48,10 @@ class VM
         i = d['deviceInfo']
         result = [i['label'].to_s,i['summary'].to_s]
       end
+      if ['VirtualE1000','VirtualPCNet32','VirtualVmxnet','VirtualEthernetCard'].include? d.soap_type
+        i = d['deviceInfo']
+        result = [i['label'].to_s,i['summary'].to_s]
+      end
       result unless result.nil?
     end
   end
@@ -68,7 +66,7 @@ class VM
     qs = summary['quickStats']
     guest = @ref['guest']
     res = []
-    res << ['power state',runtime['powerState'].to_s+' since '+runtime['bootTime'].to_s]
+    res << ['power state',runtime['powerState'].to_s+' since '+runtime['bootTime'].to_s.sub(/T/,' ').sub(/\+.*/,'')]
     res << ['host',get_host]
     res << ['cpu usage',"#{qs['overallCpuUsage'].to_s} MHz / #{num} * #{@host_cpu.to_s} MHz"]
     res << ['guest memory usage',"#{qs['guestMemoryUsage'].to_s} MB / #{mem} MB"]
@@ -97,10 +95,10 @@ class VM
       res << [first ? 'notes' : '',a]
       first = false
     end
-    [res, get_hw_info.compact]
+    Hash[ :state => res, :hw => get_hw_info.compact ]
   end
-  def execute_task task
-    @ref.send task.to_sym
+  def execute_task task, *args
+    @ref.send task.to_sym, *args
     false
   end
 end

data/lib/VMFolder.rb

@@ -13,8 +13,8 @@ class VMFolder
     @name.strip
   end
   def save_data
-    result = [@collapsed]
-    @children.each { |c| result << c.save_data if c.respond_to? :save_data }
+    result = { :collapsed => @collapsed }
+    @children.each { |c| result[c.name] = c.save_data if c.respond_to? :save_data }
     result
   end
   def add_child child
@@ -24,10 +24,10 @@ class VMFolder
     ['fold', 'unfold','toggle_fold','fold_children'].include? task.to_s
   end
   def state
-    res = [[],[]]
+    Hash[ :state => [], :hw => [] ]
   end
-  def execute_task task
-    self.send task.to_sym if has_task? task
+  def execute_task task, *args
+    self.send task.to_sym, *args if has_task? task
     true
   end
   def fold

data/lib/VcData.rb

@@ -23,12 +23,15 @@ class VcData
     @save_data = save_data
     @tree_changed = false
   end
+  def find_entities type
+    @session.find_entities(type).collect {|ref| { :ref => ref, :name => @session.wrap(ref)['name'].to_s } }
+  end
   def collect folder, save_data, indent=''
 	if folder.class.to_s == "VMware::Folder"
-      save_data = [] if !save_data.kind_of? Array
+      save_data = { :collapsed => false } if !save_data.kind_of? Hash
       i = 0
-      result = VMFolder.new folder, @session, indent+folder['name'], save_data[0] == true
-      folder.children.each { |c| i+=1; result.add_child collect c, save_data[i], indent+'  ' }
+      result = VMFolder.new folder, @session, indent+folder['name'], save_data[:collapsed] == true
+      folder.children.each { |c| i+=1; result.add_child collect c, save_data[c['name']], indent+'  ' }
       return result
 	end
     if folder.kind_of? $mock.class and indent == ''
@@ -43,11 +46,22 @@ class VcData
     i = @refs[index]
     i.send sym if i.respond_to? sym
   end
-  def execute_task index, task
-    @tree_changed = @refs[index].execute_task task
+  def execute_task index, task, *args
+    @tree_changed = @refs[index].execute_task task, *args
   end
   def get_tasks index, tasks
-    tasks.keys.collect { |t| (@refs[index].has_task? tasks[t]) ? t : nil }.compact
+    tasks.keys.collect { |t| (check_task index, tasks[t]) ? t : nil }.compact
+  end
+  def check_task index, task
+    item = @refs[index]
+    t = task['action'] || task
+    return false unless item.has_task? t
+    return true if task.kind_of? String or task['check'].nil?
+    task['check'].each_pair do |k,v|
+      next unless item.respond_to? k.to_sym
+      return false if item.send(k.to_sym) != v
+    end
+    true
   end
   def get_colors cached=nil
     @refs.collect {|i| i.color cached }
@@ -56,9 +70,6 @@ class VcData
     @save_data = @folders.save_data if !@folders.nil?
     @folders = collect @vm_folder, @save_data
   end
-  def refresh_state dummy=nil
-    @refs.each {|i| i.refresh_state if i.respond_to? :refresh_state }
-  end
   def vm_list
     @refs.clear
     list = []

data/lib/ViCli.rb

@@ -14,12 +14,8 @@ class ViCli
       @watcher = Watcher.new
       @model = VcData.new @config.login, @config.tree_state
       @gui.setup self.method(:on_focus_callback)
-      @gui.set_status "Loading VM Folders ..."
-      @model.refresh_list
-      @gui.set_status "Loaded VM Folders"
-      draw_list
-      on_focus_callback @gui.current_list_index
       setup_queues
+      load_folders
       main_loop
       @config.tree_state = @model.save_data
     rescue => ex
@@ -29,66 +25,107 @@ class ViCli
       print ex.backtrace.join "\n" if ex
     end
   end
-  def draw_list index=nil
-    @gui.draw_list @model.vm_list
-    @gui.colors = @model.get_colors true
-    @watcher.refresh_queue.push index unless index.nil?
+  def draw_list state
+    @gui.colors = @model.get_colors # state[:colors]
+    @gui.draw_list state[:vm_list] unless state[:vm_list].nil?
   end
   def on_focus_callback index
+    add_tasks index
+    #TODO needs cached data for state and hardware
+    draw_state Hash[ :state => [], :hw => [] ]
+    @gui.refresh
+    @watcher.refresh_queue.push @gui.current_list_index
+  end
+  def add_tasks index
     tasks = @model.get_tasks index, @config.keys
     callback = self.method :on_fire_callback
     @gui.add_tasks callback, index, tasks
-    @watcher.refresh_queue.push index
-    @gui.refresh
+  end
+  def prepare_arg arg
+    entities = @model.find_entities arg
+    return nil if entities.empty?
+    return entities.first[:ref] if entities.length == 1
+    selected = @gui.select entities.collect {|e| e[:name] }
+    entities.each {|e| return e[:ref] if e[:name] == selected }
   end
   def on_fire_callback index, key
-    redraw = @model.execute_task index, @config.keys[key]
-    @gui.set_status "execute #{@config.keys[key]} on #{@model.get :name, index}"
-    @gui.current_list_index
-    draw_list index if redraw
+    action = @config.keys[key]
+    args = (action['args'] || []).collect {|arg| prepare_arg arg }
+    action = action['action'] || action
+    redraw = @model.execute_task index, action, *args
+    @gui.set_status "execute #{action} on #{@model.get :name, index}"
+    if redraw
+      draw_list Hash[ :vm_list => @model.vm_list ]#, :colors => @model.get_colors ]
+      add_tasks index
+      @gui.refresh
+    else
+      @watcher.refresh_queue.push @gui.current_list_index
+    end
+  end
+  def load_folders
+    @gui.set_status "Loading VM Folders ..."
+    @model.refresh_list
+    @gui.draw_list @model.vm_list
+    @watcher.refresh_queue.push @gui.current_list_index
+    @gui.set_status "Loaded VM Folders"
   end
   def handle_char char
     return false if char.nil?
     return true if char == ?q
     @activity = true
-    @gui.enter_login if char == ?l
-    @model.refresh_list @gui.current_list_index if char == 269
-    @gui.draw_list @model.vm_list if [269,360].include? char
+    @config.login = @gui.enter_login if char == ?l
+    load_folders if char == 269
     @gui.handle_key char
     @gui.refresh
     false
   end
-  def draw_state state
+  def draw_all state
     return if state.nil?
-    @gui.colors = state[2]
-    @gui.add_hardware state[1]
-    @gui.add_state state[0]
+    return if state[:index] != @gui.current_list_index
+    draw_list state
+    draw_state state
+    add_tasks state[:index]
     @gui.refresh
   end
-  def refresh x
+  def refresh_all x
     return if x.nil?
     @gui.draw_events @model.recent_events
     @gui.refresh
-    @model.refresh_state
     @watcher.refresh_queue.push @gui.current_list_index
     return @activity = false if @activity
     @gui.set_status ''
+    @gui.refresh
+  end
+  def draw_state state
+    @gui.add_state state[:state]
+    @gui.add_hardware state[:hw]
   end
   def setup_queues
     #@watcher.register(:resize) { |q| loop { q.push sleep 5 } }
     @watcher.register(:getchar) { |q| loop { q.push @gui.getchar } }
-    @watcher.register(:sleep) { |q| loop { q.push sleep 5 } }
+    @watcher.register(:sleep) do |q|
+      loop do
+        start = Time.now
+        @model.get_colors true
+        time = 5 - (Time.now - start)
+        q.push sleep(time > 0 ? time : 1)
+      end
+    end
     @watcher.register(:state) do |q|
       loop do
-        q.push @model.get(:state, @watcher.refresh_queue.poop) << @model.get_colors
+        state = Hash[ :index => @watcher.refresh_queue.poop ]
+        # watch out for concurrency
+        # state[:vm_list] = @model.vm_list
+        state = state.update @model.get(:state, state[:index])
+        q.push state
       end
     end
   end
   def main_loop
     while @watcher.wait
       return if handle_char @watcher[:getchar].poop
-      draw_state @watcher[:state].poop
-      refresh @watcher[:sleep].poop
+      draw_all @watcher[:state].poop
+      refresh_all @watcher[:sleep].poop
     end
   end
 end

data/lib/ViCliConfig.rb

@@ -26,18 +26,18 @@ class ViCliConfig
   def keys
     return @config['keys'] unless @config['keys'].nil?
     @config['keys'] = {
-        '&power on' => 'powerOnVM_Task',
-        '&unfold' => 'unfold',
-        '&reboot guest' => 'rebootGuest',
-        'convert to &virtual machine' => 'markAsVirtualMachine', # doesn't work
-        'cut power' => 'powerOffVM',
-        '&migrate' => 'migrateVM_Task', # doesn't work
-        'f&old' => 'fold',
+        '&power on' => {'action' => 'powerOnVM_Task', 'check' => {'vm_on' => false, 'is_templ' => false} },
+        '&unfold' => {'action' => 'unfold', 'check' => {'collapsed' => true} },
+        'f&old' => {'action' => 'fold', 'check' => {'collapsed' => false} },
+        '&reboot guest' => {'action' => 'rebootGuest', 'check' => {'vm_on' => true} },
+        'convert to &virtual machine' => { 'action' => 'markAsVirtualMachine', 'args' => ['ResourcePool'], 'check' => {'is_templ' => true } },
+        'cut power' => {'action' => 'powerOffVM', 'check' => {'vm_on' => true} },
+        '&migrate' => {'action' => 'migrateVM_Task', 'args' => ['HostSystem'], 'check' => {'vm_on' => false} },
         'fold &children' => 'fold_children',
-        'convert to &template' => 'markAsTemplate',
-        'suspend' => 'suspendVM_Task',
-        'reset' => 'resetVM_Task',
-        '&shutdown guest' => 'shutdownGuest',
+        'convert to &template' => {'action' => 'markAsTemplate', 'check' => {'vm_off' => true, 'is_templ' => false} },
+        'suspend' => {'action' => 'suspendVM_Task', 'check' => {'vm_on' => true} },
+        'reset' => {'action' => 'resetVM_Task', 'check' => {'vm_on' => true} },
+        '&shutdown guest' => {'action' => 'shutdownGuest', 'check' => {'vm_on' => true} },
     }
   end
   def save

data/lib/ViGUI.rb

@@ -19,6 +19,20 @@ class ViGUI
     @current_list_toprow = 0
     @colors = []
   end
+  def select choices
+    dialog = Form.new nil
+    list = Listbox.new dialog do
+      row 2
+      col 3
+      bgcolor 'white'
+      color 'black'
+      height 8
+      width 54
+      list_variable Variable.new choices
+    end
+    show_messagebox dialog, 'Please Select'
+    list.list[list.current_index]
+  end
   def enter_login
     dialog = Form.new nil
     inputs = ['host','username','password']
@@ -37,11 +51,7 @@ class ViGUI
         maxlen 99
       end
     end
-    h, w = get_h_w
-    MessageBox.new dialog do
-      title 'Login Configuration'
-      layout 14, 60, h/2 - 7, w/2 - 30
-    end
+    show_messagebox dialog, 'Login Configuration'
     Hash[*inputs.collect{|i| [i,dialog.by_name[i].getvalue]}.flatten]
   end
   def get_h_w
@@ -50,6 +60,13 @@ class ViGUI
     Ncurses.getmaxyx Ncurses.stdscr, h, w
     return h[0] -2, w[0]
   end
+  def show_messagebox dialog, title
+    h, w = get_h_w
+    MessageBox.new dialog do
+      title title
+      layout 14, 60, h/2 - 7, w/2 - 30
+    end
+  end
   def setup focus_callback
     @tw = tw = 40
     h, w = get_h_w

data/rakefile

@@ -7,7 +7,7 @@ version = File.open('History.txt').gets[/\d+\.\d+.\d+/]
 Hoe.new('vi_cli', version) do |p|
   p.developer('SebDE', 'v1g46nr02@sneakemail.com')
   p.extra_deps = [['rbcurse','>= 0.1.2']]
-  p.extra_deps = [['vi_api_lib','>= 0.1.1']]
+  p.extra_deps = [['vi_api_lib','>= 0.1.2']]
 end
 
 task :default => :clean

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vi_cli
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - SebDE
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 +02:00
+date: 2009-06-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe