virtop 0.1.0 → 0.1.1

data/bin/virtop

@@ -11,7 +11,7 @@ include Virtop
 # Show some lines of help.
 if ['-h', '--help'].include? ARGV.first
   $stderr.puts <<EOF
-#{$0} [libvirt-uri]
+#{$0} {[libvirt-uri]}
 
 libvirt-uri   is optional. Default is qemu:///system (for the local libvirt
               daemon). See http://libvirt.org/uri.html for URI format.
@@ -27,24 +27,36 @@ end
 # Connection URL will be qemu:///system if nothing else is given as the first
 # parameter.
 if ARGV.size < 1
-  url = 'qemu:///system'
+  urls = ['qemu:///system']
 else
-  uri = URI.parse ARGV.first
+  urls = []
 
-  # Works around a deadlock if path is empty.
-  if uri.scheme == 'qemu+ssh' and uri.path == ''
-    raise Exception.new 'invalid url specified'
-  else
-    url = uri.to_s
+  ARGV.each do |url|
+    uri = URI.parse url
+
+    # Works around a deadlock if path is empty.
+    if uri.scheme == 'qemu+ssh' and uri.path == ''
+      raise Exception.new 'Invalid url specified: ' + uri.to_s
+    else
+      urls.push uri.to_s
+    end
   end
 end
 
+connections = []
+
 # Open the connection to the libvirt ressource or print out error message.
-begin
-  c = Libvirt::open url
-rescue Libvirt::ConnectionError
-  $stderr.puts 'connection failed'
-  exit 1
+urls.each do |url|
+  thread = Thread.start do
+    begin
+      connections.push Libvirt::open url
+    rescue Libvirt::ConnectionError
+      $stderr.puts 'Connection failed: ' + url.to_s
+      exit 1
+    end
+  end
+
+  thread.join
 end
 
 # Initialize ncurses context. Clear and print details for each domain in a 10s
@@ -66,22 +78,24 @@ begin
     n.keypad true
 
     # Add topmost meta information lines to ncurses screen.
-    begin
-      n.addstr(
-        c.hostname.upcase +
-        "\n" +
-        ' cores ' + c.cores +
-        ' cpus ' + c.cpus +
-        ' ghz ' + c.ghz +
-        ' arch ' + c.arch +
-        "\n" +
-        ' mem ' + c.mem +
-        ' free ' + c.memfree +
-        "\n" +
-        ' version ' + c.version +
-        "\n\n"
-      )
-    rescue Libvirt::Error
+    connections.each do |c|
+      begin
+        n.addstr(
+          c.hostname.upcase +
+          "\n" +
+          ' cores ' + c.cores +
+          ' cpus ' + c.cpus +
+          ' ghz ' + c.ghz +
+          ' arch ' + c.arch +
+          "\n" +
+          ' mem ' + c.mem +
+          ' free ' + c.memfree +
+          "\n" +
+          ' version ' + c.version +
+          "\n\n"
+        )
+      rescue Libvirt::Error
+      end
     end
 
     # Initialize table (columns).
@@ -95,15 +109,17 @@ begin
     )
 
     # Add information of each domain to table.
-    c.domains.each do |d|
-      t.add_row(
-        d.name,
-        d.state,
-        d.mem,
-        d.mem_max,
-        d.cpu_num,
-        d.cpu_time
-      )
+    connections.each do |c|
+      c.domains.each do |d|
+        t.add_row(
+          d.name,
+          d.state,
+          d.mem,
+          d.mem_max,
+          d.cpu_num,
+          d.cpu_time
+        )
+      end
     end
 
     # Sort table by chosen column.
@@ -133,4 +149,8 @@ ensure
   Ncurses.echo
   Ncurses.cbreak
   Ncurses.endwin
+
+  connections.each do |c|
+    c.close
+  end
 end

data/lib/virtop.rb

@@ -1,7 +1,7 @@
 require 'libvirt'
 
 module Virtop
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end
 
 $:.unshift File.dirname(__FILE__)

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: virtop
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors: 
 - henning mueller
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +01:00
+date: 2011-08-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 4
-        - 2
         version: 1.2.4.2
   type: :runtime
   version_requirements: *id001
@@ -41,10 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
         version: 0.3.0
   type: :runtime
   version_requirements: *id002
@@ -78,21 +65,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: The top for virtual machines (libvirt).