vagrant-hosts 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed8d9542bf42223218d3104999aab673b9bcfcfc
-  data.tar.gz: 2e5169054451f44ccd3fba4827f095b0a72f3aa0
+  metadata.gz: bc25e420c49e7f62fdb74de109d2d297bbcd04ef
+  data.tar.gz: 84dc84eaf30ba2d749dd691568aabd97fe1bc8bb
 SHA512:
-  metadata.gz: a689909a174f55a824b8d0f3653b52f1fcc7e999788f9b6e30aa9a1880c347936eccf2526df53ea2cc18b8d926e99b136aaffa24ecf03b11623fe4f85c5156b3
-  data.tar.gz: c08d0e02d031e9f0995688b0c05b1a08e80c105a61dbdbb49bc221f2b04b6814c246036702721ff22c7786b18f803d03c9e5407b21124a221f4d4f41a8b0c9c2
+  metadata.gz: f5fa318724084c3ad5ba7323330ab0550cef794a8bedbde25eed798648a3987de7289e4d90f2d98a6542368bce6cb211326aef1d55120b04e9cf70b1fbde0a78
+  data.tar.gz: 5576b69d80d8ea0c2f7338aead65a83142ccb3afb5d4782dda9555e50972dee7c310206ff8096a54fe6cefdea4bf2b768f7231010c8f3fb381fe7037a6b07065

data/CHANGELOG

@@ -1,6 +1,18 @@
 CHANGELOG
 =========
 
+2.8.0
+-----
+
+2016-04-18
+
+This is a backwards compatible feature release.
+
+  * (GH-56) Added a special value, `@facter_ipaddress`, for host entries that
+    will be replaced with the IPv4 address assigned to the default
+    network interface.
+
+
 2.7.1
 -----
 

data/README.markdown

@@ -21,7 +21,7 @@ behaviors of each provisioner instance.
     * Description: An array of tuples containing:
       - An IP address
       - A list of hostnames match with that address.
-      These entries may use special eys as described in the next section.
+      These entries may use special keys as described in the next section.
     * Default: `[]`
   * `exports`
     * Description: A hash containing named lists of `[address, [aliases]]`
@@ -54,6 +54,9 @@ data determined from the VM.
 
 For `address`, the following special keys may be used:
 
+  - `@facter_ipaddress`: Expands to the IPv4 address assigned to the
+    default network interface of the guest VM.
+
   - `@vagrant_private_networks`: Expands to create one host entry with the given
     `aliases` for each private network attached to a VM that has an explicitly
     configured `ip` address. This is similar to the `autoconfigure` setting, but

data/lib/vagrant-hosts/addresses.rb

@@ -162,6 +162,8 @@ module VagrantHosts::Addresses
         else
           []
         end
+      when '@facter_ipaddress'
+        machine.guest.capability(:network_facts)['networking']['ip']
       else
         address
       end

data/lib/vagrant-hosts/cap.rb

@@ -1,15 +1,14 @@
 module VagrantHosts
   module Cap
     module SyncHosts
-
-      class UnknownVersion < Vagrant::Errors::VagrantError
-        error_key(:unknown_version, 'vagrant_hosts.cap.sync_hosts')
-      end
-
       require 'vagrant-hosts/cap/sync_hosts/base'
       require 'vagrant-hosts/cap/sync_hosts/posix'
       require 'vagrant-hosts/cap/sync_hosts/windows'
+    end
 
+    module Facts
+      require_relative 'cap/facts/posix'
+      require_relative 'cap/facts/windows'
     end
   end
 end

data/lib/vagrant-hosts/cap/facts/base.rb

@@ -0,0 +1,43 @@
+# Base class for retrieving network facts from guest VMs
+#
+# @since 2.8.0
+class VagrantHosts::Cap::Facts::Base
+
+  # Retrieve facts from a guest VM
+  #
+  # See {#load_facts} for implementation details.
+  #
+  # @return [Hash] A hash of facts.
+  def self.network_facts(machine)
+    new(machine).load_facts
+  end
+
+  attr_reader :machine
+
+  def initialize(machine)
+    @machine = machine
+  end
+
+  def load_facts
+    raise NotImplementedError
+  end
+
+  private
+
+  # TODO: Split this out into a shared module.
+  def sudo(cmd)
+    stdout = ''
+    stderr = ''
+
+    retval = machine.communicate.sudo(cmd) do |type, data|
+      if type == :stderr
+        stderr << data.chomp
+      else
+        stdout << data.chomp
+      end
+    end
+
+    {:stdout => stdout, :stderr => stderr, :retval => retval}
+  end
+
+end

data/lib/vagrant-hosts/cap/facts/posix.rb

@@ -0,0 +1,44 @@
+require_relative 'base'
+
+# Base class for retrieving network facts from POSIX
+#
+# @since 2.8.0
+class VagrantHosts::Cap::Facts::POSIX < VagrantHosts::Cap::Facts::Base
+
+  def load_facts
+    facts = {}
+    facts['networking'] = {}
+    facts['networking']['interfaces'] = parse_ifconfig
+
+    iface = get_default_iface
+    facts['networking']['ip'] = facts['networking']['interfaces'][iface]['ip']
+
+    facts
+  end
+
+  private
+
+  def ifconfig
+    ifconfig_output = sudo('ifconfig -a')[:stdout]
+    # Group output by interface.
+    ifconfig_output.split(/^([[:alnum:]]+[:]?\s)/).drop(1).each_slice(2).map(&:join)
+  end
+
+  def parse_ifconfig
+    results = ifconfig.map do |i|
+      i.match(/^([[:alnum:]]+)[:]?\s.*inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/m)
+    end.compact.map do |r|
+      name, ip = r.captures
+      [name, {'ip' => ip}]
+    end
+
+    Hash[results]
+  end
+
+  def get_default_iface
+    route_table = sudo('netstat -rn')[:stdout]
+    default = route_table.lines.find {|e| e.start_with?('default') || e.start_with?('0.0.0.0')}
+
+    default.split.last.chomp
+  end
+end

data/lib/vagrant-hosts/cap/facts/windows.rb

@@ -0,0 +1,42 @@
+require_relative 'base'
+
+# Base class for retrieving network facts from Windows
+#
+# @since 2.8.0
+class VagrantHosts::Cap::Facts::Windows < VagrantHosts::Cap::Facts::Base
+
+  def load_facts
+    facts = {}
+    facts['networking'] = {}
+    facts['networking']['interfaces'] = parse_ifconfig
+
+    iface = get_default_iface
+    facts['networking']['ip'] = iface
+
+    facts
+  end
+
+  private
+
+  def parse_ifconfig
+    # Imagine a call to Get-WmiObject -Query that returns a combined dataset
+    # built from Win32_NetworkAdapter (interface names) and
+    # Win32_NetworkAdapterConfiguration (everything else, like ipaddress).
+    #
+    # TODO: Implement said query.
+
+    Hash.new
+  end
+
+  def get_default_iface
+    route_table = sudo('netstat -rn')[:stdout]
+
+    default = route_table.lines.find do |e|
+      e.lstrip.start_with?('default') ||
+      e.lstrip.start_with?('0.0.0.0')
+    end
+
+    default.split[-2].chomp
+  end
+
+end

data/lib/vagrant-hosts/cap/sync_hosts/base.rb

@@ -14,6 +14,12 @@ class VagrantHosts::Cap::SyncHosts::Base
   end
 
   def sync!
+    # This ensures that a default hostname is created from the macine name
+    # if the VM wasn't configured with a hostname.
+    #
+    # FIXME: Write tests for this behavior.
+    # TODO: Move this behavior into a config block on the hosts provisioner
+    # so that this capability can remain focused on updating /etc/hosts.
     hostname = @machine.config.vm.hostname || @machine.name.to_s
     change_host_name(hostname)
 

data/lib/vagrant-hosts/plugin.rb

@@ -34,6 +34,19 @@ class VagrantHosts::Plugin < Vagrant.plugin(2)
     VagrantHosts::Cap::SyncHosts::Windows
   end
 
+
+  [:darwin, :linux, :solaris, :solaris11].each do |os|
+    guest_capability(os, 'network_facts') do
+      require_relative 'cap'
+      VagrantHosts::Cap::Facts::POSIX
+    end
+  end
+
+  guest_capability(:windows, 'network_facts') do
+    require_relative 'cap'
+    VagrantHosts::Cap::Facts::Windows
+  end
+
   command(:hosts) do
     require_relative 'command'
     VagrantHosts::Command

data/lib/vagrant-hosts/version.rb

@@ -1,3 +1,3 @@
 module VagrantHosts
-  VERSION = '2.7.1'
+  VERSION = '2.8.0'
 end

data/templates/locales/en.yml

@@ -1,8 +1,3 @@
 ---
 en:
-  vagrant_hosts:
-    cap:
-      sync_hosts:
-        unknown_version: |-
-          %{vagrant_version} isn't a recognized Vagrant version, vagrant-hosts can't reliably
-          detect the `change_host_name` method.
+  vagrant_hosts: {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hosts
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -57,6 +57,9 @@ files:
 - lib/vagrant-hosts.rb
 - lib/vagrant-hosts/addresses.rb
 - lib/vagrant-hosts/cap.rb
+- lib/vagrant-hosts/cap/facts/base.rb
+- lib/vagrant-hosts/cap/facts/posix.rb
+- lib/vagrant-hosts/cap/facts/windows.rb
 - lib/vagrant-hosts/cap/sync_hosts/base.rb
 - lib/vagrant-hosts/cap/sync_hosts/posix.rb
 - lib/vagrant-hosts/cap/sync_hosts/windows.rb