vagrant 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 224d3813ea9dced5e3fd7bdb4b333292f7457f9b66207e3bbe512ed842822e35
-  data.tar.gz: 1e1829feabf687bdaa50321e59bca502f51edf028059812973d1e4a83cd2ea36
+  metadata.gz: 771bdb811142a04fbad06beadeec9a489d9200fc3649f7611600d189a5bae1cd
+  data.tar.gz: 9539cc14227d6eb0935f7eabd4808a8304b3ae890febad6d5dd15951c3d54663
 SHA512:
-  metadata.gz: 7dc6c1849cce484b599b8677c46d0e408239f72144996359adeb00ffba106566d7e191d11ce2c5c5e5e543091a6ef9fefabe975e5ed1b7a029bae54c222d0cde
-  data.tar.gz: 55a468fd98862061b4d5d40492cc56cf4ffe712626fb1d4e0325d3db8744bdb097358e151b3d80b259eb804a96807c9ed61ed57dea85c6cdf16891b3787d8e2f
+  metadata.gz: 961e6ece9c756db4b34d8ac2cad08d13dfacdcb5089506d00274c2b903fe6ded75f22c956ea80a3487ed905e3a2882d1b5b1290b801e8bfdbe7a647aa0df70c1
+  data.tar.gz: 77ac150c7313b57b7abe9541da461dc8642488333baafe48ca2404b080fd5941068159ef5971819b61cf8b907a477ba02a816376cfeea6a424a0dd169472047e

data/CHANGELOG.md

@@ -1,7 +1,15 @@
-## 2.4.4 (April 21, 2025)
+## 2.4.5 (April 23, 2025)
 
 FEATURES:
 
+- communicator/none: Add experimental none communicator [GH-13651]
+
+BUG FIXES:
+
+- core/bundler: Handle multiple versions for system specifications [GH-13652]
+
+## 2.4.4 (April 21, 2025)
+
 IMPROVEMENTS:
 
 - communicator/ssh: Update connect retry behavior, make configurable [GH-13628]

data/lib/vagrant/bundler.rb

@@ -549,8 +549,10 @@ module Vagrant
         @logger.debug("Disabling strict dependency enforcement")
       end
 
-      @logger.debug("Dependency list for installation:\n - " \
-        "#{plugin_deps.map{|d| "#{d.name} #{d.requirement}"}.join("\n - ")}")
+      dep_list = plugin_deps.sort_by(&:name).map { |d|
+        "#{d.name} #{d.requirement}"
+      }.join("\n - ")
+      @logger.debug("Dependency list for installation:\n - #{dep_list}")
 
       all_sources = source_list.values.flatten.uniq
       default_sources = DEFAULT_GEM_SOURCES & all_sources
@@ -680,11 +682,11 @@ module Vagrant
       directories = [spec_dir]
       if Vagrant.in_bundler?
         Gem::Specification.find_all{true}.each do |spec|
-          list[spec.full_name] = spec
+          list[spec.name] = spec
         end
       else
         builtin_specs.each do |spec|
-          list[spec.full_name] = spec
+          list[spec.name] = spec
         end
       end
       if Vagrant.in_installer?
@@ -693,8 +695,8 @@ module Vagrant
         end
       end
       Gem::Specification.each_spec(directories) do |spec|
-        if !list[spec.full_name]
-          list[spec.full_name] = spec
+        if !list[spec.name] || list[spec.name].version < spec.version
+          list[spec.name] = spec
         end
       end
       list.values

data/plugins/communicators/none/communicator.rb

@@ -0,0 +1,46 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: BUSL-1.1
+
+require "log4r"
+require "vagrant"
+
+module VagrantPlugins
+  module CommunicatorNone
+    # This class provides no communication with the VM.
+    # It allows Vagrant to manage a machine lifecycle
+    # while not actually connecting to it. The communicator
+    # stubs out all methods to be successful allowing
+    # Vagrant to proceed "as normal" without actually
+    # doing anything.
+    class Communicator < Vagrant.plugin("2", :communicator)
+      def self.match?(_)
+        # Any machine can be not communicated with
+        true
+      end
+
+      def initialize(_)
+        @logger = Log4r::Logger.new(self.class.name.downcase)
+      end
+
+      def ready?
+        @logger.debug("#ready? stub called on none")
+        true
+      end
+
+      def execute(*_)
+        @logger.debug("#execute stub called on none")
+        0
+      end
+
+      def sudo(*_)
+        @logger.debug("#sudo stub called on none")
+        0
+      end
+
+      def test(*_)
+        @logger.debug("#test stub called on none")
+        true
+      end
+    end
+  end
+end

data/plugins/communicators/none/plugin.rb

@@ -0,0 +1,26 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: BUSL-1.1
+
+require "vagrant"
+
+module VagrantPlugins
+  Vagrant::Util::Experimental.guard_with(:none_communicator) do
+    module CommunicatorNone
+      class Plugin < Vagrant.plugin("2")
+        name "none communicator"
+        description <<-DESC
+        This plugin provides no communication to remote machines.
+        It allows Vagrant to manage remote machines without the
+        ability to connect to them for configuration/provisioning.
+        Any calls to methods provided by this communicator will
+        always be successful.
+        DESC
+
+        communicator("none") do
+          require File.expand_path("../communicator", __FILE__)
+          Communicator
+        end
+      end
+    end
+  end
+end

data/vagrant.gemspec

@@ -21,8 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency "csv", "~> 3.3"
   s.add_dependency "ed25519", "~> 1.3.0"
   s.add_dependency "erubi"
-  s.add_dependency 'googleapis-common-protos-types', '~> 1.3'
-  s.add_dependency "grpc", "~> 1.62"
   s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
   s.add_dependency "i18n", "~> 1.12"
   s.add_dependency "listen", "~> 3.7"
@@ -36,7 +34,6 @@ Gem::Specification.new do |s|
   s.add_dependency "ostruct", "~> 0.6.0"
   s.add_dependency "rb-kqueue", "~> 0.2.0"
   s.add_dependency "rexml", "~> 3.2"
-  s.add_dependency "rgl", "~> 0.5.10"
   s.add_dependency "rubyzip", "~> 2.3.2"
   s.add_dependency "vagrant_cloud", "~> 3.1.2"
   s.add_dependency "wdm", "~> 0.2.0"

data/version.txt

@@ -1 +1 @@
-2.4.4
+2.4.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-21 00:00:00.000000000 Z
+date: 2025-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -95,34 +95,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: googleapis-common-protos-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: grpc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.62'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.62'
 - !ruby/object:Gem::Dependency
   name: hashicorp-checkpoint
   requirement: !ruby/object:Gem::Requirement
@@ -311,20 +283,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rgl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.10
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -888,6 +846,8 @@ files:
 - plugins/commands/winrm/plugin.rb
 - plugins/commands/winrm_config/command.rb
 - plugins/commands/winrm_config/plugin.rb
+- plugins/communicators/none/communicator.rb
+- plugins/communicators/none/plugin.rb
 - plugins/communicators/ssh/communicator.rb
 - plugins/communicators/ssh/plugin.rb
 - plugins/communicators/winrm/command_filter.rb