vagrant-disksize 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ed50257fa9beb3cf82e819f7c9cda72de170a1a
-  data.tar.gz: 2ea55ad19b783a25fbb442fd3947b7e13284f027
+  metadata.gz: ac665634b597c5fe88877fbeebbfb288035c407f
+  data.tar.gz: 6085074186b37a0354c7a468a77e93cd992a3cae
 SHA512:
-  metadata.gz: abee2553e9b3c3c981b76c3f39f652af94e94f5d859c74fd4c5b59fd8d50ef7d8fd076d11a2c9a7590af7ef4882ea75670f5a999ba86b9034f5116462ff852de
-  data.tar.gz: 22a95dd79e18d89e3115795d801168ac5b0367ce730901e6ceaf427c08779cbdfcdb828949c14497d845ffd6f1e2bae82053d6de927b2e02334c6db0dbf3b520
+  metadata.gz: c00a4c6edfec35b9af9197c191810ad3b8d79a07ffaaefea2a4fa06ff817dd16704aa7e88364948c2b87f37478e1edf7de9ac5194a5885584992838f552bcbae
+  data.tar.gz: e5f0bc360eda8fb227738768b8cfe55b8b1ccee26a765026681cad37ec2ed550860fb9452287ac891a6f794fe1622f92570ed278efabfe7c7a8756dc3546d7e7

data/lib/vagrant/disksize/actions.rb

@@ -6,6 +6,15 @@ module Vagrant
 
         # NOTE - size is represented in MB throughout this class, for ease of using with VirtualBox
 
+        # Creates infix for VBoxManage commands (driver.execute)
+        # according to VirtualBox version
+        VB_Meta = VagrantPlugins::ProviderVirtualBox::Driver::Meta.new()
+        if VB_Meta.version >= '5.0'
+          MEDIUM = 'medium'
+        else
+          MEDIUM = 'hd'
+        end
+
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
@@ -44,7 +53,7 @@ module Vagrant
             unless File.exist? new_disk[:file]
               clone_as_vdi(driver, old_disk, new_disk)
               attach_disk(driver, new_disk)
-              File.delete(old_disk[:file])
+              remove_disk(driver, old_disk)
             end
           end
         end
@@ -66,11 +75,11 @@ module Vagrant
         end
 
         def clone_as_vdi(driver, src, dst)
-          driver.execute('clonemedium', src[:file], dst[:file], '--format', 'VDI')
+          driver.execute("clone#{MEDIUM}", src[:file], dst[:file], '--format', 'VDI')
         end
 
         def grow_vdi(driver, disk, size)
-          driver.execute('modifymedium', disk[:file], '--resize', size.to_s)
+          driver.execute("modify#{MEDIUM}", disk[:file], '--resize', size.to_s)
         end
 
         def attach_disk(driver, disk)
@@ -81,9 +90,13 @@ module Vagrant
           driver.execute('storageattach', @machine.id, '--storagectl', controller, '--port', port, '--device', device, '--type', 'hdd',  '--medium', disk[:file])
         end
 
+        def remove_disk(driver, disk)
+          driver.execute("closemedium", disk[:file], '--delete')
+        end
+
         def get_disk_size(driver, disk)
           size = nil
-          driver.execute('showmediuminfo', disk[:file]).each_line do |line|
+          driver.execute("show#{MEDIUM}info", disk[:file]).each_line do |line|
             if line =~ /Capacity:\s+([0-9]+)\s+MB/
               size = $1.to_i
             end
@@ -97,13 +110,15 @@ module Vagrant
           disk_keys = vminfo.keys.select { |k| k =~ /-ImageUUID-/ }
           disk_keys.each do |key|
             uuid = vminfo[key]
-            disk_name = key.gsub(/-ImageUUID-/,'-')
-            disk_file = vminfo[disk_name]
-            disks << {
-              uuid: uuid,
-              name: disk_name,
-              file: disk_file
-            }
+            if is_disk(driver, uuid)
+              disk_name = key.gsub(/-ImageUUID-/,'-')
+              disk_file = vminfo[disk_name]
+              disks << {
+                uuid: uuid,
+                name: disk_name,
+                file: disk_file
+              }
+            end
           end
           disks
         end
@@ -119,6 +134,15 @@ module Vagrant
           vminfo
         end
 
+        def is_disk(driver, uuid)
+          begin
+            driver.execute("showmediuminfo", 'disk', uuid)
+            true
+          rescue
+            false
+          end
+        end
+
         def generate_resizable_disk(disk)
           src = disk[:file]
           src_extn = File.extname(src)

data/lib/vagrant/disksize/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Disksize
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-disksize
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Simon Protheroe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin to resize VirtualBox disks