vagrant-goodhosts 1.0.9 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56e892a7cfa68be113df9fb991f5fa52d72e2bc450ead6e1c75b6ef7ad569cb5
-  data.tar.gz: 53ee630010bc772f0fc7825e0e4ef25a32973d6d82ac0a6eec75a2854b8ed7dc
+  metadata.gz: 7318e82f1a00cbc634eb59ada30fc0dac4faaec430d03cf14a18cbbab3ad47ca
+  data.tar.gz: b803523ef62f3678f41d326c274b797a45fac3506965c4b3faf35f2a5d6e80dd
 SHA512:
-  metadata.gz: 84e845186cdf8f2458c325cba423ac735c1f1099ac72a9bb86717fa9d199f394159f6a2befe9c76a14eeefcbabf5d39953353f2faedd0d37aec66db092a798da
-  data.tar.gz: 407011091f694bbdc4fe85708ec3b11277f2c5be004fb5dfdeccab8eb1d905d0a73bc132f64a8e06653e2ca7ac2af1b699321b0388659e107541a5e7bbbf06a6
+  metadata.gz: 853bc371c5cb4b11ee893c4c9d36a16f8b23a304e1b96622eb4d92798d4aeca37c1fa8e9d9888706f336613cd2b4871d2afa338ee38f07dc6e793358195e7e40
+  data.tar.gz: 71c07e6cb107e9bb4f28f22169deb39ae0b8656c242cb3fa559375f6f35f04ceff66f37ee978957afc248b2bb1470d9244d64fca96a12647e6a2240275759c31

data/README.md

@@ -78,6 +78,15 @@ config.goodhosts.remove_on_suspend = false
 
 This disables `vagrant-goodhosts` from running on **suspend** and **halt**.
 
+### Disable file hosts clean
+
+If you want `/etc/hosts` file cleaned add in your `VagrantFile`:
+
+```ruby
+config.goodhosts.disable_clean = false
+```
+
+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"
@@ -79,25 +84,39 @@ module VagrantPlugins
 
         return hostnames
       end
+      
+      def disableClean(ip_address)
+        unless ip_address.nil?
+          return @machine.config.goodhosts.disable_clean
+        end
+        return true
+      end
 
       def addHostEntries
         error = false
         errorText = ""
         cli = get_cli
         hostnames_by_ips = generateHostnamesByIps
-
-        return if hostnames_by_ips.empty?
+        
+        return if not hostnames_by_ips.any?
 
         hostnames_by_ips.each do |ip_address, hostnames|
-          next if hostnames.empty?
           if ip_address.nil?
             @ui.error "[vagrant-goodhosts] Error adding some hosts, no IP was provided for the following hostnames: #{hostnames}"
             next
           end
           if cli.include? ".exe"
-            stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", "Start-Process '#{cli}' -ArgumentList \"add\",\"--clean\",\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs")
+            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
-            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo", cli, "add", "--clean", ip_address, hostnames)
+            clean = "--clean"
+            if disableClean(ip_address)
+                clean = ''
+            end
+            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo #{cli} add #{clean} #{ip_address} #{hostnames}")
           end
           if !wait_thr.value.success?
             error = true
@@ -113,18 +132,25 @@ module VagrantPlugins
         cli = get_cli
         hostnames_by_ips = generateHostnamesByIps
 
-        return if hostnames_by_ips.empty?
+        return if not hostnames_by_ips.any?
 
         hostnames_by_ips.each do |ip_address, hostnames|
-          next if hostnames.empty?
           if ip_address.nil?
             @ui.error "[vagrant-goodhosts] Error adding some hosts, no IP was provided for the following hostnames: #{hostnames}"
             next
           end
           if cli.include? ".exe"
-            stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", "Start-Process '#{cli}' -ArgumentList \"remove\",\"--clean\",\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs")
+            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
-            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo", cli, "remove", "--clean", ip_address, hostnames)
+            clean = "\"--clean\","
+            if disableClean(ip_address)
+                clean = ''
+            end
+            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

@@ -6,6 +6,11 @@ module VagrantPlugins
         attr_accessor :aliases
         attr_accessor :id
         attr_accessor :remove_on_suspend
+        attr_accessor :disable_clean
+        
+        def initialize
+            @disable_clean = true
+        end
     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.9'
+    VERSION = '1.0.14'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-goodhosts
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.14
 platform: ruby
 authors:
 - Daniele Scasciafratte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-04-06 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
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to update hosts file on the host machine with goodhosts