vagrant-goodhosts 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56e892a7cfa68be113df9fb991f5fa52d72e2bc450ead6e1c75b6ef7ad569cb5
-  data.tar.gz: 53ee630010bc772f0fc7825e0e4ef25a32973d6d82ac0a6eec75a2854b8ed7dc
+  metadata.gz: b6661999d4e2dfba792e5a925f4674cca24b6b3e523b8f2b3427933ce09570c6
+  data.tar.gz: c869c926f280627a4198f8cebcfe47aefffc24e1993e6558a637726d0471dd1a
 SHA512:
-  metadata.gz: 84e845186cdf8f2458c325cba423ac735c1f1099ac72a9bb86717fa9d199f394159f6a2befe9c76a14eeefcbabf5d39953353f2faedd0d37aec66db092a798da
-  data.tar.gz: 407011091f694bbdc4fe85708ec3b11277f2c5be004fb5dfdeccab8eb1d905d0a73bc132f64a8e06653e2ca7ac2af1b699321b0388659e107541a5e7bbbf06a6
+  metadata.gz: ee107d64bdd466fe0d96778dff5f71a9783ebe0e77392909eb0e7f041941fe436987c39a1d1967b89ef4922aed18ae579c117677c5c3b0e08e276be318d3e1e0
+  data.tar.gz: 5ccb050a4ff37df1db7c0ba61788cf1149d28c6b05d9e470e91263538c3ef9c287ac1777f03500f84ae205c3460ac1793aed94e49bc0506dc4f057501d9230df

data/README.md

@@ -78,6 +78,15 @@ config.goodhosts.remove_on_suspend = false
 
 This disables `vagrant-goodhosts` from running on **suspend** and **halt**.
 
+### Disable file hosts clean
+
+If you don't want `/etc/hosts` file cleaned add in your `VagrantFile`:
+
+```ruby
+config.goodhosts.disable_clean = true
+```
+
+This disables `vagrant-goodhosts` from running the clean command.
 
 ## Suppressing prompts for elevating privileges
 

data/lib/vagrant-goodhosts/GoodHosts.rb

@@ -79,25 +79,38 @@ module VagrantPlugins
 
         return hostnames
       end
+      
+      def shouldClean(ip_address)
+        unless ip_address.nil?
+          return @machine.config.goodhosts.disable_clean
+        end
+        return true
+      end
 
       def addHostEntries
         error = false
         errorText = ""
         cli = get_cli
         hostnames_by_ips = generateHostnamesByIps
-
-        return if hostnames_by_ips.empty?
+        
+        return if not hostnames_by_ips.any?
 
         hostnames_by_ips.each do |ip_address, hostnames|
-          next if hostnames.empty?
           if ip_address.nil?
             @ui.error "[vagrant-goodhosts] Error adding some hosts, no IP was provided for the following hostnames: #{hostnames}"
             next
           end
+          clean  = ''
           if cli.include? ".exe"
-            stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", "Start-Process '#{cli}' -ArgumentList \"add\",\"--clean\",\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs")
+            if not shouldClean(ip_address)
+              clean = "\"--clean\","
+            end
+            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, "add", "--clean", ip_address, hostnames)
+            if not shouldClean(ip_address)
+              clean = "--clean"
+            end
+            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo", cli, "add", clean, ip_address, hostnames)
           end
           if !wait_thr.value.success?
             error = true
@@ -113,18 +126,23 @@ module VagrantPlugins
         cli = get_cli
         hostnames_by_ips = generateHostnamesByIps
 
-        return if hostnames_by_ips.empty?
+        return if not hostnames_by_ips.any?
 
         hostnames_by_ips.each do |ip_address, hostnames|
-          next if hostnames.empty?
           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("powershell", "-Command", "Start-Process '#{cli}' -ArgumentList \"remove\",\"--clean\",\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs")
+            if not shouldClean(ip_address)
+              clean = "\"--clean\","
+            end
+            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, "remove", "--clean", ip_address, hostnames)
+            if not shouldClean(ip_address)
+              clean = "--clean"
+            end
+            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo", cli, "remove", clean, ip_address, hostnames)
           end
           if !wait_thr.value.success?
             error = true

data/lib/vagrant-goodhosts/config.rb

@@ -6,6 +6,11 @@ module VagrantPlugins
         attr_accessor :aliases
         attr_accessor :id
         attr_accessor :remove_on_suspend
+        attr_accessor :disable_clean
+        
+        def initialize
+            @disable_clean = false
+        end
     end
   end
 end

data/lib/vagrant-goodhosts/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GoodHosts
-    VERSION = '1.0.9'
+    VERSION = '1.0.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-goodhosts
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Daniele Scasciafratte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-01-18 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.2.0.rc.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to update hosts file on the host machine with goodhosts