vagrant-libvirt 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e9e48f76c74f80aa79c260ab558d0a72ec8dd3ecc667731ff05bd0a54d8ab8b
-  data.tar.gz: 8144733ea9d0f2a0a3152d481ab690120017a6767dcee783de8d5ba86d320d62
+  metadata.gz: 9cdcf747d5d28e485d660d025beefdd8c3f58c107816ce719bcb0ba14559913a
+  data.tar.gz: 71026dbb9ada779894dd0d5136f91e0da2c986ee279c320919817aaea511bdce
 SHA512:
-  metadata.gz: a4a81d5cacbee89973ae0dee7eedcc28ccee0a66d9d1139cef7a91ade87b16ca85a91f0cf22e7d8659450114691fc3079b7beef5cb002621683881cc99ca634a
-  data.tar.gz: 418ed72a453ba03aca7c0cb67d15adc431d37ab5de7c7f0f2d9f9a987f90ad7a88e923249eaf0a324ebc57886dc1b4d9eb23bcf3258254970dc8cdc8ba9a6f90
+  metadata.gz: 7dc8d355a72f309322630617dbb3be94536969637bc3f6d7c9fa907aebbbd1b96bcc49aad3501dd5dd3a1220d17d5d12a14f7cd87d57e43c2790238e5099622d
+  data.tar.gz: ded86b4e49bfb44e3d257936373b804d918a1eb34b956e2a02c9d99e60a7f5140cdc5241740720461a505897b74690589e0ba8c9a4656ce430be9164b86541c3

data/lib/vagrant-libvirt/action/handle_box_image.rb

@@ -34,10 +34,11 @@ module VagrantPlugins
             box_format = env[:machine].box.metadata['format']
             HandleBoxImage.verify_box_format(box_format)
 
+            image_path = HandleBoxImage.get_box_image_path(env[:machine].box, 'box.img')
             env[:box_volume_number] = 1
             env[:box_volumes] = [{
-              :path => HandleBoxImage.get_box_image_path(env[:machine].box, 'box.img'),
-              :name => HandleBoxImage.get_volume_name(env[:machine].box, 'box'),
+              :path => image_path,
+              :name => HandleBoxImage.get_volume_name(env[:machine].box, 'box', image_path, env[:ui]),
               :virtual_size => HandleBoxImage.get_virtual_size(env),
               :format => box_format,
             }]
@@ -58,6 +59,8 @@ module VagrantPlugins
               volume_name = HandleBoxImage.get_volume_name(
                 env[:machine].box,
                 disks[i].fetch('name', disks[i]['path'].sub(/#{File.extname(disks[i]['path'])}$/, '')),
+                image_path,
+                env[:ui],
               )
 
               # allowing name means needing to check that it doesn't cause a clash
@@ -122,15 +125,21 @@ module VagrantPlugins
 
         protected
 
-        def self.get_volume_name(box, name)
+        def self.get_volume_name(box, name, path, ui)
+          version = begin
+                      box.version.to_s
+                    rescue
+                      ''
+                    end
+
+          if version.empty?
+            ui.warn(I18n.t('vagrant_libvirt.box_version_missing', name: box.name.to_s))
+
+            version = "0_#{File.mtime(path).to_i}"
+          end
+
           vol_name = box.name.to_s.dup.gsub('/', '-VAGRANTSLASH-')
-          vol_name << "_vagrant_box_image_#{
-            begin
-              box.version.to_s
-            rescue
-              ''
-            end
-          }_#{name.dup.gsub('/', '-SLASH-')}.img"
+          vol_name << "_vagrant_box_image_#{version}_#{name.dup.gsub('/', '-SLASH-')}.img"
         end
 
         def self.get_virtual_size(env)

data/lib/vagrant-libvirt/version

@@ -1 +1 @@
-0.6.2
+0.6.3

data/locales/en.yml

@@ -15,6 +15,10 @@ en:
     manual_resize_required: |-
       Created volume larger than box defaults, will require manual resizing of
       filesystems to utilize.
+    box_version_missing: |-
+      No verison detected for %{name}, using timestamp to watch for modifications. Consider
+      generating a local metadata for the box with a version to allow better handling.
+      See https://www.vagrantup.com/docs/boxes/format#box-metadata for further details.
     uploading_volume: |-
       Uploading base box image as volume into Libvirt storage...
     creating_domain_volume: |-

data/spec/unit/action/handle_box_image_spec.rb

@@ -98,6 +98,36 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
         )
       end
 
+      context 'when no box version set' do
+        let(:box_mtime) { Time.now }
+
+        before do
+          expect(env[:machine]).to receive_message_chain("box.version") { nil }
+          expect(File).to receive(:mtime).and_return(box_mtime)
+        end
+
+        it 'should use the box file timestamp' do
+          expect(ui).to receive(:warn).with(
+            "No verison detected for test, using timestamp to watch for modifications. Consider\n" +
+            "generating a local metadata for the box with a version to allow better handling.\n" +
+            'See https://www.vagrantup.com/docs/boxes/format#box-metadata for further details.'
+          )
+
+          expect(subject.call(env)).to be_nil
+          expect(env[:box_volume_number]).to eq(1)
+          expect(env[:box_volumes]).to eq(
+            [
+              {
+                :path=>"/test/box.img",
+                :name=>"test_vagrant_box_image_0_#{box_mtime.to_i}_box.img",
+                :virtual_size=>byte_number_5G,
+                :format=>"qcow2"
+              }
+            ]
+          )
+        end
+      end
+
       context 'When config.machine_virtual_size is set and smaller than box_virtual_size' do
         before do
           allow(env[:machine]).to receive_message_chain("provider_config.machine_virtual_size").and_return(1)

data/spec/unit/provider_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'support/sharedcontext'
+
+describe 'VagrantPlugins::ProviderLibvirt::Provider' do
+  require 'vagrant-libvirt/provider'
+
+  include_context 'unit'
+
+  describe '#ssh_info' do
+  end
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Lukas Stanek
 - Dima Vasilets
 - Brian Pitts
 - Darragh Bailey
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2021-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -264,6 +264,7 @@ files:
 - spec/unit/action_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/driver_spec.rb
+- spec/unit/provider_spec.rb
 - spec/unit/templates/domain_all_settings.xml
 - spec/unit/templates/domain_custom_cpu_model.xml
 - spec/unit/templates/domain_defaults.xml
@@ -275,7 +276,7 @@ homepage: https://github.com/vagrant-libvirt/vagrant-libvirt
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -290,50 +291,51 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: libvirt provider for Vagrant.
 test_files:
-- spec/support/temporary_dir.rb
-- spec/support/libvirt_context.rb
-- spec/support/binding_proc.rb
-- spec/support/sharedcontext.rb
 - spec/support/matchers/have_file_content.rb
+- spec/support/binding_proc.rb
 - spec/support/environment_helper.rb
-- spec/unit/action_spec.rb
-- spec/unit/templates/domain_all_settings.xml
-- spec/unit/templates/domain_custom_cpu_model.xml
-- spec/unit/templates/domain_defaults.xml
-- spec/unit/templates/domain_spec.rb
-- spec/unit/templates/tpm/version_1.2.xml
-- spec/unit/templates/tpm/version_2.0.xml
-- spec/unit/action/create_domain_spec/additional_disks_domain.xml
-- spec/unit/action/create_domain_spec/default_domain.xml
+- spec/support/libvirt_context.rb
+- spec/support/temporary_dir.rb
+- spec/support/sharedcontext.rb
 - spec/unit/action/create_domain_spec/default_system_storage_pool.xml
 - spec/unit/action/create_domain_spec/default_user_storage_pool.xml
-- spec/unit/action/create_domain_spec.rb
-- spec/unit/action/wait_till_up_spec.rb
-- spec/unit/action/package_domain_spec.rb
-- spec/unit/action/forward_ports_spec.rb
-- spec/unit/action/destroy_domain_spec.rb
-- spec/unit/action/halt_domain_spec.rb
-- spec/unit/action/start_domain_spec.rb
-- spec/unit/action/shutdown_domain_spec.rb
-- spec/unit/action/clean_machine_folder_spec.rb
-- spec/unit/action/create_domain_volume_spec.rb
-- spec/unit/action/set_name_of_domain_spec.rb
-- spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_1.xml
+- spec/unit/action/create_domain_spec/additional_disks_domain.xml
+- spec/unit/action/create_domain_spec/default_domain.xml
+- spec/unit/action/create_domain_volume_spec/one_disk_in_storage.xml
 - spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_0.xml
+- spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_1.xml
 - spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_2.xml
-- spec/unit/action/create_domain_volume_spec/one_disk_in_storage.xml
-- spec/unit/action/start_domain_spec/default_added_tpm_path.xml
 - spec/unit/action/start_domain_spec/clock_timer_rtc.xml
 - spec/unit/action/start_domain_spec/default.xml
-- spec/unit/action/start_domain_spec/existing.xml
+- spec/unit/action/start_domain_spec/default_added_tpm_path.xml
 - spec/unit/action/start_domain_spec/default_added_tpm_version.xml
+- spec/unit/action/start_domain_spec/existing.xml
+- spec/unit/action/clean_machine_folder_spec.rb
+- spec/unit/action/forward_ports_spec.rb
+- spec/unit/action/set_name_of_domain_spec.rb
+- spec/unit/action/wait_till_up_spec.rb
+- spec/unit/action/create_domain_volume_spec.rb
+- spec/unit/action/start_domain_spec.rb
+- spec/unit/action/destroy_domain_spec.rb
+- spec/unit/action/halt_domain_spec.rb
+- spec/unit/action/create_domain_spec.rb
+- spec/unit/action/package_domain_spec.rb
+- spec/unit/action/shutdown_domain_spec.rb
 - spec/unit/action/handle_box_image_spec.rb
-- spec/unit/config_spec.rb
+- spec/unit/templates/tpm/version_1.2.xml
+- spec/unit/templates/tpm/version_2.0.xml
+- spec/unit/templates/domain_custom_cpu_model.xml
+- spec/unit/templates/domain_defaults.xml
+- spec/unit/templates/domain_spec.rb
+- spec/unit/templates/domain_all_settings.xml
 - spec/unit/util/byte_number_spec.rb
+- spec/unit/provider_spec.rb
+- spec/unit/config_spec.rb
 - spec/unit/driver_spec.rb
+- spec/unit/action_spec.rb
 - spec/spec_helper.rb