inprovise-vbox 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODEzMTU2YzNkOWY1NWYxOTI3MzY5MTljMjg2YmYyY2M3NzJmZTI5ZA==
+    OTgyMTBmNTdkOWE4MzM2MjIyMmE4NzE4ZmNhODgzMzAyN2Q1ZWIwNw==
   data.tar.gz: !binary |-
-    NzljYzMzMjU0OTJlZGNhNjUzYjI4NWE1NTNkMzgzZjE0OGM1NmU4NQ==
+    NWJiNGNmOGJhMmQ3YWM0OWZiMmFjN2Q1ODZiMDlmNjU0ZWZiM2Q5NQ==
 SHA512:
   metadata.gz: !binary |-
-    NmQzODc1ZGZlMjY3NmRiYWUyOGNiZWUzOGQ1OTY3YTNiMWNjMDBjYTc4NzFk
-    N2JiNWYxZGQ3NzQ0ZDkxNGFmYzZhZDkyMjgyODRiNDNkZjg5YTIxZDBmYjE4
-    Y2IyNTg3Y2M4ZjhjZDZlM2Y4ZTRmNGEyN2Q3Njk4MjY1YmRhMjY=
+    M2ZiZDFkMTRkNGJhMDg3NWM0ZGYwZmYzYjU5ODc3YTNiM2VjZTdmMTZiMjJj
+    ODU0OGE3YjRiYTZhNmM2YmE1NDlhY2U3NzYxZmIxZmUwZTY3MDUwZjIzMmYz
+    YWQ0MDdiZjI5NDQzMjExNTQ4OGJiNTllZTA3NDAzYWI4MDE2YWI=
   data.tar.gz: !binary |-
-    NmM1ZTA2NzMzNmYwMzQ1MDVhMmNhZTRmMmIzNDJhZjZiNzBmMzU1NzE5OTc1
-    MmQzMTQxMGU1MzdiMzZiMThmMjNhZDlkNTkzNjA0NTNkMGU2MTZkNzZiZmM1
-    NjAxM2JiMTY0ZGNjOWM1ZjA5Y2MyYTVkZTgyOGU2Njk4NDk4OWM=
+    NmExNTZjYjQ2YjZmNzBlOGM3MzUxYjEzZGU5MzA0ZjRmN2Y3NDgyYjZlMmRj
+    ODUwNTUyZTdiOGQzYjg4NDk3Y2ZjNDE4Mjg5MzAwNDQ2NmQyZjM0MTM2YTAz
+    ZTg4NmI5NTg0Yjg0ZmQyNDQyZmQ5MTgzMDg1NjQ4OTVhYTFlYTM=

data/lib/inprovise/vbox/vbox.rb

@@ -59,14 +59,14 @@ module Inprovise::VBox
     end
 
     def setup
-      # verify mandatory configuration
-      raise ArgumentError, "Missing required configuration for vbox script #{name}" unless Hash === configuration || OpenStruct === configuration
       # take care of defaults
-      configuration[:memory] ||= 1024
-      configuration[:cpus] ||= 1
-      configuration[:network] ||= :hostnet
+      @configuration ||= {}
+      @configuration[:arch] ||= 'x86_64'
+      @configuration[:memory] ||= 1024
+      @configuration[:cpus] ||= 1
+      @configuration[:network] ||= :hostnet
       # generate name if none set
-      configuration[:name] ||= "#{name}_#{self.hash}_#{Time.now.to_f}"
+      @configuration[:name] ||= "#{name}_#{self.hash}_#{Time.now.to_f}"
 
       vbs = self
       # define the scripts that do the actual work as dependencies
@@ -97,8 +97,9 @@ module Inprovise::VBox
           # 1. verify config
           raise ArgumentError, "Cannot access VBox image #{vmimg}" unless remote(vmimg).file?
           # 2. execute virt-install
-          log("Installing VBox #{vmname}".bold)
+          log("Installing VBox #{vmname}", :bold)
           cmdline = 'virt-install --connect qemu:///system --hvm --virt-type kvm --import --wait 0 '
+          cmdline << "--arch #{vbs.vbox_arch(self)} "
           cmdline << '--autostart ' if vbs.vbox_autostart(self)
           cmdline << "--name #{vmname} --memory #{vbs.vbox_memory(self)} --vcpus #{vbs.vbox_cpus(self)} "
           cmdline << "--os-variant #{vbs.vbox_os(self)} " if vbs.vbox_os(self)
@@ -126,17 +127,18 @@ module Inprovise::VBox
           vmname = vbs.vbox_name(self)
           if trigger 'vbox:vbox-verify', vmname, true
             trigger 'vbox:vbox-shutdown', vmname
-            log.print("Waiting for shutdown of VBox #{vmname}. Please wait ...|".bold)
+            msg = "Waiting for shutdown of VBox #{vmname}. Please wait ..."
+            log.print("#{msg}|\r", :bold)
             30.times do |n|
               sleep(1)
-              log.print("\b" + %w{| / - \\}[(n+1) % 4].bold)
+              log.print("#{msg}#{%w{| / - \\}[(n+1) % 4]}\r", :bold)
               break unless trigger 'vbox:vbox-verify', vmname, true
             end
             if trigger('vbox:vbox-verify', vmname, true)
               trigger('vbox:vbox-kill', vmname)
               sleep(1)
             end
-            log.println("\bdone".bold)
+            log.println("#{msg}done", :bold)
           end
           trigger('vbox:vbox-delete', vmname) unless trigger('vbox:vbox-verify', vmname, true)
         end
@@ -160,17 +162,18 @@ module Inprovise::VBox
           vmname = vbs.vbox_name(self)
           unless vbs.vbox_no_node(self)
             # get MAC and IP for VM
-            log.print("Determining IP address for VBox #{vmname}. Please wait ...|".bold)
+            msg = "Determining IP address for VBox #{vmname}. Please wait ..."
+            log.print("#{msg}|\r", :bold)
             mac = addr = nil
             150.times do |n|
               sleep(2)
-              log.print("\b" + %w{| / - \\}[(n+1) % 4].bold)
+              log.print("#{msg}#{%w{| / - \\}[(n+1) % 4]}\r", :bold)
               mac, addr = trigger 'vbox:vbox-ifaddr', vmname
               if addr
                 break
               end
             end
-            log.println("\bdone".bold)
+            log.println("#{msg}done", :bold)
             raise RuntimeError, "Failed to determin IP address for VBox #{vmname}" unless addr
             log("VBox #{vmname} : mac=#{mac}, addr=#{addr}") if Inprovise.verbosity > 0
             vbox_opts = vbs.vbox_config_hash(self)
@@ -187,7 +190,7 @@ module Inprovise::VBox
               Inprovise::Sniffer.run_sniffers_for(node) rescue Inprovise::Sniffer.run_sniffers_for(node)
               Inprovise::Infrastructure.save
             end
-            log("Added new node #{node}".bold)
+            log("Added new node #{node}", :bold)
           end
         end
 
@@ -199,9 +202,9 @@ module Inprovise::VBox
             if tgt && Inprovise::Infrastructure::Node === tgt
               Inprovise::Infrastructure.deregister(vmname)
               Inprovise::Infrastructure.save
-              log("Removed node #{tgt}".bold)
+              log("Removed node #{tgt}", :bold)
             else
-              log("No existing node #{vmname} found!".yellow)
+              log("No existing node #{vmname} found!", :yellow)
             end
           end
         end
@@ -235,6 +238,10 @@ module Inprovise::VBox
       value_for context, context.config[name.to_sym][:image]
     end
 
+    def vbox_arch(context)
+      value_for context, context.config[name.to_sym][:arch]
+    end
+
     def vbox_memory(context)
       value_for context, context.config[name.to_sym][:memory]
     end

data/lib/inprovise/vbox/version.rb

@@ -5,6 +5,6 @@
 
 module Inprovise; module VBox
 
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 
 end; end

data/test/vbox_test.rb

@@ -26,13 +26,16 @@ describe Inprovise::VBox do
       script.name.must_equal 'myVbox'
     end
 
-    it 'requires a configuration' do
-      assert_raises ArgumentError do
-        script = Inprovise::DSL.module_eval do
-          vbox 'myVbox' do
-          end
+    it 'defines default configuration' do
+      script = Inprovise::DSL.module_eval do
+        vbox 'myVbox' do
         end
       end
+      script.configuration.must_be_kind_of Hash
+      script.configuration[:arch].must_equal 'x86_64'
+      script.configuration[:memory].must_equal 1024
+      script.configuration[:cpus].must_equal 1
+      script.configuration[:network].must_equal :hostnet
     end
   end
 

metadata

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