vagrant-betterhosts 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 674b9ba6010434da286903277af9e899b2d2a982a8a4ce1434b523b460350b53
-  data.tar.gz: 4b635e5ddc088af98faa0c59b200fd9346b01ac0b540ca6a70375f4a01d852cb
+  metadata.gz: eca3ca87fa47244989ff3f69adfa4eac5ac0793cc68d81b05ff1f77d053da052
+  data.tar.gz: 26bdb0c3f05e282baa1760849a65e7dfeaeba2ab267ab95a6916a6f5dd0f7c02
 SHA512:
-  metadata.gz: 38c82c8b5344f0cc3d64521746dfdf1bd987f6362468b8fece767aff2ac1a1117d78fca0f30579f331ba38b5e45ee476cdb04ca2d5387a113ac92c6a9a3f7b39
-  data.tar.gz: 37ead61d094950df99c39c10638bf223360d619b3fc0fbd8cc35330884486e3ac1e01d2382cc7994467eaf0b374e9ac1b8fe0a766539f79e86cf10499c94819f
+  metadata.gz: dc7655a442b2ba3aeee62349861c3ee0979e5f754ae8744a7925ff3b67ba184eb4dfc3c8784767332bbb6de080638b7a6b4bfd0b6e966c95305d3d2ee0923473
+  data.tar.gz: e4c5bf8a7ae014223a0d688d56c8ee5221dcc2ef813ff086b63e164239f0f139a6824ad47d130a7445c01bd8eb0f7ddfaa1da52bfc4c630313752118b4cd8ffd

data/Gemfile.lock

@@ -28,7 +28,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-betterhosts (1.0.0)
+    vagrant-betterhosts (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/vagrant-betterhosts/BetterHosts.rb

@@ -71,10 +71,7 @@ module VagrantPlugins
 
         case @machine.config.betterhosts.aliases
         when Array
-          # simple list of aliases to link to all ips
-          ips.each do |ip|
-            hostnames[ip] += @machine.config.betterhosts.aliases
-          end
+          hostnames[ips[0]] += @machine.config.betterhosts.aliases
         when Hash
           # complex definition of aliases for various ips
           @machine.config.betterhosts.aliases.each do |ip, hosts|
@@ -82,9 +79,16 @@ module VagrantPlugins
           end
         end
 
-        return hostnames
+        # handle default hostname(s) if not already specified in the aliases
+        Array(@machine.config.vm.hostname).each do |host|
+          next unless hostnames.none? { |_, v| v.include?(host) }
+
+          hostnames[ips[0]].unshift host
+        end
+
+        hostnames
       end
-      
+
       def disableClean(ip_address)
         unless ip_address.nil?
           return @machine.config.betterhosts.disable_clean
@@ -105,6 +109,7 @@ module VagrantPlugins
             @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)
@@ -175,37 +180,16 @@ module VagrantPlugins
       end
 
       def generateHostnamesByIps()
-        hostnames_by_ips = []
         ips = getIps
-        if ips.count() < 1
-          return hostnames_by_ips
-        end
+        return [] unless ips.any?
+
+        hostnames_by_ips = {}
         hostnames = getHostnames(ips)
-        if ips.count() > 1
-          ips.each do |ip|
-            ip_address = ip
-            if hostnames[ip].count() > 0
-              hostnames[ip].each do |hostname|
-                if !ip_address.nil?
-                  @ui.info "[vagrant-betterhosts] - found entry for: #{ip_address} #{hostname}"
-                end
-              end
-              hostnames_by_ips = { ip_address => hostnames[ip].join(" ") }
-            end
-          end
-        else
-          ip_address = ips[0]
-          if hostnames[ip_address].count() > 0
-            hostnames[ip_address].each do |hostname|
-              if !ip_address.nil?
-                @ui.info "[vagrant-betterhosts] - found entry for: #{ip_address} #{hostname}"
-              end
-            end
-            hostnames_by_ips = { ip_address => hostnames[ip_address].join(" ") }
-          end
+        ips.each do |ip|
+          hostnames_by_ips[ip] = hostnames[ip].join(' ') if hostnames[ip].any?
         end
 
-        return hostnames_by_ips
+        hostnames_by_ips
       end
     end
   end

data/lib/vagrant-betterhosts/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-betterhosts
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Adam Butler