vagrant-disksize 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61d5db584b6795b573367b944bdc10de23ec4e0e
-  data.tar.gz: 9cf2dbcd7be8b19a7c53015d13b9d1dcc1bb02a4
+  metadata.gz: 2ed50257fa9beb3cf82e819f7c9cda72de170a1a
+  data.tar.gz: 2ea55ad19b783a25fbb442fd3947b7e13284f027
 SHA512:
-  metadata.gz: b97cf15cc10839ab1581b8226ddeed7106870a8796cff8d68d94002ad327399187f09714c9967270b0184b278b00d944fca86a6228e280e3c288df7518b1c60a
-  data.tar.gz: a33eb361fa69f79f2531b08ac1361bee7b25bae91e3d58149c5a2f8756389f6fe488a05e58fc04785cece47e3d02d5f6e75ed779f92cf3d521145e8a315ada33
+  metadata.gz: abee2553e9b3c3c981b76c3f39f652af94e94f5d859c74fd4c5b59fd8d50ef7d8fd076d11a2c9a7590af7ef4882ea75670f5a999ba86b9034f5116462ff852de
+  data.tar.gz: 22a95dd79e18d89e3115795d801168ac5b0367ce730901e6ceaf427c08779cbdfcdb828949c14497d845ffd6f1e2bae82053d6de927b2e02334c6db0dbf3b520

data/.gitignore

@@ -1,14 +1,14 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-.ruby-version
-.ruby-gemset
-
-.*.swp
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+.ruby-version
+.ruby-gemset
+
+.*.swp

data/Gemfile

@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
-
-group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.5'
-end
-
-group :plugins do
-  gem 'vagrant-disksize', path: '.'
-end
-
-
-# Specify your gem's dependencies in vagrant-disksize.gemspec
-# Actually, we can't do this as we need to be in the plugins group
-# for vagrant to load us during development
-#gemspec
+source 'https://rubygems.org'
+
+group :development do
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.5'
+end
+
+group :plugins do
+  gem 'vagrant-disksize', path: '.'
+end
+
+
+# Specify your gem's dependencies in vagrant-disksize.gemspec
+# Actually, we can't do this as we need to be in the plugins group
+# for vagrant to load us during development
+#gemspec

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Simon Protheroe
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2016 Simon Protheroe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,56 +1,69 @@
-# vagrant-disksize
-
-A Vagrant plugin to resize disks in VirtualBox
-
-
-## Installation
-
-
-```shell
-vagrant plugin install vagrant-disksize
-```
-
-## Usage
-
-In your Vagrantfile
-
-```ruby
-config.disksize.size = '50GB'
-```
-
-## Limitations
-
-At present only the first disk will be resized. That seems to be OK for
-typical boxes such as the official Ubuntu images for Xenial, but there may
-well be other configurations where the first disk found isn't the main HDD.
-
-The plugin only works with VirtualBox but it will issue an error message
-and then disable itself if you try to use it with another provider.
-
-Disks can only be increased in size. There is no facility to shrink a disk.
-
-Depending on the guest, you may need to resize the partition and the filesystem
-from within the guest. At present the plugin only resizes the underlying disk.
-
-This hasn't been tested on a wide variety of versions of Vagrant or VirtualBox.
-It works for, at least, Vagrant 1.8.5 and VirtualBox 5.1.x, but any
-feedback about other versions, particularly older ones, would be much appreciated.
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies.
-You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`.
-To release a new version, update the version number in `version.rb`, and then
-run `bundle exec rake release`, which will create a git tag for the version,
-push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/sprotheroe/vagrant-disksize.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
+# vagrant-disksize
+
+A Vagrant plugin to resize disks in VirtualBox
+
+
+## Installation
+
+
+```shell
+vagrant plugin install vagrant-disksize
+```
+
+## Usage
+
+Set the size you want for your disk in your Vagrantfile. For example
+
+```ruby
+Vagrant.configure('2') do |config|
+  config.vm.box = 'ubuntu/xenial64'
+  config.disksize.size = '50GB'
+end
+```
+
+You can specify the size as a raw number (in bytes) or using KB, MB, GB
+or TB (though I'd be interested to learn more if you are using Vagrant
+to create multi-terabyte disks). Internally the size will be converted
+to megabytes, for ease of interaction with VirtualBox. If the value you
+specify isn't a whole number of megabytes, it will be rounded up, to
+ensure you have at least the capacity you requested. Note that the
+plugin uses the original definitions so, for example, 1 GB = 1024 MB;
+we don't have to use hardware manufacturer marketing maths here and
+it makes the internal maths easier.
+
+## Limitations
+
+At present only the first disk will be resized. That seems to be OK for
+typical boxes such as the official Ubuntu images for Xenial, but there may
+well be other configurations where the first disk found isn't the main HDD.
+
+The plugin only works with VirtualBox but it will issue an error message
+and then disable itself if you try to use it with another provider.
+
+Disks can only be increased in size. There is no facility to shrink a disk.
+
+Depending on the guest, you may need to resize the partition and the filesystem
+from within the guest. At present the plugin only resizes the underlying disk.
+
+This hasn't been tested on a wide variety of versions of Vagrant or VirtualBox.
+It works for, at least, Vagrant 1.8.5 and VirtualBox 5.1.x, but any
+feedback about other versions, particularly older ones, would be much appreciated.
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies.
+You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`.
+To release a new version, update the version number in `version.rb`, and then
+run `bundle exec rake release`, which will create a git tag for the version,
+push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/sprotheroe/vagrant-disksize.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/Rakefile

@@ -1,2 +1,2 @@
-require "bundler/gem_tasks"
-task :default => :spec
+require "bundler/gem_tasks"
+task :default => :spec

data/Vagrantfile

@@ -1,73 +1,73 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure("2") do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "ubuntu/xenial64"
-
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = true
-  #
-  #   # Customize the amount of memory on the VM:
-  #   vb.memory = "1024"
-  # end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  config.disksize.size = '20GB' 
-
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  # config.vm.provision "shell", inline: <<-SHELL
-  #   apt-get update
-  #   apt-get install -y apache2
-  # SHELL
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "ubuntu/xenial64"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  config.disksize.size = '20GB' 
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   apt-get update
+  #   apt-get install -y apache2
+  # SHELL
+end

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "vagrant/disksize"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "vagrant/disksize"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/vagrant/disksize.rb

@@ -1,34 +1,34 @@
-#require "vagrant/disksize/version"
-begin
-  require 'vagrant'
-rescue LoadError
-  raise 'The vagrant-disksize plugin must be run within vagrant.'
-end
-
-
-module Vagrant
-  module Disksize
-    class Plugin < Vagrant.plugin('2')
-
-      name 'vagrant-disksize'
-
-      description <<-DESC
-      Provides the ability to resize VirtualBox disks at creation time,
-      so they don't need to be the same size as the default for the box.
-      Filesystems are not resized by this code.
-      DESC
-
-      config 'disksize' do
-        require_relative 'disksize/config'
-        Config
-      end
-
-      action_hook(:disksize, :machine_action_up) do |hook|
-        require_relative 'disksize/actions'
-
-        # TODO Ensure we are using the VirtualBox provider
-        hook.before(VagrantPlugins::ProviderVirtualBox::Action::Boot, Action::ResizeDisk)
-      end
-    end
-  end
-end
+#require "vagrant/disksize/version"
+begin
+  require 'vagrant'
+rescue LoadError
+  raise 'The vagrant-disksize plugin must be run within vagrant.'
+end
+
+
+module Vagrant
+  module Disksize
+    class Plugin < Vagrant.plugin('2')
+
+      name 'vagrant-disksize'
+
+      description <<-DESC
+      Provides the ability to resize VirtualBox disks at creation time,
+      so they don't need to be the same size as the default for the box.
+      Filesystems are not resized by this code.
+      DESC
+
+      config 'disksize' do
+        require_relative 'disksize/config'
+        Config
+      end
+
+      action_hook(:disksize, :machine_action_up) do |hook|
+        require_relative 'disksize/actions'
+
+        # TODO Ensure we are using the VirtualBox provider
+        hook.before(VagrantPlugins::ProviderVirtualBox::Action::Boot, Action::ResizeDisk)
+      end
+    end
+  end
+end

data/lib/vagrant/disksize/actions.rb

@@ -1,140 +1,142 @@
-module Vagrant
-  module Disksize
-    class Action
-
-      class ResizeDisk
-
-        # NOTE - size is represented in MB throughout this class, for ease of using with VirtualBox
-
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @enabled = true
-          if @machine.provider.to_s !~ /VirtualBox/
-            @enabled = false
-            env[:ui].error "The vagrant-disksize plugin only supports VirtualBox at present. Disk size will not be changed."
-          end
-        end
-
-        def call(env)
-          # Resize disk itself before boot
-          if @enabled
-            size = @machine.config.disksize.size
-            ensure_disk_resizable(env)
-            resize_disk(env, size)
-          end
-
-          # Allow middleware chain to continue so VM is booted
-          @app.call(env)
-
-          # TODO Possibly resize partition and filesystem here if needed
-        end
-
-        private
-
-        def ensure_disk_resizable(env)
-          driver = @machine.provider.driver
-          disks = identify_disks(driver)
-          # TODO Shouldn't assume that the first disk is the one we want to resize
-          unless disk_resizeable? disks.first
-            old_disk = disks.first
-            new_disk = generate_resizable_disk(old_disk)
-            unless File.exist? new_disk[:file]
-              clone_as_vdi(driver, old_disk, new_disk)
-              attach_disk(driver, new_disk)
-              File.delete(old_disk[:file])
-            end
-          end
-        end
-
-        def resize_disk(env, req_size)
-          driver = @machine.provider.driver
-          disks = identify_disks(driver)
-          target = disks.first    # TODO Shouldn't assume that the first disk is the one we want to resize
-
-          old_size = get_disk_size(driver, target)
-          if old_size < req_size
-            grow_vdi(driver, target, req_size)
-            new_size = get_disk_size(driver, target)
-            env[:ui].success "Resized disk: old #{old_size} MB, req #{req_size} MB, new #{new_size} MB"
-            env[:ui].success "You may need to resize the filesystem from within the guest."
-          elsif old_size > req_size
-            env[:ui].error "Disk cannot be decreased in size. #{req_size} MB requested but disk is already #{old_size} MB."
-          end
-        end
-
-        def clone_as_vdi(driver, src, dst)
-          driver.execute('clonemedium', src[:file], dst[:file], '--format', 'VDI')
-        end
-
-        def grow_vdi(driver, disk, size)
-          driver.execute('modifymedium', disk[:file], '--resize', size.to_s)
-        end
-
-        def attach_disk(driver, disk)
-          parts = disk[:name].split('-')
-          controller = parts[0]
-          port = parts[1]
-          device = parts[2]
-          driver.execute('storageattach', @machine.id, '--storagectl', controller, '--port', port, '--device', device, '--type', 'hdd',  '--medium', disk[:file])
-        end
-
-        def get_disk_size(driver, disk)
-          size = nil
-          driver.execute('showmediuminfo', disk[:file]).each_line do |line|
-            if line =~ /Capacity:\s+([0-9]+)\s+MB/
-              size = $1.to_i
-            end
-          end
-          size
-        end
-
-        def identify_disks(driver)
-          vminfo = get_vminfo(driver)
-          disks = []
-          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
-            }
-          end
-          disks
-        end
-
-        def get_vminfo(driver)
-          vminfo = {}
-          driver.execute('showvminfo', @machine.id, '--machinereadable', retryable: true).split("\n").each do |line|
-            parts = line.partition('=')
-            key = unquoted(parts.first)
-            value = unquoted(parts.last)
-            vminfo[key] = value
-          end
-          vminfo
-        end
-
-        def generate_resizable_disk(disk)
-          src = disk[:file]
-          src_extn = File.extname(src)
-          src_path = File.dirname(src)
-          src_base = File.basename(src, src_extn)
-          dst = File.join(src_path, src_base) + '.vdi'
-          disk.merge({ uuid: "(undefined)", file: dst })
-        end
-
-        def disk_resizeable?(disk)
-          disk[:file].end_with? '.vdi'
-        end
-
-        def unquoted(s)
-          s.gsub(/\A"(.*)"\Z/,'\1')
-        end
-      end
-
-    end
-  end
-end
+module Vagrant
+  module Disksize
+    class Action
+
+      class ResizeDisk
+
+        # NOTE - size is represented in MB throughout this class, for ease of using with VirtualBox
+
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @enabled = true
+          if @machine.provider.to_s !~ /VirtualBox/
+            @enabled = false
+            env[:ui].error "The vagrant-disksize plugin only supports VirtualBox at present. Disk size will not be changed."
+          end
+        end
+
+        def call(env)
+          # Resize disk itself before boot
+          if @enabled
+            requested_size = @machine.config.disksize.size
+            if requested_size
+              ensure_disk_resizable(env)
+              resize_disk(env, requested_size)
+            end
+          end
+
+          # Allow middleware chain to continue so VM is booted
+          @app.call(env)
+
+          # TODO Possibly resize partition and filesystem here if needed
+        end
+
+        private
+
+        def ensure_disk_resizable(env)
+          driver = @machine.provider.driver
+          disks = identify_disks(driver)
+          # TODO Shouldn't assume that the first disk is the one we want to resize
+          unless disk_resizeable? disks.first
+            old_disk = disks.first
+            new_disk = generate_resizable_disk(old_disk)
+            unless File.exist? new_disk[:file]
+              clone_as_vdi(driver, old_disk, new_disk)
+              attach_disk(driver, new_disk)
+              File.delete(old_disk[:file])
+            end
+          end
+        end
+
+        def resize_disk(env, req_size)
+          driver = @machine.provider.driver
+          disks = identify_disks(driver)
+          target = disks.first    # TODO Shouldn't assume that the first disk is the one we want to resize
+
+          old_size = get_disk_size(driver, target)
+          if old_size < req_size
+            grow_vdi(driver, target, req_size)
+            new_size = get_disk_size(driver, target)
+            env[:ui].success "Resized disk: old #{old_size} MB, req #{req_size} MB, new #{new_size} MB"
+            env[:ui].success "You may need to resize the filesystem from within the guest."
+          elsif old_size > req_size
+            env[:ui].error "Disk cannot be decreased in size. #{req_size} MB requested but disk is already #{old_size} MB."
+          end
+        end
+
+        def clone_as_vdi(driver, src, dst)
+          driver.execute('clonemedium', src[:file], dst[:file], '--format', 'VDI')
+        end
+
+        def grow_vdi(driver, disk, size)
+          driver.execute('modifymedium', disk[:file], '--resize', size.to_s)
+        end
+
+        def attach_disk(driver, disk)
+          parts = disk[:name].split('-')
+          controller = parts[0]
+          port = parts[1]
+          device = parts[2]
+          driver.execute('storageattach', @machine.id, '--storagectl', controller, '--port', port, '--device', device, '--type', 'hdd',  '--medium', disk[:file])
+        end
+
+        def get_disk_size(driver, disk)
+          size = nil
+          driver.execute('showmediuminfo', disk[:file]).each_line do |line|
+            if line =~ /Capacity:\s+([0-9]+)\s+MB/
+              size = $1.to_i
+            end
+          end
+          size
+        end
+
+        def identify_disks(driver)
+          vminfo = get_vminfo(driver)
+          disks = []
+          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
+            }
+          end
+          disks
+        end
+
+        def get_vminfo(driver)
+          vminfo = {}
+          driver.execute('showvminfo', @machine.id, '--machinereadable', retryable: true).split("\n").each do |line|
+            parts = line.partition('=')
+            key = unquoted(parts.first)
+            value = unquoted(parts.last)
+            vminfo[key] = value
+          end
+          vminfo
+        end
+
+        def generate_resizable_disk(disk)
+          src = disk[:file]
+          src_extn = File.extname(src)
+          src_path = File.dirname(src)
+          src_base = File.basename(src, src_extn)
+          dst = File.join(src_path, src_base) + '.vdi'
+          disk.merge({ uuid: "(undefined)", file: dst })
+        end
+
+        def disk_resizeable?(disk)
+          disk[:file].end_with? '.vdi'
+        end
+
+        def unquoted(s)
+          s.gsub(/\A"(.*)"\Z/,'\1')
+        end
+      end
+
+    end
+  end
+end

data/lib/vagrant/disksize/config.rb

@@ -1,45 +1,48 @@
-module Vagrant
-  module Disksize
-    class Config < Vagrant.plugin('2', :config)
-      attr_accessor :size
-
-      SIZE_REGEX = /^(?<number>[0-9]+)\s?(?<scale>KB|MB|GB|TB)?$/
-
-      def initialize
-        @size = UNSET_VALUE
-      end
-
-      def finalize!
-        return if @size == UNSET_VALUE
-        # Convert from human to machine readable
-        size_str = @size.to_s.strip
-        matches = SIZE_REGEX.match(size_str)
-        if matches
-          number = matches[:number]
-          scale = matches[:scale]
-          @size = number.to_i
-          if scale
-            pos = %w(KB MB GB TB).index(scale)
-            mult = 1 << 10*(pos+1)
-            @size *= mult
-          end
-        end
-        # Convert size from bytes to MB
-        size_in_mb = (@size.to_i + (1<<20)-1) / (1<<20)
-        @size = size_in_mb
-      end
-
-      def validate(machine)
-        errors = []
-
-        unless @size.to_s =~ SIZE_REGEX
-          errors << "'#{@size}' is not a valid specification of disk size"
-        end
-
-        return { 'Disksize configuration' => errors }
-      end
-
-    end
-  end
-end
-
+module Vagrant
+  module Disksize
+    class Config < Vagrant.plugin('2', :config)
+      attr_accessor :size
+
+      SIZE_REGEX = /^(?<number>[0-9]+)\s?(?<scale>KB|MB|GB|TB)?$/
+
+      def initialize
+        @size = UNSET_VALUE
+      end
+
+      def finalize!
+        if @size == UNSET_VALUE
+          @size = nil
+        else
+          # Convert from human to machine readable
+          size_str = @size.to_s.strip
+          matches = SIZE_REGEX.match(size_str)
+          if matches
+            number = matches[:number]
+            scale = matches[:scale]
+            @size = number.to_i
+            if scale
+              pos = %w(KB MB GB TB).index(scale)
+              mult = 1 << 10*(pos+1)
+              @size *= mult
+            end
+          end
+          # Convert size from bytes to MB
+          size_in_mb = (@size.to_i + (1<<20)-1) / (1<<20)
+          @size = size_in_mb
+        end
+      end
+
+      def validate(machine)
+        errors = _detected_errors
+
+        unless @size.nil? || @size.is_a?(Integer)
+          errors << "'#{@size}' is not a valid specification of disk size"
+        end
+
+        return { 'Disksize configuration' => errors }
+      end
+
+    end
+  end
+end
+

data/lib/vagrant/disksize/version.rb

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

data/vagrant-disksize.gemspec

@@ -1,35 +1,35 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'vagrant/disksize/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "vagrant-disksize"
-  spec.version       = Vagrant::Disksize::VERSION
-  spec.authors       = ["Simon Protheroe"]
-  spec.email         = ["protheroe@gmail.com"]
-
-  spec.summary       = %q{Vagrant plugin to resize VirtualBox disks}
-  spec.description   = %q{Vagrant plugin to resize VirtualBox disks at creation time}
-  spec.homepage      = "https://github.com/sprotheroe/vagrant-disksize"
-  spec.license       = "MIT"
-
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'vagrant/disksize/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "vagrant-disksize"
+  spec.version       = Vagrant::Disksize::VERSION
+  spec.authors       = ["Simon Protheroe"]
+  spec.email         = ["protheroe@gmail.com"]
+
+  spec.summary       = %q{Vagrant plugin to resize VirtualBox disks}
+  spec.description   = %q{Vagrant plugin to resize VirtualBox disks at creation time}
+  spec.homepage      = "https://github.com/sprotheroe/vagrant-disksize"
+  spec.license       = "MIT"
+
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
+  end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "rake", "~> 10.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-disksize
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Simon Protheroe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-24 00:00:00.000000000 Z
+date: 2016-11-06 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.4.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin to resize VirtualBox disks