kitchen-vagrant 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05ed2e3e9d5d34674af87a20b09ac774d3981d8e
-  data.tar.gz: 993f6bb3134feaeec34c4f24eebf315a6c79f93b
+  metadata.gz: 5bcdf36e88d6aef140e4c2064a79bda537075114
+  data.tar.gz: 33863859cd3303f848cebbd422fc609de9d0d3b1
 SHA512:
-  metadata.gz: e460544290ba5a7f7487f7dcf3269d18a0c64703d551b0ec0e14b5392cc23343d6839914cd46d703dd17e4dd122eb199b497368b4144a50a5319ecc581f808e8
-  data.tar.gz: d0579858e6613e6141f327eb774dc4aecf738bde8bf375f6cc21b2241f5c59a3211eabbc825c299111fadfbc6f598b0b6d78ab08df22b655f604ca6a468f3a6d
+  metadata.gz: b7b73c8e9312a899cdac7a29cab0e977832186169250d9bbe3e14cdcc206612d43a9412042ec91cdaf69c829c211a4c571135df4a6aae686dcaaf1a5d29d5872
+  data.tar.gz: 39a9416a9f3de64b9571d178f0a34e2a5b69a88fc29230bed61cbb9eda54da62071b09c0b327d89622883bfe169eb0cf29695ae9515e009da5dbe3ad8b479ba5

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## [v1.1.0](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.1.0) (2017-03-31)
+[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.0.2...v1.1.0)
+
+**New Features:**
+- Make kitchen package work [\#275](https://github.com/test-kitchen/kitchen-vagrant/pull/275) ([ccope](https://github.com/ccope))
+
+**Improvements:**
+
+- Only enable the cache when using known bento boxes. Fix \#296 [\#303](https://github.com/test-kitchen/kitchen-vagrant/pull/303) ([cheeseplus](https://github.com/cheeseplus))
+- README: add info about cache\_directory disabling [\#299](https://github.com/test-kitchen/kitchen-vagrant/pull/299) ([jugatsu](https://github.com/jugatsu))
+- Add ability to override Kitchen cache directory [\#292](https://github.com/test-kitchen/kitchen-vagrant/pull/292) ([Jakauppila](https://github.com/Jakauppila))
+- Add support for all misc vagrant providers [\#290](https://github.com/test-kitchen/kitchen-vagrant/pull/290) ([myoung34](https://github.com/myoung34))
+
 ## [v1.0.2](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.0.2) (2017-02-13)
 [Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.0.1...v1.0.2)
 

data/README.md

@@ -463,7 +463,7 @@ end
 
 ### <a name="config-cache_directory"></a> cache_directory
 
-Customize the cache directory on the instance. This parameter must be an
+Customize the cache directory on the Vagrant instance. This parameter must be an
 absolute path.
 
 The defaults are:
@@ -478,6 +478,25 @@ driver:
   cache_directory: Z:\\custom\\cache
 ```
 
+To disable usage of cache directory set `cache_directory` parameter to `false`.
+
+### <a name="config-kitchen_cache_directory"></a> kitchen_cache_directory
+
+Customize the kitchen cache directory on the system running Test Kitchen. This parameter must be an
+absolute path.
+
+The defaults are:
+* Windows: `~/.kitchen/cache`
+* Unix: `~/.kitchen/cache`
+
+The example:
+
+```yaml
+---
+driver:
+  kitchen_cache_directory: Z:\\custom\\kitchen_cache
+```
+
 ### <a name="config-vagrantfile-erb"></a> vagrantfile\_erb
 
 An alternate Vagrantfile ERB template that will be rendered for use by this

data/lib/kitchen/driver/vagrant.rb

@@ -86,9 +86,10 @@ module Kitchen
         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 :cache_directory, false
+
+      default_config :kitchen_cache_directory,
+        File.expand_path("~/.kitchen/cache")
 
       default_config :cachier, nil
 
@@ -137,6 +138,20 @@ module Kitchen
         state.delete(:hostname)
       end
 
+      def package(state)
+        if state[:hostname].nil?
+          raise UserError, "Vagrant instance not created!"
+        end
+        if not (config[:ssh] && config[:ssh][:insert_key] == false)
+          m = "Disable vagrant ssh key replacement to preserve the default key!"
+          warn(m)
+        end
+        instance.transport.connection(state).close
+        box_name = File.join(Dir.pwd, instance.name + ".box")
+        run("#{config[:vagrant_binary]} package --output #{box_name}")
+        destroy(state)
+      end
+
       # A lifecycle method that should be invoked when the object is about
       # ready to be used. A reference to an Instance is required as
       # configuration dependant data may be access through an Instance. This
@@ -182,8 +197,11 @@ module Kitchen
       # and share a local folder to that directory so that we don't pull them
       # down every single time
       def cache_directory
-        return if disable_cache?
-        config[:cache_directory]
+        if enable_cache? && !config[:cache_directory]
+          windows_os? ? "/omnibus/cache" : "/tmp/omnibus/cache"
+        else
+          config[:cache_directory]
+        end
       end
 
       protected
@@ -214,17 +232,21 @@ module Kitchen
         name =~ /^(centos|debian|fedora|freebsd|opensuse|ubuntu|oracle)-/
       end
 
-      # Return true if we found the criteria to disable the cache_directory
+      # Returns whether or not the we expect the box to work with shared folders
+      # by matching against a whitelist of bento boxes
+      # @return [TrueClass,FalseClass] whether or not the box shoud work with
+      #   shared folders
+      # @api private
+      def safe_share?(box)
+        box =~ /^bento\/(centos|debian|fedora|opensuse|ubuntu|oracle)-/
+      end
+
+      # Return true if we found the criteria to enable the cache_directory
       # functionality
-      def disable_cache?
-        # Disable for Windows not using Virtualbox
-        if windows_host? && config[:provider] != "virtualbox" ||
-            instance.platform.name =~ /(freebsd|macos|osx)/ ||
-            # Disable if cache_directory is set to "false" on .kitchen.yml
-            !config[:cache_directory]
+      def enable_cache?
+        if safe_share?(config[:box])
           return true
         end
-
         # Otherwise
         false
       end
@@ -462,7 +484,7 @@ module Kitchen
       # @return [String] full absolute path to the kitchen cache directory
       # @api private
       def local_kitchen_cache
-        @local_kitchen_cache ||= File.expand_path("~/.kitchen/cache")
+        @local_kitchen_cache ||= config[:kitchen_cache_directory]
       end
 
       # @return [String] full local path to the directory containing the

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.2"
+    VAGRANT_VERSION = "1.1.0"
   end
 end

data/spec/kitchen/driver/vagrant_spec.rb

@@ -340,32 +340,16 @@ describe Kitchen::Driver::Vagrant do
       expect(driver[:ssh]).to eq(:a => "b", :c => { :d => "e" })
     end
 
-    it "sets :synced_folders with the cache_directory by default" do
+    it "sets :synced_folders with the cache_directory for select bento boxes" do
+      config[:box] = "bento/centos-99"
       expect(driver[:synced_folders]).to eq([cache_directory_array])
     end
 
-    it "does not set :synced_folders to cache_directory on windows/non-vbox" do
-      allow(RbConfig::CONFIG).to receive(:[]).with("host_os").
-        and_return("mingw")
-      config[:provider] = "notvbox"
-      expect(driver[:synced_folders]).to eq([])
-    end
-
     it "does not set :synced_folders to cache_directory on freebsd systems" do
       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
-
     it "sets :synced_folders to a custom value" do
       config[:synced_folders] = [
         ["/host_path", "/vm_path", "create: true, type: :nfs"],
@@ -376,7 +360,6 @@ describe Kitchen::Driver::Vagrant do
           File.expand_path("/host_path"),
           "/vm_path", "create: true, type: :nfs"
         ],
-        cache_directory_array,
       ])
     end
 
@@ -387,7 +370,6 @@ describe Kitchen::Driver::Vagrant do
 
       expect(driver[:synced_folders]).to eq([
         [File.expand_path("/root/suitey-fooos-99"), "/vm_path", "stuff"],
-        cache_directory_array,
       ])
     end
 
@@ -398,7 +380,6 @@ describe Kitchen::Driver::Vagrant do
 
       expect(driver[:synced_folders]).to eq([
         [File.expand_path("/kroot/a"), "/vm_path", "stuff"],
-        cache_directory_array,
       ])
     end
 
@@ -409,7 +390,6 @@ describe Kitchen::Driver::Vagrant do
 
       expect(driver[:synced_folders]).to eq([
         [File.expand_path("/host_path"), "/vm_path", "nil"],
-        cache_directory_array,
       ])
     end
 
@@ -471,14 +451,6 @@ describe Kitchen::Driver::Vagrant do
 
     context "for windows os_types" do
 
-      let(:win_cache_directory_array) do
-        [
-          File.expand_path("~/.kitchen/cache"),
-          "/omnibus/cache",
-          "create: true",
-        ]
-      end
-
       before { allow(platform).to receive(:os_type).and_return("windows") }
 
       it "sets :vm_hostname to nil by default" do
@@ -491,10 +463,6 @@ describe Kitchen::Driver::Vagrant do
         expect(driver[:vm_hostname]).to eq("this-is-a--k")
       end
 
-      it "sets :synced_folders with the cache_directory by default" do
-        expect(driver[:synced_folders]).to eq([win_cache_directory_array])
-      end
-
       it "replaces %{instance_name} with instance name in :synced_folders" do
         config[:synced_folders] = [
           ["/root/%{instance_name}", "/vm_path", "stuff"],
@@ -502,7 +470,6 @@ describe Kitchen::Driver::Vagrant do
 
         expect(driver[:synced_folders]).to eq([
           [File.expand_path("/root/suitey-fooos-99"), "/vm_path", "stuff"],
-          win_cache_directory_array,
         ])
       end
     end

data/templates/Vagrantfile.erb

@@ -185,7 +185,7 @@ Vagrant.configure("2") do |c|
     <% else %>
     p.vmx["<%= key %>"] = "<%= value %>"
     <% end %>
-  <% when "openstack", "cloudstack", "hyperv", "ovirt3", "rackspace", "aws" %>
+  <% else %>
     <% 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: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen