vagrant-goodhosts 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86f17cd749321e35fafab21b1187d95010f121ec7ef384341aef7d1e767f66c4
-  data.tar.gz: ef74638b070b0ce806b27ae50b3ed05324d5e2715e55c9f26477f77ecead532d
+  metadata.gz: 74e9466d2e64e39de992c9940235deb31e8d64fd4e17e92d8b271392306dcabf
+  data.tar.gz: 918fb30d3de3daf04492cd8850d5cd1fc5bb2187f9a985f048b401301c527409
 SHA512:
-  metadata.gz: b8dc33d45b72b7b6cc29b66d4eb4bf77e73c0e791b54e514905315108aa1d0ce8f1b6d7e3069eda8103f7613fbe1f06200b6c4a0e745b60348f27b78ffef3009
-  data.tar.gz: 5d91d96b23d355281840675f3de98a701daaea12e3fec0bf0bd1adf7983c88ecf55e2e3fb8bb39f26da4ebc3643233053cea8bdd8e2b765f6d2512d345eb57ac
+  metadata.gz: 396c9ad919d3abaea678b2042f57a9ef02dac89d4212ceb5e18887c5be190ae86a3112fa28664fe6e7483fcf6f9e969eda012d891a4d828622b6fc15b671a050
+  data.tar.gz: f1d14ef933bfe527f6d0297300abf1cc3ed9a87f542b1ac5dc0ff017c71a52b32203984e1c04d37988fdbbe1d4f99343255f9ced3dd3a750ec1ded7b06870231

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

@@ -12,7 +12,6 @@ module VagrantPlugins
           if ([:halt, :suspend].include? machine_action) && (false == @machine.config.goodhosts.remove_on_suspend)
             @ui.info "[vagrant-goodhosts] Removing hosts on suspend disabled"
           else
-            @ui.info "[vagrant-goodhosts] Removing hosts"
             removeHostEntries
           end
         end

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

@@ -4,7 +4,6 @@ module VagrantPlugins
       class UpdateHosts < BaseAction
 
         def run(env)
-          @ui.info "[vagrant-goodhosts] Checking for host entries"
           addHostEntries()
         end
 

data/lib/vagrant-goodhosts/GoodHosts.rb

@@ -1,5 +1,6 @@
 require "rbconfig"
 require "open3"
+require "resolv"
 
 module VagrantPlugins
   module GoodHosts
@@ -8,17 +9,17 @@ module VagrantPlugins
         ips = []
 
         if @machine.config.vm.networks.length == 0
-            @ui.error("[vagrant-goodhosts] No ip address found for this virtual machine")
-            exit
+            @ui.error("[vagrant-goodhosts] No networks are available yet for this virtual machine to add IP/hosts for")
+            return ips
         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"
-          ips.push(ip) if ip
           if options[:goodhosts] == "skip"
             @ui.info '[vagrant-goodhosts] Skipped adding host entries (config.vm.network goodhosts: "skip" is set)'
           end
+          ip = options[:ip] if (key == :private_network || key == :public_network) && options[:goodhosts] != "skip"
+          ips.push(ip) if ip
 
           @machine.config.vm.provider :hyperv do |v|
             timeout = @machine.provider_config.ip_address_timeout
@@ -37,7 +38,6 @@ module VagrantPlugins
             end
           end
 
-
         end
         return ips
       end
@@ -45,16 +45,16 @@ module VagrantPlugins
       # https://stackoverflow.com/a/13586108/1902215
       def get_os_binary
         return os ||= (host_os = RbConfig::CONFIG["host_os"]
-                 case host_os
-               when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-                 :'cli.exe'
-               when /darwin|mac os/
-                 :'cli_osx'
-               when /linux/
-                 :'cli'
-               else
-                 raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
-               end)
+          case host_os
+          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+            :'cli.exe'
+          when /darwin|mac os/
+            :'cli_osx'
+          when /linux/
+            :'cli'
+          else
+            raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
+          end)
       end
 
       def get_cli
@@ -84,7 +84,7 @@ module VagrantPlugins
 
         return hostnames
       end
-      
+
       def disableClean(ip_address)
         unless ip_address.nil?
           return @machine.config.goodhosts.disable_clean
@@ -97,27 +97,22 @@ module VagrantPlugins
         errorText = ""
         cli = get_cli
         hostnames_by_ips = generateHostnamesByIps
-        
+
         return if not hostnames_by_ips.any?
 
+        @ui.info "[vagrant-goodhosts] Checking for host entries"
+
         hostnames_by_ips.each do |ip_address, hostnames|
           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"
-            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
-            clean = "--clean"
-            if disableClean(ip_address)
-                clean = ''
-            end
-            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo '#{cli}' add #{clean} #{ip_address} #{hostnames}")
-          end
+
+          # filter out the hosts we've already added
+          hosts_to_add = check_hostnames_to_add( ip_address, hostnames)
+          next if not hosts_to_add.any?
+
+          stdin, stdout, stderr, wait_thr = add_goodhost_entries(ip_address, hosts_to_add)
           if !wait_thr.value.success?
             error = true
             errorText = stderr.read.strip
@@ -126,6 +121,40 @@ module VagrantPlugins
         printReadme(error, errorText)
       end
 
+      def check_hostnames_to_add(ip_address, hostnames)
+        hostnames_to_add = Array.new
+
+        # check which hostnames actually need adding
+        hostnames.each do |hostname|
+          begin
+            address = Resolv.getaddress(hostname)
+            if address != ip_address
+              hostnames_to_add.append( hostname )
+            end
+          rescue => exception
+            hostnames_to_add.append(hostname)
+          end
+        end
+        return hostnames_to_add
+      end
+
+      def add_goodhost_entries(ip_address, hostnames)
+        if cli.include? ".exe"
+          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
+          clean = "--clean"
+          if disableClean(ip_address)
+              clean = ''
+          end
+          stdin, stdout, stderr, wait_thr = Open3.popen3("sudo '#{cli}' add #{clean} #{ip_address} #{hostnames}")
+        end
+        return stdin, stdout, stderr, wait_thr
+      end
+
       def removeHostEntries
         error = false
         errorText = ""
@@ -134,24 +163,15 @@ module VagrantPlugins
 
         return if not hostnames_by_ips.any?
 
+        @ui.info "[vagrant-goodhosts] Removing hosts"
+
         hostnames_by_ips.each do |ip_address, hostnames|
           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"
-            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
-            clean = "\"--clean\","
-            if disableClean(ip_address)
-                clean = ''
-            end
-            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo '#{cli}' remove #{clean} #{ip_address} #{hostnames}")
-          end
+
+          stdin, stdout, stderr, wait_thr = remove_goodhost_entries(ip_address, hostnames)
           if !wait_thr.value.success?
             error = true
             errorText = stderr.read.strip
@@ -160,6 +180,23 @@ module VagrantPlugins
         printReadme(error, errorText)
       end
 
+      def remove_goodhost_entries(ip_address, hostnames)
+        if cli.include? ".exe"
+          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
+          clean = "\"--clean\","
+          if disableClean(ip_address)
+              clean = ''
+          end
+          stdin, stdout, stderr, wait_thr = Open3.popen3("sudo '#{cli}' remove #{clean} #{ip_address} #{hostnames}")
+        end
+        return stdin, stdout, stderr, wait_thr
+      end
+
       def printReadme(error, errorText)
         if error
           cli = get_cli

data/lib/vagrant-goodhosts/plugin.rb

@@ -21,6 +21,10 @@ module VagrantPlugins
         hook.append(Action::UpdateHosts)
       end
 
+      action_hook(:goodhosts, :machine_action_boot) do |hook|
+        hook.append(Action::UpdateHosts)
+      end
+
       action_hook(:goodhosts, :machine_action_provision) do |hook|
         hook.before(Vagrant::Action::Builtin::Provision, Action::UpdateHosts)
       end

data/lib/vagrant-goodhosts/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GoodHosts
-    VERSION = '1.0.17'
+    VERSION = '1.0.18'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-goodhosts
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Daniele Scasciafratte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.2.27
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to update hosts file on the host machine with goodhosts