vagrant-hosts 1.0.0 → 1.1.0

data/CHANGELOG

@@ -0,0 +1,16 @@
+CHANGELOG
+=========
+
+1.1.0
+-----
+
+This is a backwards compatible feature and bugfix release.
+
+  * Support Vagrant 1.2 change_host_name capability
+  * Support Vagrant 1.1 and 1.2 change_host_name invocation
+  * Add config.vm.hostname into hosts file if set
+
+Thanks to the following contributors:
+
+  - Patrick Otto
+  - Luke Amdor

data/lib/vagrant-hosts.rb

@@ -1,5 +1,7 @@
 # Declare top level vagrant hosts module.
-module VagrantHosts; end
+module VagrantHosts
+  REQUIRED_VAGRANT_VERSION = '1.1.0'
+end
 
 require 'vagrant-hosts/version'
 require 'vagrant-hosts/plugin'

data/lib/vagrant-hosts/plugin.rb

@@ -2,8 +2,9 @@ require 'vagrant'
 require 'vagrant-hosts'
 require 'vagrant-hosts/version'
 
-if Vagrant::VERSION < "1.1.0"
-  raise "vagrant-hosts version #{VagrantHosts::VERSION} requires Vagrant 1.1 or later"
+if Vagrant::VERSION < VagrantHosts::REQUIRED_VAGRANT_VERSION
+  raise "vagrant-hosts version #{VagrantHosts::VERSION} requires Vagrant " +
+    "#{VagrantHosts::REQUIRED_VAGRANT_VERSION} or later"
 end
 
 class VagrantHosts::Plugin < Vagrant.plugin(2)

data/lib/vagrant-hosts/provisioner.rb

@@ -1,13 +1,11 @@
 require 'vagrant'
 require 'tempfile'
 
-
 module VagrantHosts
 class Provisioner < Vagrant.plugin('2', :provisioner)
 
   def initialize(machine, config)
     @machine, @config = machine, config
-    p
   end
 
   def provision
@@ -20,6 +18,12 @@ class Provisioner < Vagrant.plugin('2', :provisioner)
 
   class Linux
 
+    # This has to be inside of this class, because otherwise the hostname mixin
+    # will create this class with a different superclass. It makes me sad. :(
+    require 'vagrant-hosts/provisioner/hostname'
+    include VagrantHosts::Provisioner::Hostname
+
+
     def initialize(machine, config)
       @machine, @config = machine, config
     end
@@ -39,7 +43,8 @@ class Provisioner < Vagrant.plugin('2', :provisioner)
     end
 
     def update_hosts
-      @machine.guest.change_host_name(@machine.name.to_s)
+      hostname = @machine.config.vm.hostname || @machine.name.to_s
+      change_host_name(hostname)
       @machine.communicate.sudo('install -m 644 /tmp/hosts /etc/hosts')
     end
 
@@ -75,10 +80,11 @@ class Provisioner < Vagrant.plugin('2', :provisioner)
 
       names.each do |name|
         network_settings = env.machine(name, :virtualbox).config.vm.networks
+        hostname = env.machine(name, :virtualbox).config.vm.hostname
         network_settings.each do |entry|
           if entry[0] == :private_network
             ipaddr = entry[1][:ip]
-            hosts << [ipaddr, [name]]
+            hosts << [ipaddr, [hostname, name]]
           end
         end
       end

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

@@ -0,0 +1,26 @@
+require 'vagrant'
+require 'vagrant-hosts/provisioner'
+
+module VagrantHosts
+class Provisioner
+module Hostname
+  # Abstract the details of setting a guest hostname on different versions of
+  # Vagrant.
+  #
+  # Vagrant commit 61d2f9f96fc0f0ef5869c732674f25c4ccc85c8c converts the
+  # #change_host_name # method to a capability, which breaks the API between
+  # 1.1 and 1.2. :(
+
+  # @param name [String] The new hostname to apply on the guest
+  def change_host_name(name)
+    case Vagrant::VERSION
+    when /1\.1/
+      @machine.guest.change_host_name(name)
+    when /1\.2/
+      @machine.guest.capability(:change_host_name, name)
+    end
+  end
+
+end
+end
+end

data/lib/vagrant-hosts/version.rb

@@ -1,3 +1,3 @@
 module VagrantHosts
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hosts
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
@@ -35,12 +35,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG
 - LICENSE
 - README.markdown
 - lib/vagrant-hosts.rb
 - lib/vagrant-hosts/config.rb
 - lib/vagrant-hosts/plugin.rb
 - lib/vagrant-hosts/provisioner.rb
+- lib/vagrant-hosts/provisioner/hostname.rb
 - lib/vagrant-hosts/version.rb
 - vagrant-hosts.gemspec
 homepage: https://github.com/adrienthebo/vagrant-hosts