vagrant-virtual-hostsupdater 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de8ac4109c074a13324c748ae6bd3ca29b8d2cf2a874c73c7690c3702146b71c
-  data.tar.gz: 2e95acea00c30c123dac5734ec6f0c65031eac978b31a0acdc42608fc924ab91
+  metadata.gz: cf3391d6244305c873b8834efcf5b5e5c893e7baa370e5104d28902b96e76597
+  data.tar.gz: 86a47931ca6969f238aad159bdcae64b580e7997cc77536643d5e082364813ef
 SHA512:
-  metadata.gz: 162f3f085c82cd4743112a976b3226983d0c864a1b76de99cf005e0650d48812ddb93f6a2e27ded14cd925aed753db8da4fb10061436d23d7065c9e3ad3dd0a6
-  data.tar.gz: 97c94753ddecd27568111abfbd2497aa33e24c4fa1afc3c22032a5256ea3478dd23c4c1f8550bf6811b48e65fdc1dfc21d15ac5b60747059b0b1de17d51a7a69
+  metadata.gz: 907a8beaa9333e35530a92248e07f82dda257e82cecd7c118f07ea79de50766422b722bb1f18d2766d592ad6fc115ff98e6ecc8f77a46e5e9a83e43b8a06e422
+  data.tar.gz: ed97599fa8b29267a0798dc6a6a9b9fdaf29d90ccf28b98524ee9eee21598fa4598b8f104e07854e48830f07c3ab65bc4d3fda488304f3c37bd69b6a3e99f96c

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v2.2.19'
+  gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v2.2.19'
 end
 
 group :plugins do

data/README.md

@@ -117,6 +117,10 @@ vagrant plugin install vagrant-hostsupdater-*.gem
 
 ## Versions
 
+### 1.4.0
+
+* Avoid duplicated hosts update entries
+
 ### 1.3.0
 
 * Fix issue with Vagrant versions > 2.2.7

data/lib/vagrant-virtual-hostsupdater/Action/BaseAction.rb

@@ -0,0 +1,44 @@
+module VagrantPlugins
+  module VirtualHostsUpdater
+    module Action
+      class BaseAction
+        include VirtualHostsUpdater
+
+        # Vagrant 2.2.14 has changed the hooks execution policy so they
+        # started to be triggered more than once (a lot actually) which
+        # is non-performant and floody. With this static property, we
+        # control the executions and allowing just one.
+        #
+        # - https://github.com/hashicorp/vagrant/issues/12070#issuecomment-732271918
+        # - https://github.com/hashicorp/vagrant/compare/v2.2.13..v2.2.14#diff-4d1af7c67af870f20d303c3c43634084bab8acc101055b2e53ddc0d07f6f64dcL176-L180
+        # - https://github.com/agiledivider/vagrant-hostsupdater/issues/187
+        @@completed = {}
+
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @ui = env[:ui]
+        end
+
+        def call(env)
+          # Check whether the plugin has been executed for a particular
+          # VM as it may happen that a single Vagrantfile defines multiple
+          # machines and having a static flag will result in a plugin being
+          # executed just once.
+          # https://github.com/agiledivider/vagrant-hostsupdater/issues/198
+          if @machine.id and not @@completed.key?("#{self.class.name}-#{@machine.name}")
+            run(env)
+            @@completed["#{self.class.name}-#{@machine.name}"] = true
+          end
+
+          @app.call(env)
+        end
+
+        def run(env)
+          raise NotImplementedError.new("Must be implemented!")
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-virtual-hostsupdater/Action/CacheHosts.rb

@@ -1,17 +1,10 @@
 module VagrantPlugins
   module VirtualHostsUpdater
     module Action
-      class CacheHosts
-        include VirtualHostsUpdater
+      class CacheHosts < BaseAction
 
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-        end
-
-        def call(env)
+        def run(env)
           cacheHostEntries
-          @app.call(env)
         end
 
       end

data/lib/vagrant-virtual-hostsupdater/Action/RemoveHosts.rb

@@ -1,28 +1,21 @@
 module VagrantPlugins
   module VirtualHostsUpdater
     module Action
-      class RemoveHosts
-        include VirtualHostsUpdater
+      class RemoveHosts < BaseAction
 
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @ui = env[:ui]
-        end
-
-        def call(env)
+        def run(env)
           machine_action = env[:machine_action]
-          if machine_action != :destroy || !@machine.id
-            if machine_action != :suspend || false != @machine.config.virtualhostsupdater.remove_on_suspend
-              if machine_action != :halt || false != @machine.config.virtualhostsupdater.remove_on_suspend
-                @ui.info "[vagrant-virtual-hostsupdater] Removing hosts"
-                removeHostEntries
-              else
-                @ui.info "[vagrant-virtual-hostsupdater] Removing hosts on suspend disabled"
-              end
+          if [:suspend, :halt].include? machine_action
+            if @machine.config.virtualhostsupdater.remove_on_suspend == false
+              @ui.info "[vagrant-virtual-hostsupdater] Not removing hosts (remove_on_suspend false)"
+            else
+              @ui.info "[vagrant-virtual-hostsupdater] Removing hosts on suspend"
+              removeHostEntries
             end
+          else
+            @ui.info "[vagrant-virtual-hostsupdater] Removing hosts"
+            removeHostEntries
           end
-          @app.call(env)
         end
 
       end

data/lib/vagrant-virtual-hostsupdater/Action/UpdateHosts.rb

@@ -1,24 +1,14 @@
-require_relative "../VirtualHostsUpdater"
 module VagrantPlugins
   module VirtualHostsUpdater
     module Action
-      class UpdateHosts
-        include VirtualHostsUpdater
+      class UpdateHosts < BaseAction
 
-
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @ui = env[:ui]
-        end
-
-        def call(env)
+        def run(env)
           @ui.info "[vagrant-virtual-hostsupdater] Checking for host entries"
           addHostEntries()
-          @app.call(env)
         end
 
       end
     end
   end
-end
+end

data/lib/vagrant-virtual-hostsupdater/plugin.rb

@@ -1,3 +1,5 @@
+require "vagrant-virtual-hostsupdater/VirtualHostsUpdater.rb"
+require "vagrant-virtual-hostsupdater/Action/BaseAction"
 require "vagrant-virtual-hostsupdater/Action/UpdateHosts"
 require "vagrant-virtual-hostsupdater/Action/CacheHosts"
 require "vagrant-virtual-hostsupdater/Action/RemoveHosts"
@@ -34,9 +36,6 @@ module VagrantPlugins
 
       action_hook(:virtualhostsupdater, :machine_action_destroy) do |hook|
         hook.prepend(Action::CacheHosts)
-      end
-
-      action_hook(:virtualhostsupdater, :machine_action_destroy) do |hook|
         hook.append(Action::RemoveHosts)
       end
 

data/lib/vagrant-virtual-hostsupdater/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VirtualHostsUpdater
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-virtual-hostsupdater
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Falk Kühnel
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,6 +55,7 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-virtual-hostsupdater.rb
+- lib/vagrant-virtual-hostsupdater/Action/BaseAction.rb
 - lib/vagrant-virtual-hostsupdater/Action/CacheHosts.rb
 - lib/vagrant-virtual-hostsupdater/Action/RemoveHosts.rb
 - lib/vagrant-virtual-hostsupdater/Action/UpdateHosts.rb
@@ -83,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to update hosts file on the host machine