vagrant-goodhosts 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45d903470fa6dcb3da784a7cf514e2657f0b8fcabf240dcc27b62c3cb392d3af
-  data.tar.gz: a42fca228267c92d706eacfc5bc335954975e3ac13611a8e4199830f3ec0a50f
+  metadata.gz: f01c22f92849382e5c320c60266b1c5f4cafe4f22f4dfa1675354d15244a4566
+  data.tar.gz: 5519bd1c50e50739e42f096be5744901e023e0dd3ef4b3d2bef6f70ea3212094
 SHA512:
-  metadata.gz: c64e57715871cd38e54cc485ec672bc7d34c9e9b8ba79ad269741926122953958abc543ef69ef5fb73d691d5be192ba59b29c09af56d294384f707e956c599e6
-  data.tar.gz: 5eb7a176fa5cfdc3dfc39dfb5aca3b17dcb9c595088186c8a00e5e26fdd618e42e0bae8e4a6b90149974af1f1177c2e6ca8fa15650adffb6d1372ec23115bae7
+  metadata.gz: e5f38bb5c477970b055e595466e507b9f990ab8bfe355421f162e203edefba8b8c90ae05da25baa78a3b31f8018f73e58c325d11117eba5d3ae68fce14759fb9
+  data.tar.gz: 698212cce5999610ed8e20e8fb90bfb65a44f65132b6f493a176d77109da20346780db40faf8da470b9a19c870bc3647ec98011baf5e5026a2b102a0fa5de9d1

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  TargetRubyVersion: 2.5
   Exclude:
     - 'Gemfile'
     - 'Rakefile'

data/lib/vagrant-goodhosts/GoodHosts.rb

@@ -10,12 +10,6 @@ module VagrantPlugins
     module GoodHosts
       def get_ips
         ips = []
-
-        if @machine.config.vm.networks.empty?
-          @ui.error("[vagrant-goodhosts] No networks are available yet for this virtual machine to add IP/hosts for")
-          return ips
-        end
-
         @machine.config.vm.networks.each do |network|
           key, options = network[0], network[1]
           if options[:goodhosts] == "skip"
@@ -23,23 +17,11 @@ module VagrantPlugins
           end
           ip = options[:ip] if (key == :private_network || key == :public_network) && options[:goodhosts] != "skip"
           ips.push(ip) if ip
-
-          @machine.config.vm.provider :hyperv do
-            timeout = @machine.provider_config.ip_address_timeout
-            @ui.output("[vagrant-goodhosts] 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
+        end
+        if @machine.provider_name == :hyperv
+          ip = @machine.provider.driver.read_guest_ip["ip"]
+          @ui.info "[vagrant-goodhosts] Read guest IP #{ip} from Hyper-V provider"
+          ips.push(ip) unless ip.nil? or ips.include? ip
         end
         return ips
       end
@@ -105,8 +87,12 @@ module VagrantPlugins
         hostnames = hostnames.split
         # check which hostnames actually need adding
         hostnames.each do |hostname|
-          address = Resolv.getaddress(hostname)
-          if address != ip_address
+          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

data/lib/vagrant-goodhosts/plugin.rb

@@ -31,15 +31,15 @@ module VagrantPlugins
       end
 
       action_hook(:goodhosts, :machine_action_halt) do |hook|
-        hook.append(Action::RemoveHosts)
+        hook.prepend(Action::RemoveHosts)
       end
 
       action_hook(:goodhosts, :machine_action_suspend) do |hook|
-        hook.append(Action::RemoveHosts)
+        hook.prepend(Action::RemoveHosts)
       end
 
       action_hook(:goodhosts, :machine_action_destroy) do |hook|
-        hook.append(Action::RemoveHosts)
+        hook.prepend(Action::RemoveHosts)
       end
 
       action_hook(:goodhosts, :machine_action_reload) do |hook|

data/lib/vagrant-goodhosts/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GoodHosts
-    VERSION = '1.1.3'
+    VERSION = '1.1.5'
   end
 end

data/vagrant-goodhosts.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name          = 'vagrant-goodhosts'
   s.version       = VagrantPlugins::GoodHosts::VERSION
   s.platform      = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 2.2'
   s.authors       = ['Daniele Scasciafratte']
   s.email         = ['mte90net@gmail.com']
   s.description   = "Enables Vagrant to update hosts file on the host machine with goodhosts"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-goodhosts
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Daniele Scasciafratte
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,14 +93,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.27
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: Enables Vagrant to update hosts file on the host machine with goodhosts