kitchen-vagrant 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 863f689f3db93659089b9fab42bc68af9a95ad4b
-  data.tar.gz: 6dd5c1895f937db1365989ee58f63d5a26ca7c37
+  metadata.gz: 078a13d604dea258f0f18bb35b7fd8ab8d005227
+  data.tar.gz: 076909d85a9b05c2192aa4665dc4f45757815063
 SHA512:
-  metadata.gz: ba910a7a30032b94668729e5624bfbe982432dff9e92d73f01e13b598a5b907a03c7b803306e4f46d039a2caf8a90667ee267f46b0680d28eb3dcc2846f795f3
-  data.tar.gz: fe28cb8b5d772713b2d9f79afc4010cd73a8d1bcd946a50be31004bce921a2318fd0e4540c89b08c958772eed52d8c4e18674393c1c3e9621517d5c60f03f7e7
+  metadata.gz: 6f81440f12beb801b48b1c68718039d6d0ecba362b31a533ffb0005d21e729e326684ac535fcec85f7c622c2396c91d5c1be2045bf14fedd40c32da8a9578993
+  data.tar.gz: 2964f0f254af10b7191d1deebeab4eb33c0cae606f8157db893d801d0bf30e0929df217a7bb1c786600a6a9f7399239b883e330e368d275af4cff531898d90bb

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [1.2.0](https://github.com/test-kitchen/kitchen-vagrant/tree/1.2.0) (2017-08-11)
+[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.1.1...1.2.0)
+
+**Implemented enhancements:**
+
+- Support to create/attach multiple additional VirtualBox disks [\#312](https://github.com/test-kitchen/kitchen-vagrant/pull/312) ([stissot](https://github.com/stissot))
+- Parallel virtualbox [\#202](https://github.com/test-kitchen/kitchen-vagrant/pull/202) ([rveznaver](https://github.com/rveznaver))
+
 ## [v1.1.1](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.1.1) (2017-07-26)
 [Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.1.0...v1.1.1)
 

data/README.md

@@ -269,7 +269,7 @@ and [VMware][vagrant_config_vmware] for more details.
 #### <a name="config-customize-virtualbox-disk"></a> VirtualBox additional disk
 
 Adding the `createhd` and `storageattach` keys in `customize` allows for creation
-of an additional disk in VirtualBox. Full paths must be used as required by VirtualBox.
+of additional disks in VirtualBox. Full paths must be used as required by VirtualBox.
 
 *NOTE*: IDE Controller based drives always show up in the boot order first, regardless of if they
 are [bootable][vbox_ide_boot].
@@ -278,14 +278,21 @@ are [bootable][vbox_ide_boot].
 driver:
   customize:
     createhd:
-      filename: /tmp/disk1.vmdk
-      size: 1024
+      - filename: /tmp/disk1.vmdk
+        size: 1024
+      - filename: /tmp/disk2.vmdk
+        size: 2048
     storageattach:
-      storagectl: SATA Controller
-      port: 1
-      device: 0
-      type: hdd
-      medium: /tmp/disk1.vmdk
+      - storagectl: IDE Controller
+        port: 1
+        device: 0
+        type: hdd
+        medium: /tmp/disk2.vmdk
+      - storagectl: IDE Controller
+        port: 1
+        device: 1
+        type: hdd
+        medium: /tmp/disk2.vmdk
 ```
 
 will generate a Vagrantfile configuration similar to:

data/lib/kitchen/driver/vagrant.rb

@@ -95,7 +95,7 @@ module Kitchen
 
       default_config :cachier, nil
 
-      no_parallel_for :create, :destroy
+      # no_parallel_for :create, :destroy
 
       # Creates a Vagrant VM instance.
       #
@@ -378,6 +378,14 @@ module Kitchen
       # @see Kitchen::ShellOut.run_command
       # @api private
       def run(cmd, options = {})
+        if vagrant_root && config[:provider] == "virtualbox"
+          require "digest"
+          options[:environment] = {} if options[:environment].nil?
+          options[:environment]["VBOX_IPC_SOCKETID"] =
+            Digest::SHA256.hexdigest(vagrant_root)
+          options[:environment]["VBOX_USER_HOME"] = vagrant_root
+          debug("Accessing isolated VirtualBox environment in #{vagrant_root}")
+        end
         cmd = "echo #{cmd}" if config[:dry_run]
         run_command(cmd, { :cwd => vagrant_root }.merge(options))
       end
@@ -440,6 +448,11 @@ module Kitchen
       #
       # @api private
       def run_pre_create_command
+        if vagrant_root && config[:provider] == "virtualbox"
+          run("vboxmanage setproperty machinefolder #{vagrant_root}",
+            :cwd => config[:kitchen_root])
+          debug("Set VirtualBox machinefolder to #{vagrant_root}")
+        end
         if config[:pre_create_command]
           run(config[:pre_create_command], :cwd => config[:kitchen_root])
         end

data/lib/kitchen/driver/vagrant_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Vagrant Kitchen driver
-    VAGRANT_VERSION = "1.1.1"
+    VAGRANT_VERSION = "1.2.0"
   end
 end

data/spec/kitchen/driver/vagrant_spec.rb

@@ -1341,11 +1341,11 @@ describe Kitchen::Driver::Vagrant do
         RUBY
       end
 
-      it "adds a lines for createhd in :customize" do
+      it "add line for single createhd in :customize" do
         config[:customize] = {
           :createhd => {
-            :filename => "./d1.vmdk",
-            :size => 10 * 1024,
+              :filename => "./d1.vmdk",
+              :size => 10 * 1024,
           },
         }
         cmd
@@ -1357,7 +1357,30 @@ describe Kitchen::Driver::Vagrant do
         RUBY
       end
 
-      it "adds a lines for storageattach in :customize" do
+      it "adds lines for multiple createhd in :customize" do
+        config[:customize] = {
+          :createhd => [
+            {
+              :filename => "./d1.vmdk",
+              :size => 10 * 1024,
+            },
+            {
+              :filename => "./d2.vmdk",
+              :size => 20 * 1024,
+            },
+          ],
+        }
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :virtualbox do |p|
+            p.customize ["createhd", "--filename", "./d1.vmdk", "--size", 10240]
+            p.customize ["createhd", "--filename", "./d2.vmdk", "--size", 20480]
+          end
+        RUBY
+      end
+
+      it "adds lines for single storageattach in :customize" do
         config[:customize] = {
           :storageattach => {
             :type => "hdd",
@@ -1373,6 +1396,35 @@ describe Kitchen::Driver::Vagrant do
         RUBY
       end
 
+      it "adds lines for multiple storageattach in :customize" do
+        config[:customize] = {
+          :storageattach => [
+            {
+              :storagectl => "SATA Controller",
+              :port => 1,
+              :device => 0,
+              :type => "hdd",
+              :medium => "./d1.vmdk",
+            },
+            {
+              :storagectl => "SATA Controller",
+              :port => 1,
+              :device => 1,
+              :type => "hdd",
+              :medium => "./d2.vmdk",
+            },
+          ],
+        }
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :virtualbox do |p|
+            p.customize ["storageattach", :id, "--storagectl", "SATA Controller", "--port", 1, "--device", 0, "--type", "hdd", "--medium", "./d1.vmdk"]
+            p.customize ["storageattach", :id, "--storagectl", "SATA Controller", "--port", 1, "--device", 1, "--type", "hdd", "--medium", "./d2.vmdk"]
+          end
+        RUBY
+      end
+
       it "adds a line for cpuidset in :customize" do
         config[:customize] = {
           :cpuidset => %w{00000001 00000002},

data/templates/Vagrantfile.erb

@@ -152,18 +152,24 @@ Vagrant.configure("2") do |c|
     <% end %>
   <% when "virtualbox" %>
     <% if key == :createhd %>
-    p.customize ["createhd", "--filename", "<%= value[:filename] %>", "--size", <%= value[:size] %>]
+      <% value = [value] unless value.instance_of?(Array) %>
+      <% value.each do |item| %>
+    p.customize ["createhd", "--filename", "<%= item[:filename] %>", "--size", <%= item[:size] %>]
+      <% end %>
     <% elsif key == :storageattach %>
-      <% options = [] %>
-      <% value.each do |storageattach_option_key, storageattach_option_value|
-           options << "\"--#{storageattach_option_key}\""
-           if storageattach_option_value.instance_of? Fixnum
-             options << storageattach_option_value
-           else
-             options << "\"#{storageattach_option_value}\""
-           end
-         end %>
+      <% value = [value] unless value.instance_of?(Array) %>
+      <% value.each do |item| %>
+        <% options = [] %>
+        <% item.each do |storageattach_option_key, storageattach_option_value|
+             options << "\"--#{storageattach_option_key}\""
+             if storageattach_option_value.instance_of? Fixnum
+               options << storageattach_option_value
+             else
+               options << "\"#{storageattach_option_value}\""
+             end
+           end %>
     p.customize ["storageattach", :id, <%= options.join(', ') %>]
+    <% end %>
     <% elsif key == :cpuidset %>
       <% ids = [] %>
       <% value.each do | id |

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen