vagrant-goodhosts 1.0.2 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a413f4af6b28126f7bfa544c51fd1861d6809d3f2092ca512f4f3cb92b66a98
-  data.tar.gz: 278595e91fb77a7f0b1e9a439f21718c3c89c88d6cba2642cc15fc41f063c959
+  metadata.gz: e083ea939c0b8d617df7e7edd73baf1d56fa3b34898009596811ed7741fb7809
+  data.tar.gz: 5dc851d568aef47c267dcddfb6cdc4474887423c3d50a4904ce6b1536d57ca71
 SHA512:
-  metadata.gz: e23da17547129d300c21c3c4850994ff34f936feb65cfb06d102cca35051ed679d22c535f4e7d0edb9019687b7816c9e755b64f4cef871c063aa00a7d2fa615a
-  data.tar.gz: db90290bfcfa853afc27f4993ab87cf0bafe81b2ad094888b1dafb83664cb3837847f6e814211b22676ede0f4ed3f24debfe3ba56490d8efdb4b7450c3ba9ac5
+  metadata.gz: f1da2f9460ac88dd0b98170cba82383d9cde45d9b55ee3f0ab70a8ad73a8ea1aab9204e6babf225a7508f63d566162e11115f2da0b2449a4272e38d8e1ca6cb4
+  data.tar.gz: be40aee11d67c11c296ae6be6570cc6331660fd15091f6731c2c2345b4274482f7fca353889a80421ba40b5918e845ad442c6785b64647f46e877847b007bc7e

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

@@ -36,12 +36,13 @@ module VagrantPlugins
             end
           end
 
-          return ips
+          
         end
+        return ips
       end
 
       # https://stackoverflow.com/a/13586108/1902215
-      def get_OS
+      def get_os_binary
         return os ||= (host_os = RbConfig::CONFIG["host_os"]
                  case host_os
                when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
@@ -56,9 +57,9 @@ module VagrantPlugins
       end
 
       def get_cli
-        cli = get_OS
+        binary = get_os_binary
         path = File.expand_path(File.dirname(File.dirname(__FILE__))) + "/vagrant-goodhosts/bundle/"
-        path = "#{path}#{cli}"
+        path = "#{path}#{binary}"
 
         return path
       end
@@ -80,15 +81,6 @@ 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
 
@@ -97,11 +89,15 @@ module VagrantPlugins
         errorText = ""
         cli = get_cli
         hostnames_by_ips = generateHostnamesByIps
-        hostnames_by_ips.each do |hostnames, ip_address|
+        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, "a", ip_address, hostnames)
+            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, "a", 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
@@ -116,11 +112,15 @@ module VagrantPlugins
         errorText = ""
         cli = get_cli
         hostnames_by_ips = generateHostnamesByIps
-        hostnames_by_ips.each do |hostnames, ip_address|
+        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, "r", ip_address, hostnames)
+            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, "r", 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
@@ -153,7 +153,7 @@ module VagrantPlugins
             ip_address = ip
             hostnames[ip].each do |hostname|
               if !ip_address.nil?
-                @ui.info "[vagrant-goodhosts] - remove entry for: #{ip_address} #{hostname}"
+                @ui.info "[vagrant-goodhosts] - found entry for: #{ip_address} #{hostname}"
               end
             end
             hostnames_by_ips = { ip_address => hostnames[ip].join(" ") }
@@ -162,7 +162,7 @@ module VagrantPlugins
           ip_address = ips[0]
           hostnames[ip_address].each do |hostname|
             if !ip_address.nil?
-              @ui.info "[vagrant-goodhosts] - remove entry for: #{ip_address} #{hostname}"
+              @ui.info "[vagrant-goodhosts] - found entry for: #{ip_address} #{hostname}"
             end
           end
           hostnames_by_ips = { ip_address => hostnames[ip_address].join(" ") }

data/lib/vagrant-goodhosts/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GoodHosts
-    VERSION = '1.0.2'
+    VERSION = '1.0.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-goodhosts
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.8
 platform: ruby
 authors:
 - Daniele Scasciafratte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-11-03 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