vagrant-goodhosts 1.0.13 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9078c31120178731d174a2aa15a12b957d3057e11816127c0f89a319c1c6a400
-  data.tar.gz: f6fb7224ef9ee4eca57a100eb8cafde6ef684eae61fa9aadbc1160554c6d36f1
+  metadata.gz: 86f17cd749321e35fafab21b1187d95010f121ec7ef384341aef7d1e767f66c4
+  data.tar.gz: ef74638b070b0ce806b27ae50b3ed05324d5e2715e55c9f26477f77ecead532d
 SHA512:
-  metadata.gz: 0456d61e925bbf2dbc232c4adbc3767c36722fd1f4708283201c9a654b5d972828b4cfb8c550d41b937da3fc960243f59d7e9bda8c8b4d5f8365aa1cad1db158
-  data.tar.gz: 91abd5a594aa8b79a605f9841725f394511907a477bf879a11cb5331d6ded560854cace147e21797c0350afed9aa44a80bae924c4caffc29a161c801b9ae2601
+  metadata.gz: b8dc33d45b72b7b6cc29b66d4eb4bf77e73c0e791b54e514905315108aa1d0ce8f1b6d7e3069eda8103f7613fbe1f06200b6c4a0e745b60348f27b78ffef3009
+  data.tar.gz: 5d91d96b23d355281840675f3de98a701daaea12e3fec0bf0bd1adf7983c88ecf55e2e3fb8bb39f26da4ebc3643233053cea8bdd8e2b765f6d2512d345eb57ac

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

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

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

@@ -5,15 +5,15 @@ 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
+            @ui.info "[vagrant-goodhosts] Removing hosts"
+            removeHostEntries
           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"
@@ -111,7 +116,7 @@ module VagrantPlugins
             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
@@ -145,7 +150,7 @@ module VagrantPlugins
             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
@@ -173,13 +178,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}"
@@ -190,7 +196,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/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GoodHosts
-    VERSION = '1.0.13'
+    VERSION = '1.0.17'
   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.13
+  version: 1.0.17
 platform: ruby
 authors:
 - Daniele Scasciafratte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler