kitchen-vagrant 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdcd8378297c5463119b1d3854aa9e12669b753a
-  data.tar.gz: 4775d654b86cb58cf290dbb16dda7cde86522572
+  metadata.gz: 2ee72d57d556a167ee66c7d6e9feab387a26568d
+  data.tar.gz: 73b264e1d64ca412181265fb9823f52b5a77a992
 SHA512:
-  metadata.gz: 5f2ebcd04539cb4c8df89a484699271e26baf56d5e86a438f89523f73181cd659ab5593dc1b038d5ed913c3287c60f8b7be8b275b4b601eb6312c27f56a0479a
-  data.tar.gz: a21647a79c02ec663b974c5be64968ed4d65524fc0d73e6ca6057b71d20d275e21a325bdef4af4d1f0ec72ae79954ef96913653a72287ec6cf8ba72c073a97eb
+  metadata.gz: b7eebf2687a97c3b7b7b6af8f7047e3ddb166887a5012d47bad1c495902df3751cb84a6f39a6def15a27140925482f269fca6e6678c558ce15cafd42a661aabb
+  data.tar.gz: 3aee9e2aba2d2cc138be17e623d75d3941dabd5cfbb90db8483c78a0fcda9b391687a6deb91fc573e74dca86e38b955275107c57126f9db17aad480dc9d7ba89

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [v1.0.1](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.0.1) (2017-02-10)
+[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.0.0...v1.0.1)
+
+**Fixed bugs:**
+
+- Fixed cache folder disable for FreeBSD and MacOS/OSX [\#281](https://github.com/test-kitchen/kitchen-vagrant/pull/281) ([brentm5](https://github.com/brentm5)) [\#283](https://github.com/test-kitchen/kitchen-vagrant/pull/283) ([cheeseplus](https://github.com/cheeseplus))
+
 ## [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)
 

data/README.md

@@ -254,20 +254,23 @@ 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.
+of an additional disk 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].
 
 ```yaml
 driver:
   customize:
     createhd:
-      filename: ./tmp/disk1.vmdk
+      filename: /tmp/disk1.vmdk
       size: 1024
     storageattach:
-      storagectl: IDE Controller
+      storagectl: SATA Controller
       port: 1
       device: 0
       type: hdd
-      medium: ./tmp/disk1.vmdk
+      medium: /tmp/disk1.vmdk
 ```
 
 will generate a Vagrantfile configuration similar to:
@@ -278,7 +281,7 @@ 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"]
+    virtualbox.customize ["storageattach", :id, "--storagectl", "IDE Controller", "--port", "1", "--device", 0, "--type", "hdd", "--medium", "./tmp/disk1.vmdk"]
   end
 end
 ```
@@ -574,4 +577,5 @@ 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
+[vagrant_cachier]:          https://github.com/fgrehm/vagrant-cachier
+[vbox_ide_boot]:            https://www.virtualbox.org/ticket/6979

data/lib/kitchen/driver/vagrant.rb

@@ -219,8 +219,7 @@ module Kitchen
       def disable_cache?
         # Disable for Windows not using Virtualbox
         if windows_host? && config[:provider] != "virtualbox" ||
-            # Disable for FreeBSD
-            instance.platform.name == "freebsd" ||
+            instance.platform.name =~ /(freebsd|macos|osx)/ ||
             # Disable if cache_directory is set to "false" on .kitchen.yml
             !config[:cache_directory]
           return true
@@ -260,9 +259,10 @@ module Kitchen
       #
       # @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?
+        unless config[:box_download_ca_cert].nil?
+          config[:box_download_ca_cert] = File.expand_path(
+            config[:box_download_ca_cert], config[:kitchen_root])
+        end
       end
 
       # Replaces any `{{vagrant_root}}` tokens in the pre create command.
@@ -469,10 +469,10 @@ module Kitchen
       #   instance's Vagrantfile
       # @api private
       def vagrant_root
-        @vagrant_root ||= instance.nil? ? nil : File.join(
-          config[:kitchen_root], %w{.kitchen kitchen-vagrant},
+        root = File.join(config[:kitchen_root], %w{.kitchen kitchen-vagrant},
           "kitchen-#{File.basename(config[:kitchen_root])}-#{instance.name}"
         )
+        @vagrant_root ||= instance.nil? ? nil : root
       end
 
       # @param type [Symbol] either `:ssh` or `:winrm`

data/lib/kitchen/driver/vagrant_version.rb

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

data/spec/kitchen/driver/vagrant_spec.rb

@@ -348,7 +348,17 @@ describe Kitchen::Driver::Vagrant do
     end
 
     it "does not set :synced_folders to cache_directory on freebsd systems" do
-      allow(platform).to receive(:name).and_return("freebsd")
+      allow(platform).to receive(:name).and_return("freebsd-99")
+      expect(driver[:synced_folders]).to eq([])
+    end
+
+    it "does not set :synced_folders to cache_directory on macos systems" do
+      allow(platform).to receive(:name).and_return("macos")
+      expect(driver[:synced_folders]).to eq([])
+    end
+
+    it "does not set :synced_folders to cache_directory on osx systems" do
+      allow(platform).to receive(:name).and_return("osx-99")
       expect(driver[:synced_folders]).to eq([])
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.