vagrant-goodhosts 1.1.0beta → 1.1.0beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f6a0225da423c0c803dacaeb97182e8768510d601db33c182a088733d282f60
-  data.tar.gz: f2756ce326a5d766baa4fd63f5d4d158c13fb0591c88a9763dc6e9846b377bbc
+  metadata.gz: 58cfe3e3e7669fb2b8bf147db6786a38f6b94b8d4164460852872a007d2df40c
+  data.tar.gz: c5131a3c95e03d98a182092138ad55b1df1ae9cbe66ef7ad2800a2e3721b0d97
 SHA512:
-  metadata.gz: 11d1c0937d56326ebbd390adc477c8c047b6422f0c81c21ad454d297992876941267102811acbc7e7e32e960a2feb2767d055f086a4461b8f6008cd1b81d0581
-  data.tar.gz: 528d8f7ff5b81d8a377530a628710ef62ae4432790099f3c8a4673c01e2c3d1ef4032181680e63bc5cd49f8925d01374ed3d8ae919a09bd2849ad0def44022d2
+  metadata.gz: a6d3be03ecd50f179a01380ccda77aaddeddc943d324179e750777222c1b974c50186492d9753bdc8c3ae47da032363fcde0862a045c4fa741fe3335d8c26077
+  data.tar.gz: 4fd89f66e460df2accaf9ceae0ed8736b257dfde7e3b1f19cb8a65877e62f87d14d88421c4a98141a371b4aaf0170843555a4bd07e96976c6b60f2923d088925

data/lib/vagrant-goodhosts/GoodHosts.rb

@@ -110,24 +110,21 @@ module VagrantPlugins
       def add_goodhost_entries(ip_address, hostnames)
         cli = get_cli
         if cli.include? ".exe"
-          clean = "\"--clean\","
-          if disable_clean(ip_address)
-            clean = ''
-          end
-          stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", "Start-Process '#{cli}' -ArgumentList \"add\",#{clean}\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs")
+          clean = get_clean_parameter_by_system(ip_address, true)
+          command = "Start-Process '#{cli}' -ArgumentList \"add\",#{clean}\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs"
+          stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", command)
         else
-          clean = "--clean"
-          if disable_clean(ip_address)
-            clean = ''
-          end
-          stdin, stdout, stderr, wait_thr = Open3.popen3("sudo '#{cli}' add #{clean} #{ip_address} #{hostnames}")
+          clean = get_clean_parameter_by_system(ip_address, false)
+          command = "sudo '#{cli}' add #{clean} #{ip_address} #{hostnames}"
+          stdin, stdout, stderr, wait_thr = Open3.popen3(command)
         end
-        return stdin, stdout, stderr, wait_thr
+        return stdin, stdout, stderr, wait_thr, command
       end
 
       def add_host_entries
         error = false
-        error_text = ""
+        error_text = ''
+        command = ''
         hostnames_by_ips = generate_hostnames_by_ips
 
         return if hostnames_by_ips.none?
@@ -144,32 +141,33 @@ module VagrantPlugins
           hosts_to_add = check_hostnames_to_add(ip_address, hostnames)
           next if hosts_to_add.none?
 
-          _stdin, _stdout, stderr, wait_thr = add_goodhost_entries(ip_address, hosts_to_add)
+          _stdin, _stdout, stderr, wait_thr, command = add_goodhost_entries(ip_address, hosts_to_add)
           unless wait_thr.value.success?
             error = true
             error_text = stderr.read.strip
           end
         end
-        print_readme(error, error_text)
+        print_readme(error, error_text, command)
       end
 
       def remove_goodhost_entries(ip_address, hostnames)
         cli = get_cli
-        clean = "\"--clean\","
-        if disable_clean(ip_address)
-          clean = ''
-        end
         if cli.include? ".exe"
-          stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", "Start-Process '#{cli}' -ArgumentList \"remove\",#{clean}\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs")
+          clean = get_clean_parameter_by_system(ip_address, true)
+          command = "Start-Process '#{cli}' -ArgumentList \"remove\",#{clean}\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs"
+          stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", command)
         else
-          stdin, stdout, stderr, wait_thr = Open3.popen3("sudo '#{cli}' remove #{clean} #{ip_address} #{hostnames}")
+          clean = get_clean_parameter_by_system(ip_address, false)
+          command = "sudo '#{cli}' remove #{clean} #{ip_address} #{hostnames}"
+          stdin, stdout, stderr, wait_thr = Open3.popen3(command)
         end
-        return stdin, stdout, stderr, wait_thr
+        return stdin, stdout, stderr, wait_thr, command
       end
 
       def remove_host_entries
         error = false
-        error_text = ""
+        error_text = ''
+        command = ''
         hostnames_by_ips = generate_hostnames_by_ips
 
         return if hostnames_by_ips.none?
@@ -182,22 +180,35 @@ module VagrantPlugins
             next
           end
 
-          _stdin, _stdout, stderr, wait_thr = remove_goodhost_entries(ip_address, hostnames)
+          _stdin, _stdout, stderr, wait_thr, command = remove_goodhost_entries(ip_address, hostnames)
           unless wait_thr.value.success?
             error = true
             error_text = stderr.read.strip
           end
         end
-        print_readme(error, error_text)
+        print_readme(error, error_text, command)
       end
 
-      def print_readme(error, error_text)
+      def get_clean_parameter_by_system(ip_address, is_win)
+        clean = "--clean"
+        if is_win
+          clean = "\"--clean\","
+        end
+
+        if disable_clean(ip_address)
+          clean = ''
+        end
+        return clean
+      end
+
+      def print_readme(error, error_text, command)
         unless error
           return false
         end
 
         cli = get_cli
         @ui.error "[vagrant-goodhosts] Issue executing goodhosts CLI: #{error_text}"
+        @ui.error "[vagrant-goodhosts] Command: #{command}"
         @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"
@@ -207,6 +218,18 @@ module VagrantPlugins
         end
       end
 
+      def append_hostsnames_by_ips(hostnames_by_ips, hostnames, ip_address, ip_index)
+        if hostnames[ip_index].count() > 0
+          hostnames[ip_index].each do |hostname|
+            unless ip_address.nil?
+              @ui.info "[vagrant-goodhosts] - found entry for: #{ip_address} #{hostname}"
+            end
+          end
+          hostnames_by_ips = { ip_address => hostnames[ip_index].join(" ") }
+        end
+        return hostnames_by_ips
+      end
+
       def generate_hostnames_by_ips
         hostnames_by_ips = []
         ips = get_ips
@@ -218,25 +241,11 @@ module VagrantPlugins
         if ips.count() > 1
           ips.each do |ip|
             ip_address = ip
-            if hostnames[ip].count() > 0
-              hostnames[ip].each do |hostname|
-                unless ip_address.nil?
-                  @ui.info "[vagrant-goodhosts] - found entry for: #{ip_address} #{hostname}"
-                end
-              end
-              hostnames_by_ips = { ip_address => hostnames[ip].join(" ") }
-            end
+            hostnames_by_ips = append_hostsnames_by_ips(hostnames_by_ips, hostnames, ip_address, ip)
           end
         else
           ip_address = ips[0]
-          if hostnames[ip_address].count() > 0
-            hostnames[ip_address].each do |hostname|
-              unless 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
+          hostnames_by_ips = append_hostsnames_by_ips(hostnames_by_ips, hostnames, ip_address, ip_address)
         end
 
         return hostnames_by_ips

data/lib/vagrant-goodhosts/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GoodHosts
-    VERSION = '1.1.0beta'
+    VERSION = '1.1.0beta2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-goodhosts
 version: !ruby/object:Gem::Version
-  version: 1.1.0beta
+  version: 1.1.0beta2
 platform: ruby
 authors:
 - Daniele Scasciafratte