virtop 0.0.11 → 0.0.13

data/bin/virtop

@@ -2,18 +2,18 @@
 
 # Require uri module and print out exception message if it could not be loaded.
 begin
-	require( 'uri' )
+  require 'uri'
 rescue LoadError => e
-	$stderr.puts( e.message )
-	exit( 1 )
+  $stderr.puts e.message
+  exit 1
 end
 
 # Require ncurses module and print out instructions howto install it if it could
 # not be loaded.
 begin
-	require 'ncurses'
+  require 'ncurses'
 rescue LoadError
-	$stderr.puts <<EOF
+  $stderr.puts <<EOF
 The Ruby bindings to the ncurses library are missing. The ncurses gem on
 rubygems.org is not working with Ruby 1.9, so please issue the following
 commands as superuser to install a working ncurses gem from github.com:
@@ -22,12 +22,12 @@ commands as superuser to install a working ncurses gem from github.com:
   gem install elliottcable-ncurses
 
 EOF
-	exit( 1 )
+  exit 1
 end
 
 # Show some lines of help.
-if( ARGV.first == "-h" or ARGV.first == "--help" )
-	$stderr.puts <<EOF
+if ['-h', '--help'].include? ARGV.first
+  $stderr.puts <<EOF
 #{$0} [libvirt-uri]
 
 libvirt-uri   is optional. Default is qemu:///system (for the local libvirt
@@ -38,118 +38,121 @@ Key bindings:
   1..6   Sort by column number.
 
 EOF
-	exit( 1 )
+  exit 1
 end
 
 # Require and include virtop module. It will require libvirt.
-$:.unshift( File.join( File.dirname( __FILE__ ), '../lib' ) )
-require( 'virtop' )
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'virtop'
 include Virtop
 
 # Connection URL will be qemu:///system if nothing else is given as the first
 # parameter.
-if( ARGV.size < 1 )
-	url = 'qemu:///system'
+if ARGV.size < 1
+  url = 'qemu:///system'
 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
-		url = uri.to_s
-	end
+  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
+    url = uri.to_s
+  end
 end
 
 # Open the connection to the libvirt ressource or print out error message.
 begin
-	c = Libvirt::open( url )
+  c = Libvirt::open url
 rescue Libvirt::ConnectionError
-	$stderr.puts( 'connection failed' )
-	exit( 1 )
+  $stderr.puts 'connection failed'
+  exit 1
 end
 
 # Initialize ncurses context. Clear and print details for each domain in a 10s
 # interval. Quit on keypress of 'q'.
 begin
-	n = Ncurses.initscr
-
-	Ncurses.cbreak
-	Ncurses.noecho
-	Ncurses.halfdelay( 10 )
-
-	# Default sorting by first column (domain name).
-	sortBy = 0
-
-	while( true )
-		Ncurses.clear
-
-		n.intrflush( false )
-		n.keypad( true )
-
-		# Add topmost meta information lines to ncurses screen.
-		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"
-		)
-
-		# Initialize table (columns).
-		t = Table.new(
-			'NAME',
-			'STATE',
-			'MEM',
-			'MEM_MAX',
-			'CPU_NUM',
-			'CPU_TIME'
-		)
-
-		# 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
-			)
-		end
-
-		# Sort table by chosen column.
-		t.sort_by( sortBy )
-
-		# Convert table to array of padded strings and add them to ncurses
-		# screen.
-		t.format.each do |line|
-			n.addstr( line )
-		end
-
-		# Wait for single char user input.
-		char = n.getch
-		case( char )
-			# Key '1' till '6'
-			when 49..54
-				sortBy = char - 49
-			# Key 'q'
-			when 113
-				raise( LetsExit )
-		end
-
-		n.refresh
-	end
+  n = Ncurses.initscr
+
+  Ncurses.cbreak
+  Ncurses.noecho
+  Ncurses.halfdelay 10
+
+  # Default sorting by first column (domain name).
+  sortBy = 0
+
+  while true
+    Ncurses.clear
+
+    n.intrflush false
+    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
+    end
+
+    # Initialize table (columns).
+    t = Table.new(
+      'NAME',
+      'STATE',
+      'MEM',
+      'MEM_MAX',
+      'CPU_NUM',
+      'CPU_TIME'
+    )
+
+    # 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
+      )
+    end
+
+    # Sort table by chosen column.
+    t.sort_by sortBy
+
+    # Convert table to array of padded strings and add them to ncurses
+    # screen.
+    t.format.each do |line|
+      n.addstr line
+    end
+
+    # Wait for single char user input.
+    char = n.getch
+    case char
+      # Key '1' till '6'
+      when 49..54
+        sortBy = char - 49
+      # Key 'q'
+      when 113
+        raise LetsExit
+    end
+
+    n.refresh
+  end
 rescue LetsExit
 ensure
-	Ncurses.echo
-	Ncurses.cbreak
-	Ncurses.endwin
+  Ncurses.echo
+  Ncurses.cbreak
+  Ncurses.endwin
 end

data/lib/libvirt/connect.rb

@@ -1,58 +1,56 @@
 # Extend Libvirt::Connect with a method which returns all available domains as
 # an array and several methods to access the host info more easily.
 class Libvirt::Connect
-	# Returns array of domain objects.
-	def domains
-		ret = Array.new
-
-		self.list_domains.each do |id|
-			ret.push( 
-				self.lookup_domain_by_id( id )
-			)
-		end
-
-		ret
-	end
-
-	# Returns number of cores as string.
-	def cores
-		self.node_get_info.cores.to_s
-	end
-
-	# Returns number of CPUs as string.
-	def cpus
-		self.node_get_info.cpus.to_s
-	end
-
-	# Returns clock speed in GHz.
-	def ghz
-		"%.2f" % ( self.node_get_info.mhz / 1000.0 )
-	end
-
-	# Returns CPU architecture.
-	def arch
-		self.node_get_info.model
-	end
-
-	# Returns total memory in mebibytes as string.
-	def mem
-		( self.node_get_info.memory / 1024 ).to_s + 'M'
-	end
-
-	# Returns memory which is not allocated to virtual machines in mebibytes as
-	# string.
-	def memfree
-		memUsed = 0
-
-		self.domains.each do |domain|
-			memUsed += domain.info.memory
-		end
-
-		( ( self.node_get_info.memory - memUsed ) / 1024 ).to_s + 'M'
-	end
-
-	# Returns the libvirt version number.
-	def version
-		self.libversion.to_s
-	end
+  # Returns array of domain objects.
+  def domains
+    ret = Array.new
+
+    self.list_domains.each do |id|
+      ret.push self.lookup_domain_by_id id
+    end
+
+    ret
+  end
+
+  # Returns number of cores as string.
+  def cores
+    self.node_get_info.cores.to_s
+  end
+
+  # Returns number of CPUs as string.
+  def cpus
+    self.node_get_info.cpus.to_s
+  end
+
+  # Returns clock speed in GHz.
+  def ghz
+    "%.2f" % (self.node_get_info.mhz / 1000.0)
+  end
+
+  # Returns CPU architecture.
+  def arch
+    self.node_get_info.model
+  end
+
+  # Returns total memory in mebibytes as string.
+  def mem
+    (self.node_get_info.memory / 1024).to_s + 'M'
+  end
+
+  # Returns memory which is not allocated to virtual machines in mebibytes as
+  # string.
+  def memfree
+    memUsed = 0
+
+    self.domains.each do |domain|
+      memUsed += domain.info.memory
+    end
+
+    ((self.node_get_info.memory - memUsed) / 1024).to_s + 'M'
+  end
+
+  # Returns the libvirt version number.
+  def version
+    self.libversion.to_s
+  end
 end

data/lib/libvirt/domain.rb

@@ -1,48 +1,48 @@
 # Extend Libvirt::Domain with different methods for human readable display of
 # the domain state.
 class Libvirt::Domain
-	# Default string representation of domain object is the domain's name.
-	def to_s
-		self.name
-	end
+  # Default string representation of domain object is the domain's name.
+  def to_s
+    self.name
+  end
 
-	# Return state as string symbol.
-	def state
-		case( self.info.state )
-			when 1
-				">"
-			when 3
-				"||"
-			else
-				"?"
-		end
-	end
+  # Return state as string symbol.
+  def state
+    case self.info.state
+      when 1
+        ">"
+      when 3
+        "||"
+      else
+        "?"
+    end
+  end
 
-	# Return current memory assignment in mebibytes as string.
-	def mem
-		( self.info.memory / 1024 ).to_s + "M"
-	end
+  # Return current memory assignment in mebibytes as string.
+  def mem
+    (self.info.memory / 1024).to_s + "M"
+  end
 
-	# Return maximum memory assignment in mebibytes as string.
-	def mem_max
-		( self.info.max_mem / 1024 ).to_s + "M"
-	end
+  # Return maximum memory assignment in mebibytes as string.
+  def mem_max
+    (self.info.max_mem / 1024).to_s + "M"
+  end
 
-	# Return the number of assigned virtual CPUs as string.
-	def cpu_num
-		self.info.nr_virt_cpu.to_s
-	end
+  # Return the number of assigned virtual CPUs as string.
+  def cpu_num
+    self.info.nr_virt_cpu.to_s
+  end
 
-	# Return time the virtual domain's CPU was scheduled as string formatted
-	# d-hh:mm:ss.
-	def cpu_time
-		t = self.info.cpu_time / 10**9
+  # Return time the virtual domain's CPU was scheduled as string formatted
+  # d-hh:mm:ss.
+  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
+    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
+    "%i-%02i:%02i:%02i" % [d, h, m, s]
+  end
 end

data/lib/virtop.rb

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

data/lib/virtop/table.rb

@@ -1,62 +1,62 @@
 # 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
-
-	# 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 )
-		if( args.size != @header.size )
-			raise( Exception.new( 'Wrong column number.' ) )
-		end
-
-		@rows.push( args )
-	end
-
-	# 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!
-
-		a = []
-
-		( [ @header ] + @rows ).each do |row|
-			line = ''
-			@header.size.times do |i|
-				line += row[i].to_s.ljust( @widths[i] + 2 )
-			end
-			a.push( line + "\n" )
-		end
-
-		a
-	end
+  # Contructor gets table header strings as arguments.
+  def initialize(*args)
+    @header = args
+    @rows = []
+    @widths = [0] * args.size
+  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)
+    if args.size != @header.size
+      raise Exception.new 'Wrong column number.'
+    end
+
+    @rows.push args
+  end
+
+  # 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!
+
+    a = []
+
+    ([@header] + @rows).each do |row|
+      line = ''
+      @header.size.times do |i|
+        line += row[i].to_s.ljust(@widths[i] + 2)
+      end
+      a.push(line + "\n")
+    end
+
+    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|
-				@widths[i] = row[i].size if( @widths[i] < row[i].size)
-			end
-		end
-	end
+  # Saves maximum width per column into the +@header+ array.
+  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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - henning mueller
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 +02:00
+date: 2011-01-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,11 +57,11 @@ extra_rdoc_files: []
 
 files: 
 - bin/virtop
+- lib/libvirt/connect.rb
+- lib/libvirt/domain.rb
+- lib/virtop.rb
 - lib/virtop/letsexit.rb
 - lib/virtop/table.rb
-- lib/virtop.rb
-- lib/libvirt/domain.rb
-- lib/libvirt/connect.rb
 - README.rdoc
 has_rdoc: true
 homepage: