kitchen-vagrant 2.1.3 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dacf84b53e50807b2391c69d3ae7f903965dde4ba59630d8074079ef90df5fc0
-  data.tar.gz: d1858fb64df4930c100a6866cd92417419d230720f6a335857237ea719bc8aac
+  metadata.gz: 4abf5224b64f63f370ce34d71838b1aa1706a70a2a8f7285219388a977eb2bdf
+  data.tar.gz: 91b8de7ff382f07694a1df7d7714237e77be14be7b4faa854b509e97dc31fc31
 SHA512:
-  metadata.gz: 3030c84bcf25c246c201cb851beded8c826ec25a6d54c4b37f63ae50f3099d58fc03a0cabeda3f761b3e7041bba12db9dadb8556f3a5c8a8b4b4f44801f78292
-  data.tar.gz: c1e1b21e07c471ff3a8c963b9d98c66797904f69ab40a115520d8bc53facb220b3e8a0ed27d55c0aff2ff4c65b5f4bd2a25fb785cf4c1ed3a2925cd449c98de3
+  metadata.gz: 3b42b779d8c9726c89ef893e2ae4289775ae488eb26d2ff52d3a909e3efd97296db770801908a41beb73df703a9e065dae8836b82ce0fab7fc4dc9eb968ba02d
+  data.tar.gz: 4656b6f370e4c2233ad1c0fb8ab933599829599348fab18461f8ab487df9e180b040267e3fcd01124453b7c223f84792e276b7f8140ecf4e8c03377d62e79eb7

data/lib/kitchen/driver/vagrant.rb

@@ -80,6 +80,8 @@ module Kitchen
 
       default_config :synced_folders, []
 
+      default_config :env, []
+
       default_config :use_cached_chef_client, false
 
       default_config :vagrant_binary, "vagrant"
@@ -116,6 +118,7 @@ module Kitchen
       def create(state)
         create_vagrantfile
         run_pre_create_command
+        check_box_outdated
         run_box_auto_update
         run_box_auto_prune
         run_vagrant_up
@@ -335,6 +338,25 @@ module Kitchen
           .gsub("{{vagrant_root}}", vagrant_root)
       end
 
+      # Formats synced folder options for use in the Vagrantfile.
+      # Accepts either a Hash (converts to Ruby hash syntax) or a String (returns as-is).
+      # Supports SMB options like smb_username, smb_password, etc.
+      #
+      # @param options [Hash, String, nil] synced folder options
+      # @return [String] formatted options string for Vagrantfile
+      # @api private
+      def format_synced_folder_options(options)
+        return "nil" if options.nil?
+        return options if options.is_a?(String)
+
+        # Convert Hash to Ruby hash literal syntax
+        if options.is_a?(Hash)
+          options.map { |k, v| "#{k}: #{v.inspect}" }.join(", ")
+        else
+          options.to_s
+        end
+      end
+
       # Replaces an `%{instance_name}` tokens in the synced folder items.
       #
       # @api private
@@ -347,7 +369,7 @@ module Kitchen
                 config[:kitchen_root]
               ),
               destination.gsub("%{instance_name}", instance.name),
-              options || "nil",
+              format_synced_folder_options(options),
             ]
           end
         add_extra_synced_folders!
@@ -474,6 +496,81 @@ module Kitchen
       end
       # rubocop:enable Metrics/CyclomaticComplexity
 
+      # Check if a newer version of the vagrant box is available and warn the user
+      #
+      # @api private
+      def check_box_outdated
+        # Skip if box_auto_update is enabled (they'll get the update anyway)
+        return if config[:box_auto_update]
+
+        cmd = "#{config[:vagrant_binary]} box outdated --box #{config[:box]}"
+        cmd += " --provider #{config[:provider]}" if config[:provider]
+
+        begin
+          output = run_silently(cmd)
+          warn_if_outdated(output)
+        rescue Kitchen::ShellOut::ShellCommandFailed => e
+          # If the box isn't installed yet or there's an error checking, silently continue
+          # This can happen on first run before the box is downloaded
+          debug("Unable to check if box is outdated: #{e.message}")
+        end
+      end
+
+      # Parse vagrant box outdated output and warn if a new version is available
+      #
+      # @param output [String] output from vagrant box outdated command
+      # @api private
+      def warn_if_outdated(output)
+        return unless box_is_outdated?(output)
+
+        current_version = extract_current_version(output)
+        latest_version = extract_latest_version(output)
+
+        warning_msg = "A new version of the '#{config[:box]}' box is available!"
+        if current_version && latest_version
+          warning_msg += " Current: #{current_version}, Latest: #{latest_version}."
+        end
+        warning_msg += " Run `vagrant box update --box #{config[:box]}` to update."
+
+        warn(warning_msg)
+      end
+
+      # Check if the vagrant box outdated output indicates an outdated box
+      #
+      # @param output [String] output from vagrant box outdated command
+      # @return [Boolean] true if box is outdated
+      # @api private
+      def box_is_outdated?(output)
+        # Check for various output patterns indicating an outdated box
+        # Use include? instead of complex regexes to avoid ReDoS vulnerabilities
+        output_downcase = output.downcase
+        output_downcase.include?("is outdated") ||
+          output_downcase.include?("newer version") && output_downcase.include?("available") ||
+          output_downcase.include?("newer version of the box")
+      end
+
+      # Extract current version from vagrant box outdated output
+      #
+      # @param output [String] output from vagrant box outdated command
+      # @return [String, nil] current version or nil if not found
+      # @api private
+      def extract_current_version(output)
+        match = output.match(/Current:\s+v?(\S+)/i) ||
+          output.match(/currently have version\s+'?v?([^'.\s]+)/i)
+        match ? match[1] : nil
+      end
+
+      # Extract latest version from vagrant box outdated output
+      #
+      # @param output [String] output from vagrant box outdated command
+      # @return [String, nil] latest version or nil if not found
+      # @api private
+      def extract_latest_version(output)
+        match = output.match(/Latest:\s+v?(\S+)/i) ||
+          output.match(/latest is version\s+'?v?([^'.\s]+)/i)
+        match ? match[1] : nil
+      end
+
       # Tell vagrant to update vagrant box to latest version
       def run_box_auto_update
         if config[:box_auto_update]
@@ -559,6 +656,38 @@ module Kitchen
         @vagrant_root
       end
 
+      # @return [true,false] whether or not we're running in WSL
+      # @api private
+      def wsl?
+        # Check for WSL via environment variables
+        return true if ENV["WSL_DISTRO_NAME"]
+        return true if ENV["VAGRANT_WSL_ENABLE_WINDOWS_ACCESS"]
+
+        # Check for WSL via /proc/version
+        if File.exist?("/proc/version")
+          version_content = File.read("/proc/version")
+          return true if version_content.match?(/microsoft|wsl/i)
+        end
+
+        false
+      rescue
+        false
+      end
+
+      # Converts a Windows path to a WSL path
+      # @param path [String] Windows path (e.g., "C:/Users/...")
+      # @return [String] WSL path (e.g., "/mnt/c/users/...")
+      # @api private
+      def windows_to_wsl_path(path)
+        # Only convert if it looks like a Windows path
+        if path.match?(%r{^[A-Za-z]:/})
+          # Convert C:/path to /mnt/c/path
+          path.gsub(/^([A-Za-z]):/, '/mnt/\1').downcase
+        else
+          path
+        end
+      end
+
       # @param type [Symbol] either `:ssh` or `:winrm`
       # @return [Hash] key/value pairs resulting from parsing a
       #   `vagrant ssh-config` or `vagrant winrm-config` local command
@@ -568,7 +697,10 @@ module Kitchen
         lines = run_silently("#{config[:vagrant_binary]} #{type}-config")
           .split("\n").map do |line|
             tokens = line.strip.partition(" ")
-            [tokens.first, tokens.last.delete('"')]
+            value = tokens.last.delete('"')
+            # Convert Windows paths to WSL paths when running in WSL
+            value = windows_to_wsl_path(value) if wsl? && tokens.first == "IdentityFile"
+            [tokens.first, value]
           end
         Hash[lines]
       end

data/lib/kitchen/driver/vagrant_version.rb

@@ -20,6 +20,6 @@ module Kitchen
   module Driver
 
     # Version string for Vagrant Kitchen driver
-    VAGRANT_VERSION = "2.1.3".freeze
+    VAGRANT_VERSION = "2.2.1".freeze
   end
 end

data/templates/Vagrantfile.erb

@@ -253,4 +253,14 @@ Vagrant.configure("2") do |c|
   <% end %>
 <% end %>
   end
+
+<% if config[:env] && !config[:env].empty? %>
+  # Set environment variables
+  <% config[:env].each do |env_var| %>
+  c.vm.provision "shell", inline: <<-SHELL
+    echo 'export <%= env_var.gsub("'", "'\\\\''") %>' >> /etc/profile.d/kitchen.sh
+  SHELL
+  <% end %>
+  c.vm.provision "shell", inline: "chmod +x /etc/profile.d/kitchen.sh", run: "once"
+<% end %>
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2026-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -19,7 +19,7 @@ dependencies:
         version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 description: Kitchen::Driver::Vagrant - A HashiCorp Vagrant Driver for Test Kitchen.
 email:
 - fnichol@nichol.ca