vagrant-goodhosts 1.0.15 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00dc15e9dc6876fb9f1610777d190e21c6bf6397531950a1cae0f35496e1e989
-  data.tar.gz: 30f87a2f1855fde5e646148f02f1861d400de9054109920302e04ab29b95b353
+  metadata.gz: 9df62f1e1e6994b0e268f5a4c70e05992d2aa8717359bc843468f7fe209d735c
+  data.tar.gz: 5de2dbc4f9eefe5dddfed6a74c8db799b9cf5fd8003d111ea5d47e6bb07d68d3
 SHA512:
-  metadata.gz: b9fd306e3cbff7ad32f524ba17f3248b1b5fdd113e59e341f34deb153f52c39212c1da1b97382d78567101e6edf74b1b1559180a3bdfbcadf3cabb7786c8edad
-  data.tar.gz: 908da7239733a24b072256659e453d3864c429306b42f3128a6856e7013b635e0c922d3436c5c4ef902c43c9935f1a91f247fa7a0a0b68c1daab8531d931b4d1
+  metadata.gz: a80232c8572f03701db820c2ab9be2e37288ab1fa258381c35843ebfc68c121f844c1765b18c6c743c3f9b0da18014e5bc32d7dde6d3b91d03ed6c2de24cff44
+  data.tar.gz: 69f5149b8e73aaedabc0c4011bade5b0a12f1cda452603b230fef861e774f2fed5eec14ec311ec6157fa4ec4cdb925d292faaf1bc448e6c9fb6e766bee5aaf7b

data/README.md

@@ -30,7 +30,7 @@ You currently only need the `hostname` and a `:private_network` network with a f
 
 ```ruby
 config.vm.network :private_network, ip: "192.168.3.10"
-config.vm.hostname = "www.testing.de"
+config.vm.hostname = "www.testing.de" # This is not used by the plugin
 config.goodhosts.aliases = ["alias.testing.de", "alias2.somedomain.com"]
 ```
 
@@ -96,15 +96,15 @@ If you understand the risks that go with supressing them, here's how to do it.
 ### Linux/OS X: Passwordless sudo
 
 To allow vagrant to automatically update the hosts file without asking for a sudo password, add one of the following snippets to a new sudoers file include, i.e. `sudo visudo -f /etc/sudoers.d/vagrant_goodhosts`.
-The command path is printed when there are errors with sudo.
+The command path is printed when there are errors with Vagrant, check the output marked in red.
 
 For Ubuntu and most Linux environments:
 
-    %sudo ALL=(root) NOPASSWD: [the-path]
+    %sudo ALL=(root) NOPASSWD: [the-command-path]
 
 For MacOS:
 
-    %admin ALL=(root) NOPASSWD: [the-path]
+    %admin ALL=(root) NOPASSWD: [the-command-path]
 
 Replace in both %sudo/%admin with the username it if it is not working for you.
 

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

@@ -26,9 +26,10 @@ module VagrantPlugins
           # 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)
+          @@completed[@machine.name] = [] unless @@completed.key?(@machine.name)
+          unless @@completed[@machine.name].include? self.class.name
             run(env)
-            @@completed[@machine.name] = true
+            @@completed[@machine.name] << self.class.name
           end
 
           @app.call(env)

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

@@ -5,15 +5,14 @@ module VagrantPlugins
 
         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
-              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
+
+          return unless @machine.id
+          return unless [:destroy, :halt, :suspend].include? machine_action
+
+          if ([:halt, :suspend].include? machine_action) && (false == @machine.config.goodhosts.remove_on_suspend)
+            @ui.info "[vagrant-goodhosts] Removing hosts on suspend disabled"
+          else
+            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
@@ -92,32 +92,61 @@ module VagrantPlugins
         return true
       end
 
+      def checkHostnamesToAdd(ip_address, hostnames)
+        hostnames_to_add = Array.new
+        hostnames = hostnames.split
+        # 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 addGoodhostEntries(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 addHostEntries
         error = false
         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 = checkHostnamesToAdd(ip_address, hostnames)
+          next if not hosts_to_add.any?
+
+          stdin, stdout, stderr, wait_thr = addGoodhostEntries(ip_address, hosts_to_add)
           if !wait_thr.value.success?
             error = true
             errorText = stderr.read.strip
@@ -126,6 +155,23 @@ module VagrantPlugins
         printReadme(error, errorText)
       end
 
+      def removeGoodhostEntries(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 removeHostEntries
         error = false
         errorText = ""
@@ -134,24 +180,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 = removeGoodhostEntries(ip_address, hostnames)
           if !wait_thr.value.success?
             error = true
             errorText = stderr.read.strip
@@ -178,13 +215,14 @@ module VagrantPlugins
         hostnames_by_ips = []
         ips = getIps
         if ips.count() < 1
+          @ui.error("[vagrant-goodhosts] No ip address found for this virtual machine")
           return hostnames_by_ips
         end
         hostnames = getHostnames(ips)
         if ips.count() > 1
           ips.each do |ip|
             ip_address = ip
-            if hostnames[ip].count() > 1
+            if hostnames[ip].count() > 0
               hostnames[ip].each do |hostname|
                 if !ip_address.nil?
                   @ui.info "[vagrant-goodhosts] - found entry for: #{ip_address} #{hostname}"
@@ -195,7 +233,7 @@ module VagrantPlugins
           end
         else
           ip_address = ips[0]
-          if hostnames[ip_address].count() > 1
+          if hostnames[ip_address].count() > 0
             hostnames[ip_address].each do |hostname|
               if !ip_address.nil?
                 @ui.info "[vagrant-goodhosts] - found entry for: #{ip_address} #{hostname}"

data/lib/vagrant-goodhosts/config.rb

@@ -9,6 +9,7 @@ module VagrantPlugins
         attr_accessor :disable_clean
         
         def initialize
+            @remove_on_suspend = true
             @disable_clean = true
         end
     end

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.15'
+    VERSION = '1.0.19'
   end
 end

data/package.sh

@@ -13,3 +13,4 @@ rm -f ./*.txt
 # Generate
 cd ../../../
 gem build vagrant-goodhosts.gemspec
+# gem push

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-goodhosts
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.19
 platform: ruby
 authors:
 - Daniele Scasciafratte
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ homepage: https://github.com/goodhosts/vagrant
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -82,8 +82,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.2.27
+signing_key:
 specification_version: 4
 summary: Enables Vagrant to update hosts file on the host machine with goodhosts
 test_files: []