vcloud-core 0.0.7 → 0.0.8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.8 (2014-03-04)
+
+Bugfix:
+
+  - missing VM bootstrap->vars section would throw NilClass error
+
 ## 0.0.7 (2014-03-03)
 
 Bugfixes:

data/lib/vcloud/core/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module Core
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end
 end

data/lib/vcloud/core/vm.rb

@@ -101,7 +101,8 @@ module Vcloud
         if bootstrap_config.nil? or bootstrap_config[:script_path].nil?
           interpolated_preamble = ''
         else
-          preamble_vars = bootstrap_config[:vars].merge(:extra_disks => extra_disks)
+          preamble_vars = bootstrap_config[:vars] || {}
+          preamble_vars.merge!(:extra_disks => extra_disks)
           interpolated_preamble = generate_preamble(
               bootstrap_config[:script_path],
               bootstrap_config[:script_post_processor],

data/spec/vcloud/core/vm_spec.rb

@@ -122,6 +122,64 @@ module Vcloud
         end
       end
 
+      context '#configure_guest_customization_section' do
+
+        it "should handle complete configuration" do
+          name = 'test-vm'
+          bootstrap_config = {
+            script_path: 'hello_world.erb',
+            script_post_processor: 'remove_hello.rb',
+            vars: { bob: 'hello', mary: 'hello' },
+          }
+          extra_disks = []
+          @vm.should_receive(:generate_preamble).
+            with('hello_world.erb', 'remove_hello.rb', {
+              bob: "hello",
+              mary: "hello",
+              extra_disks: [] }).
+            and_return('RETURNED_PREAMBLE')
+          @fog_interface.should_receive(:put_guest_customization_section).
+            with(@vm_id, 'test-vm', 'RETURNED_PREAMBLE')
+          @vm.configure_guest_customization_section(name, bootstrap_config, extra_disks)
+        end
+
+        it "should handle nil configuration" do
+          name = 'test-vm'
+          bootstrap_config = nil
+          extra_disks = nil
+          @vm.should_not_receive(:generate_preamble)
+          @fog_interface.should_receive(:put_guest_customization_section).
+            with(@vm_id, 'test-vm', '')
+          @vm.configure_guest_customization_section(name, bootstrap_config, extra_disks)
+        end
+
+        it "should handle empty configuration" do
+          name = 'test-vm'
+          bootstrap_config = {}
+          extra_disks = nil
+          @vm.should_not_receive(:generate_preamble)
+          @fog_interface.should_receive(:put_guest_customization_section).
+            with(@vm_id, 'test-vm', '')
+          @vm.configure_guest_customization_section(name, bootstrap_config, extra_disks)
+        end
+
+        it "should handle bootstrap vars being missing" do
+          name = 'test-vm'
+          bootstrap_config = {
+            script_path: 'hello_world.erb',
+            script_post_processor: 'remove_hello.rb',
+          }
+          extra_disks = []
+          @vm.should_receive(:generate_preamble).
+            with('hello_world.erb', 'remove_hello.rb', { extra_disks: [] }).
+            and_return('RETURNED_PREAMBLE')
+          @fog_interface.should_receive(:put_guest_customization_section).
+            with(@vm_id, 'test-vm', 'RETURNED_PREAMBLE')
+          @vm.configure_guest_customization_section(name, bootstrap_config, extra_disks)
+        end
+
+      end
+
       context '#generate_preamble' do
         it "should interpolate vars hash into template" do
           vars = {:message => 'hello world'}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-core
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -512267274305654333
+      hash: 4076622022301530583
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23