kitchen-vagrant 0.21.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad1eb2e544973ec0e6864be3d857c448edce6be0
-  data.tar.gz: 80092da59b88a3f00ba1dab7d4160d3bd030c238
+  metadata.gz: cdcd8378297c5463119b1d3854aa9e12669b753a
+  data.tar.gz: 4775d654b86cb58cf290dbb16dda7cde86522572
 SHA512:
-  metadata.gz: e6ea18edbddc33dadcf7ee8be669ab216507364094d6cf04aba8655bff6901449fc7d0217ea351abee4aaa2ca67d4b15a282ab3941daf58e5802f03476287db4
-  data.tar.gz: fd16e4495a3b1fd544b267ab8f8fa072e6d417801e0109262c3fe12b51b7abd40c749dcacf6595b8021d7b179ee0988265759960a096e72baa5cbd5001a05104
+  metadata.gz: 5f2ebcd04539cb4c8df89a484699271e26baf56d5e86a438f89523f73181cd659ab5593dc1b038d5ed913c3287c60f8b7be8b275b4b601eb6312c27f56a0479a
+  data.tar.gz: a21647a79c02ec663b974c5be64968ed4d65524fc0d73e6ca6057b71d20d275e21a325bdef4af4d1f0ec72ae79954ef96913653a72287ec6cf8ba72c073a97eb

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [1.0.0](https://github.com/test-kitchen/kitchen-vagrant/tree/1.0.0) (2017-01-10)
+[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v0.21.1...v1.0.0)
+
+**Implemented enhancements:**
+
+- Add vagrant-cachier support to default Vagrantfile.erb [\#186](https://github.com/test-kitchen/kitchen-vagrant/issues/186)
+- Allow customization of cpuidset for VirtualBox VMs  [\#175](https://github.com/test-kitchen/kitchen-vagrant/issues/175)
+- Add KVM/libvirt storage support to Vagrantfile.erb [\#271](https://github.com/test-kitchen/kitchen-vagrant/pull/271) ([dprts](https://github.com/dprts))
+- Move to chefstyle [\#264](https://github.com/test-kitchen/kitchen-vagrant/pull/264) ([shortdudey123](https://github.com/shortdudey123))
+- Allow multiple "include" statements in LXC configuration [\#230](https://github.com/test-kitchen/kitchen-vagrant/pull/230) ([alexmv](https://github.com/alexmv))
+- Set FQDN to include vagrantup.com again for non-windows operating sys… [\#168](https://github.com/test-kitchen/kitchen-vagrant/pull/168) ([spion06](https://github.com/spion06))
+- Virtualbox storage via createhd and storageattach [\#246](https://github.com/test-kitchen/kitchen-vagrant/pull/246) ([shortdudey123](https://github.com/shortdudey123))
+- Add support for box\_download\_ca\_cert [\#274](https://github.com/test-kitchen/kitchen-vagrant/pull/274) ([cheeseplus](https://github.com/cheeseplus))
+
+**Fixed bugs:**
+
+- Bug in box\_check\_update code [\#237](https://github.com/test-kitchen/kitchen-vagrant/issues/237)
+- Fix quoting for cloud providers \(redux \#179\) [\#268](https://github.com/test-kitchen/kitchen-vagrant/pull/268) ([cheeseplus](https://github.com/cheeseplus))
+
 ## [0.21.1](https://github.com/test-kitchen/kitchen-vagrant/tree/0.21.1) (2016-12-05)
 [Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v0.21.0...v0.21.1)
 

data/README.md

@@ -33,10 +33,10 @@ If you are creating Windows VMs over a WinRM Transport, then the
 [vagrant-winrm][vagrant_winrm] Vagrant plugin must be installed. As a
 consequence, the minimum version of Vagrant required is 1.6 or higher.
 
-### <a name="dependencies-virtualization"></a> Virtualbox, VMware Fusion/Workstation, and/or Parallels
+### <a name="dependencies-virtualization"></a> Virtualization Hypervisor(s)
 
-Currently this driver supports VirtualBox and VMware Fusion/Workstation.
-Virtualbox is free and is the default provider for Vagrant.
+Currently this driver supports Parallels, VirtualBox, and VMware Fusion/Workstation
+hypervisors. VirtualBox is free and is the default provider for Vagrant.
 
 [VirtualBox package][virtualbox_dl]
 
@@ -70,17 +70,9 @@ on [Atlas][atlas] such as:
 ```yaml
 ---
 platforms:
-  - name: ubuntu-12.04
-  - name: ubuntu-14.04
-  - name: centos-5.11
-  - name: centos-6.7
-  - name: centos-7.2
-  - name: debian-7.9
-  - name: debian-8.3
-  - name: fedora-22
-  - name: fedora-23
-  - name: freebsd-9.3
-  - name: freebsd-10.2
+  - name: ubuntu-16.04
+  - name: centos-7.3
+  - name: freebsd-11
 ```
 
 This will effectively generate a configuration similar to:
@@ -88,21 +80,15 @@ This will effectively generate a configuration similar to:
 ```yaml
 ---
 platforms:
-  - name: ubuntu-12.04
+  - name: ubuntu-16.04
     driver:
-      box: bento/ubuntu-12.04
-  - name: ubuntu-14.04
+      box: bento/ubuntu-16.04
+  - name: centos-7.3
     driver:
-      box: bento/ubuntu-14.04
-  - name: centos-5.11
+      box: bento/centos-7.3
+  - name: freebsd-11.0
     driver:
-      box: bento/centos-5.11
-  - name: centos-6.7
-    driver:
-      box: bento/centos-6.7
-  - name: centos-7.2
-    driver:
-      box: bento/centos-7.2
+      box: bento/freebsd-11.0
   # ...
 ```
 
@@ -136,17 +122,41 @@ Many host wide defaults for Vagrant can be set using `$HOME/.vagrant.d/Vagrantfi
 
 ## <a name="config"></a> Configuration
 
+### <a name="config-cachier"></a> cachier
+
+Enable and configure scope for [vagrant-cachier][vagrant_cachier] plugin.
+Valid options are `:box` or `:machine`, setting to a truthy value yields `:box`
+
+For example:
+
+```yaml
+---
+driver:
+  cachier: true
+```
+
+will generate a Vagrantfile configuration similar to:
+
+```ruby
+  config.cache.scope = :box
+```
+
+The default is `nil`, indicating unset.
+
+
 ### <a name="config-box"></a> box
 
 **Required** This determines which Vagrant box will be used. For more
 details, please read the Vagrant [machine settings][vagrant_machine_settings]
 page.
 
-The default will be computed from the platform name of the instance. However, for a small number of common/known platforms in the [Bento][bento] project, the default will prepend `"opscode-"` to the start to match the downloadable `box_url` (see below).
+The default will be computed from the platform name of the instance. However, 
+for a number of common platforms in the [Bento][bento] project, the default will 
+prefix the name with `bento/` in accordance with Atlas naming standards.
 
-For example, a platform with a Bento box called "ubuntu-14.04" will produce a
-default `box` value of `"opscode-ubuntu-14.04"`. Alternatively, a box called
-`"slackware-14.1"` will produce a default `box` value of `"slackware-14.1".
+For example, a platform with name `ubuntu-16.04` will produce a
+default `box` value of `bento/ubuntu-16.04`. Alternatively, a box called
+`slackware-14.1` will produce a default `box` value of `slackware-14.1`.
 
 ### <a name="config-box-check-update"></a> box\_check\_update
 
@@ -154,17 +164,35 @@ Whether to check for box updates (enabled by default).
 
 ### <a name="config-box-url"></a> box\_url
 
-A default URL will be computed only for a small number of common/known
-platforms in the [Bento][bento] project. Additionally, a URL will only be
-computed if the Vagrant provider is VirtualBox or is VMware based (these are
-the only providers with downloadable base boxes).
+A box_url is not required when using the Atlas format of 
+`bento/ubuntu-16.04` assuming the organization and box referenced
+exist. If using a custom box this can be an `https://` or `file://`
+URL.
+
+### <a name="config-box-download-ca-cert"></a> box\_download\_ca\_cert
+
+Path relative to the `.kitchen.yml` file for locating the trusted CA bundle.
+Useful when combined with `box_url`.
+
+The default is `nil`, indicating to use the default Mozilla CA cert bundle.
+See also `box_download_insecure`.
+
+### <a name="config-box-download-insecure"></a> box\_download\_insecure
+
+If true, then SSL certificates from the server will
+not be verified.
+
+The default is `false`, meaning if the URL is an HTTPS URL,
+then SSL certs will be verified.
 
 ### <a name="config-box-version"></a> box\_version
 
-The [version][vagrant_versioning] of the configured box.
+The [version][vagrant_versioning] of the configured box. 
 
 The default is `nil`, indicating unset.
 
+This option is only relevant when used with Atlas boxes which support versioning.
+
 ### <a name="config-communicator"></a> communicator
 
 **Note:** It should largely be the responsibility of the underlying Vagrant
@@ -223,6 +251,42 @@ end
 Please read the "Customizations" sections for [VirtualBox][vagrant_config_vbox]
 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.
+
+```yaml
+driver:
+  customize:
+    createhd:
+      filename: ./tmp/disk1.vmdk
+      size: 1024
+    storageattach:
+      storagectl: IDE Controller
+      port: 1
+      device: 0
+      type: hdd
+      medium: ./tmp/disk1.vmdk
+```
+
+will generate a Vagrantfile configuration similar to:
+
+```ruby
+Vagrant.configure("2") do |config|
+  # ...
+
+  config.vm.provider :virtualbox do |virtualbox|
+    virtualbox.customize ["createhd", "--filename", "./tmp/disk1.vmdk", "--size", 1024]
+    virtualbox.customize ["storageattach", :id, "--storagectl", "IDE Controller", "--port", "1", "device", 0, "--type", "hdd", "--medium", "./tmp/disk1.vmdk"]
+  end
+end
+```
+
+Please read [createhd](https://www.virtualbox.org/manual/ch08.html#vboxmanage-createvdi)
+and [storageattach](https://www.virtualbox.org/manual/ch08.html#vboxmanage-storageattach)
+for additional information on these options.
+
 ### <a name="config-guest"></a> guest
 
 **Note:** It should largely be the responsibility of the underlying Vagrant
@@ -245,7 +309,7 @@ providers.
 ```yaml
 ---
 platforms:
-  - name: ubuntu-14.04
+  - name: ubuntu-16.04
     driver:
       gui: true
 ```
@@ -271,7 +335,7 @@ Allows to use linked clones to import boxes for VirtualBox, VMware and Parallels
 ```yaml
 ---
 platforms:
-  - name: ubuntu-14.04
+  - name: ubuntu-16.04
     driver:
       linked_clone: true
 ```
@@ -476,17 +540,17 @@ example:
 
 ## <a name="authors"></a> Authors
 
-Created and maintained by [Fletcher Nichol][author] (<fnichol@nichol.ca>)
+Created by [Fletcher Nichol][author] (<fnichol@nichol.ca>)
 
 ## <a name="license"></a> License
 
 Apache 2.0 (see [LICENSE][license])
 
 
-[author]:           https://github.com/opscode
-[issues]:           https://github.com/opscode/kitchen-vagrant/issues
-[license]:          https://github.com/opscode/kitchen-vagrant/blob/master/LICENSE
-[repo]:             https://github.com/opscode/kitchen-vagrant
+[author]:           https://github.com/test-kitchen
+[issues]:           https://github.com/test-kitchen/kitchen-vagrant/issues
+[license]:          https://github.com/test-kitchen/kitchen-vagrant/blob/master/LICENSE
+[repo]:             https://github.com/test-kitchen/kitchen-vagrant
 [driver_usage]:     http://kitchen.ci/docs/getting-started/adding-platform
 
 [bento]:                    https://github.com/chef/bento
@@ -510,3 +574,4 @@ Apache 2.0 (see [LICENSE][license])
 [atlas]:                    https://atlas.hashicorp.com/
 [parallels_dl]:             http://www.parallels.com/products/desktop/download/
 [vagrant_parallels]:        https://github.com/Parallels/vagrant-parallels
+[vagrant_cachier]:        https://github.com/fgrehm/vagrant-cachier

data/Rakefile

@@ -17,7 +17,7 @@ Cane::RakeTask.new do |cane|
   cane.canefile = "./.cane"
 end
 
-require "finstyle"
+require "chefstyle"
 require "rubocop/rake_task"
 RuboCop::RakeTask.new(:style) do |task|
   task.options << "--display-cop-names"
@@ -42,5 +42,5 @@ GitHubChangelogGenerator::RakeTask.new :changelog do |config|
   config.future_release = Kitchen::Driver::VAGRANT_VERSION
   config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature,Improvement".split(",")
   config.bug_labels = "bug,Bug".split(",")
-  config.exclude_labels = %w[Duplicate Question Discussion No_Changelog]
+  config.exclude_labels = %w{Duplicate Question Discussion No_Changelog}
 end

data/kitchen-vagrant.gemspec

@@ -21,15 +21,12 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "test-kitchen", "~> 1.4"
 
-  gem.add_development_dependency "countloc",  "~> 0.4"
+  gem.add_development_dependency "countloc", "~> 0.4"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec",     "~> 3.2"
   gem.add_development_dependency "simplecov", "~> 0.9"
   gem.add_development_dependency "github_changelog_generator", "1.11.3"
 
-  # style and complexity libraries are tightly version pinned as newer releases
-  # may introduce new and undesireable style choices which would be immediately
-  # enforced in CI
-  gem.add_development_dependency "finstyle",  "1.5.0"
-  gem.add_development_dependency "cane",      "2.6.2"
+  gem.add_development_dependency "chefstyle"
+  gem.add_development_dependency "cane", "3.0.0"
 end

data/lib/kitchen/driver/vagrant.rb

@@ -45,6 +45,8 @@ module Kitchen
 
       default_config :box_download_insecure, nil
 
+      default_config :box_download_ca_cert, nil
+
       default_config(:box_url) { |driver| driver.default_box_url }
 
       default_config :box_version, nil
@@ -81,13 +83,15 @@ module Kitchen
       expand_path_for :vagrantfiles
 
       default_config(:vm_hostname) do |driver|
-        driver.windows_os? ? nil : driver.instance.name
+        driver.windows_os? ? nil : "#{driver.instance.name}.vagrantup.com"
       end
 
       default_config(:cache_directory) do |driver|
         driver.windows_os? ? "/omnibus/cache" : "/tmp/omnibus/cache"
       end
 
+      default_config :cachier, nil
+
       no_parallel_for :create, :destroy
 
       # Creates a Vagrant VM instance.
@@ -147,6 +151,7 @@ module Kitchen
         finalize_vm_hostname!
         finalize_pre_create_command!
         finalize_synced_folders!
+        finalize_ca_cert!
         self
       end
 
@@ -251,6 +256,15 @@ module Kitchen
         debug("------------")
       end
 
+      # Setup path for CA cert
+      #
+      # @api private
+      def finalize_ca_cert!
+        config[:box_download_ca_cert] = File.expand_path(
+          config[:box_download_ca_cert], config[:kitchen_root]) unless
+            config[:box_download_ca_cert].nil?
+      end
+
       # Replaces any `{{vagrant_root}}` tokens in the pre create command.
       #
       # @api private
@@ -273,7 +287,7 @@ module Kitchen
                 config[:kitchen_root]
               ),
               destination.gsub("%{instance_name}", instance.name),
-              options || "nil"
+              options || "nil",
             ]
           end
         add_extra_synced_folders!
@@ -288,7 +302,7 @@ module Kitchen
           config[:synced_folders].push([
             local_kitchen_cache,
             cache_directory,
-            "create: true"
+            "create: true",
           ])
         end
       end
@@ -363,7 +377,7 @@ module Kitchen
         merged = {
           :use_sudo => config[:use_sudo],
           :log_subject => name,
-          :environment => {}
+          :environment => {},
         }.merge(options)
 
         # Attempt to extract bundler and associated GEM related values.
@@ -373,8 +387,8 @@ module Kitchen
         # "A Hard Problem"(TM), we simply blow away all known bundler
         # related changes.
         env = merged[:environment]
-        %w[BUNDLE_BIN_PATH BUNDLE_GEMFILE GEM_HOME GEM_PATH GEM_ROOT RUBYLIB
-           RUBYOPT _ORIGINAL_GEM_PATH].each do |var|
+        %w{BUNDLE_BIN_PATH BUNDLE_GEMFILE GEM_HOME GEM_PATH GEM_ROOT RUBYLIB
+           RUBYOPT _ORIGINAL_GEM_PATH}.each do |var|
           env[var] = nil
         end
 
@@ -456,7 +470,7 @@ module Kitchen
       # @api private
       def vagrant_root
         @vagrant_root ||= instance.nil? ? nil : File.join(
-          config[:kitchen_root], %w[.kitchen kitchen-vagrant],
+          config[:kitchen_root], %w{.kitchen kitchen-vagrant},
           "kitchen-#{File.basename(config[:kitchen_root])}-#{instance.name}"
         )
       end
@@ -470,7 +484,7 @@ module Kitchen
         lines = run_silently("#{config[:vagrant_binary]} #{type}-config").
           split("\n").map do |line|
           tokens = line.strip.partition(" ")
-          [tokens.first, tokens.last.gsub(/"/, "")]
+          [tokens.first, tokens.last.delete('"')]
         end
         Hash[lines]
       end

data/lib/kitchen/driver/vagrant_version.rb

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

data/spec/kitchen/driver/vagrant_spec.rb

@@ -122,7 +122,7 @@ describe Kitchen::Driver::Vagrant do
           "GEM_ROOT" => "gem_root",
           "RUBYLIB" => "ruby_lib",
           "RUBYOPT" => "ruby_opt",
-          "_ORIGINAL_GEM_PATH" => "original_gem_path"
+          "_ORIGINAL_GEM_PATH" => "original_gem_path",
         }
       end
 
@@ -153,11 +153,11 @@ describe Kitchen::Driver::Vagrant do
       [
         File.expand_path("~/.kitchen/cache"),
         "/tmp/omnibus/cache",
-        "create: true"
+        "create: true",
       ]
     end
 
-    %W[centos debian fedora opensuse ubuntu oracle freebsd].each do |name|
+    %w{centos debian fedora opensuse ubuntu oracle freebsd}.each do |name|
 
       context "for known bento platform names starting with #{name}" do
 
@@ -210,6 +210,16 @@ describe Kitchen::Driver::Vagrant do
       expect(driver[:box_check_update]).to eq(true)
     end
 
+    it "sets :box_download_ca_cert to nil by default" do
+      expect(driver[:box_download_ca_cert]).to eq(nil)
+    end
+
+    it "sets :box_download_ca_cert to a custom value" do
+      config[:box_download_ca_cert] = "cacert.pem"
+
+      expect(driver[:box_download_ca_cert]).to eq("/kroot/cacert.pem")
+    end
+
     it "sets :box_download_insecure to nil by default" do
       expect(driver[:box_download_insecure]).to eq(nil)
     end
@@ -264,11 +274,11 @@ describe Kitchen::Driver::Vagrant do
 
     it "sets :network to a custom value" do
       config[:network] = [
-        ["forwarded_port", :guest => 80, :host => 8080]
+        ["forwarded_port", :guest => 80, :host => 8080],
       ]
 
       expect(driver[:network]).to eq([
-        ["forwarded_port", :guest => 80, :host => 8080]
+        ["forwarded_port", :guest => 80, :host => 8080],
       ])
     end
 
@@ -344,7 +354,7 @@ describe Kitchen::Driver::Vagrant do
 
     it "sets :synced_folders to a custom value" do
       config[:synced_folders] = [
-        ["/host_path", "/vm_path", "create: true, type: :nfs"]
+        ["/host_path", "/vm_path", "create: true, type: :nfs"],
       ]
 
       expect(driver[:synced_folders]).to eq([
@@ -352,40 +362,40 @@ describe Kitchen::Driver::Vagrant do
           File.expand_path("/host_path"),
           "/vm_path", "create: true, type: :nfs"
         ],
-        cache_directory_array
+        cache_directory_array,
       ])
     end
 
     it "replaces %{instance_name} with instance name in :synced_folders" do
       config[:synced_folders] = [
-        ["/root/%{instance_name}", "/vm_path", "stuff"]
+        ["/root/%{instance_name}", "/vm_path", "stuff"],
       ]
 
       expect(driver[:synced_folders]).to eq([
         [File.expand_path("/root/suitey-fooos-99"), "/vm_path", "stuff"],
-        cache_directory_array
+        cache_directory_array,
       ])
     end
 
     it "expands source paths relative to :kitchen_root in :synced_folders" do
       config[:synced_folders] = [
-        ["./a", "/vm_path", "stuff"]
+        ["./a", "/vm_path", "stuff"],
       ]
 
       expect(driver[:synced_folders]).to eq([
         [File.expand_path("/kroot/a"), "/vm_path", "stuff"],
-        cache_directory_array
+        cache_directory_array,
       ])
     end
 
     it "sets options to 'nil' if not set in :synced_folders entry" do
       config[:synced_folders] = [
-        ["/host_path", "/vm_path", nil]
+        ["/host_path", "/vm_path", nil],
       ]
 
       expect(driver[:synced_folders]).to eq([
         [File.expand_path("/host_path"), "/vm_path", "nil"],
-        cache_directory_array
+        cache_directory_array,
       ])
     end
 
@@ -423,10 +433,10 @@ describe Kitchen::Driver::Vagrant do
     end
 
     it "sets and expands paths in :vagrantfiles" do
-      config[:vagrantfiles] = %W[one two three]
+      config[:vagrantfiles] = %w{one two three}
 
       expect(driver[:vagrantfiles]).to eq(
-        %W[/kroot/one /kroot/two /kroot/three].map { |f| File.expand_path(f) }
+        %w{/kroot/one /kroot/two /kroot/three}.map { |f| File.expand_path(f) }
       )
     end
 
@@ -435,7 +445,7 @@ describe Kitchen::Driver::Vagrant do
       before { allow(platform).to receive(:os_type).and_return("unix") }
 
       it "sets :vm_hostname to the instance name by default" do
-        expect(driver[:vm_hostname]).to eq("suitey-fooos-99")
+        expect(driver[:vm_hostname]).to eq("suitey-fooos-99.vagrantup.com")
       end
 
       it "sets :vm_hostname to a custom value" do
@@ -451,7 +461,7 @@ describe Kitchen::Driver::Vagrant do
         [
           File.expand_path("~/.kitchen/cache"),
           "/omnibus/cache",
-          "create: true"
+          "create: true",
         ]
       end
 
@@ -473,12 +483,12 @@ describe Kitchen::Driver::Vagrant do
 
       it "replaces %{instance_name} with instance name in :synced_folders" do
         config[:synced_folders] = [
-          ["/root/%{instance_name}", "/vm_path", "stuff"]
+          ["/root/%{instance_name}", "/vm_path", "stuff"],
         ]
 
         expect(driver[:synced_folders]).to eq([
           [File.expand_path("/root/suitey-fooos-99"), "/vm_path", "stuff"],
-          win_cache_directory_array
+          win_cache_directory_array,
         ])
       end
     end
@@ -489,7 +499,7 @@ describe Kitchen::Driver::Vagrant do
         [
           File.expand_path("~/.kitchen/cache"),
           "Z:\\awesome\\cache",
-          "create: true"
+          "create: true",
         ]
       end
 
@@ -501,12 +511,12 @@ describe Kitchen::Driver::Vagrant do
 
       it "replaces %{instance_name} with instance name in :synced_folders" do
         config[:synced_folders] = [
-          ["/root/%{instance_name}", "/vm_path", "stuff"]
+          ["/root/%{instance_name}", "/vm_path", "stuff"],
         ]
 
         expect(driver[:synced_folders]).to eq([
           [File.expand_path("/root/suitey-fooos-99"), "/vm_path", "stuff"],
-          custom_cache_directory_array
+          custom_cache_directory_array,
         ])
       end
     end
@@ -606,10 +616,10 @@ describe Kitchen::Driver::Vagrant do
     let(:cmd) { driver.create(state) }
 
     let(:vagrant_root) do
-      File.join(%W[
+      File.join(%W{
         #{@dir} .kitchen kitchen-vagrant
         kitchen-#{File.basename(@dir)}-suitey-fooos-99
-      ])
+      })
     end
 
     before do
@@ -838,10 +848,10 @@ describe Kitchen::Driver::Vagrant do
     let(:cmd) { driver.destroy(state) }
 
     let(:vagrant_root) do
-      File.join(%W[
+      File.join(%W{
         #{@dir} .kitchen kitchen-vagrant
         kitchen-#{File.basename(@dir)}-suitey-fooos-99
-      ])
+      })
     end
 
     before do
@@ -928,10 +938,10 @@ describe Kitchen::Driver::Vagrant do
     let(:cmd) { driver.create(state) }
 
     let(:vagrant_root) do
-      File.join(%W[
+      File.join(%W{
         #{@dir} .kitchen kitchen-vagrant
         kitchen-#{File.basename(@dir)}-suitey-fooos-99
-      ])
+      })
     end
 
     before do
@@ -955,6 +965,27 @@ describe Kitchen::Driver::Vagrant do
       ))
     end
 
+    it "sets no cache.scope if missing" do
+      config[:cachier] = nil
+      cmd
+
+      expect(vagrantfile).to_not match(regexify(%{c.cache.scope}, :partial))
+    end
+
+    it "sets cache.scope to :box if :cachier is set" do
+      config[:cachier] = true
+      cmd
+
+      expect(vagrantfile).to match(regexify(%{c.cache.scope = :box}))
+    end
+
+    it "sets cache.scope if :cachier is set to a custom value" do
+      config[:cachier] = ":machine"
+      cmd
+
+      expect(vagrantfile).to match(regexify(%{c.cache.scope = :machine}))
+    end
+
     it "sets the vm.box" do
       cmd
 
@@ -993,7 +1024,7 @@ describe Kitchen::Driver::Vagrant do
     end
 
     it "requires each entry in :vagranfiles" do
-      config[:vagrantfiles] = %W[/a /b /c]
+      config[:vagrantfiles] = %w{/a /b /c}
       cmd
 
       expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
@@ -1060,14 +1091,7 @@ describe Kitchen::Driver::Vagrant do
       config[:box_check_update] = false
       cmd
 
-      expect(vagrantfile).to match(regexify(%{c.vm.box_check_update = "false"}))
-    end
-
-    it "sets vm.box_check_update if :box_check_update is set" do
-      config[:box_check_update] = "um"
-      cmd
-
-      expect(vagrantfile).to match(regexify(%{c.vm.box_check_update = "um"}))
+      expect(vagrantfile).to match(regexify(%{c.vm.box_check_update = false}))
     end
 
     it "sets no vm.box_download_insecure if missing" do
@@ -1192,7 +1216,7 @@ describe Kitchen::Driver::Vagrant do
         :username => %{jdoe},
         :password => %{secret},
         :private_key_path => %{/key},
-        :insert_key => false
+        :insert_key => false,
       }
       cmd
 
@@ -1207,7 +1231,7 @@ describe Kitchen::Driver::Vagrant do
     it "adds a vm.network line for each element in :network" do
       config[:network] = [
         ["forwarded_port", { :guest => 80, :host => 8080 }],
-        ["private_network", { :ip => "192.168.33.33" }]
+        ["private_network", { :ip => "192.168.33.33" }],
       ]
       cmd
 
@@ -1220,7 +1244,7 @@ describe Kitchen::Driver::Vagrant do
     it "adds a vm.synced_folder line for each element in :synced_folders" do
       config[:synced_folders] = [
         ["/a/b", "/opt/instance_data", "nil"],
-        ["/host_path", "/vm_path", "create: true, type: :nfs"]
+        ["/host_path", "/vm_path", "create: true, type: :nfs"],
       ]
       cmd
 
@@ -1233,7 +1257,7 @@ describe Kitchen::Driver::Vagrant do
     it "vm.synced_folder scapes the back slashes for Windows paths" do
       config[:synced_folders] = [
         ["/a/b", "C:\\opt\\instance_data", "nil"],
-        ["Z:\\host_path", "/vm_path", "create: true"]
+        ["Z:\\host_path", "/vm_path", "create: true"],
       ]
       cmd
 
@@ -1250,7 +1274,7 @@ describe Kitchen::Driver::Vagrant do
       it "adds a line for each element in :customize" do
         config[:customize] = {
           :a_key => "some value",
-          :something => "else"
+          :something => "else",
         }
         cmd
 
@@ -1320,6 +1344,51 @@ describe Kitchen::Driver::Vagrant do
           end
         RUBY
       end
+
+      it "adds a lines for createhd in :customize" do
+        config[:customize] = {
+          :createhd => {
+            :filename => "./d1.vmdk",
+            :size => 10 * 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]
+          end
+        RUBY
+      end
+
+      it "adds a lines for storageattach in :customize" do
+        config[:customize] = {
+          :storageattach => {
+            :type => "hdd",
+            :port => 1,
+          },
+        }
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :virtualbox do |p|
+            p.customize ["storageattach", :id, "--type", "hdd", "--port", 1]
+          end
+        RUBY
+      end
+
+      it "adds a line for cpuidset in :customize" do
+        config[:customize] = {
+          :cpuidset => %w{00000001 00000002},
+        }
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :virtualbox do |p|
+            p.customize ["modifyvm", :id, "--cpuidset", "00000001", "00000002"]
+          end
+        RUBY
+      end
     end
 
     context "for parallels provider" do
@@ -1329,7 +1398,7 @@ describe Kitchen::Driver::Vagrant do
       it "adds a line for each element in :customize" do
         config[:customize] = {
           :a_key => "some value",
-          :something => "else"
+          :something => "else",
         }
         cmd
 
@@ -1344,7 +1413,7 @@ describe Kitchen::Driver::Vagrant do
       it "adds a short form of :memory and :cpus elements in :customize" do
         config[:customize] = {
           :memory => 2048,
-          :cpus => 4
+          :cpus => 4,
         }
         cmd
 
@@ -1394,7 +1463,7 @@ describe Kitchen::Driver::Vagrant do
       it "adds a line for each element in :customize" do
         config[:customize] = {
           :a_key => "some value",
-          :something => "else"
+          :something => "else",
         }
         cmd
 
@@ -1415,8 +1484,8 @@ describe Kitchen::Driver::Vagrant do
         config[:customize] = {
           :disk_capacity => {
             :"0" => 25,
-            :"2" => 100
-          }
+            :"2" => 100,
+          },
         }
         cmd
 
@@ -1430,7 +1499,7 @@ describe Kitchen::Driver::Vagrant do
       it "adds a line for each element in :customize" do
         config[:customize] = {
           :a_key => "some value",
-          :something => "else"
+          :something => "else",
         }
         cmd
 
@@ -1451,7 +1520,7 @@ describe Kitchen::Driver::Vagrant do
         config[:customize] = {
           :a_key => "some value",
           :something => "else",
-          :a_number_key => 1024
+          :a_number_key => 1024,
         }
         cmd
 
@@ -1463,6 +1532,38 @@ describe Kitchen::Driver::Vagrant do
           end
         RUBY
       end
+
+      it "adds a single storage definition in :customize" do
+        config[:customize] = {
+          :storage => ":file, :size => '32G'",
+        }
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :libvirt do |p|
+            p.storage :file, :size => '32G'
+          end
+        RUBY
+      end
+
+      it "adds a line for each additional storage definition in :customize" do
+        config[:customize] = {
+          :storage => [
+            ":file, :size => '1G'",
+            ":file, :size => '128G', :bus => 'sata'",
+            ":file, :size => '64G', :bus => 'sata'",
+          ],
+        }
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :libvirt do |p|
+            p.storage :file, :size => '1G'
+            p.storage :file, :size => '128G', :bus => 'sata'
+            p.storage :file, :size => '64G', :bus => 'sata'
+          end
+        RUBY
+      end
     end
 
     context "for lxc provider" do
@@ -1471,7 +1572,7 @@ describe Kitchen::Driver::Vagrant do
 
       it "sets container_name to :machine if set" do
         config[:customize] = {
-          :container_name => ":machine"
+          :container_name => ":machine",
         }
         cmd
 
@@ -1484,7 +1585,7 @@ describe Kitchen::Driver::Vagrant do
 
       it "sets container_name to another value in quotes if set" do
         config[:customize] = {
-          :container_name => "beans"
+          :container_name => "beans",
         }
         cmd
 
@@ -1497,7 +1598,7 @@ describe Kitchen::Driver::Vagrant do
 
       it "sets backingstore if set" do
         config[:customize] = {
-          :backingstore => "lvm"
+          :backingstore => "lvm",
         }
         cmd
 
@@ -1512,8 +1613,8 @@ describe Kitchen::Driver::Vagrant do
         config[:customize] = {
           :backingstore_options => {
             :vgname => "schroots",
-            :fstype => "xfs"
-          }
+            :fstype => "xfs",
+          },
         }
         cmd
 
@@ -1528,7 +1629,7 @@ describe Kitchen::Driver::Vagrant do
       it "sets all other options to customize lines" do
         config[:customize] = {
           :cookies => "cream",
-          :salt => "vinegar"
+          :salt => "vinegar",
         }
         cmd
 
@@ -1577,7 +1678,7 @@ describe Kitchen::Driver::Vagrant do
       it "adds a line for each element in :customize" do
         config[:customize] = {
           :a_key => "some value",
-          :something => "else"
+          :something => "else",
         }
         cmd
 
@@ -1591,7 +1692,7 @@ describe Kitchen::Driver::Vagrant do
 
       it "converts :memory into :memsize" do
         config[:customize] = {
-          :memory => "222"
+          :memory => "222",
         }
         cmd
 
@@ -1605,7 +1706,7 @@ describe Kitchen::Driver::Vagrant do
       it "skips :memory if key :memsize exists" do
         config[:customize] = {
           :memory => "222",
-          :memsize => "444"
+          :memsize => "444",
         }
         cmd
 
@@ -1618,7 +1719,7 @@ describe Kitchen::Driver::Vagrant do
 
       it "converts :cpus into :numvcpus" do
         config[:customize] = {
-          :cpus => "2"
+          :cpus => "2",
         }
         cmd
 
@@ -1632,7 +1733,7 @@ describe Kitchen::Driver::Vagrant do
       it "skips :cpus if key :numvcpus exists" do
         config[:customize] = {
           :cpus => "2",
-          :numvcpus => "4"
+          :numvcpus => "4",
         }
         cmd
 
@@ -1650,7 +1751,7 @@ describe Kitchen::Driver::Vagrant do
 
       it "adds a line a server" do
         config[:customize] = {
-          :server => "my_server"
+          :server => "my_server",
         }
         cmd
 
@@ -1664,7 +1765,7 @@ describe Kitchen::Driver::Vagrant do
       it "ignores all other key types than server" do
         config[:customize] = {
           :other => "stuff",
-          :is => "ignored"
+          :is => "ignored",
         }
         cmd
 
@@ -1683,7 +1784,7 @@ describe Kitchen::Driver::Vagrant do
         config[:customize] = {
           :key1 => "some string value",
           :key2 => 22,
-          :key3 => false
+          :key3 => false,
         }
         cmd
 
@@ -1704,7 +1805,7 @@ describe Kitchen::Driver::Vagrant do
       it "adds a line for each element in :customize" do
         config[:customize] = {
           :a_key => "some value",
-          :something => "else"
+          :something => "else",
         }
         cmd
 
@@ -1724,16 +1825,16 @@ describe Kitchen::Driver::Vagrant do
               :cidrlist  => "B.B.B.B/24",
               :protocol  => "tcp",
               :startport => 2222,
-              :endport   => 2222
+              :endport   => 2222,
             },
             {
               :ipaddress => "C.C.C.C",
               :cidrlist  => "D.D.D.D/32",
               :protocol  => "tcp",
               :startport => 80,
-              :endport   => 81
-            }
-          ]
+              :endport   => 81,
+            },
+          ],
         }
         cmd
 
@@ -1752,7 +1853,7 @@ describe Kitchen::Driver::Vagrant do
       it "builds an array for security group ids in :customize" do
         config[:customize] = {
           :security_group_ids => ["aaaa-bbbb-cccc-dddd",
-                                  "1111-2222-3333-4444"]
+                                  "1111-2222-3333-4444"],
         }
         cmd
 
@@ -1768,8 +1869,8 @@ describe Kitchen::Driver::Vagrant do
 
       it "builds an array for security group names in :customize" do
         config[:customize] = {
-          :security_group_names => %w[min_fantastiska_security_group
-                                      another_security_group]
+          :security_group_names => %w{min_fantastiska_security_group
+                                      another_security_group},
         }
         cmd
 
@@ -1795,18 +1896,18 @@ describe Kitchen::Driver::Vagrant do
                   :protocol => "TCP",
                   :startport => 22,
                   :endport => 22,
-                  :cidrlist => "0.0.0.0/0"
+                  :cidrlist => "0.0.0.0/0",
                 },
                 {
                   :type => "egress",
                   :protocol => "TCP",
                   :startport => 81,
                   :endport => 82,
-                  :cidrlist => "1.2.3.4/24"
-                }
-              ]
-            }
-          ]
+                  :cidrlist => "1.2.3.4/24",
+                },
+              ],
+            },
+          ],
         }
         cmd
 
@@ -1826,7 +1927,7 @@ describe Kitchen::Driver::Vagrant do
 
       it "builds an array of hashes for static nat in :customize" do
         config[:customize] = {
-          :static_nat => [{ :idaddress => "A.A.A.A" }]
+          :static_nat => [{ :idaddress => "A.A.A.A" }],
         }
         cmd
 
@@ -1845,16 +1946,16 @@ describe Kitchen::Driver::Vagrant do
               :protocol => "tcp",
               :publicport => 22,
               :privateport => 22,
-              :openfirewall => false
+              :openfirewall => false,
             },
             {
               :ipaddress => "X.X.X.X",
               :protocol => "tcp",
               :publicport => 80,
               :privateport => 80,
-              :openfirewall => false
-            }
-          ]
+              :openfirewall => false,
+            },
+          ],
         }
         cmd
 

data/templates/Vagrantfile.erb

@@ -4,6 +4,12 @@ require "<%= vagrantfile %>"
 
 Vagrant.configure("2") do |c|
   c.berkshelf.enabled = false if Vagrant.has_plugin?("vagrant-berkshelf")
+  <% if config[:cachier] %>
+  if Vagrant.has_plugin?("vagrant-cachier")
+    c.cache.scope = <%= [':box', ':machine'].include?(config[:cachier]) ? config[:cachier] : ':box' %>
+  end
+  <% end %>
+
   c.vm.box = "<%= config[:box] %>"
 
 <% if config[:box_url] %>
@@ -15,7 +21,11 @@ Vagrant.configure("2") do |c|
 <% end %>
 
 <% if !config[:box_check_update].nil? %>
-  c.vm.box_check_update = "<%= config[:box_check_update] %>"
+  c.vm.box_check_update = <%= config[:box_check_update] %>
+<% end %>
+
+<% if !config[:box_download_ca_cert].nil? %>
+  c.vm.box_download_ca_cert = "<%= config[:box_download_ca_cert] %>"
 <% end %>
 
 <% if !config[:box_download_insecure].nil? %>
@@ -93,11 +103,21 @@ Vagrant.configure("2") do |c|
 <% config[:customize].each do |key, value| %>
   <% case config[:provider]
      when "libvirt" %>
-  <% if value.is_a? String %>
+    <% if key == :storage %>
+      <% if value.is_a? String %>
+    p.storage <%= value %>
+      <% elsif value.is_a? Array %>
+        <% value.each do |v| %>
+    p.storage <%= v %>
+        <% end %>
+      <% end %>
+    <% else %>
+      <% if value.is_a? String %>
     p.<%= key %> = "<%= value%>"
-  <% else %>
+      <% else %>
     p.<%= key %> = <%= value%>
-  <% end %>
+      <% end %>
+    <% end %>
   <% when "lxc" %>
     <% if key == :container_name %>
     p.container_name = <%= value == ":machine" ? value : "\"#{value}\"" %>
@@ -107,6 +127,10 @@ Vagrant.configure("2") do |c|
       <% config[:customize][:backingstore_options].each do |opt, opt_val| %>
     p.backingstore_option "--<%= opt %>", "<%= opt_val %>"
       <% end %>
+    <% elsif key == :include %>
+      <% Array(value).each do |include| %>
+    p.customize "<%= key %>", "<%= include %>"
+      <% end %>
     <% else %>
     p.customize "<%= key %>", "<%= value %>"
     <% end %>
@@ -120,8 +144,6 @@ Vagrant.configure("2") do |c|
     <% else %>
     p.customize ["set", :id, "--<%= key.to_s.gsub('_', '-') %>", "<%= value %>"]
     <% end %>
-  <% when "rackspace" %>
-    p.<%= key %> = "<%= value%>"
   <% when "softlayer" %>
     <% if key == :disk_capacity %>
     p.<%= key %> = <%= value %>
@@ -129,7 +151,28 @@ Vagrant.configure("2") do |c|
     p.<%= key %> = "<%= value %>"
     <% end %>
   <% when "virtualbox" %>
+    <% if key == :createhd %>
+    p.customize ["createhd", "--filename", "<%= value[:filename] %>", "--size", <%= value[:size] %>]
+    <% 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 %>
+    p.customize ["storageattach", :id, <%= options.join(', ') %>]
+    <% elsif key == :cpuidset %>
+      <% ids = [] %>
+      <% value.each do | id |
+           ids << "\"#{id}\""
+         end %>
+    p.customize ["modifyvm", :id, "--cpuidset", <%= ids.join(', ') %>]
+    <% else %>
     p.customize ["modifyvm", :id, "--<%= key %>", "<%= value %>"]
+    <% end %>
   <% when /^vmware_/ %>
     <% if key == :memory %>
       <% unless config[:customize].include?(:memsize) %>
@@ -142,7 +185,7 @@ Vagrant.configure("2") do |c|
     <% else %>
     p.vmx["<%= key %>"] = "<%= value %>"
     <% end %>
-  <% when "openstack", "cloudstack", "hyperv", "ovirt3" %>
+  <% when "openstack", "cloudstack", "hyperv", "ovirt3", "rackspace", "aws" %>
     <% if value.is_a? String %>
     p.<%= key %> = "<%= value%>"
     <% else  %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -95,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.11.3
 - !ruby/object:Gem::Dependency
-  name: finstyle
+  name: chefstyle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 3.0.0
 description: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
 email:
 - fnichol@nichol.ca
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.