vagrant-hostsupdater 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c6b415c941a16c739c8f6b6c331fdd2b559c39e5c6ee3f7955779da3004e8b2
-  data.tar.gz: 8cc732de6682cca8f91f5a03c99eef3b9bf519dc758736b81f6616bcd2d941c8
+  metadata.gz: 28da9dcc8ae93032fce5f1005a560e515d04c52dd7fbd8b59a4fe02a5dc28d9f
+  data.tar.gz: 9b52816b56418ef87eeb9d4570832af2b21f4a54e1ff3fff8410f58cf79cb42a
 SHA512:
-  metadata.gz: 639e1a983ae8fd9011a02795f8dd7018ca9d16f06f7295d37f88e14c40a2061b346aff70111f2901181ca095d1767d420e092512aeb619203db99730376e1079
-  data.tar.gz: 7e0f3e55b11a5b2af496cccfcbf595558eb1ca9fdd7c891ff519684c3ea1b3121663c6603cde76ea9de359989e4a341a2e8066455a121f63e99561796f90db52
+  metadata.gz: 017dd22e81cec47f73a0af31ecfa58489fd8bc89c57b722d97ef4c381a5fd8d04365138268f5466bda9a486f7fad075071eb1b0ecc484dea7842a26e74dccbe3
+  data.tar.gz: 0f6b2d84f9c791d35e930ac6b75472a0fc38272b88bccfaa9c8b60df2476dcd1c3dd7d9a16b9bed0a9108b960dc077798216fb63c35e0dbaab233a4aa6df6554

data/README.md

@@ -1,3 +1,19 @@
+# NOT MAINTAINED
+# USE AN ALTERNATIVE
+
+March 3, 2021
+
+Hi Everyone. @cgsmith here. I took maintenance over from @agiledivider (Falk Kühnel) in 2015. Myself and the company I worked for relied on Vagrant for our development machines and I relied on vagrant-hostsupdater for changing hosts files. When I found out he was no longer maintaining the project I reached out to him on Twitter and he was willing to let me maintain it and apply some much needed pull requests.
+
+Maintaining a large project is extremely rewarding. I enjoyed doing so but have stopped using Vagrant for development. There are other plugins to help you manage your hosts file or you can feel free to fork this one into your own. 
+
+Don't worry if you don't know Ruby... I didn't. I'm a PHP developer. I figured it out though and asked the right questions to get the problem solved. 
+
+So long... may we meet elsewhere on this vast planet.
+
+- Chris Smith
+
+
 # Vagrant::Hostsupdater
 
 [![Gem Version](https://badge.fury.io/rb/vagrant-hostsupdater.svg)](https://badge.fury.io/rb/vagrant-hostsupdater)

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

@@ -0,0 +1,39 @@
+module VagrantPlugins
+  module HostsUpdater
+    module Action
+      class BaseAction
+        include HostsUpdater
+
+        # 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)
+          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-hostsupdater/Action/CacheHosts.rb

@@ -1,17 +1,10 @@
 module VagrantPlugins
   module HostsUpdater
     module Action
-      class CacheHosts
-        include HostsUpdater
+      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-hostsupdater/Action/RemoveHosts.rb

@@ -1,16 +1,9 @@
 module VagrantPlugins
   module HostsUpdater
     module Action
-      class RemoveHosts
-        include HostsUpdater
+      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.hostsupdater.remove_on_suspend
@@ -22,7 +15,6 @@ module VagrantPlugins
               end
             end
           end
-          @app.call(env)
         end
 
       end

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

@@ -1,24 +1,14 @@
-require_relative "../HostsUpdater"
 module VagrantPlugins
   module HostsUpdater
     module Action
-      class UpdateHosts
-        include HostsUpdater
+      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-hostsupdater] Checking for host entries"
           addHostEntries()
-          @app.call(env)
         end
 
       end
     end
   end
-end
+end

data/lib/vagrant-hostsupdater/HostsUpdater.rb

@@ -78,14 +78,13 @@ module VagrantPlugins
 
       def addHostEntries
         ips = getIps
-        hostnames = getHostnames(ips)
         file = File.open(@@hosts_path, "rb")
         hostsContents = file.read
         uuid = @machine.id
         name = @machine.name
         entries = []
-        ips.each do |ip|
-          hostnames[ip].each do |hostname|
+        getHostnames(ips).each do |ip, hostnames|
+          hostnames.each do |hostname|
             entryPattern = hostEntryPattern(ip, hostname)
 
             if hostsContents.match(/#{entryPattern}/)

data/lib/vagrant-hostsupdater/plugin.rb

@@ -1,6 +1,8 @@
-require "vagrant-hostsupdater/Action/UpdateHosts"
-require "vagrant-hostsupdater/Action/CacheHosts"
-require "vagrant-hostsupdater/Action/RemoveHosts"
+require_relative "HostsUpdater"
+require_relative "Action/BaseAction"
+require_relative "Action/UpdateHosts"
+require_relative "Action/CacheHosts"
+require_relative "Action/RemoveHosts"
 
 module VagrantPlugins
   module HostsUpdater
@@ -34,9 +36,6 @@ module VagrantPlugins
 
       action_hook(:hostsupdater, :machine_action_destroy) do |hook|
         hook.prepend(Action::CacheHosts)
-      end
-
-      action_hook(:hostsupdater, :machine_action_destroy) do |hook|
         hook.append(Action::RemoveHosts)
       end
 

data/lib/vagrant-hostsupdater/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module HostsUpdater
-    VERSION = '1.2.1'
+    VERSION = '1.2.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hostsupdater
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Falk Kühnel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,7 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-hostsupdater.rb
+- lib/vagrant-hostsupdater/Action/BaseAction.rb
 - lib/vagrant-hostsupdater/Action/CacheHosts.rb
 - lib/vagrant-hostsupdater/Action/RemoveHosts.rb
 - lib/vagrant-hostsupdater/Action/UpdateHosts.rb