virtop 0.0.6 → 0.0.7

data/bin/virtop

@@ -1,9 +1,7 @@
 #!/usr/bin/env ruby
 
-# Require libvirt and uri modules and print out exception message if they could
-# not be loaded.
+# Require uri module and print out exception message if it could not be loaded.
 begin
-	require( 'libvirt' )
 	require( 'uri' )
 rescue LoadError => e
 	$stderr.puts( e.message )
@@ -27,9 +25,10 @@ EOF
 	exit( 1 )
 end
 
-# Require virtop module.
+# Require and include virtop module. It will require libvirt.
 $:.unshift( File.join( File.dirname( __FILE__ ), '../lib' ) )
 require( 'virtop' )
+include Virtop
 
 # Connection URL will be qemu:///system if nothing else is given as the first
 # parameter.
@@ -68,22 +67,32 @@ begin
 		n.intrflush( false )
 		n.keypad( true )
 
-		n.addstr(
-			"name\t\tstate\tmem\tmem_max\tcpu_num\tcpu_time\n\n"
+		t = Table.new(
+			'name',
+			'state',
+			'mem',
+			'mem_max',
+			'cpu_num',
+			'cpu_time'
 		)
 
 		c.domains.each do |domain|
-			n.addstr(
-				domain.name		+ "\t" +
-				domain.state	+ "\t" +
-				domain.mem		+ "\t" +
-				domain.mem_max	+ "\t" +
-				domain.cpu_num	+ "\t" +
-				domain.cpu_time	+ "\n"
+			t.add_row(
+				domain.name,
+				domain.state,
+				domain.mem,
+				domain.mem_max,
+				domain.cpu_num,
+				domain.cpu_time
 			)
 		end
 
+		t.format.each do |line|
+			n.addstr( line )
+		end
+
 		n.refresh
+
 		raise( LetsExit ) if( n.getch == 113 )
 	end
 rescue LetsExit

data/lib/libvirt/connect.rb

@@ -0,0 +1,15 @@
+# Extend Libvirt::Connect with a method which returns all available domains as
+# an array.
+class Libvirt::Connect
+	def domains
+		ret = Array.new
+
+		self.list_domains.each do |id|
+			ret.push( 
+				self.lookup_domain_by_id( id )
+			)
+		end
+
+		ret
+	end
+end

data/lib/libvirt/domain.rb

@@ -0,0 +1,41 @@
+# Extend Libvirt::Domain with different methods for human readable display of
+# the domain state.
+class Libvirt::Domain
+	def to_s
+		self.name
+	end
+
+	def state
+		case( self.info.state )
+			when 1
+				">"
+			when 3
+				"||"
+			else
+				"?"
+		end
+	end
+
+	def mem
+		( self.info.memory / 1024 ).to_s + "M"
+	end
+
+	def mem_max
+		( self.info.max_mem / 1024 ).to_s + "M"
+	end
+
+	def cpu_num
+		self.info.nr_virt_cpu.to_s
+	end
+
+	def cpu_time
+		t = self.info.cpu_time / 10**9
+
+		s = ( t % 60                 ).to_s
+		m = ( t / 60 % 60            ).to_s
+		h = ( t / 60 / 60 % 24       ).to_s
+		d = ( t / 60 / 60 / 24 % 365 ).to_s
+
+		"%i-%02i:%02i:%02i" % [d, h, m, s]
+	end
+end

data/lib/virtop.rb

@@ -1,5 +1,11 @@
+require( 'libvirt' )
+
+module Virtop
+	VERSION = '0.0.7'
+end
+
 $:.unshift( File.dirname( __FILE__ ) )
 
-Dir.glob( $:.first + '/**/*.rb' ).each do |file|
+Dir.glob( $:.first + '/*/*.rb' ).sort.each do |file|
 	require( file )
 end

data/lib/virtop/letsexit.rb

@@ -1,3 +1,3 @@
 # This exception should be thrown, if an exit is triggered.
-class LetsExit < Exception
+class Virtop::LetsExit < Exception
 end

data/lib/virtop/table.rb

@@ -0,0 +1,48 @@
+class Virtop::Table
+	def initialize( *args )
+		@header = args
+		@rows = []
+		@widths = [0] * args.size
+	end
+
+	def header
+		@header.to_s + "\n"
+	end
+
+	def add_row( *args )
+		raise( Exception ) if( args.size != @header.size )
+		@rows.push( args )
+	end
+
+	def each_row
+		@rows.each do |row|
+			yield( row.to_s )
+		end
+	end
+
+	def format
+		update_widths!
+
+		a = []
+
+		( [ @header ] + @rows ).each do |row|
+			line = ''
+			@header.size.times do |i|
+				line += row[i].ljust( @widths[i] + 2 )
+			end
+			a.push( line + "\n" )
+		end
+
+		a.insert( 1, "\n" )
+	end
+
+private
+
+	def update_widths!
+		@header.size.times do |i|
+			( [ @header ] + @rows ).each do |row|
+				@widths[i] = row[i].size if( @widths[i] < row[i].size)
+			end
+		end
+	end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: virtop
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - henning mueller
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 +02:00
+date: 2010-06-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,9 +45,10 @@ extra_rdoc_files: []
 files: 
 - bin/virtop
 - lib/virtop.rb
-- lib/virtop/libvirt/connect.rb
-- lib/virtop/libvirt/domain.rb
 - lib/virtop/letsexit.rb
+- lib/virtop/table.rb
+- lib/libvirt/connect.rb
+- lib/libvirt/domain.rb
 - README
 has_rdoc: true
 homepage: 

data/lib/virtop/libvirt/connect.rb

@@ -1,17 +0,0 @@
-# Extend Libvirt::Connect with a method which returns all available domains as
-# an array.
-module Libvirt
-	class Connect
-		def domains
-			ret = Array.new
-
-			self.list_domains.each do |id|
-				ret.push( 
-					self.lookup_domain_by_id( id )
-				)
-			end
-
-			ret
-		end
-	end
-end

data/lib/virtop/libvirt/domain.rb

@@ -1,48 +0,0 @@
-# Extend Libvirt::Domain with different methods for human readable display of
-# the domain state.
-module Libvirt
-	class Domain
-		def to_s
-			self.name
-		end
-
-		def state
-			case( self.info.state )
-				when 1
-					">"
-				when 3
-					"||"
-				else
-					"?"
-			end
-		end
-
-		def mem
-			( self.info.memory / 1024 ).to_s + "M"
-		end
-
-		def mem_max
-			( self.info.max_mem / 1024 ).to_s + "M"
-		end
-
-		def cpu_num
-			self.info.nr_virt_cpu.to_s
-		end
-
-		def cpu_time
-			t = self.info.cpu_time / 10**9
-
-			s = ( t % 60                 ).to_s
-			m = ( t / 60 % 60            ).to_s
-			h = ( t / 60 / 60 % 24       ).to_s
-			d = ( t / 60 / 60 / 24 % 365 ).to_s
-
-			str  = d != '0' ? d + '-' : ''
-			str += h != '0' ? "%02i:" % h : ''
-			str += "%02i:" % m
-			str += s
-
-			str
-		end
-	end
-end