vmonkey 0.2.0 → 0.3.0

data/lib/vmonkey/version.rb

@@ -1,3 +1,3 @@
 module Vmonkey
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/vmonkey/vim/VirtualMachine.rb

@@ -8,7 +8,7 @@ class RbVmomi::VIM::VirtualMachine
   def clone_to(path, opts = {})
     dest = monkey.get(path.parent)
     unless dest.is_a? RbVmomi::VIM::Folder or dest.is_a? RbVmomi::VIM::VirtualApp
-      raise "Cannot clone_to [#{dest.pretty_path}] - destination must specify a Folder or VirtualApp"
+      raise "Cannot clone_to [#{path.parent}] - destination must specify a Folder or VirtualApp"
     end
 
     params = _clone_params(path.basename, dest, opts)
@@ -57,14 +57,14 @@ class RbVmomi::VIM::VirtualMachine
 
   unless self.method_defined? :guest_ip
     ## backported from rbvmomi 1.8 for rbvmomi 1.5 support
-    def guest_ip 
+    def guest_ip
       g = self.guest
       if g.ipAddress && (g.toolsStatus == "toolsOk" || g.toolsStatus == "toolsOld")
         g.ipAddress
       else
         nil
       end
-    end  
+    end
   end
 
   def move_to!(path)
@@ -89,8 +89,24 @@ class RbVmomi::VIM::VirtualMachine
     tcp_socket && tcp_socket.close
   end
 
+  def wait_for(max=300, interval=2, &block)
+    elapsed = 0
+    start = Time.now
+
+    until (result = yield) || (elapsed > max)
+      sleep interval
+      elapsed = Time.now - start
+    end
+
+    unless result
+      raise Errors::TimeoutError.new "Waited #{max} seconds, giving up"
+    end
+
+    true
+  end
+
   def wait_for_port(port)
-    sleep 2 until port_ready?(port)
+    wait_for { port_ready?(port) }
   end
 
   def stop
@@ -105,6 +121,14 @@ class RbVmomi::VIM::VirtualMachine
     PowerOnVM_Task().wait_for_completion unless runtime.powerState == 'poweredOn'
   end
 
+  def started?
+    runtime.powerState == 'poweredOn'
+  end
+
+  def ready?
+    ! guest_ip.nil?
+  end
+
   def find_property(name)
     config.vAppConfig.property.find { |p| p.props[:id] == name.to_s  }
   end

data/spec/virtualmachine_spec.rb

@@ -144,7 +144,7 @@ describe RbVmomi::VIM::VirtualMachine do
         @other_path = "#{@vm_path}-other"
         @other_vm = @spec_vm.clone_to @other_path
       end
-      
+
       after(:all) do
         other_vm = @monkey.vm @other_path
         other_vm.destroy if other_vm
@@ -174,14 +174,33 @@ describe RbVmomi::VIM::VirtualMachine do
     context 'that has had #start called' do
       before(:all) { @spec_vm.start }
 
-      describe '#port_ready?' do
-        it 'should be false immediately following start' do
-          expect(@spec_vm.port_ready? 22).to be_false
+      context 'immediately following start' do
+        describe '#ready?' do
+          it 'should be false' do
+            expect(@spec_vm.ready?).to be_false
+          end
+        end
+
+        describe '#port_ready?' do
+          it 'should be false' do
+            expect(@spec_vm.port_ready? 22).to be_false
+          end
+        end
+      end
+
+      context 'following wait_for_port' do
+        before(:all) { @spec_vm.wait_for_port 22 }
+
+        describe '#ready?' do
+          it 'should be true' do
+            expect(@spec_vm.ready?).to be_true
+          end
         end
 
-        it 'should be true after wait_for_port' do
-          @spec_vm.wait_for_port 22
-          expect(@spec_vm.port_ready? 22).to be_true
+        describe '#port_ready?' do
+          it 'should be true' do
+            expect(@spec_vm.port_ready? 22).to be_true
+          end
         end
       end
 

data/vmonkey.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '~> 2.14'
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: vmonkey
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Brian Dupras
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,32 +63,36 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-description: ' simple to use vsphere methods '
+        version: '2.14'
+description: ! ' simple to use vsphere methods '
 email:
 - brian@duprasville.com
 - dsmith@rallydev.com
@@ -113,26 +124,33 @@ files:
 homepage: https://github.com/something/vmonkey
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3892349743528929698
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3892349743528929698
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: simple to use vsphere methods
 test_files:
 - spec/datacenter_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a0ff9f61554b7d4d9b77eb7db920190d126c0dc7
-  data.tar.gz: edd8cf44704212d256c7abb8e00f5bd83ff4ee1d
-SHA512:
-  metadata.gz: 34f00cb986328f92dbbe713edd3342c6674a25f18332f089ca6b789a9f2c4abbefc47705e3fd781567504b82770d4040942aa1dcd9ed2be4c4e2ec91ac89ee6f
-  data.tar.gz: 81d1b577c3f4de6a43c4ce2789726cdf1672a2388096ca913bac1dbc8ff278a7e17f5cf2303cad323fcf7ce941d761e35d4d69be2796bd227396046bae0368c1