vmonkey 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f06b3dd64edba38e7b3f7b330edffae937941e3
-  data.tar.gz: 59a854225c0012e6719d3800feac1c83b7849d5b
+  metadata.gz: 2c508835c077aca3004f773a73dfb541babb3819
+  data.tar.gz: 326b56af7fd2c5dd1ba364fe834fd0546863e859
 SHA512:
-  metadata.gz: cdcb5eeeab2916d3b0869369c4a6301ee302d3fbe90565b1e85d4030eb7de592275e7b79f1291b1334b856eb0bc8e5f87b019f35eeccc54a23a5c7c921b20f34
-  data.tar.gz: 9e437485f66d560e513a208f6dbe74a78f0e34df3e5ba4f783ad2202dfc0d95e8c9ae3014e54fc57f31faad90faee22332859c5eae97dba20769aa754029fa13
+  metadata.gz: 47e5a378a2fadf4304ff8d4bf19f66b30ce9745dabc44ac5a30262b428f57500285a1bd730bb90df0709d7c2daeb858c220ceb4114f5be33c5f81d73d2ed864d
+  data.tar.gz: 04c89a6f1bf9e2f978bbdf4b78086616a174e6f5326b3a3095868c4ef555e83fc3d7759111b5d991038f6d6cdd70d43b42033dc5a9020e6608a144b0a19dad77

data/.gitignore

@@ -22,3 +22,4 @@ tmp
 mkmf.log
 .vmonkey
 .DS_Store
+.ruby-version

data/lib/vmonkey/version.rb

@@ -1,3 +1,3 @@
 module Vmonkey
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
 end

data/lib/vmonkey/vim/VirtualApp.rb

@@ -15,6 +15,12 @@ class RbVmomi::VIM::VirtualApp
     PowerOnVApp_Task().wait_for_completion unless vapp_state? 'started'
   end
 
+  def stop
+    return if vapp_state? 'stopped'
+    PowerOffVApp_Task()
+    sleep 2 until vapp_state? 'stopped'
+  end
+
   def vm_pool
     self
   end
@@ -110,6 +116,55 @@ class RbVmomi::VIM::VirtualApp
     UpdateVAppConfig( spec: vm_config_spec )
   end
 
+  def port_ready?(port, timeout=5)
+    return false if vapp_state? 'stopped'
+    ready=self.vm.all? { |vm| vm.port_ready?(port, 2) }
+    ready
+  end
+
+  def wait_for(max=600, interval=2, &block)
+    elapsed = 0
+    start = Time.now
+
+    until (result = yield) || (elapsed > max)
+      sleep interval
+      elapsed = Time.now - start
+    end
+
+    unless result
+      raise "Waited #{max} seconds, giving up."
+    end
+
+    true
+  end
+
+  def wait_for_port(port)
+    wait_for { port_ready?(port) }
+  end
+
+  def move_to(path)
+    monkey.vapp(path) && raise("VirtualApp already exists. [#{path}]")
+
+    rename = self.name != path.basename
+    to_folder = monkey.folder! path.parent
+    reparent = parent != to_folder
+
+    if reparent
+      Rename_Task(newName: "#{path.basename}-tmp").wait_for_completion if rename
+      to_folder.MoveIntoFolder_Task(list: [self]).wait_for_completion
+      Rename_Task(newName: path.basename).wait_for_completion if rename
+    else
+      Rename_Task(newName: path.basename).wait_for_completion
+    end
+  end
+
+  def move_to!(path)
+    dest_vapp = monkey.vapp(path)
+    dest_vapp.destroy if dest_vapp
+
+    move_to(path)
+  end
+
   def _clone_params(vapp_name, dest, opts)
     {
       name: vapp_name,

data/spec/vapp_spec.rb

@@ -54,6 +54,110 @@ describe RbVmomi::VIM::VirtualApp do
       it { expect(@spec_vapp.property :xyzzy).to be_nil }
     end
 
-  end
+    describe '#move_to' do
+      it 'should raise a RuntimeError when given a path of an existing vApp' do
+        expect { @spec_vapp.move_to @spec_vapp_path }.to raise_error RuntimeError
+      end
+
+      it 'should move a vapp to a new name in the same folder' do
+        parent = @spec_vapp.parentFolder
+
+        @spec_vapp.move_to "#{@spec_vapp_path}-moved"
+        expect(@spec_vapp.name).to eq "#{@spec_vapp_path.basename}-moved"
+        expect(@spec_vapp.parentFolder).to eq parent
+
+        @spec_vapp.move_to @spec_vapp_path
+        expect(@spec_vapp.name).to eq @spec_vapp_path.basename
+        expect(@spec_vapp.parentFolder).to eq parent
+      end
+
+      it 'should move a vapp to the same name in a new folder' do
+        from_folder = @spec_vapp.parentFolder
+        from_name = @spec_vapp.name
+        to_path = "#{VM_SPEC_OPTS[:working_folder2]}/#{@spec_vapp_path.basename}"
+        to_folder = @monkey.folder VM_SPEC_OPTS[:working_folder2]
+
+        @spec_vapp.move_to to_path
+        expect(@spec_vapp.name).to eq from_name
+        expect(@spec_vapp.parentFolder).to eq to_folder
+
+        @spec_vapp.move_to @spec_vapp_path
+        expect(@spec_vapp.name).to eq from_name
+        expect(@spec_vapp.parentFolder).to eq from_folder
+      end
+
+      it 'should move a vapp to a new name in a new folder' do
+        from_folder = @spec_vapp.parentFolder
+        from_name = @spec_vapp.name
+        to_name = "#{@spec_vapp_path.basename}-different"
+        to_path = "#{VM_SPEC_OPTS[:working_folder2]}/#{to_name}"
+        to_folder = @monkey.folder VM_SPEC_OPTS[:working_folder2]
+
+        @spec_vapp.move_to to_path
+        expect(@spec_vapp.name).to eq to_name
+        expect(@spec_vapp.parentFolder).to eq to_folder
+
+        @spec_vapp.move_to @spec_vapp_path
+        expect(@spec_vapp.name).to eq from_name
+        expect(@spec_vapp.parentFolder).to eq from_folder
+      end
+    end
+
+    describe '#move_to!' do
+      before(:all) do
+        @other_path = "#{@spec_vapp_path}-other"
+        @other_vapp = @spec_vapp.clone_to @other_path
+      end
+
+      after(:all) do
+        other_vapp = @monkey.vapp @other_path
+        other_vapp.destroy if other_vapp
+      end
 
+      it 'should overwrite a vApp when given a path of an existing VM' do
+        @spec_vapp.move_to! @other_path
+        expect(@monkey.vapp @other_path).to_not be_nil
+
+        @spec_vapp.move_to @spec_vapp_path
+        expect(@monkey.vapp @other_path).to be_nil
+      end
+    end
+
+    describe '#stop' do
+      it 'should return successfully when the vApp is already powered off' do
+        expect { @spec_vapp.stop }.to_not raise_error
+      end
+    end
+
+    describe '#port_ready?' do
+      it 'should be false when the vApp is powered off' do
+        expect( @spec_vapp.port_ready? 22 ).to be_falsey
+      end
+    end
+
+    context 'that has had #start called' do
+      before(:all) { @spec_vapp.start }
+
+      context 'immediately following start' do
+        describe '#port_ready?' do
+          it 'should be false' do
+            expect(@spec_vapp.port_ready? 22).to be_falsey
+          end
+        end
+      end
+
+      context 'following wait_for_port' do
+        before(:all) { @spec_vapp.wait_for_port 22 }
+
+        describe '#port_ready?' do
+          it 'should be true' do
+            expect(@spec_vapp.port_ready? 22).to be_truthy
+          end
+        end
+      end
+
+      after(:all) { @spec_vapp.stop }
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmonkey
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Brian Dupras
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -29,73 +29,73 @@ dependencies:
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ' simple to use vsphere methods '
+description: " simple to use vsphere methods "
 email:
 - brian@duprasville.com
 - dsmith@rallydev.com
@@ -103,7 +103,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -134,17 +134,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: simple to use vsphere methods