vagrant-hosts 1.1.4 → 1.1.5

data/CHANGELOG

@@ -1,6 +1,20 @@
 CHANGELOG
 =========
 
+1.1.5
+-----
+
+2013-09-06
+
+This is a backwards compatible bugfix release.
+
+  * (GH-11) Assign `config.vm.hostname` to 127.0.1.1 if available
+  * (GH-10, GH-13) Normalize hostnames and aliases.
+  * Add `change_host_name` shim support for Vagrant 1.3
+
+Thanks to Charlie Sharpsteen for pretty much authoring this entire release.
+
+
 1.1.4
 -----
 

data/lib/vagrant-hosts/provisioner/hostname.rb

@@ -16,9 +16,9 @@ module VagrantHosts::Provisioner::Hostname
   # @param name [String] The new hostname to apply on the guest
   def change_host_name(name)
     case Vagrant::VERSION
-    when /1\.1/
+    when /^1\.1/
       @machine.guest.change_host_name(name)
-    when /1\.2/
+    when /^1\.2/, /^1\.3/
       @machine.guest.capability(:change_host_name, name)
     else
       raise UnknownVersion, :vagrant_version => Vagrant::VERSION

data/lib/vagrant-hosts/provisioner/linux.rb

@@ -49,10 +49,25 @@ class VagrantHosts::Provisioner::Linux
     all_hosts
   end
 
+  # Builds an array containing hostname and aliases for a given machine.
+  def hostnames_for_machine machine
+    # Cast any Symbols to Strings
+    machine_name = machine.name.to_s
+    hostname = machine.config.vm.hostname || machine_name
+
+    hostnames = [hostname]
+    # If the hostname is a fqdn, add the first component as an alias.
+    hostnames << hostname.split('.').first if hostname.index('.')
+    # Also add the machine name as an alias.
+    hostnames << machine_name unless hostnames.include? machine_name
+
+    hostnames
+  end
+
   def local_hosts
     [
       ['127.0.0.1', ['localhost']],
-      ['127.0.1.1', [@machine.name]],
+      ['127.0.1.1', hostnames_for_machine(@machine)],
     ]
   end
 
@@ -60,13 +75,10 @@ class VagrantHosts::Provisioner::Linux
     hosts = []
 
     all_machines.each do |m|
-      m_networks = m.config.vm.networks
-      m_hostname = m.config.vm.hostname
-
-      m_networks.each do |(net_type, opts)|
+      m.config.vm.networks.each do |(net_type, opts)|
         next unless net_type == :private_network
         addr = opts[:ip]
-        hosts << [addr, [m.name, m_hostname]]
+        hosts << [addr, hostnames_for_machine(m)]
       end
     end
 

data/lib/vagrant-hosts/version.rb

@@ -1,3 +1,3 @@
 module VagrantHosts
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hosts
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies: []
 description: ! '    Manage static DNS entries and configuration for Vagrant guests.