vagrant-betterhosts 0.2.0 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eca3ca87fa47244989ff3f69adfa4eac5ac0793cc68d81b05ff1f77d053da052
-  data.tar.gz: 26bdb0c3f05e282baa1760849a65e7dfeaeba2ab267ab95a6916a6f5dd0f7c02
+  metadata.gz: 60bf7a7c9e9cc61760d6709cb16288e4365e86d609495ad885551e8e960a15b2
+  data.tar.gz: dadf8fa51c50cd6a52802717bb82407e1f2781354c844cf9935fb1b8ec9d9f7f
 SHA512:
-  metadata.gz: dc7655a442b2ba3aeee62349861c3ee0979e5f754ae8744a7925ff3b67ba184eb4dfc3c8784767332bbb6de080638b7a6b4bfd0b6e966c95305d3d2ee0923473
-  data.tar.gz: e4c5bf8a7ae014223a0d688d56c8ee5221dcc2ef813ff086b63e164239f0f139a6824ad47d130a7445c01bd8eb0f7ddfaa1da52bfc4c630313752118b4cd8ffd
+  metadata.gz: '099f622af619dcedf96c42f9496e45cb792cfda71c5128ccd18828ff5309aed13668268b8ef2b3cc015a159f5110b396a02b9210f5f15d98efbab0913e599bb3'
+  data.tar.gz: 037f1613518ec4f02f54f3898526e966edc6370d7ac4b05b20f0e40390dd740853c02f1874b8f205f772a80d6f70ac6ba4175ecc97e909bc2e6f5baa904a05ce

data/.rubocop.yml

@@ -0,0 +1,71 @@
+AllCops:
+  TargetRubyVersion: 2.5
+  Exclude:
+    - 'Gemfile'
+    - 'Rakefile'
+    - 'lib/vagrant-goodhosts/config.rb'
+
+Naming/FileName:
+    Enabled: false
+Naming/AccessorMethodName:
+    Enabled: false
+Metrics/MethodLength:
+    Enabled: false
+Metrics/PerceivedComplexity:
+    Enabled: false
+Metrics/ModuleLength:
+    Enabled: false
+Metrics/CyclomaticComplexity:
+    Enabled: false
+Metrics/AbcSize:
+    Enabled: false
+Style/AndOr:
+    Enabled: false
+Style/FrozenStringLiteralComment:
+    Enabled: false
+Style/RaiseArgs:
+    Enabled: false
+Layout/LineLength:
+    Enabled: false
+Style/StringLiterals:
+    Enabled: false
+Style/ExpandPathArguments:
+    Enabled: false
+Style/RedundantReturn:
+    Enabled: false
+Style/SymbolArray:
+    Enabled: false
+Style/ClassVars:
+    Enabled: false
+Style/YodaCondition:
+    Enabled: false
+Style/MethodCallWithoutArgsParentheses:
+    Enabled: false
+Style/NumericPredicate:
+    Enabled: false
+Style/ParallelAssignment:
+    Enabled: false
+Style/Not:
+    Enabled: false
+Style/EmptyLiteral:
+    Enabled: false
+Style/IfUnlessModifier:
+    Enabled: false
+Style/MutableConstant:
+    Enabled: false
+Style/SymbolLiteral:
+    Enabled: false
+Style/AccessorGrouping:
+    Enabled: false
+Style/Next:
+    Enabled: false
+Style/MultipleComparison:
+    Enabled: false
+Style/FormatStringToken:
+    Enabled: false
+Style/SoleNestedConditional:
+    Enabled: false
+Style/GuardClause:
+    Enabled: false
+Gemspec/RequiredRubyVersion:
+    Enabled: false

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.2
+ruby-3.2.2

data/Gemfile

@@ -1,9 +1,11 @@
 source "https://rubygems.org"
 
 group :development do
-  gem "vagrant", git: "https://github.com/hashicorp/vagrant.git"
+  gem "vagrant", git: "https://github.com/hashicorp/vagrant.git", branch: 'main'
 end
 
 group :plugins do
   gem "vagrant-betterhosts", path: "."
 end
+
+gem 'os'

data/Gemfile.lock

@@ -1,94 +1,114 @@
 GIT
   remote: https://github.com/hashicorp/vagrant.git
-  revision: 22795b161bf67a4c0ebbe32c9ce8777cb888c4a7
+  revision: 8004b9e001db13179e47b4b1895c0c88a1f59335
+  branch: main
   specs:
-    vagrant (2.2.11.dev)
-      bcrypt_pbkdf (~> 1.0.0)
-      childprocess (~> 4.0.0)
-      ed25519 (~> 1.2.4)
+    vagrant (2.3.8.dev)
+      bcrypt_pbkdf (~> 1.1)
+      childprocess (~> 4.1.0)
+      ed25519 (~> 1.3.0)
       erubi
+      googleapis-common-protos-types (~> 1.3)
+      grpc
       hashicorp-checkpoint (~> 0.1.5)
-      i18n (~> 1.8)
-      listen (~> 3.1)
+      i18n (~> 1.12)
+      ipaddr (>= 1.2.4)
+      listen (~> 3.7)
       log4r (~> 1.1.9, < 1.1.11)
-      mime (~> 0.4.4)
-      net-scp (~> 1.2.0)
-      net-sftp (~> 3.0)
-      net-ssh (~> 6.0)
+      mime-types (~> 3.3)
+      net-ftp (~> 0.2)
+      net-scp (~> 4.0)
+      net-sftp (~> 4.0)
+      net-ssh (~> 7.0)
       rb-kqueue (~> 0.2.0)
-      rest-client (>= 1.6.0, < 3.0)
-      ruby_dep (<= 1.3.1)
-      rubyzip (~> 2.0)
-      vagrant_cloud (~> 2.0.3)
-      wdm (~> 0.1.0)
-      winrm (>= 2.3.4, < 3.0)
-      winrm-elevated (>= 1.2.1, < 2.0)
-      winrm-fs (>= 1.3.4, < 2.0)
+      rexml (~> 3.2)
+      rgl (~> 0.5.10)
+      rubyzip (~> 2.3.2)
+      vagrant_cloud (~> 3.0.5)
+      wdm (~> 0.1.1)
+      winrm (>= 2.3.6, < 3.0)
+      winrm-elevated (>= 1.2.3, < 2.0)
+      winrm-fs (>= 1.3.5, < 2.0)
 
 PATH
   remote: .
   specs:
-    vagrant-betterhosts (0.2.0)
+    vagrant-betterhosts (1.1.6)
+      os (~> 0.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    bcrypt_pbkdf (1.0.1)
+    bcrypt_pbkdf (1.1.0)
     builder (3.2.4)
-    childprocess (4.0.0)
-    concurrent-ruby (1.1.9)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    ed25519 (1.2.4)
-    erubi (1.10.0)
-    ffi (1.15.1)
+    childprocess (4.1.0)
+    concurrent-ruby (1.2.2)
+    date (3.3.3)
+    ed25519 (1.3.0)
+    erubi (1.12.0)
+    excon (0.100.0)
+    ffi (1.15.5)
+    google-protobuf (3.23.4-x86_64-linux)
+    googleapis-common-protos-types (1.7.0)
+      google-protobuf (~> 3.14)
+    grpc (1.56.2-x86_64-linux)
+      google-protobuf (~> 3.23)
+      googleapis-common-protos-types (~> 1.0)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
       builder (>= 2.1.2)
+      rexml (~> 3.0)
     hashicorp-checkpoint (0.1.5)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    listen (3.5.1)
+    ipaddr (1.2.5)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
     log4r (1.1.10)
-    logging (2.3.0)
+    logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    mime (0.4.4)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    mime-types-data (3.2023.0218.1)
     multi_json (1.15.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-sftp (3.0.0)
-      net-ssh (>= 5.0.0, < 7.0.0)
-    net-ssh (6.1.0)
-    netrc (0.11.0)
+    net-ftp (0.2.0)
+      net-protocol
+      time
+    net-protocol (0.2.1)
+      timeout
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-ssh (7.1.0)
     nori (2.6.0)
-    rb-fsevent (0.11.0)
+    os (0.9.6)
+    pairing_heap (3.0.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rb-kqueue (0.2.6)
+    rb-kqueue (0.2.8)
       ffi (>= 0.5.0)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    ruby_dep (1.3.1)
+    rexml (3.2.5)
+    rgl (0.5.10)
+      pairing_heap (>= 0.3.0)
+      rexml (~> 3.2, >= 3.2.4)
+      stream (~> 0.5.3)
     rubyntlm (0.6.3)
-    rubyzip (2.3.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
-    vagrant_cloud (2.0.3)
-      rest-client (~> 2.0.2)
+    rubyzip (2.3.2)
+    stream (0.5.5)
+    time (0.2.2)
+      date
+    timeout (0.4.0)
+    vagrant_cloud (3.0.5)
+      excon (~> 0.73)
+      log4r (~> 1.1.10)
+      rexml (~> 3.2.5)
     wdm (0.1.1)
     winrm (2.3.6)
       builder (>= 2.1.2)
@@ -110,11 +130,12 @@ GEM
       winrm (~> 2.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
+  os
   vagrant!
   vagrant-betterhosts!
 
 BUNDLED WITH
-   2.1.4
+   2.4.10

data/README.md

@@ -91,20 +91,25 @@ This enable `vagrant-betterhosts` from running the clean command in every call.
 ## Suppressing prompts for elevating privileges
 
 These prompts exist to prevent anything that is being run by the user from inadvertently updating the hosts file.
+The command path is printed in red when there are errors with Vagrant eg. if the sudo password is entered incorrectly for 3 times.  
 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_betterhosts`.
-The command path is printed when there are errors with 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`.
+The command path is printed when there are errors with Vagrant, check the output marked in red.
 
 For Ubuntu and most Linux environments:
 
-    %sudo ALL=(root) NOPASSWD: [the-path]
+    %sudo ALL=(root) NOPASSWD: [the-command-path]
+
+An example complete:
+
+    %sudo ALL=(root) NOPASSWD: /home/user/sites/vvv/.vagrant/plugins/gems/3.1.2/gems/vagrant-goodhosts-1.1.6/lib/vagrant-goodhosts/bundle/cli_amd64_linux
 
 For MacOS:
 
-    %admin ALL=(root) NOPASSWD: [the-path]
+    %admin ALL=(root) NOPASSWD: [the-command-path]
 
 Replace in both %sudo/%admin with the username it if it is not working for you.
 
@@ -115,7 +120,7 @@ You have to open an elevated command prompt; hold `❖ Win` and press `X`, then
 
     cacls %SYSTEMROOT%\system32\drivers\etc\hosts /E /G %USERNAME%:W
 
-## Installing The Development Version
+## Generate The Development Version
 
 If you would like to install `vagrant-betterhosts` to make contributions or changes, run the following commands::
 
@@ -125,3 +130,7 @@ cd vagrant-betterhosts
 ./package.sh
 vagrant plugin install vagrant-betterhosts-*.gem
 ```
+
+## Test the plugin
+
+You need to run a Vagrant machine with the minimum settings specified in the [Usage](https://github.com/goodhosts/vagrant#usage) section, it is enough a turn on and off and in the meantime if the hosts file in your machine is written in the right way.

data/lib/vagrant-betterhosts/Action/BaseAction.rb

@@ -1,6 +1,8 @@
+# Action to extend for the plugin needs, detects if it was already executed etc
 module VagrantPlugins
   module BetterHosts
     module Action
+      # Extend it!
       class BaseAction
         include BetterHosts
 
@@ -35,10 +37,9 @@ module VagrantPlugins
           @app.call(env)
         end
 
-        def run(env)
+        def run(_env)
           raise NotImplementedError.new("Must be implemented!")
         end
-
       end
     end
   end

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

@@ -1,8 +1,9 @@
+# Run when is removing the hosts
 module VagrantPlugins
   module BetterHosts
     module Action
+      # Remove hosts
       class RemoveHosts < BaseAction
-
         def run(env)
           machine_action = env[:machine_action]
 
@@ -12,11 +13,9 @@ module VagrantPlugins
           if (%i[halt suspend].include? machine_action) && (false == @machine.config.goodhosts.remove_on_suspend)
             @ui.info '[vagrant-betterhosts] Removing hosts on suspend disabled'
           else
-            @ui.info '[vagrant-betterhosts] Removing hosts'
-            removeHostEntries
+            remove_host_entries
           end
         end
-
       end
     end
   end

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

@@ -1,13 +1,12 @@
+# Run when is adding hosts
 module VagrantPlugins
   module BetterHosts
     module Action
+      # Update hosts
       class UpdateHosts < BaseAction
-
-        def run(env)
-          @ui.info "[vagrant-betterhosts] Checking for host entries"
-          addHostEntries()
+        def run(_env)
+          add_host_entries()
         end
-
       end
     end
   end

data/lib/vagrant-betterhosts/BetterHosts.rb

@@ -1,12 +1,25 @@
+# The core of the plugin
 require "rbconfig"
 require "open3"
+require "resolv"
+require "os"
 
 module VagrantPlugins
   module BetterHosts
+    # Plugin module
     module BetterHosts
-      def getIps
+      def get_ips
         ips = []
 
+        if @machine.provider_name == :docker
+            @ui.info '[vagrant-betterhosts] Docker detected, adding 127.0.0.1 and ::1 IP addresses'
+            ip = "127.0.0.1"
+            ips.push(ip) unless ip.nil? or ips.include? ip
+            ip = "::1"
+            ips.push(ip) unless ip.nil? or ips.include? ip
+            return ips
+        end
+
         if @machine.config.vm.networks.length == 0
             @ui.error("[vagrant-betterhosts] No ip address found for this virtual machine")
             exit
@@ -14,59 +27,50 @@ module VagrantPlugins
         
         @machine.config.vm.networks.each do |network|
           key, options = network[0], network[1]
-          ip = options[:ip] if (key == :private_network || key == :public_network) && options[:betterhosts] != "skip"
-          ips.push(ip) if ip
           if options[:betterhosts] == "skip"
             @ui.info '[vagrant-betterhosts] Skipped adding host entries (config.vm.network betterhosts: "skip" is set)'
           end
-
-          @machine.config.vm.provider :hyperv do |v|
-            timeout = @machine.provider_config.ip_address_timeout
-            @ui.output("[vagrant-betterhosts] 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
-          end
-
-
+          ip = options[:ip] if (key == :private_network || key == :public_network) && options[:betterhosts] != "skip"
+          ips.push(ip) if ip
+        end
+        if @machine.provider_name == :hyperv
+          ip = @machine.provider.driver.read_guest_ip["ip"]
+          @ui.info "[vagrant-betterhosts] Read guest IP #{ip} from Hyper-V provider"
+          ips.push(ip) unless ip.nil? or ips.include? ip
         end
         return ips
       end
 
-      # https://stackoverflow.com/a/13586108/1902215
       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)
+        if OS.windows?
+          return 'cli.exe'
+        elsif OS.mac?
+          if Etc.uname[:version].include? 'ARM64'
+            return 'cli_arm64_osx'
+          else
+            return 'cli_amd64_osx'
+          end
+        elsif OS.linux?
+          if Etc.uname[:version].include? 'ARM64'
+            return 'cli_arm64_linux'
+          else
+            return 'cli_amd64_linux'
+          end
+        else
+          raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
+        end
       end
 
       def get_cli
         binary = get_os_binary
-        path = File.expand_path(File.dirname(File.dirname(__FILE__))) + "/vagrant-betterhosts/bundle/"
+        path = format('%s%s', File.expand_path(File.dirname(File.dirname(__FILE__))), "/vagrant-betterhosts/bundle/")
         path = "#{path}#{binary}"
 
         return path
       end
 
       # Get a hash of hostnames indexed by ip, e.g. { 'ip1': ['host1'], 'ip2': ['host2', 'host3'] }
-      def getHostnames(ips)
+      def get_hostnames(ips)
         hostnames = Hash.new { |h, k| h[k] = [] }
 
         case @machine.config.betterhosts.aliases
@@ -89,102 +93,150 @@ module VagrantPlugins
         hostnames
       end
 
-      def disableClean(ip_address)
+      def disable_clean(ip_address)
         unless ip_address.nil?
           return @machine.config.betterhosts.disable_clean
         end
         return true
       end
 
-      def addHostEntries
-        error = false
-        errorText = ""
+      def check_hostnames_to_add(ip_address, hostnames)
+        hostnames_to_add = Array.new
+        hostnames = hostnames.split
+        # check which hostnames actually need adding
+        hostnames.each do |hostname|
+          begin
+            address = Resolv.getaddress(hostname)
+            if address != ip_address
+              hostnames_to_add.append(hostname)
+            end
+          rescue StandardError => _e
+            hostnames_to_add.append(hostname)
+          end
+        rescue StandardError => _e
+          hostnames_to_add.append(hostname)
+        end
+        return hostnames_to_add.join(' ')
+      end
+
+      def add_betterhost_entries(ip_address, hostnames)
         cli = get_cli
-        hostnames_by_ips = generateHostnamesByIps
+        if cli.include? ".exe"
+          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 = 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, command
+      end
+
+      def add_host_entries
+        error = false
+        error_text = ''
+        command = ''
+        hostnames_by_ips = generate_hostnames_by_ips
         
-        return if not hostnames_by_ips.any?
+        return if hostnames_by_ips.none?
+
+        @ui.info "[vagrant-betterhosts] Checking for host entries"
 
         hostnames_by_ips.each do |ip_address, hostnames|
           if ip_address.nil?
             @ui.error "[vagrant-betterhosts] Error adding some hosts, no IP was provided for the following hostnames: #{hostnames}"
             next
           end
-          @ui.info "[vagrant-betterhosts] Adding #{hostnames} for address #{ip_address}"
-          if cli.include? ".exe"
-            clean = "\"--clean\","
-            if disableClean(ip_address)
-                clean = ''
-            end
-            stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", "Start-Process '#{cli}' -ArgumentList \"add\",#{clean}\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs")
-          else
-            clean = "--clean"
-            if disableClean(ip_address)
-                clean = ''
-            end
-            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo '#{cli}' add #{clean} #{ip_address} #{hostnames}")
-          end
-          if !wait_thr.value.success?
+
+          # filter out the hosts we've already added
+          hosts_to_add = check_hostnames_to_add(ip_address, hostnames)
+          next if hosts_to_add.empty?
+
+          _stdin, _stdout, stderr, wait_thr, command = add_betterhost_entries(ip_address, hosts_to_add)
+          unless wait_thr.value.success?
             error = true
-            errorText = stderr.read.strip
+            error_text = stderr.read.strip
           end
         end
-        printReadme(error, errorText)
+        print_readme(error, error_text, command)
       end
 
-      def removeHostEntries
-        error = false
-        errorText = ""
+      def remove_betterhost_entries(ip_address, hostnames)
         cli = get_cli
-        hostnames_by_ips = generateHostnamesByIps
+        if cli.include? ".exe"
+          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
+          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, command
+      end
+
+      def remove_host_entries
+        error = false
+        error_text = ''
+        command = ''
+        hostnames_by_ips = generate_hostnames_by_ips
 
-        return if not hostnames_by_ips.any?
+        return if hostnames_by_ips.none?
+
+        @ui.info "[vagrant-betterhosts] Removing hosts"
 
         hostnames_by_ips.each do |ip_address, hostnames|
           if ip_address.nil?
             @ui.error "[vagrant-betterhosts] Error adding some hosts, no IP was provided for the following hostnames: #{hostnames}"
             next
           end
-          if cli.include? ".exe"
-            clean = "\"--clean\","
-            if disableClean(ip_address)
-                clean = ''
-            end
-            stdin, stdout, stderr, wait_thr = Open3.popen3("powershell", "-Command", "Start-Process '#{cli}' -ArgumentList \"remove\",#{clean}\"#{ip_address}\",\"#{hostnames}\" -Verb RunAs")
-          else
-            clean = "\"--clean\","
-            if disableClean(ip_address)
-                clean = ''
-            end
-            stdin, stdout, stderr, wait_thr = Open3.popen3("sudo '#{cli}' remove #{clean} #{ip_address} #{hostnames}")
-          end
-          if !wait_thr.value.success?
+
+          _stdin, _stdout, stderr, wait_thr, command = remove_betterhost_entries(ip_address, hostnames)
+          unless wait_thr.value.success?
             error = true
-            errorText = stderr.read.strip
+            error_text = stderr.read.strip
           end
         end
-        printReadme(error, errorText)
+        print_readme(error, error_text, command)
       end
 
-      def printReadme(error, errorText)
-        if error
-          cli = get_cli
-          @ui.error "[vagrant-betterhosts] Issue executing goodhosts CLI: #{errorText}"
-          @ui.error "[vagrant-betterhosts] Cli path: #{cli}"
-          if cli.include? ".exe"
-            @ui.error "[vagrant-betterhosts] Check the readme at https://github.com/ajxb/vagrant-betterhosts#windows-uac-prompt"
-            exit
-          else
-            @ui.error "[vagrant-betterhosts] Check the readme at https://github.com/ajxb/vagrant-betterhosts#passwordless-sudo"
-          end
+      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
+          @ui.info "[vagrant-betterhosts] Finished processing"
+          return false
+        end
+
+        cli = get_cli
+        @ui.error "[vagrant-betterhosts] Issue executing goodhosts CLI: #{error_text}"
+        @ui.error "[vagrant-betterhosts] Command: #{command}"
+        @ui.error "[vagrant-betterhosts] Cli path: #{cli}"
+        if cli.include? ".exe"
+          @ui.error "[vagrant-betterhosts] Check the readme at https://github.com/betterhosts/vagrant#windows-uac-prompt"
+          exit
+        else
+          @ui.error "[vagrant-betterhosts] Check the readme at https://github.com/betterhosts/vagrant#passwordless-sudo"
         end
       end
 
-      def generateHostnamesByIps()
-        ips = getIps
+      def generate_hostnames_by_ips
+        ips = get_ips
         return [] unless ips.any?
 
         hostnames_by_ips = {}
-        hostnames = getHostnames(ips)
+        hostnames = get_hostnames(ips)
         ips.each do |ip|
           hostnames_by_ips[ip] = hostnames[ip].join(' ') if hostnames[ip].any?
         end

data/lib/vagrant-betterhosts/config.rb

@@ -2,6 +2,7 @@ require "vagrant"
 
 module VagrantPlugins
   module BetterHosts
+    # Vagrant plugin definition
     class Config < Vagrant.plugin("2", :config)
       attr_accessor :aliases
       attr_accessor :id

data/lib/vagrant-betterhosts/plugin.rb

@@ -5,6 +5,7 @@ require_relative "Action/RemoveHosts"
 
 module VagrantPlugins
   module BetterHosts
+    # Various Vagrant hooks
     class Plugin < Vagrant.plugin('2')
       name 'BetterHosts'
       description <<-DESC
@@ -21,20 +22,24 @@ module VagrantPlugins
         hook.append(Action::UpdateHosts)
       end
 
+      action_hook(:betterhosts, :machine_action_boot) do |hook|
+        hook.append(Action::UpdateHosts)
+      end
+
       action_hook(:betterhosts, :machine_action_provision) do |hook|
         hook.before(Vagrant::Action::Builtin::Provision, Action::UpdateHosts)
       end
 
       action_hook(:betterhosts, :machine_action_halt) do |hook|
-        hook.append(Action::RemoveHosts)
+        hook.prepend(Action::RemoveHosts)
       end
 
       action_hook(:betterhosts, :machine_action_suspend) do |hook|
-        hook.append(Action::RemoveHosts)
+        hook.prepend(Action::RemoveHosts)
       end
 
       action_hook(:betterhosts, :machine_action_destroy) do |hook|
-        hook.append(Action::RemoveHosts)
+        hook.prepend(Action::RemoveHosts)
       end
 
       action_hook(:betterhosts, :machine_action_reload) do |hook|

data/lib/vagrant-betterhosts/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module BetterHosts
-    VERSION = '0.2.0'
+    VERSION = '1.1.6'
   end
 end

data/lib/vagrant-betterhosts.rb

@@ -1,11 +1,13 @@
+# Root file of the plugin
 require "vagrant-betterhosts/version"
 require "vagrant-betterhosts/plugin"
 
+# Extend Vagrant Plugins
 module VagrantPlugins
+  # Load our plugin
   module BetterHosts
     def self.source_root
       @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
   end
 end
-

data/package.sh

@@ -5,9 +5,11 @@ cd ./lib/vagrant-betterhosts/bundle
 # Download
 curl -s https://api.github.com/repos/goodhosts/cli/releases/latest | jq --raw-output '.assets[] | .browser_download_url' | xargs wget -i
 # Extract
-tar -zxvf goodhosts_darwin_amd64.tar.gz goodhosts && mv goodhosts cli_osx
-tar -zxvf goodhosts_linux_amd64.tar.gz goodhosts && mv goodhosts cli
-tar -zxvf goodhosts_windows_amd64.tar.gz goodhosts.exe && mv goodhosts.exe cli.exe
+tar -zxvf goodhosts-1.1.0-darwin-amd64.tar.gz goodhosts && mv goodhosts cli_amd64_osx
+tar -zxvf goodhosts-1.1.0-darwin-arm64.tar.gz goodhosts && mv goodhosts cli_arm64_osx
+tar -zxvf goodhosts-1.1.0-linux-amd64.tar.gz goodhosts && mv goodhosts cli_amd64_linux
+tar -zxvf goodhosts-1.1.0-linux-arm64.tar.gz goodhosts && mv goodhosts cli_arm64_linux
+tar -zxvf goodhosts-1.1.0-windows-amd64.tar.gz goodhosts.exe && mv goodhosts.exe cli.exe
 rm -f ./*.tar.gz
 rm -f ./*.txt
 # Generate

data/vagrant-betterhosts.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/ajxb/vagrant-betterhosts'
   s.license       = 'MIT'
 
-  s.required_ruby_version = "~> 2.5", "< 2.8"
+  s.required_ruby_version     = ">= 2.5"
   s.files                 = `git ls-files`.split($/)
   s.files                += Dir.glob("lib/vagrant-betterhosts/bundle/*")
   s.executables           = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -23,4 +23,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake', '~> 13.0'
+
+  s.add_runtime_dependency 'os', '~> 0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-betterhosts
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.1.6
 platform: ruby
 authors:
 - Adam Butler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-19 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: Enables Vagrant to update hosts file on the host machine using the goodhosts
   cli tool
 email:
@@ -52,6 +66,7 @@ files:
 - ".idea/modules.xml"
 - ".idea/vagrant-betterhosts.iml"
 - ".idea/vcs.xml"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - Gemfile
@@ -64,9 +79,11 @@ files:
 - lib/vagrant-betterhosts/Action/RemoveHosts.rb
 - lib/vagrant-betterhosts/Action/UpdateHosts.rb
 - lib/vagrant-betterhosts/BetterHosts.rb
-- lib/vagrant-betterhosts/bundle/cli
 - lib/vagrant-betterhosts/bundle/cli.exe
-- lib/vagrant-betterhosts/bundle/cli_osx
+- lib/vagrant-betterhosts/bundle/cli_amd64_linux
+- lib/vagrant-betterhosts/bundle/cli_amd64_osx
+- lib/vagrant-betterhosts/bundle/cli_arm64_linux
+- lib/vagrant-betterhosts/bundle/cli_arm64_osx
 - lib/vagrant-betterhosts/config.rb
 - lib/vagrant-betterhosts/plugin.rb
 - lib/vagrant-betterhosts/version.rb
@@ -82,19 +99,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '2.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin to manage the hosts file on the host machine