kitchen-vagrant 1.14.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 773e721e0d0a6a5b247a81564963e6dc54c29239610ab984f978d2d11a647d01
-  data.tar.gz: 66eb6a6c254227c89c96004ff0a1c4d39b3eb7404a5d945bf51558d3cdc2d0f8
+  metadata.gz: a3f214228bf52efa9cb0d163b283d714f61426e13d6ca0b37d0632201f48bd94
+  data.tar.gz: 8ae44fd2027215c4c5e507a1f744cacd91ced18e82072717857b29e659a4f880
 SHA512:
-  metadata.gz: 0c62f0582d48f45b0c8df5b7bd0e4d33722ca14e685e4da0a09ea350ec4f1c1c13ca26635d18045533f509ef996cea07cd37af3accd23ebc3a0a9b02e15cb98b
-  data.tar.gz: 6af826384d3f17bc56f728d50fa26d6b1b208b9327af849175254f72ff05262a05ba1baa1578fca01467a1fc2ef45cc293866b7ab70d9d72cc737bc8eb9a942c
+  metadata.gz: 630ab055d4e77582c79661484a731a772e9b18a1afa73ba52c7eddbb80744a0df6905dc2aaa2746fda9c3bae666a29dbc9c172502f70f27946c038a3822a21bb
+  data.tar.gz: d3c5734ad3be9c51a811d753edc99daca20ce8af8d60884f4cb24c7b463b7083246a0b3c640fc6de52dbc339ec49952de500a426d285ec559996f64ee88a69d3

data/lib/kitchen/driver/vagrant.rb

@@ -56,6 +56,8 @@ module Kitchen
 
       default_config :box_version, nil
 
+      default_config :box_arch, nil
+
       default_config :boot_timeout, nil
 
       default_config :customize, {}
@@ -125,7 +127,7 @@ module Kitchen
       # @return [String,nil] the Vagrant box for this Instance
       def default_box
         if bento_box?(instance.platform.name)
-          "bento/#{instance.platform.name}#{"-arm64" if RbConfig::CONFIG["host_cpu"].eql?("arm64")}"
+          "bento/#{instance.platform.name}"
         else
           instance.platform.name
         end
@@ -224,16 +226,10 @@ module Kitchen
 
       protected
 
-      WEBSITE = "https://www.vagrantup.com/downloads.html".freeze
-      MIN_VER = "1.1.0".freeze
+      WEBSITE = "https://developer.hashicorp.com/vagrant/install".freeze
+      MIN_VER = "2.4.0".freeze
 
       class << self
-
-        # @return [true,false] whether or not the vagrant-winrm plugin is
-        #   installed
-        # @api private
-        attr_accessor :winrm_plugin_passed
-
         # @return [String] the version of Vagrant installed on the workstation
         # @api private
         attr_accessor :vagrant_version
@@ -313,14 +309,20 @@ module Kitchen
       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]} --provider #{config[:provider]}"
+        cmd = "#{config[:vagrant_binary]} box update --box #{config[:box]}"
+        cmd += " --architecture #{config[:box_arch]}" if config[:box_arch]
+        cmd += " --provider #{config[:provider]}" if config[:provider]
+        cmd += " --insecure" if config[:box_download_insecure]
+        config[:box_auto_update] = cmd
       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 --force --keep-active-boxes --name #{config[:box]} --provider #{config[:provider]}"
+        cmd = "#{config[:vagrant_binary]} box prune --force --keep-active-boxes --name #{config[:box]}"
+        cmd += " --provider #{config[:provider]}" if config[:provider]
+        config[:box_auto_prune] = cmd
       end
 
       # Replaces any `{{vagrant_root}}` tokens in the pre create command.
@@ -390,19 +392,6 @@ module Kitchen
         end
       end
 
-      # Loads any required third party Ruby libraries or runs any shell out
-      # commands to prepare the plugin. This method will be called in the
-      # context of the main thread of execution and so does not necessarily
-      # have to be thread safe.
-      #
-      # @raise [ClientError] if any library loading fails or any of the
-      #   dependency requirements cannot be satisfied
-      # @api private
-      def load_needed_dependencies!
-        super
-        verify_winrm_plugin if winrm_transport?
-      end
-
       # Renders the Vagrantfile ERb template.
       #
       # @return [String] the contents for a Vagrantfile
@@ -597,46 +586,12 @@ module Kitchen
           " Please download a package from #{WEBSITE}."
       end
 
-      # Verify that the vagrant-winrm plugin is installed and a suitable
-      #   version of Vagrant is installed
-      #
-      # @api private
-      def verify_winrm_plugin
-        if Gem::Version.new(vagrant_version) < Gem::Version.new("1.6")
-          raise UserError, "Detected an old version of Vagrant " \
-            "(#{vagrant_version}) that cannot support the vagrant-winrm " \
-            "Vagrant plugin." \
-            " Please upgrade to version 1.6 or higher from #{WEBSITE}."
-        end
-
-        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
-
       # @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
-      def winrm_plugin_installed?
-        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+/ }
-      end
     end
   end
 end

data/lib/kitchen/driver/vagrant_version.rb

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

data/templates/Vagrantfile.erb

@@ -20,6 +20,10 @@ Vagrant.configure("2") do |c|
   c.vm.box_version = "<%= config[:box_version] %>"
 <% end %>
 
+<% if config[:box_arch] %>
+  c.vm.box_architecture = "<%= config[:box_arch] %>"
+<% end %>
+
 <% if !config[:box_check_update].nil? %>
   c.vm.box_check_update = <%= config[:box_check_update] %>
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -30,7 +30,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
-description: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
+description: Kitchen::Driver::Vagrant - A HashiCorp Vagrant Driver for Test Kitchen.
 email:
 - fnichol@nichol.ca
 executables: []
@@ -55,15 +55,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
-summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
+summary: Kitchen::Driver::Vagrant - A HashiCorp Vagrant Driver for Test Kitchen.
 test_files: []