vixen 0.0.4 → 0.0.5

data/lib/vixen/bridge.rb

@@ -44,6 +44,7 @@ module Vixen::Bridge
   attach_function :VixVM_GetCurrentSnapshot, [:handle, :pointer], :int
   attach_function :VixSnapshot_GetParent, [:handle, :pointer], :int
   attach_function :VixVM_PowerOn, [:handle, :int, :handle, :VixEventProc, :pointer], :handle
+  attach_function :VixVM_CreateSnapshot, [:handle, :string, :string, :int, :handle, :VixEventProc, :pointer], :handle
 
   def self.connect(hostType, hostname, port, username, password)
     job_handle = VixHandle[:invalid]
@@ -99,6 +100,20 @@ module Vixen::Bridge
     Vix_ReleaseHandle job_handle
   end
 
+  def self.wait_for_async_handle_creation_job(operation, pointer_to_handle, &block)
+    job_handle = yield
+    sleep 0.5
+    err = VixJob_Wait job_handle, VixPropertyId[:job_result_handle],
+                :pointer, pointer_to_handle,
+                :int, VixPropertyId[:none]
+    unless err == VixError[:ok]
+      raise "couldn't %s. (error: %s, %s)" %
+        [operation, err, Vix_GetErrorText(err, nil)]
+    end
+    Vix_ReleaseHandle job_handle
+    err
+  end
+
   def self.running_vms(host_handle)
     available_vms = []
 
@@ -134,20 +149,22 @@ module Vixen::Bridge
   end
 
   def self.open_vm(host_handle, vm_path)
-    job_handle = VixHost_OpenVM(host_handle,
-                                vm_path,
-                                VixVMOpenOptions[:normal],
-                                VixHandle[:invalid],
-                                nil,
-                                nil)
     vm_handle = pointer_to_handle do |vm_handle_pointer|
-      VixJob_Wait(job_handle,
-                  VixPropertyId[:job_result_handle],
-                  :pointer, vm_handle_pointer,
-                  :int, VixPropertyId[:none])
+      wait_for_async_handle_creation_job "open vm", vm_handle_pointer do
+        VixHost_OpenVM host_handle, vm_path, VixVMOpenOptions[:normal],
+                       VixHandle[:invalid], nil, nil
+      end
+    end
+  end
+
+  def self.create_snapshot(vm_handle, name, description)
+    snapshot_handle = pointer_to_handle do |snapshot_handle_pointer|
+      wait_for_async_handle_creation_job "create snapshot", snapshot_handle_pointer do
+        VixVM_CreateSnapshot vm_handle, name, description,
+                             VixCreateSnapshotOptions[:include_memory],
+                             VixHandle[:invalid], nil, nil
+      end
     end
-    Vix_ReleaseHandle job_handle
-    vm_handle
   end
 
   def self.current_snapshot(vm_handle)

data/lib/vixen/constants.rb

@@ -112,4 +112,7 @@ module Vixen::Constants
                         :blocked_on_msg, 0x0100,
                         :paused,         0x0200,
                         :resuming,       0x0800 )
+
+  VixCreateSnapshotOptions = enum( :include_memory, 0x0002 )
+
 end

data/lib/vixen/model/vm.rb

@@ -7,8 +7,12 @@ class Vixen::Model::VM < Vixen::Model::Base
     Vixen::Model::Snapshot.new(Vixen::Bridge.current_snapshot(handle))
   end
 
+  def create_snapshot(name, description)
+    Vixen::Model::Snapshot.new(Vixen::Bridge.create_snapshot handle, name, description)
+  end
+
   def power_on
-    return self if powered_on? or powering_on? or resuming?
+    return self if powered_on? or powering_on? or resuming? or resetting?
     Vixen::Bridge.power_on handle
     self
   end
@@ -60,6 +64,10 @@ class Vixen::Model::VM < Vixen::Model::Base
     current_power_states.include? :suspended
   end
 
+  def resetting?
+    current_power_states.include? :resetting
+  end
+
   def current_power_states
     states = []
     bitwise_state = Vixen::Bridge.current_power_state handle

data/vixen.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'vixen'
-  s.version = '0.0.4'
+  s.version = '0.0.5'
   s.summary = 'Ruby bindings for VMware VIX API'
   s.description = <<-EOF
   Vixen is an easy way to interact with VMware virtual machines from Ruby. 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vixen
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi