vagrant-dns 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b96bd995237133ab779883dc28ed8ac0ed8b2cb15b71c81c755bef68f93fc6bb
-  data.tar.gz: 9ddc6a521a68af235a6626672e6d7089e330bfcc0445b2126e01f8f45f4ebf32
+  metadata.gz: 634350bb6858e837967286d76282adba60eae400e80ebf3009cda0a18a317d99
+  data.tar.gz: 3d5a633eb5f9c5ca06248f22f36b8df8d64dba5db1893cde3380bea6aaef6ea5
 SHA512:
-  metadata.gz: dee69e1a9fb66bdb817a310a2e2daf049bab4c032f907f7220825feffac480dbdeb4356c412c59dd7bd2369f40b030e8b21576e0c21d7bfd6dd6d3460fc69d74
-  data.tar.gz: d58f43351a8a12aa3f79e6bdb7c047f312b38714767a0c4d0e03c5e2e4a484c9bd11a57aec95d775f37e425ed6cda027af49b8c8cd66f38a84b5fb92bd8439bd
+  metadata.gz: cec812610ae743d812282ce1b1c58e7d05a04df46c1d3d5bc240a07d1c69ac83b572030e933fddf2d49cc446cf59ac17a561c0b41bcb348f027f238896f407e8
+  data.tar.gz: 31881bf472a679f21b4288890c825de4dc40bf635564f9ec569a1a6fe4c77513ab6f2c83de8c2df74ebf80d85fc8d3d27ceabc4ef70266501ce5773709eb05b1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.4.1 (2023-04-16)
+
+* Fix plugin hooking for multi-machine setups. [GH-78]
+
 ## 2.4.0 (2023-04-11)
 
 * DHCP support. [GH-51]

data/lib/vagrant-dns/version.rb

@@ -1,3 +1,3 @@
 module VagrantDNS
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

data/lib/vagrant-dns.rb

@@ -12,22 +12,6 @@ require "vagrant-dns/middlewares/config_down"
 require "vagrant-dns/middlewares/restart"
 
 module VagrantDNS
-
-  # @private
-  def self.hooks
-    @hooks ||= []
-  end
-
-  # @private
-  def self.hooked(name)
-    hooks << name
-  end
-
-  # @private
-  def self.hooked?(name)
-    hooks.include?(name)
-  end
-
   class Plugin < Vagrant.plugin("2")
     name "vagrant-dns"
 
@@ -41,21 +25,28 @@ module VagrantDNS
     end
 
     %w{machine_action_up machine_action_reload}.each do |action|
-      action_hook("restart_vagarant_dns_on_#{action}", action) do |hook|
-        unless VagrantDNS.hooked?(action)
-          hook.append VagrantDNS::Middlewares::ConfigUp
-          hook.append VagrantDNS::Middlewares::Restart
-          VagrantDNS.hooked(action)
-        end
+      action_hook("restart_vagarant_dns_on_#{action}", action) do |hook, *args|
+        hook_once VagrantDNS::Middlewares::ConfigUp, hook
+        hook_once VagrantDNS::Middlewares::Restart, hook
       end
     end
 
     action_hook("remove_vagrant_dns_config", "machine_action_destroy") do |hook|
-      unless VagrantDNS.hooked?("remove_vagrant_dns_config")
-        hook.append VagrantDNS::Middlewares::ConfigDown
-        hook.append VagrantDNS::Middlewares::Restart
-        VagrantDNS.hooked("remove_vagrant_dns_config")
-      end
+      hook_once VagrantDNS::Middlewares::ConfigDown, hook
+      hook_once VagrantDNS::Middlewares::Restart, hook
+    end
+
+    # @private
+    def self.hook_once(middleware, hook)
+      return if hook.append_hooks.any? { |stack_item|
+        if stack_item.is_a?(Array)
+          stack_item.first == middleware
+        else
+          stack_item.middleware == middleware
+        end
+
+      }
+      hook.append middleware
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dns
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Florian Gilcher
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2023-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons