vagrant-goodhosts 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0a9a9277945173d86017e1adc047ab0f77c2cc1779720feacab37f2095eeaab
-  data.tar.gz: 20814631c5aea07c8eb72a7ea7458ef0e6617ce5358585587a62883c30cee311
+  metadata.gz: 9078c31120178731d174a2aa15a12b957d3057e11816127c0f89a319c1c6a400
+  data.tar.gz: f6fb7224ef9ee4eca57a100eb8cafde6ef684eae61fa9aadbc1160554c6d36f1
 SHA512:
-  metadata.gz: 8ff28f24b53144938296b34731d73f0569724b4d2bd877ef5e1d148a4a485de2c2aefe34abaecdd60ba9a3a6d3c24296d3a21ddebe42864e32dfa459083ec19b
-  data.tar.gz: 11c2e604dace4cc0cb75a829f0162d0a3a9941f14ba9103fc79333ee87d4eab107c659c463ff4fe3fa19395549a6089e56fda12256da95a9abd6e627e5ba8712
+  metadata.gz: 0456d61e925bbf2dbc232c4adbc3767c36722fd1f4708283201c9a654b5d972828b4cfb8c550d41b937da3fc960243f59d7e9bda8c8b4d5f8365aa1cad1db158
+  data.tar.gz: 91abd5a594aa8b79a605f9841725f394511907a477bf879a11cb5331d6ded560854cace147e21797c0350afed9aa44a80bae924c4caffc29a161c801b9ae2601

data/lib/vagrant-goodhosts/Action/BaseAction.rb

@@ -0,0 +1,39 @@
+module VagrantPlugins
+  module GoodHosts
+    module Action
+      class BaseAction
+        include GoodHosts
+
+        # 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/goodhosts/vagrant/issues/25
+        @@completed = {}
+
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @ui = env[:ui]
+        end
+
+        def call(env)
+          if not @@completed.key?(self.class.name)
+            run(env)
+            @@completed[self.class.name] = true
+          end
+
+          @app.call(env)
+        end
+
+        def run(env)
+          raise NotImplementedError.new("Must be implemented!")
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-goodhosts/Action/RemoveHosts.rb

@@ -1,32 +1,20 @@
 module VagrantPlugins
   module GoodHosts
     module Action
-      class RemoveHosts
-        include GoodHosts
-        @@updated = false
+      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.goodhosts.remove_on_suspend
-              unless @@updated
-                @@updated = true
-                if machine_action != :halt || false != @machine.config.goodhosts.remove_on_suspend
-                  @ui.info "[vagrant-goodhosts] Removing hosts"
-                  removeHostEntries
-                else
-                  @ui.info "[vagrant-goodhosts] Removing hosts on suspend disabled"
-                end
+              if machine_action != :halt || false != @machine.config.goodhosts.remove_on_suspend
+                @ui.info "[vagrant-goodhosts] Removing hosts"
+                removeHostEntries
+              else
+                @ui.info "[vagrant-goodhosts] Removing hosts on suspend disabled"
               end
             end
           end
-          @app.call(env)
         end
 
       end

data/lib/vagrant-goodhosts/Action/UpdateHosts.rb

@@ -1,24 +1,11 @@
-require_relative "../GoodHosts"
 module VagrantPlugins
   module GoodHosts
     module Action
-      class UpdateHosts
-        include GoodHosts
-        @@updated = false
+      class UpdateHosts < BaseAction
 
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @ui = env[:ui]
-        end
-
-        def call(env)
-          unless @@updated
-            @@updated = true
-            @ui.info "[vagrant-goodhosts] Checking for host entries"
-            addHostEntries()
-          end
-          @app.call(env)
+        def run(env)
+          @ui.info "[vagrant-goodhosts] Checking for host entries"
+          addHostEntries()
         end
 
       end

data/lib/vagrant-goodhosts/plugin.rb

@@ -1,5 +1,7 @@
-require "vagrant-goodhosts/Action/UpdateHosts"
-require "vagrant-goodhosts/Action/RemoveHosts"
+require_relative "GoodHosts"
+require_relative "Action/BaseAction"
+require_relative "Action/UpdateHosts"
+require_relative "Action/RemoveHosts"
 
 module VagrantPlugins
   module GoodHosts

data/lib/vagrant-goodhosts/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GoodHosts
-    VERSION = '1.0.12'
+    VERSION = '1.0.13'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-goodhosts
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Daniele Scasciafratte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,6 +51,7 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-goodhosts.rb
+- lib/vagrant-goodhosts/Action/BaseAction.rb
 - lib/vagrant-goodhosts/Action/RemoveHosts.rb
 - lib/vagrant-goodhosts/Action/UpdateHosts.rb
 - lib/vagrant-goodhosts/GoodHosts.rb