vmonkey 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b5abf9886b87a12c8c10b8325e21b066efbde2e
-  data.tar.gz: e5dbdfb1e613e7bb2bddfc548daac3a2fb2f006b
+  metadata.gz: 8e56d35ace21b66bf6da740b610ce5b92f98caff
+  data.tar.gz: 34ce83f0af713c575ea2cf000ada45a9168f4ec1
 SHA512:
-  metadata.gz: 179e134d60a7800751beee309ef87abed62b5d06032eb0ef3f37af53e3da762631c02662a2382205c6388ca7456192c2bd94fc11b6d8ed29203843df03a4bc89
-  data.tar.gz: cc36d62392f7c923dbc1fd3cd4588652f7c86fb60fd9f247f8c22047a5d1bcc7c6ef0a71a72b9ea8b21539478ed148f0864c629fbcca70455f54235d30dd18de
+  metadata.gz: f3ad0eea275e652f949b9e0e434d3b049dc52d9cd4007e1e7071c72adb6bd66b655c5d13a5e870dbc4ead65a913b63248b148e4516b5710942ab5211aedcf3e2
+  data.tar.gz: 44fb91749aed2e712e09c98aac1babda93a78323a95dd273b6b75731de3dbfae6d4b73f1db2c0e4b0e6bafa64e90f831d3e1abd6863a6700486d820de7da680c

data/lib/vmonkey/version.rb

@@ -1,3 +1,3 @@
 module Vmonkey
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/vmonkey/vim/VirtualApp.rb

@@ -83,6 +83,13 @@ class RbVmomi::VIM::VirtualApp
     self.CloneVApp_Task(params).wait_for_completion
   end
 
+  def clone_to!(path, opts = {})
+    dest_vapp = monkey.vapp(path)
+    dest_vapp.destroy if dest_vapp
+
+    clone_to(path)
+  end
+
   def find_property(name)
     vAppConfig.property.find { |p| p.props[:id] == name.to_s  }
   end
@@ -97,11 +104,13 @@ class RbVmomi::VIM::VirtualApp
     value
   end
 
-  def set_property(name, value, opts={})
-    opts = {
+  def set_property(name, value, requested_opts={})
+    default_opts = {
         type: 'string',
         userConfigurable: true
-      }.merge opts
+        }
+
+    existing_opts = {}
 
     if vAppConfig.property
       existing_property = find_property(name)
@@ -109,12 +118,15 @@ class RbVmomi::VIM::VirtualApp
 
     if existing_property
       operation = 'edit'
+      existing_opts = existing_property.props
       property_key = existing_property.props[:key]
     else
       operation = 'add'
       property_key = name.object_id
     end
 
+    opts = default_opts.merge(existing_opts).merge(requested_opts)
+
     vapp_config_spec = RbVmomi::VIM.VAppConfigSpec(
         property: [
           RbVmomi::VIM.VAppPropertySpec(
@@ -128,6 +140,20 @@ class RbVmomi::VIM::VirtualApp
     self.UpdateVAppConfig( spec: vapp_config_spec )
   end
 
+  def set_properties(props)
+    props.each do |key, v|
+      if v.is_a?(Hash)
+        value = v.delete :value
+        opts = v
+      else
+        value = v
+        opts = {}
+      end
+
+      set_property key, value, opts
+    end
+  end
+
   def port_ready?(port, timeout=5)
     return false if vapp_state? 'stopped'
     ready=self.vm.all? { |vm| vm.port_ready?(port, 2) }

data/spec/vapp_clone_spec.rb

@@ -0,0 +1,47 @@
+require_relative 'spec_helper'
+using VMonkey unless RUBY_VERSION.split('.')[0] == '1'
+
+describe RbVmomi::VIM::VirtualApp do
+
+  before :all do
+    @monkey   ||= VMonkey.connect
+    @vapp     ||= @monkey.vapp VM_SPEC_OPTS[:vapp_path]
+    @spec_vapp_path = "#{VM_SPEC_OPTS[:working_folder]}/vmonkey_spec_vapp"
+  end
+
+  context 'with a cloned vapp' do
+    before(:all) { @spec_vapp = @vapp.clone_to @spec_vapp_path }
+    after(:all)  { @spec_vapp.destroy }
+
+    describe '#clone_to' do
+      context 'to a Folder' do
+        subject { @monkey.vapp @spec_vapp_path }
+        it { should_not be_nil }
+      end
+
+      it 'should raise an error when given a path of an existing vApp' do
+        expect { @spec_vapp.clone_to @spec_vapp_path }.to raise_error
+      end
+    end
+
+    describe '#clone_to!' do
+      before(:all) do
+        @other_path = "#{@spec_vapp_path}-other"
+        @other_vapp = @spec_vapp.clone_to @other_path
+        @other_vapp.property :clone_to_bang, 'before'
+      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 vApp' do
+        @spec_vapp.clone_to! @other_path
+        after_vapp = @monkey.vapp @other_path
+        expect(after_vapp).to_not be_nil
+        expect(after_vapp.property :clone_to_bang).to be_nil
+      end
+    end
+  end
+end

data/spec/vapp_property_spec.rb

@@ -47,5 +47,34 @@ describe RbVmomi::VIM::VirtualApp do
       it { expect(@spec_vapp.find_property(:ip_prop_with_default)[:type]).to eq 'ip' }
     end
 
+    describe '#set_properties' do
+      before(:all) do
+        @spec_vapp.set_properties({
+            multi_prop: 'xyzzy',
+            multi_ip_prop: { value: '1.1.1.1', type: 'ip' },
+            multi_ip_prop_with_default: { value: nil, type: 'ip', defaultValue: '0.0.0.0' }
+          })
+      end
+
+      it 'should set multiple properies from scratch' do
+        expect(@spec_vapp.property :multi_prop).to eq 'xyzzy'
+        expect(@spec_vapp.property :multi_ip_prop).to eq '1.1.1.1'
+        expect(@spec_vapp.property :multi_ip_prop_with_default).to eq '0.0.0.0'
+      end
+
+      it 'should overwrite multiple properies that already exist' do
+        @spec_vapp.set_properties({
+            multi_prop: 'abc123',
+            multi_ip_prop: '2.2.2.2',
+            multi_ip_prop_with_default: { value: '3.3.3.3', type: 'string' }
+          })
+
+        expect(@spec_vapp.property :multi_prop).to eq 'abc123'
+        expect(@spec_vapp.property :multi_ip_prop).to eq '2.2.2.2'
+        expect(@spec_vapp.find_property(:multi_ip_prop)[:type]).to eq 'ip'
+        expect(@spec_vapp.property :multi_ip_prop_with_default).to eq '3.3.3.3'
+        expect(@spec_vapp.find_property(:multi_ip_prop_with_default)[:type]).to eq 'string'
+      end
+    end
   end
 end

data/spec/vapp_spec.rb

@@ -28,13 +28,6 @@ describe RbVmomi::VIM::VirtualApp do
     before(:all) { @spec_vapp = @vapp.clone_to @spec_vapp_path }
     after(:all)  { @spec_vapp.destroy }
 
-    describe '#clone' do
-      context 'to a Folder' do
-        subject { @monkey.vapp @spec_vapp_path }
-        it { should_not 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmonkey
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Brian Dupras
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-25 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
@@ -119,6 +119,7 @@ files:
 - spec/datacenter_spec.rb
 - spec/folder_spec.rb
 - spec/spec_helper.rb
+- spec/vapp_clone_spec.rb
 - spec/vapp_property_spec.rb
 - spec/vapp_spec.rb
 - spec/vim_spec.rb
@@ -136,17 +137,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.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: simple to use vsphere methods
@@ -154,6 +155,7 @@ test_files:
 - spec/datacenter_spec.rb
 - spec/folder_spec.rb
 - spec/spec_helper.rb
+- spec/vapp_clone_spec.rb
 - spec/vapp_property_spec.rb
 - spec/vapp_spec.rb
 - spec/vim_spec.rb