inprovise-vbox 0.2.9 → 0.2.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzBhZThhZmE1NGJkNWE3MDg2NDRhYWYwOTNiYmFjZDAxOGVmYTgwOQ==
+    MmEzN2Y0NWY5MmZjZWZhZjljMzc1Zjg0OWYwMGM2ZTdjZWI2MWJiOA==
   data.tar.gz: !binary |-
-    ZDEwYjczZTNiNWIxNmU2ZDJmOTliN2U3YmNiMDEyMjRmYTY1NWY3Yw==
+    NTcyYjg1NWQ0NTdkMWZkYjQ1OTA5YTdmNWFhZjQ3YzdiNGY1MTE4NA==
 SHA512:
   metadata.gz: !binary |-
-    MjU0NmRhZGMyODM0YjkwOTBiMzFlZWYxZjJlOTZiNTNlZjAzYmM1MTMzZjNm
-    ZDlhYTFlZmFmZWFiM2ZlNjlkMDc0OGUxNDU5ZDQ1NzBkOWZjNzQwZmQ4ZDNh
-    MzRiNjJhNjhhNmNhZDMyZTFjOWQ2YTgxNzY2YWVkZDM3NDRlNDA=
+    OWVlODJiMzJiZjQ0YTFiOTdiZTJmNjE4ODJlYjkzNTYyMWI5YTdhNTc0Mjlj
+    ZGY0ODcwZjRmMjM1ZTBjOThhM2JkYzBmMWFiOTg1N2U3ZGUxNDYwMGU5ZGYy
+    YTNjMmQyYTU1OTFhYmI3NjM3ZGE3ODdlYTBkODVmMmFjZGQ1YTA=
   data.tar.gz: !binary |-
-    ZDk4NTk0MmEyZjBlMWNiNzJjYzNjYmVmMjU5ZjZjMGYxYTI2Njg1Mzk2Y2U3
-    ZmE0MDQ2ZjU5YTk4YmE5YTc3NGQ0NGQ1YmQzYjY5ZjZkZTYwNWZmNjU1MGY4
-    ZmQyNDk3N2UwMmVlM2Q5YjJmNjc4YjgzODU5OWM1NWFiZTM3Nzc=
+    ZGUzMzEyM2IzY2RiMDlhNzM0YjhiOGRmNzRkMzNiYTI2Y2Y4NWM2YmU4YjY1
+    YjBiMWU5Mjk5ZmMwOTA2N2U4NzE1NDYyYzMwZDIxNjkwMjk0OTZiMjI4NTBm
+    YzQ3OTRhNzlhMjEzYmViNWNhYTQxNzAzMGEyODdlMjg0ZWUwOGE=

data/lib/inprovise/vbox/vbox.rb

@@ -97,7 +97,7 @@ module Inprovise::VBox
 
     def setup
       # take care of defaults
-      @configuration ||= {}
+      @configuration ||= Inprovise::Config.new
       @configuration[:arch] ||= 'x86_64'
       @configuration[:memory] ||= 1024
       @configuration[:cpus] ||= 1
@@ -233,17 +233,21 @@ module Inprovise::VBox
             end
             Inprovise::Infrastructure.save unless node_group.empty?
             unless vbs.vbox_no_sniff(self)
-              # retry on (comm) failure
-              begin
-                Inprovise::Sniffer.run_sniffers_for(node)
-              rescue
-                sleep(5)  # maybe VM needs more time to start up SSH
-                node.disconnect!
-                Inprovise::Sniffer.run_sniffers_for(node)
+              (1..5).each do |i|
+                begin
+                  Inprovise::Sniffer.run_sniffers_for(node)
+                  break
+                rescue
+                  raise if i == 5
+                  sleep(5)  # maybe VM needs more time to start up SSH
+                  node.disconnect!
+                  # retry on (comm) failure
+                end
               end
               Inprovise::Infrastructure.save
             end
             log("Added new node #{node}", :bold)
+            config['vbox'] = node
           end
         end
 
@@ -265,12 +269,25 @@ module Inprovise::VBox
       end
 
       # add dependencies in correct order
-      # MUST proceed any user defined dependencies
+      # MUST preceed any user defined dependencies
       dependencies.insert(0, @vm_script.name, @node_script.name)
 
       self
     end
 
+    # overload Script#configure
+    def configure(cfg=nil, &definition)
+      @configuration = Inprovise::Config.new.merge!(cfg) if cfg
+      if block_given?
+        vbs = self
+        command(:configure) do
+          self.instance_eval(&definition)
+          config['vbox'] = Inprovise::Infrastructure.find(config[vbs.name][:name])
+        end
+      end
+      @configuration
+    end
+
     def vbox_name(context)
       value_for context, context.config[name.to_sym][:name]
     end

data/lib/inprovise/vbox/version.rb

@@ -5,6 +5,6 @@
 
 module Inprovise; module VBox
 
-  VERSION = '0.2.9'
+  VERSION = '0.2.10'
 
 end; end

data/test/vbox_test.rb

@@ -31,7 +31,7 @@ describe Inprovise::VBox do
         vbox 'myVbox' do
         end
       end
-      script.configuration.must_be_kind_of Hash
+      script.configuration.must_be_kind_of Inprovise::Config
       script.configuration[:arch].must_equal 'x86_64'
       script.configuration[:memory].must_equal 1024
       script.configuration[:cpus].must_equal 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inprovise-vbox
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inprovise