vagrant-goodhosts 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74e9466d2e64e39de992c9940235deb31e8d64fd4e17e92d8b271392306dcabf
-  data.tar.gz: 918fb30d3de3daf04492cd8850d5cd1fc5bb2187f9a985f048b401301c527409
+  metadata.gz: 9df62f1e1e6994b0e268f5a4c70e05992d2aa8717359bc843468f7fe209d735c
+  data.tar.gz: 5de2dbc4f9eefe5dddfed6a74c8db799b9cf5fd8003d111ea5d47e6bb07d68d3
 SHA512:
-  metadata.gz: 396c9ad919d3abaea678b2042f57a9ef02dac89d4212ceb5e18887c5be190ae86a3112fa28664fe6e7483fcf6f9e969eda012d891a4d828622b6fc15b671a050
-  data.tar.gz: f1d14ef933bfe527f6d0297300abf1cc3ed9a87f542b1ac5dc0ff017c71a52b32203984e1c04d37988fdbbe1d4f99343255f9ced3dd3a750ec1ded7b06870231
+  metadata.gz: a80232c8572f03701db820c2ab9be2e37288ab1fa258381c35843ebfc68c121f844c1765b18c6c743c3f9b0da18014e5bc32d7dde6d3b91d03ed6c2de24cff44
+  data.tar.gz: 69f5149b8e73aaedabc0c4011bade5b0a12f1cda452603b230fef861e774f2fed5eec14ec311ec6157fa4ec4cdb925d292faaf1bc448e6c9fb6e766bee5aaf7b

data/lib/vagrant-goodhosts/GoodHosts.rb

@@ -92,38 +92,9 @@ module VagrantPlugins
         return true
       end
 
-      def addHostEntries
-        error = false
-        errorText = ""
-        cli = get_cli
-        hostnames_by_ips = generateHostnamesByIps
-
-        return if not hostnames_by_ips.any?
-
-        @ui.info "[vagrant-goodhosts] Checking for host entries"
-
-        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
-
-          # filter out the hosts we've already added
-          hosts_to_add = check_hostnames_to_add( ip_address, hostnames)
-          next if not hosts_to_add.any?
-
-          stdin, stdout, stderr, wait_thr = add_goodhost_entries(ip_address, hosts_to_add)
-          if !wait_thr.value.success?
-            error = true
-            errorText = stderr.read.strip
-          end
-        end
-        printReadme(error, errorText)
-      end
-
-      def check_hostnames_to_add(ip_address, hostnames)
+      def checkHostnamesToAdd(ip_address, hostnames)
         hostnames_to_add = Array.new
-
+        hostnames = hostnames.split
         # check which hostnames actually need adding
         hostnames.each do |hostname|
           begin
@@ -138,7 +109,7 @@ module VagrantPlugins
         return hostnames_to_add
       end
 
-      def add_goodhost_entries(ip_address, hostnames)
+      def addGoodhostEntries(ip_address, hostnames)
         if cli.include? ".exe"
           clean = "\"--clean\","
           if disableClean(ip_address)
@@ -155,7 +126,7 @@ module VagrantPlugins
         return stdin, stdout, stderr, wait_thr
       end
 
-      def removeHostEntries
+      def addHostEntries
         error = false
         errorText = ""
         cli = get_cli
@@ -163,7 +134,7 @@ module VagrantPlugins
 
         return if not hostnames_by_ips.any?
 
-        @ui.info "[vagrant-goodhosts] Removing hosts"
+        @ui.info "[vagrant-goodhosts] Checking for host entries"
 
         hostnames_by_ips.each do |ip_address, hostnames|
           if ip_address.nil?
@@ -171,7 +142,11 @@ module VagrantPlugins
             next
           end
 
-          stdin, stdout, stderr, wait_thr = remove_goodhost_entries(ip_address, hostnames)
+          # filter out the hosts we've already added
+          hosts_to_add = checkHostnamesToAdd(ip_address, hostnames)
+          next if not hosts_to_add.any?
+
+          stdin, stdout, stderr, wait_thr = addGoodhostEntries(ip_address, hosts_to_add)
           if !wait_thr.value.success?
             error = true
             errorText = stderr.read.strip
@@ -180,7 +155,7 @@ module VagrantPlugins
         printReadme(error, errorText)
       end
 
-      def remove_goodhost_entries(ip_address, hostnames)
+      def removeGoodhostEntries(ip_address, hostnames)
         if cli.include? ".exe"
           clean = "\"--clean\","
           if disableClean(ip_address)
@@ -197,6 +172,31 @@ module VagrantPlugins
         return stdin, stdout, stderr, wait_thr
       end
 
+      def removeHostEntries
+        error = false
+        errorText = ""
+        cli = get_cli
+        hostnames_by_ips = generateHostnamesByIps
+
+        return if not hostnames_by_ips.any?
+
+        @ui.info "[vagrant-goodhosts] Removing hosts"
+
+        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
+
+          stdin, stdout, stderr, wait_thr = removeGoodhostEntries(ip_address, hostnames)
+          if !wait_thr.value.success?
+            error = true
+            errorText = stderr.read.strip
+          end
+        end
+        printReadme(error, errorText)
+      end
+
       def printReadme(error, errorText)
         if error
           cli = get_cli

data/lib/vagrant-goodhosts/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GoodHosts
-    VERSION = '1.0.18'
+    VERSION = '1.0.19'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-goodhosts
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Daniele Scasciafratte
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ homepage: https://github.com/goodhosts/vagrant
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Enables Vagrant to update hosts file on the host machine with goodhosts
 test_files: []