vagrant-persistent-storage 0.0.46 → 0.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4837fd59327b9bb86feed1bb7a3dd11189573365
-  data.tar.gz: 41e3fd130655643213d059181493a245198d6f8b
+  metadata.gz: 0c1f7961084fd1bc13ea55f1000e5e94753e69fd
+  data.tar.gz: f3cd4a6cb46192aac0dfb5975a92c3839575f901
 SHA512:
-  metadata.gz: 354207edfea91e109672e4059fdef1308e0897f70350868a6fc9c4f6d49ca5df799c618c6e18709e875937d1fc8a661670479532b07a8a5ce0d00dae382bcbdc
-  data.tar.gz: e845f5e1ec53847b798fbe97568c26f44b104b77fddffb7441c78ba9e85db6cfcd289dd14273a7e01a3ae108cf8cfec68ed8b50cbd6f5f4c8ccc2b72cc5f447b
+  metadata.gz: b8b9b167cbf68baa93b6510af517ad753faa18efa921cac68b8c76ef820a63aa03d1b33fdf6df60bb97eb9dfd971b4b94e42ee9b51a3eb65314741f9e23cef85
+  data.tar.gz: 2beb8f63549e196163fd6e8293c462792e3e1b3fc76aff9c1c0c204709bc1efd9d699c9b0b151483ac1fa0d9d24257c747d4da6f7377516413eec861a8b633a9

data/lib/vagrant-persistent-storage/providers/virtualbox/driver/base.rb

@@ -48,6 +48,7 @@ module VagrantPlugins
           persistent_storage_data = read_persistent_storage(location_realpath)
           if location and persistent_storage_data and identical_files(persistent_storage_data.location, location_realpath)
               execute("storageattach", @uuid, "--storagectl", persistent_storage_data.controller, "--port", persistent_storage_data.port, "--device", "0", "--type", "hdd", "--medium", "none")
+              execute("closemedium", "disk", persistent_storage_data.image)
           end
         end
 
@@ -57,13 +58,27 @@ module VagrantPlugins
           storage_data = nil
           controller_name = get_controller_name
           info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+          # Parse the following two lines matching the controller name:
+          # "SATA Controller-4-0"="/data/my-persistent-disk.vdi"
+          # "SATA Controller-ImageUUID-4-0"="1b5c4a17-3f84-49ba-b394-bfc609f30283"
+          # The first reports the underlying file, while the second reports the
+          # UUID of the VirtualBox medium.
           info.split("\n").each do |line|
               tmp_storage_data = nil
-              tmp_storage_data = PersistentStorageData.new(controller_name, $1, $3) if line =~ /^"#{controller_name}-(\d+)-(\d+)"="(.*)"/
+              tmp_storage_data = PersistentStorageData.new(controller_name, $1, $3, nil) if line =~ /^"#{controller_name}-(\d+)-(\d+)"="(.*)"/
+
+              tmp_storage_data_image = nil
+              tmp_storage_data_image = $3 if line =~ /^"#{controller_name}-ImageUUID-(\d+)-(\d+)"="(.*)"/
 
               if !tmp_storage_data.nil? and tmp_storage_data.location != 'none' and identical_files(File.expand_path(location), tmp_storage_data.location)
                   storage_data = tmp_storage_data
               end
+
+              # XXX: The ImageUUID line comes second and thus we have already
+              # storage_data initialized.
+              if !storage_data.nil? and !tmp_storage_data_image.nil?
+                  storage_data.image = tmp_storage_data_image
+              end
           end
           return storage_data
         end
@@ -93,11 +108,13 @@ module VagrantPlugins
           attr_accessor :controller
           attr_accessor :port
           attr_accessor :location
+          attr_accessor :image
 
-          def initialize(controller,port,location)
+          def initialize(controller,port,location,image)
             @controller = controller
             @port = port
             @location = location
+            @image = image
           end
         end
 

data/lib/vagrant-persistent-storage/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module PersistentStorage
-    VERSION = "0.0.46"
+    VERSION = "0.0.47"
   end
 end

data/test.sh

@@ -31,8 +31,8 @@ do
 	else
 		echo ...[FAILED]
 	fi
-	VAGRANT_VAGRANTFILE="$f" vagrant destroy -f --no-color >> $f.log && "$VBOXMANAGE" closemedium disk virtualdrive.vdi --delete >> $f.log 2>&1 
+	VAGRANT_VAGRANTFILE="$f" vagrant destroy -f --no-color >> $f.log && rm -fv virtualdrive.vdi >> $f.log 2>&1 
 done
 
 
-popd > /dev/null
+popd > /dev/null

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-persistent-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.47
 platform: ruby
 authors:
 - Sebastian Kusnier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake