vagrant-goodhosts 1.0.4 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d08aeb238e55a6b9c10399ed2bb6cdf227e223bbde08e4a6dfb11366e67e5ee
-  data.tar.gz: 59169325206bd3f62a0b040d259fe14dc42dd3fa310822e5bccd4fc04beb15c0
+  metadata.gz: b6661999d4e2dfba792e5a925f4674cca24b6b3e523b8f2b3427933ce09570c6
+  data.tar.gz: c869c926f280627a4198f8cebcfe47aefffc24e1993e6558a637726d0471dd1a
 SHA512:
-  metadata.gz: 4be9ec9e1d21b768de7c7a711f49daebec9606d28bdaf0a897f6deacb45faa76c1c6aec786a1701f119b5e6f4a4152a39315b58bfef77e9fd6dfa14744656519
-  data.tar.gz: 2a3e60b74d59745cea020b37dbd946ab0a1a14cbd77041727b20c0f55d9879871704512540578cbe8a247a86d55608c72692b016b061438569d231d4606e14b8
+  metadata.gz: ee107d64bdd466fe0d96778dff5f71a9783ebe0e77392909eb0e7f041941fe436987c39a1d1967b89ef4922aed18ae579c117677c5c3b0e08e276be318d3e1e0
+  data.tar.gz: 5ccb050a4ff37df1db7c0ba61788cf1149d28c6b05d9e470e91263538c3ef9c287ac1777f03500f84ae205c3460ac1793aed94e49bc0506dc4f057501d9230df

data/.gitignore

@@ -1,16 +1,35 @@
+# OS-specific
+.DS_Store
+
+# editors
+*.swp
+
+# Bundler/Rubygems
 *.gem
+.bundle
+pkg/*
+tags
+Gemfile.lock
+
+# Vagrant
+.vagrant
+Vagrantfile
+!example_box/Vagrantfile
+
+# RVM files for gemset/ruby setting
+.ruby-*
+.rvmrc
+
 .idea
 *.rbc
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
 doc/
 lib/bundler/man
-pkg
 rdoc
 spec/reports
 test/tmp

data/Gemfile

@@ -1,9 +1,9 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 group :development do
-  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.6.2'
+  gem "vagrant", git: "https://github.com/hashicorp/vagrant.git"
 end
 
 group :plugins do
-  gemspec
-end
+  gem "vagrant-goodhosts", path: "."
+end

data/README.md

@@ -1,10 +1,10 @@
 # Vagrant::Goodhosts
 
-This vagrant plugin adds host file entries to the host pointing to the guest VM, using the [GoodHosts](https://github.com/goodhosts/cli) cli tool. This plugin is based on [vagrant-hostsupdater](https://github.com/cogitatio/vagrant-hostsupdater) and aims to be compatible with the same config parameters.  
+This vagrant plugin adds host file entries to the host pointing to the guest VM, using the [GoodHosts](https://github.com/goodhosts/cli) cli tool. This plugin is based on [vagrant-hostsupdater](https://github.com/cogitatio/vagrant-hostsupdater) and aims to be compatible with the same config parameters.
 
 On **up**, **resume** and **reload** commands, it tries to add the hosts if they do not already exist in your hosts file. If it needs to be added, you will be asked for the `sudo` password to make the necessary edits.
 
-On **halt**, **destroy**, and **suspend**, those entries will be removed again. By setting the `config.goodhosts.remove_on_suspend  = false`, **suspend** and **halt** will not remove them. 
+On **halt**, **destroy**, and **suspend**, those entries will be removed again. By setting the `config.goodhosts.remove_on_suspend  = false`, **suspend** and **halt** will not remove them.
 
 ## Installation
 
@@ -38,7 +38,7 @@ This IP address and the hostname will be used for the entry in the `/etc/hosts`
 
 ### vagrant-hostsupdater conflicts
 
-The original plugin has the issue of be executed in any vagrant environment, also that is not using and will add a rule in the hosts file that is not generated by this one.  
+The original plugin has the issue of be executed in any vagrant environment, also that is not using and will add a rule in the hosts file that is not generated by this one.
 To avoid issues is better to remove that plugin and in case update accordingly the Vagrantfile if use it. Require just a change of the reference of the plugin name as the example above.
 
 ### Multiple private network adapters
@@ -78,15 +78,24 @@ 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
 
-These prompts exist to prevent anything that is being run by the user from inadvertently updating the hosts file. 
+These prompts exist to prevent anything that is being run by the user from inadvertently updating the hosts file.
 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`.  
+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.
 
 For Ubuntu and most Linux environments:
@@ -96,15 +105,15 @@ 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
 
-You can use `cacls` or `icacls` to grant your user account permanent write permission to the system's hosts file. 
+You can use `cacls` or `icacls` to grant your user account permanent write permission to the system's hosts file.
 You have to open an elevated command prompt; hold `❖ Win` and press `X`, then choose "Command Prompt (Admin)"
 
-    cacls %SYSTEMROOT%\system32\drivers\etc\hosts /E /G %USERNAME%:W 
+    cacls %SYSTEMROOT%\system32\drivers\etc\hosts /E /G %USERNAME%:W
 
 ## Installing The Development Version
 
@@ -113,7 +122,6 @@ If you would like to install `vagrant-goodhosts` to make contributions or change
 ```shell
 git clone https://github.com/goodhosts/vagrant vagrant-goodhosts
 cd vagrant-goodhosts
-git checkout develop
 ./package.sh
 vagrant plugin install vagrant-goodhosts-*.gem
 ```

data/Rakefile

@@ -1,3 +1,14 @@
 require 'rubygems'
 require 'bundler/setup'
+
+# Immediately sync all stdout so that tools like buildbot can
+# immediately load in the output.
+$stdout.sync = true
+$stderr.sync = true
+
+# Change to the directory of this file.
+Dir.chdir(File.expand_path("../", __FILE__))
+
+# This installs the tasks that help with gem creation and
+# publishing.
 Bundler::GemHelper.install_tasks

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

@@ -3,6 +3,7 @@ module VagrantPlugins
     module Action
       class RemoveHosts
         include GoodHosts
+        @@updated = false
 
         def initialize(app, env)
           @app = app
@@ -14,11 +15,14 @@ module VagrantPlugins
           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"
+              unless @@updated
+                @@updated = true
+                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
             end
           end

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

@@ -4,7 +4,7 @@ module VagrantPlugins
     module Action
       class UpdateHosts
         include GoodHosts
-
+        @@updated = false
 
         def initialize(app, env)
           @app = app
@@ -13,8 +13,11 @@ module VagrantPlugins
         end
 
         def call(env)
-          @ui.info "[vagrant-goodhosts] Checking for host entries"
-          addHostEntries()
+          unless @@updated
+            @@updated = true
+            @ui.info "[vagrant-goodhosts] Checking for host entries"
+            addHostEntries()
+          end
           @app.call(env)
         end
 

data/lib/vagrant-goodhosts/GoodHosts.rb

@@ -5,10 +5,6 @@ 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"
-        end
-
         ips = []
 
         @machine.config.vm.networks.each do |network|
@@ -16,7 +12,7 @@ module VagrantPlugins
           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)'
+            @ui.info '[vagrant-goodhosts] Skipped adding host entries (config.vm.network goodhosts: "skip" is set)'
           end
 
           @machine.config.vm.provider :hyperv do |v|
@@ -36,7 +32,7 @@ module VagrantPlugins
             end
           end
 
-          
+
         end
         return ips
       end
@@ -81,32 +77,40 @@ 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 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 not hostnames_by_ips.any?
+
         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
+          clean  = ''
           if cli.include? ".exe"
-            stdin, stdout, stderr, wait_thr = Open3.popen3(cli, "add", ip_address, hostnames)
+            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", 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
@@ -121,15 +125,24 @@ module VagrantPlugins
         errorText = ""
         cli = get_cli
         hostnames_by_ips = generateHostnamesByIps
+
+        return if not hostnames_by_ips.any?
+
         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", ip_address, hostnames)
+            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", 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
@@ -156,25 +169,32 @@ module VagrantPlugins
       def generateHostnamesByIps()
         hostnames_by_ips = []
         ips = getIps
+        if ips.count() < 1
+          return hostnames_by_ips
+        end
         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}"
+            if hostnames[ip].count() > 1
+              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
-            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}"
+          if hostnames[ip_address].count() > 1
+            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
-          hostnames_by_ips = { ip_address => hostnames[ip_address].join(" ") }
         end
 
         return hostnames_by_ips

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.4'
+    VERSION = '1.0.10'
   end
 end

data/vagrant-goodhosts.gemspec

@@ -3,22 +3,23 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vagrant-goodhosts/version'
 
-Gem::Specification.new do |spec|
-  spec.name          = 'vagrant-goodhosts'
-  spec.version       = VagrantPlugins::GoodHosts::VERSION
-  spec.authors       = ['Daniele Scasciafratte']
-  spec.email         = ['mte90net@gmail.com']
-  spec.description   = %q{Enables Vagrant to update hosts file on the host machine with goodhosts}
-  spec.summary       = spec.description
-  spec.homepage      = 'https://github.com/goodhosts/vagrant'
-  spec.license       = 'MIT'
+Gem::Specification.new do |s|
+  s.name          = 'vagrant-goodhosts'
+  s.version       = VagrantPlugins::GoodHosts::VERSION
+  s.platform      = Gem::Platform::RUBY
+  s.authors       = ['Daniele Scasciafratte']
+  s.email         = ['mte90net@gmail.com']
+  s.description   = "Enables Vagrant to update hosts file on the host machine with goodhosts"
+  s.summary       = s.description
+  s.homepage      = 'https://github.com/goodhosts/vagrant'
+  s.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
-  spec.files     += Dir.glob("lib/vagrant-goodhosts/bundle/*")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  s.files         = `git ls-files`.split($/)
+  s.files        += Dir.glob("lib/vagrant-goodhosts/bundle/*")
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
+  s.add_development_dependency 'bundler', '~> 1.3'
+  s.add_development_dependency 'rake'
 end

metadata

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