virtop 0.0.7 → 0.0.8

data/README.rdoc

@@ -0,0 +1,22 @@
+== Installation ==
+
+Add gems.github.com as a source for gems and install elliottcable-ncurses from
+this mirror, because there is no version on rubygems.org which works with ruby
+1.9.
+
+ * gem sources -a http://gems.github.com
+ * gem install elliottcable-ncurses
+
+Build the virtop gem and install it.
+
+ * gem build virtop.gemspec
+ * gem install virtop-*.gem
+
+This should install ruby-libvirt as a dependency. Seems to me, that ruby-libvirt
+from rubygems.org does not build with ruby 1.9. On Arch Linux you can install
+ruby-libvirt from AUR:
+
+http://aur.archlinux.org/packages.php?ID=31952
+
+On other platforms you have to hallucinate another solution. At the link above
+you find a patch to the ruby-libvirt sources, which makes it build in ruby 1.9.

data/bin/virtop

@@ -25,6 +25,22 @@ EOF
 	exit( 1 )
 end
 
+# Show some lines of help.
+if( ARGV.first == "-h" or ARGV.first == "--help" )
+	$stderr.puts <<EOF
+#{$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.
+
+Key bindings:
+	q			Quit.
+	1..6		Sort by column number.
+
+EOF
+	exit( 1 )
+end
+
 # Require and include virtop module. It will require libvirt.
 $:.unshift( File.join( File.dirname( __FILE__ ), '../lib' ) )
 require( 'virtop' )
@@ -37,6 +53,7 @@ if( ARGV.size < 1 )
 else
 	uri = URI.parse( ARGV.first )
 
+	# Works around a deadlock if path is empty.
 	if( uri.scheme == 'qemu+ssh' and uri.path == '' )
 		raise( Exception.new( 'invalid url specified' ) )
 	else
@@ -61,39 +78,68 @@ begin
 	Ncurses.noecho
 	Ncurses.halfdelay( 10 )
 
+	sortBy = 0
+
 	while( true )
 		Ncurses.clear
 
 		n.intrflush( false )
 		n.keypad( true )
 
+		info = c.node_get_info
+
+		n.addstr(
+			c.hostname.upcase +
+			"\n" +
+			' cores ' + info.cores.to_s +
+			' cpus '  + info.cpus.to_s +
+			' mhz '   + info.mhz.to_s +
+			' arch '  + info.model.to_s +
+			"\n" +
+			' mem '   + info.memory.to_s +
+			' nodes ' + info.nodes.to_s +
+			' sockets ' + info.sockets.to_s +
+			' threads ' + info.threads.to_s +
+			"\n" +
+			' version ' + c.libversion.to_s +
+			"\n\n"
+		)
+
 		t = Table.new(
-			'name',
-			'state',
-			'mem',
-			'mem_max',
-			'cpu_num',
-			'cpu_time'
+			'NAME',
+			'STATE',
+			'MEM',
+			'MEM_MAX',
+			'CPU_NUM',
+			'CPU_TIME'
 		)
 
-		c.domains.each do |domain|
+		c.domains.each do |d|
 			t.add_row(
-				domain.name,
-				domain.state,
-				domain.mem,
-				domain.mem_max,
-				domain.cpu_num,
-				domain.cpu_time
+				d.name,
+				d.state,
+				d.mem,
+				d.mem_max,
+				d.cpu_num,
+				d.cpu_time
 			)
 		end
 
+		t.sort_by( sortBy )
+
 		t.format.each do |line|
 			n.addstr( line )
 		end
 
-		n.refresh
+		char = n.getch
+		case( char )
+			when 49..54
+				sortBy = char - 49
+			when 113
+				raise( LetsExit )
+		end
 
-		raise( LetsExit ) if( n.getch == 113 )
+		n.refresh
 	end
 rescue LetsExit
 ensure

data/lib/virtop/table.rb

@@ -1,25 +1,38 @@
+# Represents a table. Important for column width correction and sorting of rows.
 class Virtop::Table
+	# Contructor gets table header strings as arguments.
 	def initialize( *args )
 		@header = args
 		@rows = []
 		@widths = [0] * args.size
 	end
 
-	def header
-		@header.to_s + "\n"
-	end
-
+	# Adds a row to the table. Number of arguments must equal the number of
+	# columns given by header strings on contruction.
 	def add_row( *args )
-		raise( Exception ) if( args.size != @header.size )
+		if( args.size != @header.size )
+			raise( Exception.new( 'Wrong column number.' ) )
+		end
+
 		@rows.push( args )
 	end
 
-	def each_row
-		@rows.each do |row|
-			yield( row.to_s )
+	# Sorts the table by a certain column given by it's header string or the
+	# index of the column starting at zero.
+	def sort_by( col )
+		if( col.class == String )
+			index = @header.index( col )
+		else
+			index = col.to_i
+		end
+
+		@rows = @rows.sort_by do |row|
+			row[index]
 		end
 	end
 
+	# Converts the whole table as array of strings, which are fancy formatted
+	# (mainly for good column widths).
 	def format
 		update_widths!
 
@@ -28,16 +41,17 @@ class Virtop::Table
 		( [ @header ] + @rows ).each do |row|
 			line = ''
 			@header.size.times do |i|
-				line += row[i].ljust( @widths[i] + 2 )
+				line += row[i].to_s.ljust( @widths[i] + 2 )
 			end
 			a.push( line + "\n" )
 		end
 
-		a.insert( 1, "\n" )
+		a
 	end
 
 private
 
+	# Saves maximum width per column into the +@header+ array.
 	def update_widths!
 		@header.size.times do |i|
 			( [ @header ] + @rows ).each do |row|

data/lib/virtop.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: virtop
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - henning mueller
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 +02:00
+date: 2010-07-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,12 +44,12 @@ extra_rdoc_files: []
 
 files: 
 - bin/virtop
-- lib/virtop.rb
-- lib/virtop/letsexit.rb
-- lib/virtop/table.rb
 - lib/libvirt/connect.rb
 - lib/libvirt/domain.rb
-- README
+- lib/virtop.rb
+- lib/virtop/table.rb
+- lib/virtop/letsexit.rb
+- README.rdoc
 has_rdoc: true
 homepage: 
 licenses: []

data/README

@@ -1,15 +0,0 @@
-== Installation ==
-
-Add gems.github.com as a source for gems and install elliottcable-ncurses from
-this mirror, because there is no version on rubygems.org which works with ruby
-1.9.
-
- * gem sources -a http://gems.github.com
- * gem install elliottcable-ncurses
-
-Build the virtop gem and install it. Do not build ri and rdoc documentation for
-this would throw nasty errors.
-
- * gem build virtop.gemspec
- * gem install --no-ri --no-rdoc virtop-*.gem
-