kitchen-vagrant 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fc68310e6aba9fcb3eb1b5afde0b19a1742f84304ce03e27a56a422743285de
-  data.tar.gz: 8fcedc69d161384ccd9d758c2b2164058b7221ab5ccb08ce9a2f78d5a54f9e26
+  metadata.gz: ee92d49f3d5e73344418c1cb8d3540785af402102e83a92736420b81d7fdc0de
+  data.tar.gz: 325004bfa3ad692a57a54cc26643898cb969291d650d1688e9d1761e3df8a4b0
 SHA512:
-  metadata.gz: 48680298fa28e965b62094e838a8b90aa15302003ea1f03b6b0b77976e8ead91b151b8c6a7207863cae90b4c658827549417f303f1e81cfd10fc8db873bf4cdf
-  data.tar.gz: bd4a465ec423af44508c81d4dabc05c46e6654dc09cb32b518a27e0dd7dd016152ffbf40de4ed6747d6e5ce5e5e70329748d684d10e9473782e67f29dd2d1348
+  metadata.gz: 74609777bd6d7c36d5d682ea82831affc691ed4e9b87ba1a63ef5a08c09e9a2f71228e0914fcf8e2b47e8af9ab9dfb68e87fd8c130edc3e9cfee1251fb461cfc
+  data.tar.gz: 3086d110f043047f9e50ebae55317f4d1ce3c9f4dca9b2902c8053ba16a3339a4b2cc3bf410d796b5eeef3d8e836719a9f287f468f4a911bb67324c5bd03c06a

data/lib/kitchen/driver/vagrant.rb

@@ -298,16 +298,16 @@ module Kitchen
       def finalize_pre_create_command!
         return if config[:pre_create_command].nil?
 
-        config[:pre_create_command] = config[:pre_create_command].
-          gsub("{{vagrant_root}}", vagrant_root)
+        config[:pre_create_command] = config[:pre_create_command]
+          .gsub("{{vagrant_root}}", vagrant_root)
       end
 
       # Replaces an `%{instance_name}` tokens in the synced folder items.
       #
       # @api private
       def finalize_synced_folders!
-        config[:synced_folders] = config[:synced_folders].
-          map do |source, destination, options|
+        config[:synced_folders] = config[:synced_folders]
+          .map do |source, destination, options|
             [
               File.expand_path(
                 source.gsub("%{instance_name}", instance.name),
@@ -396,7 +396,7 @@ module Kitchen
       # @api private
       def run(cmd, options = {})
         cmd = "echo #{cmd}" if config[:dry_run]
-        run_command(cmd, { :cwd => vagrant_root }.merge(options))
+        run_command(cmd, { cwd: vagrant_root }.merge(options))
       end
 
       # Delegates to Kitchen::ShellOut.run_command, overriding some default
@@ -415,9 +415,9 @@ module Kitchen
       # rubocop:disable Metrics/CyclomaticComplexity
       def run_command(cmd, options = {})
         merged = {
-          :use_sudo => config[:use_sudo],
-          :log_subject => name,
-          :environment => {},
+          use_sudo: config[:use_sudo],
+          log_subject: name,
+          environment: {},
         }.merge(options)
 
         # Attempt to extract bundler and associated GEM related values.
@@ -458,7 +458,7 @@ module Kitchen
       # @api private
       def run_pre_create_command
         if config[:pre_create_command]
-          run(config[:pre_create_command], :cwd => config[:kitchen_root])
+          run(config[:pre_create_command], cwd: config[:kitchen_root])
         end
       end
 
@@ -468,7 +468,7 @@ module Kitchen
       # @api private
       def run_silently(cmd, options = {})
         merged = {
-          :live_stream => nil, :quiet => (logger.debug? ? false : true)
+          live_stream: nil, quiet: (logger.debug? ? false : true)
         }.merge(options)
         run(cmd, merged)
       end
@@ -524,8 +524,8 @@ module Kitchen
       #   invocation
       # @api private
       def vagrant_config(type)
-        lines = run_silently("#{config[:vagrant_binary]} #{type}-config").
-          split("\n").map do |line|
+        lines = run_silently("#{config[:vagrant_binary]} #{type}-config")
+          .split("\n").map do |line|
           tokens = line.strip.partition(" ")
           [tokens.first, tokens.last.delete('"')]
         end
@@ -537,8 +537,8 @@ module Kitchen
       # @api private
       def vagrant_version
         self.class.vagrant_version ||= run_silently(
-          "#{config[:vagrant_binary]} --version", :cwd => Dir.pwd).
-          chomp.split(" ").last
+          "#{config[:vagrant_binary]} --version", cwd: Dir.pwd)
+          .chomp.split(" ").last
       rescue Errno::ENOENT
         raise UserError, "Vagrant #{MIN_VER} or higher is not installed." \
           " Please download a package from #{WEBSITE}."
@@ -556,11 +556,13 @@ module Kitchen
             " Please upgrade to version 1.6 or higher from #{WEBSITE}."
         end
 
-        if !winrm_plugin_installed?
-          raise UserError, "WinRM Transport requires the vagrant-winrm " \
-            "Vagrant plugin to properly communicate with this Vagrant VM. " \
-            "Please install this plugin with: " \
-            "`vagrant plugin install vagrant-winrm' and try again."
+        if Gem::Version.new(vagrant_version) < Gem::Version.new("2.2.0") && !winrm_plugin_installed?
+          raise UserError, "Vagrant version #{vagrant_version} requires the " \
+            "vagrant-winrm plugin to properly communicate with this Vagrant VM " \
+            "over WinRM Transport. Please install this plugin with: " \
+            "`vagrant plugin install vagrant-winrm' and try again." \
+            "Alternatively upgrade to Vagrant >= 2.2.0 which does not " \
+            "require the vagrant-winrm plugin."
         end
       end
 
@@ -578,8 +580,8 @@ module Kitchen
         return true if self.class.winrm_plugin_passed
 
         self.class.winrm_plugin_passed = run_silently(
-          "#{config[:vagrant_binary]} plugin list", :cwd => Dir.pwd).
-          split("\n").find { |line| line =~ /vagrant-winrm\s+/ }
+          "#{config[:vagrant_binary]} plugin list", cwd: Dir.pwd)
+          .split("\n").find { |line| line =~ /vagrant-winrm\s+/ }
       end
     end
   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.3.5"
+    VAGRANT_VERSION = "1.3.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.