vagrant-goodhosts 1.0.10 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6661999d4e2dfba792e5a925f4674cca24b6b3e523b8f2b3427933ce09570c6
-  data.tar.gz: c869c926f280627a4198f8cebcfe47aefffc24e1993e6558a637726d0471dd1a
+  metadata.gz: 00dc15e9dc6876fb9f1610777d190e21c6bf6397531950a1cae0f35496e1e989
+  data.tar.gz: 30f87a2f1855fde5e646148f02f1861d400de9054109920302e04ab29b95b353
 SHA512:
-  metadata.gz: ee107d64bdd466fe0d96778dff5f71a9783ebe0e77392909eb0e7f041941fe436987c39a1d1967b89ef4922aed18ae579c117677c5c3b0e08e276be318d3e1e0
-  data.tar.gz: 5ccb050a4ff37df1db7c0ba61788cf1149d28c6b05d9e470e91263538c3ef9c287ac1777f03500f84ae205c3460ac1793aed94e49bc0506dc4f057501d9230df
+  metadata.gz: b9fd306e3cbff7ad32f524ba17f3248b1b5fdd113e59e341f34deb153f52c39212c1da1b97382d78567101e6edf74b1b1559180a3bdfbcadf3cabb7786c8edad
+  data.tar.gz: 908da7239733a24b072256659e453d3864c429306b42f3128a6856e7013b635e0c922d3436c5c4ef902c43c9935f1a91f247fa7a0a0b68c1daab8531d931b4d1

data/README.md

@@ -80,13 +80,13 @@ This disables `vagrant-goodhosts` from running on **suspend** and **halt**.
 
 ### Disable file hosts clean
 
-If you don't want `/etc/hosts` file cleaned add in your `VagrantFile`:
+If you want `/etc/hosts` file cleaned add in your `VagrantFile`:
 
 ```ruby
-config.goodhosts.disable_clean = true
+config.goodhosts.disable_clean = false
 ```
 
-This disables `vagrant-goodhosts` from running the clean command.
+This enable `vagrant-goodhosts` from running the clean command in every call.
 
 ## Suppressing prompts for elevating privileges
 

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

@@ -0,0 +1,44 @@
+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)
+          # 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/goodhosts/vagrant/issues/30
+          if not @@completed.key?(@machine.name)
+            run(env)
+            @@completed[@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-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/GoodHosts.rb

@@ -7,6 +7,11 @@ module VagrantPlugins
       def getIps
         ips = []
 
+        if @machine.config.vm.networks.length == 0
+            @ui.error("[vagrant-goodhosts] No ip address found for this virtual machine")
+            exit
+        end
+        
         @machine.config.vm.networks.each do |network|
           key, options = network[0], network[1]
           ip = options[:ip] if (key == :private_network || key == :public_network) && options[:goodhosts] != "skip"
@@ -80,7 +85,7 @@ module VagrantPlugins
         return hostnames
       end
       
-      def shouldClean(ip_address)
+      def disableClean(ip_address)
         unless ip_address.nil?
           return @machine.config.goodhosts.disable_clean
         end
@@ -100,17 +105,18 @@ module VagrantPlugins
             @ui.error "[vagrant-goodhosts] Error adding some hosts, no IP was provided for the following hostnames: #{hostnames}"
             next
           end
-          clean  = ''
           if cli.include? ".exe"
-            if not shouldClean(ip_address)
-              clean = "\"--clean\","
+            clean = "\"--clean\","
+            if disableClean(ip_address)
+                clean = ''
             end
             stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", "Start-Process '#{cli}' -ArgumentList \"add\",#{clean}\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs")
           else
-            if not shouldClean(ip_address)
-              clean = "--clean"
+            clean = "--clean"
+            if disableClean(ip_address)
+                clean = ''
             end
-            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo", cli, "add", clean, ip_address, hostnames)
+            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo '#{cli}' add #{clean} #{ip_address} #{hostnames}")
           end
           if !wait_thr.value.success?
             error = true
@@ -134,15 +140,17 @@ module VagrantPlugins
             next
           end
           if cli.include? ".exe"
-            if not shouldClean(ip_address)
-              clean = "\"--clean\","
+            clean = "\"--clean\","
+            if disableClean(ip_address)
+                clean = ''
             end
             stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", "Start-Process '#{cli}' -ArgumentList \"remove\",#{clean}\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs")
           else
-            if not shouldClean(ip_address)
-              clean = "--clean"
+            clean = "\"--clean\","
+            if disableClean(ip_address)
+                clean = ''
             end
-            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo", cli, "remove", clean, ip_address, hostnames)
+            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo '#{cli}' remove #{clean} #{ip_address} #{hostnames}")
           end
           if !wait_thr.value.success?
             error = true

data/lib/vagrant-goodhosts/config.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
         attr_accessor :disable_clean
         
         def initialize
-            @disable_clean = false
+            @disable_clean = true
         end
     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.10'
+    VERSION = '1.0.15'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-goodhosts
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.15
 platform: ruby
 authors:
 - Daniele Scasciafratte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-04-19 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