vmonkey 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b377b2e2e04e33a7e11a78bfdba2a9359e2f7a6
-  data.tar.gz: 69f2335719ab9d9fde2e4a7a2b1d91a86567c06d
+  metadata.gz: 72cbcf9517482d8c9d0a3b9ea687536cf06ccef5
+  data.tar.gz: 73a280923d278454a00123ddd83ff266e209febd
 SHA512:
-  metadata.gz: e24027bf933a229dedc82fe9958b0e1b57ca9eb79fff135d358805f5ab372d0946d0215af39c06f554b9c4cbe3366a49b9f4b6ecff85d8003f9fc9a2cc73ef20
-  data.tar.gz: d5812887c249c9cca6cbc72ae0985b7eb9b46776615b64a9c5edd9819a2862957109cd917f68de5287b2eccd0807e84436c563eda58fea1eb0ebcfebea13ef24
+  metadata.gz: a0f05f8a88f96c7d8d9892a64f788484623021332a61c984ff8883708ba598f9738545c25558c6557a33bb394d3a8401f06cb8bb5842fa566a6184bac518f3c3
+  data.tar.gz: 35d37eab5e6103b330809a1bf84c7ac0c5f510b71985dc6a705631722db17bf23d7afce3e216f5cb131d51f9a4efef63b6376e9bba8a3b23234bb6be3c7f2e73

data/lib/vmonkey/version.rb

@@ -1,3 +1,3 @@
 module Vmonkey
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/vmonkey/vim/VirtualMachine.rb

@@ -18,6 +18,13 @@ class RbVmomi::VIM::VirtualMachine
     self.CloneVM_Task(params).wait_for_completion
   end
 
+  def clone_to!(path)
+    dest_vm = monkey.vm(path)
+    dest_vm.destroy if dest_vm
+
+    clone_to(path)
+  end
+
   def annotation
     config.annotation
   end
@@ -76,19 +83,50 @@ class RbVmomi::VIM::VirtualMachine
     move_to(path)
   end
 
-  def port_ready?(port)
+  def port_ready?(port, timeout = 5)
     ip = guest_ip or return false
-    tcp_socket = TCPSocket.new(ip, port)
-    readable = IO.select([tcp_socket], nil, nil, 5)
-    if readable
-      true
-    else
-      false
+
+    ## modified from http://spin.atomicobject.com/2013/09/30/socket-connection-timeout-ruby/
+    addr = Socket.getaddrinfo(ip, nil)
+    sockaddr = Socket.pack_sockaddr_in(port, addr[0][3])
+
+    Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0).tap do |socket|
+      socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+      begin
+        # Initiate the socket connection in the background. If it doesn't fail
+        # immediately it will raise an IO::WaitWritable (Errno::EINPROGRESS)
+        # indicating the connection is in progress.
+        socket.connect_nonblock(sockaddr)
+
+      rescue IO::WaitWritable
+        # IO.select will block until the socket is writable or the timeout
+        # is exceeded - whichever comes first.
+        if IO.select(nil, [socket], nil, timeout)
+          begin
+            # Verify there is now a good connection
+            socket.connect_nonblock(sockaddr)
+          rescue Errno::EISCONN
+            # Good news everybody, the socket is connected!
+            socket.close
+            return true
+          rescue Errno::ETIMEDOUT, Errno::EPERM, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH
+            socket.close
+            return false
+          rescue
+            # An unexpected exception was raised - the connection is no good.
+            raise
+          end
+        else
+          # IO.select returns nil when the socket is not ready before timeout
+          # seconds have elapsed
+          socket.close
+          return false
+        end
+      end
+
+      return false
     end
-  rescue Errno::ETIMEDOUT, Errno::EPERM, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH
-    false
-  ensure
-    tcp_socket && tcp_socket.close
   end
 
   def wait_for(max=300, interval=2, &block)

data/spec/virtualmachine_spec.rb

@@ -59,13 +59,31 @@ describe RbVmomi::VIM::VirtualMachine do
     before(:all) { @spec_vm = @template.clone_to @vm_path }
     after(:all)  { @spec_vm.destroy }
 
-    describe '#clone' do
+    describe '#clone_to' do
       context 'to a Folder' do
         subject { @monkey.vm @vm_path }
         it { should_not be_nil }
       end
     end
 
+    describe '#clone_to!' do
+      before(:all) do
+        @other_path = "#{@vm_path}-other"
+      end
+
+      after(:all) do
+        other_vm = @monkey.vm @other_path
+        other_vm.destroy if other_vm
+      end
+
+      it 'should overwrite a VM when given a path of an existing VM' do
+        expect{
+          @other_vm = @spec_vm.clone_to! @other_path
+          @other_vm = @spec_vm.clone_to! @other_path
+        }.to_not raise_error
+      end
+    end
+
     describe '#annotation=' do
       it 'sets the annotation' do
         @spec_vm.annotation = 'xyzzy'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmonkey
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Brian Dupras
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri