kitchen-vagrant 1.5.1 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d71669b8b76e71c9a612e96ea3860d72e73c16bb3cbf9080c72dce0b083e9d3
-  data.tar.gz: 1289fb40f6391d780efda4415c8ade2271e6c090aa88012534ccadd764a97d6f
+  metadata.gz: 6eea2b13ae661430bd3bb6d2f860790e92073f3e4c73953c7158524b6883fe78
+  data.tar.gz: 71492f51d07e28547642bd2cbbf0412e592b89101883a4b707f4758e7127ea47
 SHA512:
-  metadata.gz: 625a7c1a111d11d423eaedb1711f4fffb0dc8cad2eb428e239484df14c39cc65781ac67bde09f00129fb7d17bd94aed939e7ed8eb6d13c80ff2176625ee1cc85
-  data.tar.gz: bb8679a9b716e0eb071d01d4f0cf350d495d893c418137cac32043d310be8ca0b598e95179587bd8fd29d1b939d6391a345ee428540a5da9d04eb43473ff7f91
+  metadata.gz: 50493706587595344c62f3c19b44884c9a890a1f4dfad1e3566ab76f01dae6df0f8acf17a39bbc3b9b6925d3dda1f6a6a9984c6e64b95de8c999f7ec5c7f8735
+  data.tar.gz: bdbb2f2e15af0418a526ba5386affe68bf96dccc376d01c4bed55112648ae67e4a5c8356d0e4bc0cf49b5165fa0313c4d8a0c784cb16d42a650a2e5669889f22

data/lib/kitchen/driver/helpers.rb

@@ -15,9 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "mixlib/shellout"
-require "fileutils"
-require "json"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+require "fileutils" unless defined?(FileUtils)
+require "json" unless defined?(JSON)
 
 module Kitchen
   module Driver
@@ -76,6 +76,7 @@ module Kitchen
         sh.run_command
         debug("Local Command END #{Util.duration(sh.execution_time)}")
         raise "Failed: #{sh.stderr}" if sh.error?
+
         stdout = sanitize_stdout(sh.stdout)
         JSON.parse(stdout) if stdout.length > 2
       end
@@ -91,12 +92,13 @@ module Kitchen
             default_switch_object["Name"].empty?
           raise "Failed to find a default VM Switch."
         end
+
         default_switch_object["Name"]
       end
 
       def hyperv_default_switch_ps
         <<-VMSWITCH
-          Get-DefaultVMSwitch #{ENV['KITCHEN_HYPERV_SWITCH']} | ConvertTo-Json
+          Get-DefaultVMSwitch #{ENV["KITCHEN_HYPERV_SWITCH"]} | ConvertTo-Json
         VMSWITCH
       end
 
@@ -104,6 +106,7 @@ module Kitchen
 
       def ruby_array_to_ps_array(list)
         return "@()" if list.nil? || list.empty?
+
         list.to_s.tr("[]", "()").prepend("@")
       end
     end

data/lib/kitchen/driver/vagrant.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
@@ -16,13 +15,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "erb"
-require "fileutils"
+require "erb" unless defined?(Erb)
+require "fileutils" unless defined?(FileUtils)
 require "rubygems/version"
 
 require "kitchen"
-require "kitchen/driver/vagrant_version"
-require "kitchen/driver/helpers"
+require_relative "vagrant_version"
+require_relative "helpers"
 
 module Kitchen
 
@@ -40,16 +39,20 @@ module Kitchen
 
       plugin_version Kitchen::Driver::VAGRANT_VERSION
 
-      default_config(:box) { |driver| driver.default_box }
+      default_config(:box, &:default_box)
       required_config :box
 
       default_config :box_check_update, nil
 
+      default_config :box_auto_update, nil
+
+      default_config :box_auto_prune, nil
+
       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_url, &:default_box_url)
 
       default_config :box_version, nil
 
@@ -109,6 +112,8 @@ module Kitchen
       def create(state)
         create_vagrantfile
         run_pre_create_command
+        run_box_auto_update
+        run_box_auto_prune
         run_vagrant_up
         update_state(state)
         instance.transport.connection(state).wait_until_ready
@@ -149,7 +154,8 @@ module Kitchen
         if state[:hostname].nil?
           raise UserError, "Vagrant instance not created!"
         end
-        if not (config[:ssh] && config[:ssh][:insert_key] == false)
+
+        unless config[:ssh] && config[:ssh][:insert_key] == false
           m = "Disable vagrant ssh key replacement to preserve the default key!"
           warn(m)
         end
@@ -171,6 +177,8 @@ module Kitchen
       def finalize_config!(instance)
         super
         finalize_vm_hostname!
+        finalize_box_auto_update!
+        finalize_box_auto_prune!
         finalize_pre_create_command!
         finalize_synced_folders!
         finalize_ca_cert!
@@ -246,8 +254,9 @@ module Kitchen
       #   shared folders
       # @api private
       def safe_share?(box)
-        return false if config[:provider] =~ /(hyperv|libvirt)/
-        box =~ /^bento\/(centos|debian|fedora|opensuse|ubuntu|oracle|amazonlinux)-/
+        return false if /(hyperv|libvirt)/.match?(config[:provider])
+
+        box =~ %r{^bento/(centos|debian|fedora|opensuse|ubuntu|oracle|amazonlinux)-}
       end
 
       # Return true if we found the criteria to enable the cache_directory
@@ -255,6 +264,7 @@ module Kitchen
       def enable_cache?
         return false unless config[:cache_directory]
         return true if safe_share?(config[:box])
+
         # Otherwise
         false
       end
@@ -291,10 +301,25 @@ module Kitchen
       def finalize_ca_cert!
         unless config[:box_download_ca_cert].nil?
           config[:box_download_ca_cert] = File.expand_path(
-            config[:box_download_ca_cert], config[:kitchen_root])
+            config[:box_download_ca_cert], config[:kitchen_root]
+          )
         end
       end
 
+      # Create vagrant command to update box to the latest version
+      def finalize_box_auto_update!
+        return if config[:box_auto_update].nil?
+
+        config[:box_auto_update] = "vagrant box update #{"--insecure " if config[:box_download_insecure]}--box #{config[:box]}"
+      end
+
+      # Create vagrant command to remove older versions of the box
+      def finalize_box_auto_prune!
+        return if config[:box_auto_prune].nil?
+
+        config[:box_auto_prune] = "vagrant box prune --keep-active-boxes --name #{config[:box]}"
+      end
+
       # Replaces any `{{vagrant_root}}` tokens in the pre create command.
       #
       # @api private
@@ -344,8 +369,8 @@ module Kitchen
       def finalize_vm_hostname!
         string = config[:vm_hostname]
 
-        if windows_os? && string.is_a?(String) && string.size >= 12
-          config[:vm_hostname] = "#{string[0...10]}-#{string[-1]}"
+        if windows_os? && string.is_a?(String) && string.size > 15
+          config[:vm_hostname] = "#{string[0...12]}-#{string[-1]}"
         end
       end
 
@@ -382,10 +407,11 @@ module Kitchen
       # @api private
       def render_template
         template = File.expand_path(
-          config[:vagrantfile_erb], config[:kitchen_root])
+          config[:vagrantfile_erb], config[:kitchen_root]
+        )
 
         if File.exist?(template)
-          ERB.new(IO.read(template)).result(binding).gsub(%r{^\s*$\n}, "")
+          ERB.new(IO.read(template)).result(binding).gsub(/^\s*$\n/, "")
         else
           raise ActionFailed, "Could not find Vagrantfile template #{template}"
         end
@@ -432,8 +458,8 @@ module Kitchen
         env = merged[:environment]
         %w{BUNDLE_BIN_PATH BUNDLE_GEMFILE GEM_HOME GEM_PATH GEM_ROOT RUBYLIB
            RUBYOPT _ORIGINAL_GEM_PATH}.each do |var|
-          env[var] = nil
-        end
+             env[var] = nil
+           end
 
         # Altering the path seems to break vagrant. When the :environment
         # is passed to a windows process with a PATH, Vagrant's batch installer
@@ -456,6 +482,20 @@ module Kitchen
       end
       # rubocop:enable Metrics/CyclomaticComplexity
 
+      # Tell vagrant to update vagrant box to latest version
+      def run_box_auto_update
+        if config[:box_auto_update]
+          run(config[:box_auto_update])
+        end
+      end
+
+      # Tell vagrant to remove older vagrant boxes
+      def run_box_auto_prune
+        if config[:box_auto_prune]
+          run(config[:box_auto_prune])
+        end
+      end
+
       # Runs a local command before `vagrant up` has been called.
       #
       # @api private
@@ -529,9 +569,9 @@ module Kitchen
       def vagrant_config(type)
         lines = run_silently("#{config[:vagrant_binary]} #{type}-config")
           .split("\n").map do |line|
-          tokens = line.strip.partition(" ")
-          [tokens.first, tokens.last.delete('"')]
-        end
+            tokens = line.strip.partition(" ")
+            [tokens.first, tokens.last.delete('"')]
+          end
         Hash[lines]
       end
 
@@ -540,7 +580,8 @@ module Kitchen
       # @api private
       def vagrant_version
         self.class.vagrant_version ||= run_silently(
-          "#{config[:vagrant_binary]} --version", cwd: Dir.pwd)
+          "#{config[:vagrant_binary]} --version", cwd: Dir.pwd
+        )
           .chomp.split(" ").last
       rescue Errno::ENOENT
         raise UserError, "Vagrant #{MIN_VER} or higher is not installed." \
@@ -583,7 +624,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)
+          "#{config[:vagrant_binary]} plugin list", cwd: Dir.pwd
+        )
           .split("\n").find { |line| line =~ /vagrant-winrm\s+/ }
       end
     end

data/lib/kitchen/driver/vagrant_version.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
@@ -21,6 +20,6 @@ module Kitchen
   module Driver
 
     # Version string for Vagrant Kitchen driver
-    VAGRANT_VERSION = "1.5.1".freeze
+    VAGRANT_VERSION = "1.7.1".freeze
   end
 end

data/templates/Vagrantfile.erb

@@ -92,7 +92,7 @@ Vagrant.configure("2") do |c|
   c.vm.provider :<%= config[:provider] %> do |p|
 <% case config[:provider]
    when "virtualbox" %>
-    p.name = "kitchen-<%= File.basename(config[:kitchen_root]) %>-<%= instance.name %>"
+    p.name = "kitchen-<%= File.basename(config[:kitchen_root]) %>-<%= instance.name %>-<%= SecureRandom.uuid %>"
 <% end %>
 
 <% case config[:provider]
@@ -108,7 +108,7 @@ Vagrant.configure("2") do |c|
     p.linked_clone = <%= config[:linked_clone] %>
 <%   end
    when "hyperv" %>
-    p.vmname = "kitchen-<%= File.basename(config[:kitchen_root]) %>-<%= instance.name %>"
+    p.vmname = "<%="kitchen-#{File.basename(config[:kitchen_root])}-#{instance.name}-#{SecureRandom.uuid}"[0..99].chomp('-') %>"
 <%   if config[:linked_clone] == true || config[:linked_clone] == false %>
     p.linked_clone = <%= config[:linked_clone] %>
 <%   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.7.1
 platform: ruby
 authors:
 - Fletcher Nichol
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -117,7 +117,7 @@ homepage: https://github.com/test-kitchen/kitchen-vagrant/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,15 +125,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
 test_files: []