kitchen-vagrant 0.21.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa643733a8bf6bd645efc9fa0194c06011c74ee
-  data.tar.gz: 6c27247da25efbeacdddc37a185e578ec92d3d06
+  metadata.gz: ad1eb2e544973ec0e6864be3d857c448edce6be0
+  data.tar.gz: 80092da59b88a3f00ba1dab7d4160d3bd030c238
 SHA512:
-  metadata.gz: 2d941b21d57414cae57419b423c5ff5032d4320a7cd28bb81c1f0bf4047fcfdaf464dde79925d9ccbe24c7d1390977a8ffc61ce3fcae143b363edb54387f4968
-  data.tar.gz: 48ee12e85af4eeb36976ad354a6ef9f1771fee7e3072e67899a8efffb0b97a9e0a8a1672611047fb6e88d6f4277b7ac52ef160c12f08bb193a7f67fb514edb60
+  metadata.gz: e6ea18edbddc33dadcf7ee8be669ab216507364094d6cf04aba8655bff6901449fc7d0217ea351abee4aaa2ca67d4b15a282ab3941daf58e5802f03476287db4
+  data.tar.gz: fd16e4495a3b1fd544b267ab8f8fa072e6d417801e0109262c3fe12b51b7abd40c749dcacf6595b8021d7b179ee0988265759960a096e72baa5cbd5001a05104

data/CHANGELOG.md

@@ -1,5 +1,21 @@
+## [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)
+
+**Implemented enhancements:**
+
+- add oracle as supported bento-box type [\#258](https://github.com/test-kitchen/kitchen-vagrant/pull/258) ([lamont-granquist](https://github.com/lamont-granquist))
+
+**Fixed bugs:**
+
+- Change default cache dir for Windows [\#259](https://github.com/test-kitchen/kitchen-vagrant/pull/259) ([afiune](https://github.com/afiune))
+- Vagrant requires also to scape slashes [\#253](https://github.com/test-kitchen/kitchen-vagrant/pull/253) ([afiune](https://github.com/afiune))
+- Fix cache directory on windows [\#251](https://github.com/test-kitchen/kitchen-vagrant/pull/251) ([afiune](https://github.com/afiune))
+- Exclude freebsd and ability to disable cache dir [\#262](https://github.com/test-kitchen/kitchen-vagrant/pull/262) ([afiune](https://github.com/afiune))
+- Don't alter the path during the bundler cleanup on windows [\#241](https://github.com/test-kitchen/kitchen-vagrant/pull/241) ([mwrock](https://github.com/mwrock))
+- do not map the extra cache drive on non virtualbox windows [\#255](https://github.com/test-kitchen/kitchen-vagrant/pull/255) ([mwrock](https://github.com/mwrock))
+
 ## [0.21.0](https://github.com/test-kitchen/kitchen-vagrant/tree/0.21.0) (2016-11-29)
-[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v0.20.0...0.21.0)
+[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v0.20.0...v0.21.0)
 
 **Fixed bugs:**
 

data/README.md

@@ -394,6 +394,23 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+### <a name="config-cache_directory"></a> cache_directory
+
+Customize the cache directory on the instance. This parameter must be an
+absolute path.
+
+The defaults are:
+* Windows: `C:\\omnibus\\cache`
+* Unix: `/tmp/omnibus/cache`
+
+The example:
+
+```yaml
+---
+driver:
+  cache_directory: Z:\\custom\\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

@@ -84,6 +84,10 @@ module Kitchen
         driver.windows_os? ? nil : driver.instance.name
       end
 
+      default_config(:cache_directory) do |driver|
+        driver.windows_os? ? "/omnibus/cache" : "/tmp/omnibus/cache"
+      end
+
       no_parallel_for :create, :destroy
 
       # Creates a Vagrant VM instance.
@@ -173,7 +177,8 @@ module Kitchen
       # and share a local folder to that directory so that we don't pull them
       # down every single time
       def cache_directory
-        windows_os? ? "$env:TEMP\\omnibus\\cache" : "/tmp/omnibus/cache"
+        return if disable_cache?
+        config[:cache_directory]
       end
 
       protected
@@ -201,7 +206,23 @@ module Kitchen
       #   box
       # @api private
       def bento_box?(name)
-        name =~ /^(centos|debian|fedora|freebsd|opensuse|ubuntu)-/
+        name =~ /^(centos|debian|fedora|freebsd|opensuse|ubuntu|oracle)-/
+      end
+
+      # Return true if we found the criteria to disable the cache_directory
+      # functionality
+      def disable_cache?
+        # Disable for Windows not using Virtualbox
+        if windows_host? && config[:provider] != "virtualbox" ||
+            # Disable for FreeBSD
+            instance.platform.name == "freebsd" ||
+            # Disable if cache_directory is set to "false" on .kitchen.yml
+            !config[:cache_directory]
+          return true
+        end
+
+        # Otherwise
+        false
       end
 
       # Renders and writes out a Vagrantfile dedicated to this instance.
@@ -337,6 +358,7 @@ module Kitchen
       # will inherit our bundled environment.
       # @see https://github.com/test-kitchen/kitchen-vagrant/issues/190
       # @see Kitchen::ShellOut#run_command
+      # rubocop:disable Metrics/CyclomaticComplexity
       def run_command(cmd, options = {})
         merged = {
           :use_sudo => config[:use_sudo],
@@ -355,15 +377,27 @@ module Kitchen
            RUBYOPT _ORIGINAL_GEM_PATH].each do |var|
           env[var] = nil
         end
-        gem_home = ENV["GEM_HOME"]
-        if gem_home && (env["PATH"] || ENV["PATH"])
-          env["PATH"] ||= ENV["PATH"].dup if ENV["PATH"]
-          gem_bin = File.join(gem_home, "bin") + File::PATH_SEPARATOR
-          env["PATH"][gem_bin] = "" if env["PATH"].include?(gem_bin)
+
+        # Altering the path seems to break vagrant. When the :environment
+        # is passed to a windows process with a PATH, Vagrant's batch installer
+        # (https://github.com/mitchellh/vagrant-installers/blob/master/substrate
+        # /modules/vagrant_installer/templates/windows_vagrant.bat.erb)
+        # does not efectively prepend the vagrant ruby path in a persistent
+        # manner which causes vagrant to use the same ruby as test-kitchen and
+        # then the environment is essentially corrupted leading to many errors
+        # and dispair
+        unless windows_host?
+          gem_home = ENV["GEM_HOME"]
+          if gem_home && (env["PATH"] || ENV["PATH"])
+            env["PATH"] ||= ENV["PATH"].dup if ENV["PATH"]
+            gem_bin = File.join(gem_home, "bin") + File::PATH_SEPARATOR
+            env["PATH"][gem_bin] = "" if env["PATH"].include?(gem_bin)
+          end
         end
 
         super(cmd, merged)
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       # Runs a local command before `vagrant up` has been called.
       #
@@ -473,6 +507,13 @@ module Kitchen
         end
       end
 
+      # @return [true,false] whether or not the host is windows
+      #
+      # @api private
+      def windows_host?
+        RbConfig::CONFIG["host_os"] =~ /mswin|mingw/
+      end
+
       # @return [true,false] whether or not the vagrant-winrm plugin is
       #   installed
       # @api private

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.0"
+    VAGRANT_VERSION = "0.21.1"
   end
 end

data/spec/kitchen/driver/vagrant_spec.rb

@@ -136,6 +136,8 @@ describe Kitchen::Driver::Vagrant do
       end
 
       it "fixes path if it notices gem_home in it" do
+        allow(RbConfig::CONFIG).to receive(:[]).with("host_os").
+          and_return("linux")
         env.merge!(bundler_env)
         env["PATH"] = "gem_home/bin#{File::PATH_SEPARATOR}/something/else"
         options = driver.send(:run_command, "cmd")
@@ -155,7 +157,7 @@ describe Kitchen::Driver::Vagrant do
       ]
     end
 
-    %W[centos debian fedora opensuse ubuntu].each do |name|
+    %W[centos debian fedora opensuse ubuntu oracle freebsd].each do |name|
 
       context "for known bento platform names starting with #{name}" do
 
@@ -328,6 +330,18 @@ describe Kitchen::Driver::Vagrant do
       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")
+      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"]
@@ -436,7 +450,7 @@ describe Kitchen::Driver::Vagrant do
       let(:win_cache_directory_array) do
         [
           File.expand_path("~/.kitchen/cache"),
-          "$env:TEMP\\omnibus\\cache",
+          "/omnibus/cache",
           "create: true"
         ]
       end
@@ -468,6 +482,34 @@ describe Kitchen::Driver::Vagrant do
         ])
       end
     end
+
+    context "when cache_directory is customized" do
+
+      let(:custom_cache_directory_array) do
+        [
+          File.expand_path("~/.kitchen/cache"),
+          "Z:\\awesome\\cache",
+          "create: true"
+        ]
+      end
+
+      before { config[:cache_directory] = 'Z:\\awesome\\cache' }
+
+      it "sets :synced_folders with the custom cache_directory" do
+        expect(driver[:synced_folders]).to eq([custom_cache_directory_array])
+      end
+
+      it "replaces %{instance_name} with instance name in :synced_folders" do
+        config[:synced_folders] = [
+          ["/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
+        ])
+      end
+    end
   end
 
   describe "#verify_dependencies" do
@@ -1188,6 +1230,19 @@ describe Kitchen::Driver::Vagrant do
       RUBY
     end
 
+    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"]
+      ]
+      cmd
+
+      expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {6}/, "").chomp))
+        c.vm.synced_folder "/a/b", "C:\\\\opt\\\\instance_data", nil
+        c.vm.synced_folder "Z:\\\\host_path", "/vm_path", create: true
+      RUBY
+    end
+
     context "for virtualbox provider" do
 
       before { config[:provider] = "virtualbox" }

data/spec/spec_helper.rb

@@ -17,8 +17,8 @@
 # limitations under the License.
 
 if ENV["CODECLIMATE_REPO_TOKEN"]
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
+  require "simplecov"
+  SimpleCov.start
 elsif ENV["COVERAGE"]
   require "simplecov"
   SimpleCov.profiles.define "gem" do

data/templates/Vagrantfile.erb

@@ -72,7 +72,7 @@ Vagrant.configure("2") do |c|
 
   c.vm.synced_folder ".", "/vagrant", disabled: true
 <% config[:synced_folders].each do |source, destination, options| %>
-  c.vm.synced_folder "<%= source %>", "<%= destination %>", <%= options %>
+  c.vm.synced_folder <%= source.inspect %>, <%= destination.inspect %>, <%= options %>
 <% end %>
 
   c.vm.provider :<%= config[:provider] %> do |p|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen