vi_cli 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,14 @@
+=== 0.1.2 / 2009-06-15
+
+* 1 bug fix
+  * Pause getchar thread when showing dialogs
+* 1 major enhancement
+  * Cache arguments used in tasks
+* 3 minor enhancements
+  * Cache virtual machine summary and hardware
+  * Show progress for running tasks
+  * Add power on specific host to virtual machine tasks
+
 === 0.1.1 / 2009-06-08
 
 * 1 bug fix

data/lib/VM.rb

@@ -5,6 +5,7 @@ class VM
     @ref = ref
     @session = session
     @name = name
+    @cached_state = Hash[ :state => [], :hw => [] ]
   end
   def name
     @name.strip
@@ -95,7 +96,10 @@ class VM
       res << [first ? 'notes' : '',a]
       first = false
     end
-    Hash[ :state => res, :hw => get_hw_info.compact ]
+    @cached_state = Hash[ :state => res, :hw => get_hw_info.compact ]
+  end
+  def cached_state
+    @cached_state
   end
   def execute_task task, *args
     @ref.send task.to_sym, *args

data/lib/VMFolder.rb

@@ -26,6 +26,9 @@ class VMFolder
   def state
     Hash[ :state => [], :hw => [] ]
   end
+  def cached_state
+    state
+  end
   def execute_task task, *args
     self.send task.to_sym, *args if has_task? task
     true

data/lib/VcData.rb

@@ -20,11 +20,15 @@ class VcData
     @session = $mock || VMware::Session.new(@connection)
     @vm_folder = $mock || @session.root_folder.children[0].vm_folder
     @refs = [] 
+    @entities = {}
     @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 } }
+    return @entities[type] unless @entities[type].nil?
+    @entities[type] = @session.find_entities(type).collect do |ref|
+      { :ref => ref, :name => @session.wrap(ref)['name'].to_s }
+    end
   end
   def collect folder, save_data, indent=''
 	if folder.class.to_s == "VMware::Folder"
@@ -84,8 +88,10 @@ class VcData
       desc = t['name'] || t['descriptionId'] # TODO use task descriptions form TaskManager
       target = t['entityName']
       cancelled = t['cancelled'].to_s
-      status = t['state']
-      status = t['error']['localizedMessage'] if status == 'error'
+      status = t['state'].to_s
+      status = t['error']['localizedMessage'].to_s if status == 'error'
+      status = t['progress'].to_s+'%' if status == 'running'
+      status = 'running' if status == '%'
       user = t['reason']
       user = user['userName'] || user['name'] || user['alarmName'] || '<System>'
       start = t['startTime']

data/lib/ViCli.rb

@@ -32,7 +32,7 @@ class ViCli
   def on_focus_callback index
     add_tasks index
     #TODO needs cached data for state and hardware
-    draw_state Hash[ :state => [], :hw => [] ]
+    draw_state @model.get :cached_state, index
     @gui.refresh
     @watcher.refresh_queue.push @gui.current_list_index
   end
@@ -45,7 +45,9 @@ class ViCli
     entities = @model.find_entities arg
     return nil if entities.empty?
     return entities.first[:ref] if entities.length == 1
+    @watcher.pause :getchar
     selected = @gui.select entities.collect {|e| e[:name] }
+    @watcher.resume :getchar
     entities.each {|e| return e[:ref] if e[:name] == selected }
   end
   def on_fire_callback index, key
@@ -64,6 +66,8 @@ class ViCli
   end
   def load_folders
     @gui.set_status "Loading VM Folders ..."
+    args = @config.keys.values.collect { |i| i['args'] }
+    args.compact.flatten.uniq.each { |i| @model.find_entities i }
     @model.refresh_list
     @gui.draw_list @model.vm_list
     @watcher.refresh_queue.push @gui.current_list_index
@@ -102,7 +106,15 @@ class ViCli
   end
   def setup_queues
     #@watcher.register(:resize) { |q| loop { q.push sleep 5 } }
-    @watcher.register(:getchar) { |q| loop { q.push @gui.getchar } }
+    @watcher.register(:getchar) do |q|
+      loop do
+        begin
+          loop { q.push @gui.getchar }
+        rescue => ex
+          Thread.stop
+        end
+      end
+    end
     @watcher.register(:sleep) do |q|
       loop do
         start = Time.now

data/lib/ViCliConfig.rb

@@ -27,6 +27,7 @@ class ViCliConfig
     return @config['keys'] unless @config['keys'].nil?
     @config['keys'] = {
         '&power on' => {'action' => 'powerOnVM_Task', 'check' => {'vm_on' => false, 'is_templ' => false} },
+        'power on specific host' => {'action' => 'powerOnVM_Task', 'args' => ['HostSystem'], '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} },

data/lib/Watcher.rb

@@ -8,6 +8,7 @@ class Watcher
   def initialize
     @queue = Queue.new
     @queues = {}
+    @threads = {}
     @refresh_queue = LastQueue.new
   end
   def update
@@ -17,11 +18,17 @@ class Watcher
     @queue.pop
   end
   def [] key
-    @queues[key.to_s]
+    @queues[key]
   end
   def register name, &block
-    q = @queues[name.to_s] = ObservedQueue.new(self)
-    Thread.new q, &block
+    q = @queues[name] = ObservedQueue.new(self)
+    @threads[name] = Thread.new q, &block
+  end
+  def pause name
+    @threads[name].raise "sleep!"
+  end
+  def resume name
+    @threads[name].wakeup
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vi_cli
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - SebDE
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-08 00:00:00 +02:00
+date: 2009-06-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency