vagrant-goodhosts 1.0.1 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57ccc464161aae46b772cf48cebb81d5dd397a01910ef46cbb49f59da6018e6
-  data.tar.gz: ae7c977400c970df2a0685f2ec5ffafa1c3c4276eabdd1c60e7c522874f4201d
+  metadata.gz: 773499e5908599b791ece8dbfbeb82929508e5c9341af2603250e0d973ab1be2
+  data.tar.gz: 4b65f0a08a6779474a320e40ef0a0b924bb51c7c3334fa53a182da3dc856d5aa
 SHA512:
-  metadata.gz: 9aeeb25fd2974a73558f3380727b885038ff2a22a151ee216dbca37c47eddbd86cc07cacdd7ff1d7ab049a93b0b9316fae77b9231f95b153d2a81e534f8afddc
-  data.tar.gz: 48e57ad4c315c39f75f454616b5aa2af6402988294f2d006df8448c1e48b919e4743ab64a28663c50c85cc5627d6dae6e608e3094fa3a9e6cfccd20f78368b6f
+  metadata.gz: d71b200fa955218bdf800fc4da2d5c56d3b3d8719145b9961e8d9017d3215a34b21753dc4b10e151ca2616e05e24e0709a14d2058ba4b84da5ff1a9dbeb2d06e
+  data.tar.gz: d9ff6081767d318a1c91d96bf683c4791a809c60ec6e6d0fb39abc541d4e647dc50789717471493be2e8862ceda89718f33cb57e07804d4a3d1f6f71f5190cd2

data/README.md

@@ -87,7 +87,7 @@ 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`.  
-Change the cli path as printed in the vagrant output.
+The command path is printed when there are errors with sudo.
 
 For Ubuntu and most Linux environments:
 
@@ -96,6 +96,8 @@ For Ubuntu and most Linux environments:
 For MacOS:
 
     %admin ALL=(root) NOPASSWD: [the-path]
+    
+Replace in both %sudo/%admin with the username it if it is not working for you.
 
 ### Windows: UAC Prompt
 

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

@@ -5,7 +5,6 @@ module VagrantPlugins
       class UpdateHosts
         include GoodHosts
 
-
         def initialize(app, env)
           @app = app
           @machine = env[:machine]

data/lib/vagrant-goodhosts/GoodHosts.rb

@@ -1,69 +1,67 @@
-require 'rbconfig'
-require 'open3'
+require "rbconfig"
+require "open3"
 
 module VagrantPlugins
   module GoodHosts
     module GoodHosts
-
       def getIps
         if Vagrant.has_plugin?("vagrant-hostsupdater")
-            @ui.warn "[vagrant-goodhosts] Warning: The vagrant-hostsupdater plugin is installed, hostsupdater always adds the VM name even if the VagrantFile says not to. This shouldn't cause issues, but if it does, uninstall hostsupdater" 
+          @ui.warn "[vagrant-goodhosts] Warning: The vagrant-hostsupdater plugin is installed, hostsupdater always adds the VM name even if the VagrantFile says not to. This shouldn't cause issues, but if it does, uninstall hostsupdater"
         end
-        
+
         ips = []
 
-            @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] Skipping adding host entries (config.vm.network goodhosts: "skip" is set)'
-            end
-            
-            @machine.config.vm.provider :hyperv do |v|
-                timeout = @machine.provider_config.ip_address_timeout
-                @ui.output("[vagrant-goodhosts] Waiting for the guest machine to report its IP address ( this might take some time, have patience )...")
-                @ui.detail("Timeout: #{timeout} seconds")
-
-                options = {
-                    vmm_server_address: @machine.provider_config.vmm_server_address,
-                    proxy_server_address: @machine.provider_config.proxy_server_address,
-                    timeout: timeout,
-                    machine: @machine
-                }
-                network = @machine.provider.driver.read_guest_ip(options)
-                if network["ip"]
-                    ips.push( network["ip"] ) unless ips.include? network["ip"]
-                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] Skipping adding host entries (config.vm.network goodhosts: "skip" is set)'
+          end
+
+          @machine.config.vm.provider :hyperv do |v|
+            timeout = @machine.provider_config.ip_address_timeout
+            @ui.output("[vagrant-goodhosts] Waiting for the guest machine to report its IP address ( this might take some time, have patience )...")
+            @ui.detail("Timeout: #{timeout} seconds")
+
+            options = {
+              vmm_server_address: @machine.provider_config.vmm_server_address,
+              proxy_server_address: @machine.provider_config.proxy_server_address,
+              timeout: timeout,
+              machine: @machine,
+            }
+            network = @machine.provider.driver.read_guest_ip(options)
+            if network["ip"]
+              ips.push(network["ip"]) unless ips.include? network["ip"]
             end
-            
-            return ips
+          end
+
+          
         end
+        return ips
       end
-      
+
       # https://stackoverflow.com/a/13586108/1902215
-      def get_OS
-        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
-        )
+      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)
       end
-      
+
       def get_cli
-          cli = get_OS
-          path = File.expand_path(File.dirname(File.dirname(__FILE__))) + '/vagrant-goodhosts/bundle/'
-          path = "#{path}#{cli}"
-          
-          return path
+        binary = get_os_binary
+        path = File.expand_path(File.dirname(File.dirname(__FILE__))) + "/vagrant-goodhosts/bundle/"
+        path = "#{path}#{binary}"
+
+        return path
       end
 
       # Get a hash of hostnames indexed by ip, e.g. { 'ip1': ['host1'], 'ip2': ['host2', 'host3'] }
@@ -83,80 +81,95 @@ module VagrantPlugins
           end
         end
 
-        # handle default hostname(s) if not already specified in the aliases
-        Array(@machine.config.vm.hostname).each do |host|
-          if hostnames.none? { |k, v| v.include?(host) }
-            ips.each do |ip|
-              hostnames[ip].unshift host
-            end
-          end
-        end
-
         return hostnames
       end
 
       def addHostEntries
-        ips = getIps
-        hostnames = getHostnames(ips)
         error = false
         errorText = ""
         cli = get_cli
-        ips.each do |ip|
-          hostnames[ip].each do |hostname|
-              ip_address = ip
-              if !ip_address.nil?
-                @ui.info "[vagrant-goodhosts] - found entry for: #{ip_address} #{hostname}"
-                if cli.include? ".exe"
-                    stdin, stdout, stderr, wait_thr = Open3.popen3(cli, "a", ip_address, hostname)
-                else
-                    stdin, stdout, stderr, wait_thr = Open3.popen3('sudo', cli, "a", ip_address, hostname)
-                end
-                if !wait_thr.value.success?
-                    error = true
-                    errorText = stderr.read.strip
-                end
-              end
+        hostnames_by_ips = generateHostnamesByIps
+        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"
+            stdin, stdout, stderr, wait_thr = Open3.popen3(cli, "add", "--clean", ip_address, hostnames)
+          else
+            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo", cli, "add", "--clean", ip_address, hostnames)
+          end
+          if !wait_thr.value.success?
+            error = true
+            errorText = stderr.read.strip
           end
         end
         printReadme(error, errorText)
       end
 
       def removeHostEntries
-        ips = getIps
-        hostnames = getHostnames(ips)
         error = false
         errorText = ""
         cli = get_cli
-        ips.each do |ip|
-          hostnames[ip].each do |hostname|
-              ip_address = ip
-              if !ip_address.nil?
-                @ui.info "[vagrant-goodhosts] - remove entry for: #{ip_address} #{hostname}"
-                if cli.include? ".exe"
-                    stdin, stdout, stderr, wait_thr = Open3.popen3(cli, "r", ip_address, hostname)
-                else
-                    stdin, stdout, stderr, wait_thr = Open3.popen3('sudo', cli, "r", ip_address, hostname)
-                end
-                if !wait_thr.value.success?
-                    error = true
-                    errorText = stderr.read.strip
-                end
-              end
+        hostnames_by_ips = generateHostnamesByIps
+        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"
+            stdin, stdout, stderr, wait_thr = Open3.popen3(cli, "remove", "--clean", ip_address, hostnames)
+          else
+            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo", cli, "remove", "--clean", ip_address, hostnames)
+          end
+          if !wait_thr.value.success?
+            error = true
+            errorText = stderr.read.strip
           end
         end
         printReadme(error, errorText)
       end
-      
+
       def printReadme(error, errorText)
         if error
-            cli = get_cli
-            @ui.error "[vagrant-goodhosts] Issue executing goodhosts CLI: #{errorText}"
-            @ui.error "[vagrant-goodhosts] Cli path: #{cli}"
+          cli = get_cli
+          @ui.error "[vagrant-goodhosts] Issue executing goodhosts CLI: #{errorText}"
+          @ui.error "[vagrant-goodhosts] Cli path: #{cli}"
+          if cli.include? ".exe"
+            @ui.error "[vagrant-goodhosts] Check the readme at https://github.com/goodhosts/vagrant#windows-uac-prompt"
+            exit
+          else
             @ui.error "[vagrant-goodhosts] Check the readme at https://github.com/goodhosts/vagrant#passwordless-sudo"
+          end
         end
-
       end
 
+      def generateHostnamesByIps()
+        hostnames_by_ips = []
+        ips = getIps
+        hostnames = getHostnames(ips)
+        if ips.count() > 1
+          ips.each do |ip|
+            ip_address = ip
+            hostnames[ip].each do |hostname|
+              if !ip_address.nil?
+                @ui.info "[vagrant-goodhosts] - found entry for: #{ip_address} #{hostname}"
+              end
+            end
+            hostnames_by_ips = { ip_address => hostnames[ip].join(" ") }
+          end
+        else
+          ip_address = ips[0]
+          hostnames[ip_address].each do |hostname|
+            if !ip_address.nil?
+              @ui.info "[vagrant-goodhosts] - found entry for: #{ip_address} #{hostname}"
+            end
+          end
+          hostnames_by_ips = { ip_address => hostnames[ip_address].join(" ") }
+        end
+
+        return hostnames_by_ips
+      end
     end
   end
-end 
+end

data/lib/vagrant-goodhosts/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GoodHosts
-    VERSION = '1.0.1'
+    VERSION = '1.0.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-goodhosts
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.7
 platform: ruby
 authors:
 - Daniele Scasciafratte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to update hosts file on the host machine with goodhosts