vagrant-libvirt 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b55fc32f8adb0cb243c614739bd328914c41ba8af23ca327dc41e2dba2a5eefe
-  data.tar.gz: de8042a84390599e5f4eb7ae9ea63a2306644e7562b41bec3afeae795fe01333
+  metadata.gz: 8cce5cc2c14c33a541cb2c0a446dd76692685131abbff67992976e736cd0f04e
+  data.tar.gz: 4abe7566cc6269cb8c9fa4cac79cdfe6a1d5919e7305ffec1a214e937853c4ea
 SHA512:
-  metadata.gz: 3958a03dca08540b0c49f444de1ba8164cdbc40056e3206b1af674c28f9cb15eda0a290f0044089e5f35f7ce69c1424828259042a64f19cea85f46f9ae738071
-  data.tar.gz: 5d60cf7e10f6468b3e2597a211634e6a04138dc22a7f320bbc753c07b1e8d3a4ae83de15fd6294061d0f282990e2a68e40b9a7849db6fe3db232055141d42b5c
+  metadata.gz: 2eb5a19c0aa21eccd856d8056270669d201ceec6f3f6cfb209ec7e6185bfcca0a25fd1b60556bef4ea92ed261b6069c17011c2c0083999c146065dc216656beb
+  data.tar.gz: c3ffc56e5e8d680f87541be65a9990fd77a0e8235c070a413eb5d44d63f7cb1b5bbc712ea6c8b5fb8fe45ef85d72a967e31f241ea0461a9b943f7cd79eb6151b

data/README.md

@@ -1788,11 +1788,25 @@ $ bundle exec rspec spec/
 If those pass, you're ready to start developing the plugin. You can test the
 plugin without installing it into your Vagrant environment by just creating a
 `Vagrantfile` in the top level of this directory (it is gitignored) that uses
-it. Don't forget to add following line at the beginning of your `Vagrantfile`
-while in development mode:
+it. You can add the following line to your Vagrantfile while in development to
+ensure vagrant checks that the plugin is installed:
 
 ```ruby
-Vagrant.require_plugin "vagrant-libvirt"
+Vagrant.configure("2") do |config|
+  config.vagrant.plugins = "vagrant-libvirt"
+end
+```
+Or add the following to the top of the file to ensure that any required plugins
+are installed globally:
+```ruby
+REQUIRED_PLUGINS = %w(vagrant-libvirt)
+exit unless REQUIRED_PLUGINS.all? do |plugin|
+  Vagrant.has_plugin?(plugin) || (
+    puts "The #{plugin} plugin is required. Please install it with:"
+    puts "$ vagrant plugin install #{plugin}"
+    false
+  )
+end
 ```
 
 Now you can use bundler to execute Vagrant:

data/lib/vagrant-libvirt/action.rb

@@ -186,11 +186,11 @@ module VagrantPlugins
 
             b2.use Call, DestroyConfirm do |env2, b3|
               if env2[:result]
+                b3.use ProvisionerCleanup, :before
                 b3.use ClearForwardedPorts
                 b3.use PruneNFSExports
                 b3.use DestroyDomain
                 b3.use DestroyNetworks
-                b3.use ProvisionerCleanup
               else
                 b3.use MessageWillNotDestroy
               end

data/lib/vagrant-libvirt/driver.rb

@@ -97,11 +97,13 @@ module VagrantPlugins
           return get_ipaddress_from_system domain.mac
         end
 
-        # Get IP address from arp table
+        # Get IP address from dhcp leases table
         begin
           ip_address = get_ipaddress_from_domain(domain)
         rescue Fog::Errors::TimeoutError
           @logger.info('Timeout at waiting for an ip address for machine %s' % machine.name)
+
+          raise
         end
 
         unless ip_address

data/lib/vagrant-libvirt/plugin.rb

@@ -26,6 +26,7 @@ module VagrantPlugins
       end
 
       action_hook(:remove_libvirt_image) do |hook|
+        require_relative 'action'
         hook.after Vagrant::Action::Builtin::BoxRemove, Action.remove_libvirt_image
       end
 

data/lib/vagrant-libvirt/version

@@ -1 +1 @@
-0.4.0
+0.4.1

data/spec/support/binding_proc.rb

@@ -0,0 +1,24 @@
+##
+# A simple extension of the Proc class that supports setting a custom binding
+# and evaluates everything in the Proc using the new binding.
+
+class ProcWithBinding < Proc
+  ##
+  # Set the binding for this instance
+
+  def apply_binding(bind, *args)
+    @binding = bind
+    instance_exec(*args, &self)
+  end
+
+  def method_missing(method, *args)
+    begin
+      method_from_binding = eval("method(#{method.inspect})", @binding)
+      return method_from_binding.call(*args)
+    rescue NameError
+      # fall through on purpose
+    end
+
+    super
+  end
+end

data/spec/unit/action/wait_till_up_spec.rb

@@ -12,7 +12,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::WaitTillUp do
   include_context 'libvirt'
   include_context 'unit'
 
-  let (:driver) { double('driver') }
+  let (:driver) { VagrantPlugins::ProviderLibvirt::Driver.new env[:machine] }
 
   describe '#call' do
     before do
@@ -47,6 +47,24 @@ describe VagrantPlugins::ProviderLibvirt::Action::WaitTillUp do
         end
       end
 
+      context 'multiple timeouts waiting for IP' do
+        before do
+          allow(env).to receive(:[]).and_call_original
+          allow(env).to receive(:[]).with(:interrupted).and_return(false)
+          allow(logger).to receive(:debug)
+          allow(logger).to receive(:info)
+        end
+
+        it 'should abort after hitting limit' do
+          expect(domain).to receive(:wait_for).at_least(300).times.and_raise(::Fog::Errors::TimeoutError)
+          expect(app).to_not receive(:call)
+          expect(ui).to receive(:info).with('Waiting for domain to get an IP address...')
+          expect(ui).to_not receive(:info).with('Waiting for SSH to become available...')
+          expect(env[:machine].communicate).to_not receive(:ready?)
+          expect {subject.call(env) }.to raise_error(::Fog::Errors::TimeoutError)
+        end
+      end
+
       context 'if interrupted waiting for SSH' do
         before do
           allow(domain).to receive(:wait_for).and_return(true)

data/spec/unit/config_spec.rb

@@ -1,4 +1,4 @@
-require 'contextual_proc'
+require 'support/binding_proc'
 
 require 'spec_helper'
 require 'support/sharedcontext'
@@ -103,7 +103,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
             :id_ssh_key_file => nil,
           },
           {
-            :setup => ContextualProc.new {
+            :setup => ProcWithBinding.new {
               expect(File).to_not receive(:file?)
             }
           }
@@ -116,7 +116,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
             :id_ssh_key_file => "/home/tests/.ssh/id_rsa",
           },
           {
-            :setup => ContextualProc.new {
+            :setup => ProcWithBinding.new {
               expect(File).to receive(:file?).with("/home/tests/.ssh/id_rsa").and_return(true)
             }
           }
@@ -263,7 +263,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
           {:connect_via_ssh => true},
           {:uri => 'qemu+ssh://localhost/system?no_verify=1', :id_ssh_key_file => nil},
           {
-            :setup => ContextualProc.new {
+            :setup => ProcWithBinding.new {
               expect(File).to receive(:file?).with("/home/tests/.ssh/id_rsa").and_return(false)
             }
           }
@@ -272,7 +272,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
           {:connect_via_ssh => true},
           {:uri => 'qemu+ssh://localhost/system?no_verify=1&keyfile=/home/tests/.ssh/id_rsa', :id_ssh_key_file => '/home/tests/.ssh/id_rsa'},
           {
-            :setup => ContextualProc.new {
+            :setup => ProcWithBinding.new {
               expect(File).to receive(:file?).with("/home/tests/.ssh/id_rsa").and_return(true)
             }
           }
@@ -294,7 +294,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
           end
 
           if !opts[:setup].nil?
-            opts[:setup].apply(binding)
+            opts[:setup].apply_binding(binding)
           end
 
           inputs.each do |k, v|
@@ -362,7 +362,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
           {:connect_via_ssh => true, :host => 'remote', :username => 'myuser'},
           "ssh 'remote' -l 'myuser' -i '/home/tests/.ssh/id_rsa' -W %h:%p",
           {
-            :setup => ContextualProc.new {
+            :setup => ProcWithBinding.new {
               expect(File).to receive(:file?).with("/home/tests/.ssh/id_rsa").and_return(true)
             }
           }
@@ -417,7 +417,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
           end
 
           if !opts[:setup].nil?
-            opts[:setup].apply(binding)
+            opts[:setup].apply_binding(binding)
           end
 
           inputs.each do |k, v|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,22 +10,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2021-04-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: contextual_proc
-  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-core
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +209,7 @@ files:
 - lib/vagrant-libvirt/version.rb
 - locales/en.yml
 - spec/spec_helper.rb
+- spec/support/binding_proc.rb
 - spec/support/environment_helper.rb
 - spec/support/libvirt_context.rb
 - spec/support/sharedcontext.rb
@@ -291,5 +278,6 @@ test_files:
 - spec/unit/templates/domain_custom_cpu_model.xml
 - spec/support/libvirt_context.rb
 - spec/support/environment_helper.rb
+- spec/support/binding_proc.rb
 - spec/support/sharedcontext.rb
 - spec/spec_helper.rb