vixen 0.0.11 → 0.0.12

data/lib/vixen/bridge.rb

@@ -50,8 +50,11 @@ module Vixen::Bridge
   attach_function :VixVM_RemoveSnapshot, [:handle, :handle, :int, :VixEventProc, :pointer], :handle
   attach_function :VixJob_CheckCompletion, [:handle, :pointer], :int
   attach_function :Vix_GetHandleType, [:handle], :int
-
-  @@all_my_blocks = []
+  attach_function :VixVM_GetNumRootSnapshots, [:handle, :pointer], :int
+  attach_function :VixVM_GetRootSnapshot, [:handle, :int, :pointer], :int
+  attach_function :VixVM_GetNamedSnapshot, [:handle, :string, :pointer], :int
+  attach_function :VixSnapshot_GetNumChildren, [:handle, :pointer], :int
+  attach_function :VixSnapshot_GetChild, [:handle, :int, :pointer], :int
 
   def self.safe_proc_from_block(&block)
     return nil unless block_given?
@@ -217,7 +220,7 @@ module Vixen::Bridge
   def self.create_snapshot(vm_handle, name, description, &block)
     progress_proc = safe_proc_from_block &block
     snapshot_handle = pointer_to_handle do |snapshot_handle_pointer|
-      wait_for_async_handle_creation_job "create snapshot", snapshot_handle_pointer, 1, 0.2 do
+      wait_for_async_handle_creation_job "create snapshot", snapshot_handle_pointer, 0.2, 0.2 do
         Vixen.logger.info "creating %s snapshot" % name
         VixVM_CreateSnapshot vm_handle, name, description,
                              VixCreateSnapshotOptions[:include_memory],
@@ -228,7 +231,7 @@ module Vixen::Bridge
 
   def self.revert_to_snapshot(vm, snapshot, &block)
     progress_proc = safe_proc_from_block &block
-    wait_for_async_job(("revert to %s snapshot" % snapshot.display_name), 1, 0.2) do
+    wait_for_async_job(("revert to %s snapshot" % snapshot.display_name), 0.2, 0.2) do
       VixVM_RevertToSnapshot vm.handle, snapshot.handle, VixVMPowerOptions[:normal],
                              VixHandle[:invalid], progress_proc, nil
     end
@@ -236,7 +239,7 @@ module Vixen::Bridge
 
   def self.remove_snapshot(vm, snapshot, &block)
     progress_proc = safe_proc_from_block &block
-    wait_for_async_job(("remove %s snapshot" % snapshot.display_name), 1, 0.2) do
+    wait_for_async_job(("remove %s snapshot" % snapshot.display_name), 0.2, 0.2) do
       VixVM_RemoveSnapshot vm.handle, snapshot.handle, 0, progress_proc, nil
     end
   end
@@ -248,6 +251,18 @@ module Vixen::Bridge
     end
   end
 
+  def self.get_root_snapshots(vm_handle)
+    count = pointer_to_int { |int_pointer| VixVM_GetNumRootSnapshots(vm_handle, int_pointer) }
+    snapshots = []
+    count.times do |n|
+      handle = pointer_to_handle do |handle_pointer|
+        VixVM_GetRootSnapshot(vm_handle, n, handle_pointer)
+      end
+      snapshots << Vixen::Model::Snapshot.new( handle )
+    end
+    snapshots
+  end
+
   def self.get_parent(snapshot_handle)
     pointer_to_handle do |snapshot_handle_pointer|
       Vixen.logger.debug "retrieving snapshot parent"
@@ -255,6 +270,19 @@ module Vixen::Bridge
     end
   end
 
+  def self.get_children(snapshot_handle)
+    count = pointer_to_int { |int_pointer| VixSnapshot_GetNumChildren(snapshot_handle, int_pointer) }
+    children = []
+    count.times do |n|
+      handle = pointer_to_handle do |handle_pointer|
+        VixSnapshot_GetChild(snapshot_handle, n, handle_pointer)
+      end
+      child = Vixen::Model::Snapshot.new( handle )
+      children << child
+    end
+    children
+  end
+
   def self.get_string_property(handle, property_id)
     string = pointer_to_string do |string_pointer|
       Vixen.logger.debug "getting %s property" % Vixen::Constants::VixPropertyId[property_id]

data/lib/vixen/command_line.rb

@@ -2,18 +2,26 @@ require 'vixen'
 
 class Vixen::CommandLine
   def execute
+
+    context = {}
+
     command = ARGV.shift
     command ||= 'status'
 
-    begin
-      require "vixen/command_line/#{command}"
+    ARGV.unshift command
+
+    while ! ARGV.empty?
+      begin
+        command = ARGV.shift
+        require "vixen/command_line/#{command}"
 
-      klass = self.class.const_get(command.split('_').map {|s| s.capitalize }.join)
-      raise "Couldn't find #{command}" unless klass
+        klass = self.class.const_get(command.split('_').map {|s| s.capitalize }.join)
+        raise "Couldn't find #{command}" unless klass
 
-      klass.new.execute
-    rescue LoadError
-      puts "Unknown command: #{command}"
+        klass.new(context).execute
+      rescue LoadError
+        puts "Unknown command: #{command}"
+      end
     end
   end
 end

data/lib/vixen/command_line/base.rb

@@ -1,8 +1,9 @@
 class Vixen::CommandLine::Base
-  attr_reader :start
+  attr_reader :start, :context
 
-  def initialize
+  def initialize(context)
     @start = Time.now
+    @context = context
   end
 
   def elapsed_time
@@ -11,14 +12,29 @@ class Vixen::CommandLine::Base
 
   def new_line_after
     val = yield if block_given?
-    puts
+    $stdout.puts
     val
   end
 
   def print(message, *args)
-    timed_message = "\r             \r#{elapsed_time} " + message
+    timed_message = "\r             \r#{elapsed_time} " + message.to_s
     $stdout.print timed_message, args
     $stdout.flush
   end
 
+  def puts(message, *args)
+    new_line_after { print(message, args) }
+  end
+
+  def host
+    return @host unless @host.nil?
+    @host = context[:host] || Vixen.local_connect
+  end
+
+  def vms
+    return @vms unless @vms.nil?
+    context[:vms] ||= host.running_vms
+    @vms = context[:vms]
+  end
+
 end

data/lib/vixen/command_line/snapshot.rb

@@ -2,6 +2,55 @@ require 'vixen/command_line/base'
 
 class Vixen::CommandLine::Snapshot < Vixen::CommandLine::Base
   def execute
-    puts "Snapshot is not yet implemented"
+    action = ARGV.shift
+    action ||= default_action
+
+    action = action.to_sym
+
+    if defined? action
+      send action
+    end
+  end
+
+  def list
+    total_snapshots = 0
+
+    vms.each do |vm|
+      puts "#{vm.name} : (#{vm.current_snapshot.display_name})"
+      all_snaps = vm.all_snapshots
+      total_snapshots += all_snaps.count
+      all_snaps.each do |snap|
+        puts "  - #{snap.display_name}"
+      end
+    end
+    puts "Found #{total_snapshots} snapshots on #{vms.count} virtual machines"
+  end
+
+  def current
+    vms.each do |vm|
+      puts "#{vm.name}"
+      puts "  - #{vm.current_snapshot.full_name}"
+    end
+  end
+
+  def create
+    snapshot_name = ARGV.shift
+    vms.each do |vm|
+      new_line_after do
+        vm.create_snapshot(snapshot_name) do |job_handle, event_type, more_event_info, client_data|
+          print "Creating #{snapshot_name} snapshot on #{vm.name}"
+        end
+      end
+    end
+  end
+
+  def revert
+  end
+
+  def remove
+  end
+
+  def default_action
+    'list'
   end
 end

data/lib/vixen/command_line/start.rb

@@ -0,0 +1,19 @@
+require 'vixen/command_line/base'
+
+class Vixen::CommandLine::Start < Vixen::CommandLine::Base
+  def execute
+    count = 0
+
+    vms.each do |vm|
+      unless vm.powered_on?
+        new_line_after do
+          vm.power_on do |*args|
+            print "Powering on #{vm.name}"
+          end
+        end
+        count += 1
+      end
+    end
+    puts "Powered on #{count} machines"
+  end
+end

data/lib/vixen/command_line/status.rb

@@ -2,19 +2,18 @@ require 'vixen/command_line/base'
 
 class Vixen::CommandLine::Status < Vixen::CommandLine::Base
   def execute
-    new_line_after { print "Connecting to local host" }
-    host = Vixen.local_connect
+    new_line_after { print "Connecting to host" }
 
     vms = host.paths_of_running_vms do |job_handle, event_type, more_event_info, client_data|
       print " <searching> "
       if event_type == Vixen::Constants::VixEventType[:find_item]
         path = Vixen::Bridge.get_string_property more_event_info, Vixen::Constants::VixPropertyId[:found_item_location]
         if path
-          new_line_after { print File.basename path }
+          new_line_after { print "  #{File.basename path}" }
         end
       end
     end
 
-    new_line_after { print "Found #{vms.size} running virtual machines" }
+    puts "Found #{vms.size} running virtual machines"
   end
 end

data/lib/vixen/command_line/stop.rb

@@ -0,0 +1,19 @@
+require 'vixen/command_line/base'
+
+class Vixen::CommandLine::Stop < Vixen::CommandLine::Base
+  def execute
+    count = 0
+
+    vms.each do |vm|
+      if vm.powered_on?
+        new_line_after do
+          vm.power_off do |*args|
+            print "Powering off #{vm.name}"
+          end
+        end
+        count += 1
+      end
+    end
+    puts "Powered off #{count} machines"
+  end
+end

data/lib/vixen/command_line/suspend.rb

@@ -2,6 +2,18 @@ require 'vixen/command_line/base'
 
 class Vixen::CommandLine::Suspend < Vixen::CommandLine::Base
   def execute
-    puts "Suspend is not yet implemented"
+    count = 0
+
+    vms.each do |vm|
+      if vm.powered_on?
+        new_line_after do
+          vm.suspend do |*args|
+            print "Suspending #{vm.name}"
+          end
+        end
+        count += 1
+      end
+    end
+    puts "Suspended #{count} machines"
   end
 end

data/lib/vixen/command_line/vm.rb

@@ -0,0 +1,23 @@
+require 'vixen/command_line/base'
+
+class Vixen::CommandLine::Vm < Vixen::CommandLine::Base
+  def execute
+    machines = ARGV.shift
+
+    return puts "A path to a virtual machine must be included" if machines.nil?
+
+    powered_count = 0
+
+    vm_paths = machines.split ','
+    vms = []
+    vm_paths.each do |path|
+      vm = new_line_after do
+        host.open_vm path do
+          print "Opening #{path}"
+        end
+      end
+      vms << vm
+    end
+    context[:vms] = vms
+  end
+end

data/lib/vixen/model/snapshot.rb

@@ -22,6 +22,15 @@ class Vixen::Model::Snapshot < Vixen::Model::Base
     File.join(root, display_name)
   end
 
+  def children
+    Vixen::Bridge.get_children(handle)
+  end
+
+  def all_children
+    childs = children
+    (childs + childs.map {|child| child.all_children}).flatten
+  end
+
   def to_s
     display_name
   end

data/lib/vixen/model/vm.rb

@@ -3,10 +3,32 @@ require File.join(File.dirname(__FILE__), 'snapshot')
 
 class Vixen::Model::VM < Vixen::Model::Base
 
+  def name
+    get_string_property Vixen::Constants::VixPropertyId[:vm_name]
+  end
+
+  def path
+    get_string_property Vixen::Constants::VixPropertyId[:vmx_pathname]
+  end
+
+  def guest_os
+    get_string_property Vixen::Constants::VixPropertyId[:vm_guestos]
+  end
+
   def current_snapshot
     Vixen::Model::Snapshot.new(Vixen::Bridge.current_snapshot(handle))
   end
 
+  def root_snapshots
+    Vixen::Bridge.get_root_snapshots handle
+  end
+
+  def all_snapshots
+    roots = root_snapshots
+    childs = roots.map {|s| s.all_children }
+    (roots + childs).flatten
+  end
+
   def create_snapshot(name, description="", &block)
     Vixen::Model::Snapshot.new(Vixen::Bridge.create_snapshot handle, name, description, &block)
   end

data/vixen.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'vixen'
-  s.version = '0.0.11'
-  s.date = '2012-11-20'
+  s.version = '0.0.12'
+  s.date = '2012-11-23'
 
 
   s.summary = 'Ruby bindings for VMware VIX API'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vixen
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -64,12 +64,13 @@ files:
 - lib/vixen/bridge.rb
 - lib/vixen/command_line.rb
 - lib/vixen/command_line/base.rb
-- lib/vixen/command_line/halt.rb
 - lib/vixen/command_line/resume.rb
 - lib/vixen/command_line/snapshot.rb
+- lib/vixen/command_line/start.rb
 - lib/vixen/command_line/status.rb
+- lib/vixen/command_line/stop.rb
 - lib/vixen/command_line/suspend.rb
-- lib/vixen/command_line/up.rb
+- lib/vixen/command_line/vm.rb
 - lib/vixen/constants.rb
 - lib/vixen/model/base.rb
 - lib/vixen/model/host.rb

data/lib/vixen/command_line/halt.rb

@@ -1,7 +0,0 @@
-require 'vixen/command_line/base'
-
-class Vixen::CommandLine::Halt < Vixen::CommandLine::Base
-  def execute
-    puts "Halt is not yet implemented"
-  end
-end

data/lib/vixen/command_line/up.rb

@@ -1,7 +0,0 @@
-require 'vixen/command_line/base'
-
-class Vixen::CommandLine::Up < Vixen::CommandLine::Base
-  def execute
-    puts "Up is not yet implemented"
-  end
-end