vagrant-hosts 2.6.2 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67ecc8f4fa29f9f2672c135efa98df042014c846
-  data.tar.gz: df396fc91d0d361ce8b583128a9b40e50af90e52
+  metadata.gz: cfff7593a5865f5cabdc74e7270a64c3e1f5de15
+  data.tar.gz: e4f29ffa5b3a999603dbe792a9ed75da87b9222b
 SHA512:
-  metadata.gz: a442e5a025b25ddb66fe4118b7448fd05fdc89cc9948a9fbb2cf45afcc9a054a4772da401dbd7785453d439e872ef1085d142ff60c545de6fca474f1b730704d
-  data.tar.gz: 2934bf400d9719eb3563a731873a8ddd9543546287b7b1c3d58b3205f6afa1be74169ab3a46fde9c0018da3acd8eee1a1e3a208921ad92570a558b6cf80b909a
+  metadata.gz: 564de5beef4fc73fe719ffeaf728cf07f2e945e1acecb2bef30b53c8ac0deddaa7d187bfa722965747f1f31ab9120ebf83ef58fb6951f34980a32b9189a1cb05
+  data.tar.gz: 08b964be8d8ee3d53dfce11efb0b505078f92ea54ecbd8f29c2cbcb90b88e6ceb312bf1c217c1ebe4bfc427d0c1d66bf803db80681e85ef60d41045e280e0849

data/CHANGELOG

@@ -1,6 +1,25 @@
 CHANGELOG
 =========
 
+2.7.0
+-----
+
+2016-03-28
+
+This is a backwards compatible feature release.
+
+  * (GH-58) Added a flexible import/export system for sharing host entries among
+    groups of VMs.
+
+  * (GH-56) Added a special value, `@vagrant_ssh`, for host entries that will
+    be replaced with the address Vagrant uses to SSH into the VM.
+
+  * (GH-59) Made sync_hosts more friendly to VMs that have requiretty turned on.
+
+  * (GH-61) Fixed a bug where config_builder 0.x couldn't set the hosts array
+    on the hosts provisioner.
+
+
 2.6.2
 -----
 

data/Gemfile

@@ -20,8 +20,8 @@ group :test do
     gem 'vagrant', :github => 'mitchellh/vagrant', :tag => ENV['TEST_VAGRANT_VERSION']
   end
 
-  # Pinned on 12/10/2014. Compatible with Vagrant 1.5.x, 1.6.x and 1.7.x.
-  gem 'vagrant-spec', :github => 'mitchellh/vagrant-spec', :ref => '1df5a3a'
+  # Pinned on 2/21/2016. Compatible with Vagrant 1.6.x, 1.7.x and 1.8.x.
+  gem 'vagrant-spec', :github => 'mitchellh/vagrant-spec', :ref => '9bba7e1'
 end
 
 eval_gemfile "#{__FILE__}.local" if File.exists? "#{__FILE__}.local"

data/README.markdown

@@ -21,6 +21,16 @@ 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.
+    * Default: `[]`
+  * `exports`
+    * Description: A hash containing named lists of `[address, [aliases]]`
+      entries that are exported by this VM. These exports can be collected
+      by other VMs using the imports setting. These entries may use special
+      keys as described in the next section.
+    * Default: `{}`
+  * `imports`
+    * Description: A list of named exports to collect from other VMs.
     * Default: `[]`
   * `autoconfigure`
     * Description: A boolean which controls whether hosts are pulled in from other machines.
@@ -32,6 +42,34 @@ behaviors of each provisioner instance.
     * Description: A boolean which controls whether running the hosts provisioner causes an update on all other running machines.
       This also happens during machine destruction.
     * Default: `false`
+  * `sync_hosts`
+    * Description: A boolean which controls whether running the hosts provisioner causes an update on all other running machines.
+      This also happens during machine destruction.
+    * Default: `false`
+
+### Special Keys
+
+The tuples used by the `hosts` and `exports` settings are of the form:
+
+    [address, [aliases]]
+
+For each component, there are some special keys defined that will be replaced by
+data determined from the VM.
+
+For `address`, the following special keys may be used:
+
+  - `@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
+    gives control over which aliases are used.
+
+  - `@vagrant_ssh`: Expands to the IP address that `vagrant ssh` uses to connect
+    with the VM.
+
+For `aliases`, the following special keys may be used:
+
+  - `@vagrant_hostnames`: Expands to an array of aliases containing:
+        <vm hostname> <first component of vm hostname> <vm name>
 
 
 Example Usage
@@ -115,6 +153,40 @@ Vagrant.configure('2') do |config|
 end
 ```
 
+- - -
+
+Use exports and special keys to share names among VMs:
+
+```ruby
+Vagrant.configure('2') do |config|
+
+  # A node running in a remote compute environment, such as AWS or OpenStack.
+  config.vm.define :cloud do |node|
+    node.vm.provision :hosts do |provisioner|
+      provisioner.sync_hosts = true
+      provisioner.exports = {
+        'global' => [
+          ['@vagrant_ssh', ['@vagrant_hostnames']],
+        ],
+      }
+    end
+  end
+
+  # A node running locally under Virtualbox
+  config.vm.define :local do |node|
+    node.vm.provision :hosts do |provisioner|
+      provisioner.sync_hosts = true
+      provisioner.imports = ['global', 'virtualbox']
+      provisioner.exports = {
+        'virtualbox' => [
+          ['@vagrant_private_networks', ['@vagrant_hostnames']],
+        ],
+      }
+    end
+  end
+end
+```
+
 Vagrant Commands
 ----------------
 

data/lib/vagrant-hosts/addresses.rb

@@ -1,5 +1,16 @@
+require 'resolv'
+require 'ipaddr'
+
 module VagrantHosts::Addresses
 
+  # Cache for networking data
+  #
+  # @return [Hash{String => Hash{String => String}}]
+  # @private
+  #
+  # @since 2.7.0
+  CACHE ||= {}
+
   private
 
   def all_hosts(config)
@@ -9,9 +20,14 @@ module VagrantHosts::Addresses
     if config.autoconfigure
       all_hosts += vagrant_hosts(@env)
     end
-    all_hosts += config.hosts
 
-    all_hosts
+    unless config.imports.empty?
+      all_hosts += collect_imports(@machine, config)
+    end
+
+    all_hosts += resolve_host_entries(config.hosts, @machine)
+
+    all_hosts.uniq
   end
 
   # Builds an array containing hostname and aliases for a given machine.
@@ -53,6 +69,164 @@ module VagrantHosts::Addresses
     hosts
   end
 
+  # Collect all hosts entries for a machine
+  #
+  # @param machine [Vagrant::Machine] A vagrant VM to perform collection upon.
+  # @param config [VagrantHosts::Config] A configuration object for the hosts
+  #   provisioner.
+  #
+  # @return [Array<Array<IPAddr, Array<String>>>] A list of address, alias
+  #   tuples.
+  #
+  # @since 2.7.0
+  def collect_imports(machine, config)
+    env = machine.env
+    imports = config.imports
+
+    # TODO: Use Set?
+    hosts = []
+
+    all_machines(env).each do |m|
+      next if m.name == machine.name
+
+      host_provisioners(m).each do |p|
+        imports.each do |k|
+          next unless p.config.exports.has_key?(k)
+          hosts.concat resolve_host_entries(p.config.exports[k], m)
+        end
+      end
+    end
+
+    hosts.uniq
+  end
+
+  # Generate a list of IP addresses and aliases for a vagrant machine
+  #
+  # This functionresolves a list of addresses and aliases, possibly including
+  # special keys, into a list of addresses and aliases.
+  #
+  # See {#resolve_addresses} and {#resolve_aliases} for special key handling.
+  #
+  # @param entries[Array<String, Array<String>>] A list of entries.
+  #
+  # @raise [IPAddr::InvalidAddressError] Raised when an invalid address is
+  #   supplied.
+  # @raise [Resolv::ResolvError] When a hostname cannot be resolved to an IP.
+  #
+  # @return [Array<IPAddr, Array<String>>]
+  #
+  # @since 2.7.0
+  def resolve_host_entries(entries, machine)
+    entries.flat_map do |(address, aliases)|
+      names = resolve_aliases(aliases, machine)
+      resolve_addresses(address, machine).map {|ip| [resolve_ip(ip), names]}
+    end
+  end
+
+  # Generate a list of IP addresses for a vagrant machine
+  #
+  # This function resolves an address or special key into a list of
+  # IP addresses.
+  #
+  # Special keys currently supported:
+  #
+  #   - `@vagrant_private_networks`: The IP addresses of each privte network
+  #     attached to the machine.
+  #
+  #   - `@vagrant_ssh`: The IP address used by Vagrant to communicate with the
+  #     machine (also includes WinRM and other communicators).
+  #
+  # @param aliases [String] An IP address or special key.
+  # @param machine [Vagrant::Machine] The Vagrant machine to use when resolving
+  #   addresses.
+  #
+  # @return [Array<String>] A list of addresses.
+  #
+  # @since 2.7.0
+  def resolve_addresses(address, machine)
+    # Some network addresses, such as ssh_info, can be expensive to
+    # look up from cloud environments such as AWS, vSphere and OpenStack.
+    # So, we cache these special keys.
+    if CACHE.key?(machine.name) && CACHE[machine.name].key?(address)
+      ips = CACHE[machine.name][address]
+    else
+      ips = case address
+      when '@vagrant_private_networks'
+        machine.config.vm.networks.map do |(net_type, opts)|
+          next unless net_type == :private_network
+          opts[:ip]
+        end.compact
+      when '@vagrant_ssh'
+        if (info = machine.ssh_info)
+          info[:host]
+        else
+          []
+        end
+      else
+        address
+      end
+
+      if address.start_with?('@')
+        CACHE[machine.name] ||= {}
+        CACHE[machine.name][address] = ips
+      end
+    end
+
+    Array(ips)
+  end
+
+  # Generate an list of IP addresses from a string
+  #
+  # This function resolves a string into an IP address.
+  # IP addresses.
+  #
+  # @param address [String] A string that might be an IP address or a hostname.
+  #
+  # @raise [IPAddr::InvalidAddressError] Raised when an invalid address is
+  #   supplied.
+  # @raise [Resolv::ResolvError] When a hostname cannot be resolved to an IP.
+  #
+  # @return [IPAddr] An IP address.
+  #
+  # @since 2.7.0
+  def resolve_ip(address)
+    ip = begin
+      IPAddr.new(address)
+    rescue IPAddr::InvalidAddressError
+      # Wasn't an IP address. Resolve it. The AWS provider does this.
+      IPAddr.new(Resolv.getaddress(address))
+    end
+
+    ip
+  end
+
+  # Generate a list of hostnames for a vagrant machine
+  #
+  # This function resolves a list of hostnames or special keys into a list of
+  # hostnmaes.
+  #
+  # Special keys currently supported:
+  #
+  #   - `@vagrant_hostnames`: See {#hostnames_for_machine}.
+  #
+  # @param aliases [Array<String>] A list of hostnames or special keys.
+  # @param machine [Vagrant::Machine] The Vagrant machine to use when resolving
+  #   aliases.
+  #
+  # @return [Array<String>] A list of hostnames.
+  #
+  # @since 2.7.0
+  def resolve_aliases(aliases, machine)
+    aliases.flat_map do |a|
+      case a
+      when '@vagrant_hostnames'
+        hostnames_for_machine(machine)
+      else
+        a
+      end
+    end
+  end
+
   # @return [Array<Vagrant::Machine>]
   def all_machines(env)
     env.active_machines.map do |vm_id|
@@ -64,4 +238,15 @@ module VagrantHosts::Addresses
     end.compact
   end
 
+  # NOTE: This method exists for compatibility with Vagrant 1.6 and earlier.
+  # Remove it once support for these versions is dropped.
+  def host_provisioners(machine)
+    machine.config.vm.provisioners.select do |p|
+      if Vagrant::VERSION < '1.7'
+        p.name.intern == :hosts
+      else
+        p.type.intern == :hosts
+      end
+    end
+  end
 end

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

@@ -14,23 +14,7 @@ class VagrantHosts::Cap::SyncHosts::Base
   end
 
   def sync!
-    hostname = @machine.config.vm.hostname || @machine.name.to_s
-    change_host_name(hostname)
-
     # call to method not implemented by abstract base class
     update_hosts
   end
-
-  private
-
-  # @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)
-    else
-      @machine.guest.capability(:change_host_name, name)
-    end
-  end
-
 end

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

@@ -15,7 +15,18 @@ class VagrantHosts::Cap::SyncHosts::POSIX < VagrantHosts::Cap::SyncHosts::Base
 
   def update_hosts
     upload_tmphosts
+
+    # Switch to PTY mode as this provider may execute across multiple machines
+    # which may not have requiretty set to false (i.e. because they're still
+    # booting and scripts that disable requiretty haven't run yet). Not doing
+    # this can have nasty side effects --- such as preventing machines from
+    # being destroyed.
+    old_pty_setting = @machine.config.ssh.pty
+    @machine.config.ssh.pty = true
+
     @machine.communicate.sudo('cat /tmp/hosts > /etc/hosts')
+  ensure
+    @machine.config.ssh.pty = old_pty_setting
   end
 
   # Generates content appropriate for a linux hosts file

data/lib/vagrant-hosts/config.rb

@@ -25,8 +25,26 @@ module VagrantHosts
     #     destruction. Defaults to `false`.
     attr_accessor :sync_hosts
 
+    # @!attribute [rw] exports
+    #   @return [Hash{String => Array<Array<String, Array<String>>>}]
+    #     A hash containing named lists of `[address, [aliases]]` tuples
+    #     that are exported by this VM. These exports can be collected by other
+    #     VMs using the {#imports} option.
+    #
+    #   @since 2.7.0
+    attr_accessor :exports
+
+    # @!attribute [rw] imports
+    #   @return [Array<String>]
+    #     A list of exports to collect from other VMs.
+    #
+    #   @since 2.7.0
+    attr_accessor :imports
+
     def initialize
       @hosts = []
+      @exports = {}
+      @imports = []
       @autoconfigure = UNSET_VALUE
       @add_localhost_hostnames = UNSET_VALUE
       @sync_hosts = UNSET_VALUE
@@ -51,7 +69,7 @@ module VagrantHosts
 
     def finalize!
       if @autoconfigure == UNSET_VALUE
-       if  @hosts.empty?
+       if  @hosts.empty? && @imports.empty?
           @autoconfigure = true
         else
           @autoconfigure = false

data/lib/vagrant-hosts/config_builder.rb

@@ -1,37 +1,7 @@
-require 'config_builder/model'
+require 'config_builder/version'
 
-module VagrantHosts
-  module ConfigBuilder
-    class Model < ::ConfigBuilder::Model::Base
-
-      # @!attribute [rw] hosts
-      attr_accessor :hosts
-      # @!attribute [rw] autoconfigure
-      attr_accessor :autoconfigure
-      # @!attribute [rw] add_localhost_hostnames
-      attr_accessor :add_localhost_hostnames
-      # @!attribute [rw] sync_hosts
-      attr_accessor :sync_hosts
-
-      def initialize
-        @hosts = []
-      end
-
-      def to_proc
-        Proc.new do |vm_config|
-          vm_config.provision :hosts do |h_config|
-            h_config.autoconfigure = attr(:autoconfigure) unless attr(:autoconfigure).nil?
-            h_config.add_localhost_hostnames = attr(:add_localhost_hostnames) unless attr(:add_localhost_hostnames).nil?
-            h_config.sync_hosts = attr(:sync_hosts) unless attr(:sync_hosts).nil?
-
-            @hosts.each do |(address, aliases)|
-              h_config.add_host address, aliases
-            end
-          end
-        end
-      end
-
-      ::ConfigBuilder::Model::Provisioner.register('hosts', self)
-    end
-  end
+if ConfigBuilder::VERSION > '1.0'
+  require_relative 'config_builder/1_x.rb'
+else
+  require_relative 'config_builder/0_x.rb'
 end

data/lib/vagrant-hosts/config_builder/0_x.rb

@@ -0,0 +1,40 @@
+require 'config_builder/model'
+
+# Integration with ConfigBuilder 0.x and older
+module VagrantHosts
+  module ConfigBuilder
+    class Model < ::ConfigBuilder::Model::Base
+
+      # @!attribute [rw] hosts
+      attr_accessor :hosts
+      # @!attribute [rw] autoconfigure
+      attr_accessor :autoconfigure
+      # @!attribute [rw] add_localhost_hostnames
+      attr_accessor :add_localhost_hostnames
+      # @!attribute [rw] sync_hosts
+      attr_accessor :sync_hosts
+
+      def initialize
+        @defaults = {
+          :hosts => [],
+        }
+      end
+
+      def to_proc
+        Proc.new do |vm_config|
+          vm_config.provision :hosts do |h_config|
+            h_config.autoconfigure = attr(:autoconfigure) unless attr(:autoconfigure).nil?
+            h_config.add_localhost_hostnames = attr(:add_localhost_hostnames) unless attr(:add_localhost_hostnames).nil?
+            h_config.sync_hosts = attr(:sync_hosts) unless attr(:sync_hosts).nil?
+
+            attr(:hosts).each do |(address, aliases)|
+              h_config.add_host address, aliases
+            end
+          end
+        end
+      end
+
+      ::ConfigBuilder::Model::Provisioner.register('hosts', self)
+    end
+  end
+end

data/lib/vagrant-hosts/config_builder/1_x.rb

@@ -0,0 +1,33 @@
+require 'config_builder/model'
+
+# Integration with ConfigBuilder 1.x and newer
+#
+# @since 2.7.0
+module VagrantHosts
+  module ConfigBuilder
+    class Model < ::ConfigBuilder::Model::Provisioner::Base
+
+      # @!attribute [rw] hosts
+      def_model_attribute :hosts
+      # @!attribute [rw] autoconfigure
+      def_model_attribute :autoconfigure
+      # @!attribute [rw] add_localhost_hostnames
+      def_model_attribute :add_localhost_hostnames
+      # @!attribute [rw] sync_hosts
+      def_model_attribute :sync_hosts
+      # @!attribute [rw] exports
+      def_model_attribute :exports
+      # @!attribute [rw] exports
+      def_model_attribute :imports
+
+      # @private
+      def configure_hosts(config, val)
+        val.each do |(address, aliases)|
+          config.add_host(address, aliases)
+        end
+      end
+
+      ::ConfigBuilder::Model::Provisioner.register('hosts', self)
+    end
+  end
+end

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

@@ -32,14 +32,18 @@ module VagrantHosts
             # returning false (mitchellh/vagrant#6356).
             false
           end
-          has_hosts = vm.config.vm.provisioners.any? {|p| p.type.intern == :hosts}
+          has_hosts = if Vagrant::VERSION < '1.7'
+            vm.config.vm.provisioners.any? {|p| p.name.intern == :hosts}
+          else
+            vm.config.vm.provisioners.any? {|p| p.type.intern == :hosts}
+          end
 
           running && has_hosts && (not calling_machine)
         end
 
         machines_to_provision.each do |vm|
           vm.ui.info "Updating hosts on: #{vm.name}"
-          vm.config.vm.provisioners.select {|p| p.type.intern == :hosts}.each do |p|
+          host_provisioners(vm).each do |p|
             # Duplicate the hosts configuration.
             hosts_config = @config.class.new.merge(p.config)
             # Set sync_hosts to false to avoid recursion.

data/lib/vagrant-hosts/version.rb

@@ -1,3 +1,3 @@
 module VagrantHosts
-  VERSION = '2.6.2'
+  VERSION = '2.7.0'
 end

data/spec/integration/addresses_spec.rb

@@ -0,0 +1,115 @@
+require 'spec_helper'
+
+require 'vagrant-hosts/addresses'
+require 'vagrant-hosts/config'
+
+
+describe 'Vagrant Integration: VagrantHosts::Addresses' do
+  include_context 'vagrant-unit'
+
+  let(:test_env)    {
+    env = isolated_environment
+
+    env.vagrantfile <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define 'machine-a' do |node|
+    node.vm.hostname = 'machine-a.testvm'
+
+    node.vm.network :private_network, ip: '10.40.1.1'
+    node.vm.network :private_network, ip: '10.40.1.3'
+
+    node.vm.provision 'hosts' do |p|
+      p.exports = {
+        'global' => [
+          ['@vagrant_private_networks', ['@vagrant_hostnames']]
+        ],
+      }
+    end
+  end
+
+  config.vm.define 'machine-b' do |node|
+    node.vm.network :private_network, ip: '10.40.1.2'
+
+    node.vm.provision 'hosts' do |p|
+      p.exports = {
+        'global' => [
+          ['@vagrant_private_networks', ['@vagrant_hostnames']],
+        ],
+        'ssh' => [
+          ['@vagrant_ssh', ['@vagrant_hostnames']],
+        ],
+      }
+    end
+  end
+end
+EOF
+    env
+  }
+  let(:env)         {
+    test_env.create_vagrant_env(local_data_path: "#{test_env.workdir}/.vagrant")
+  }
+  let(:machine_a)     { env.machine(:'machine-a', :dummy) }
+  let(:machine_b)     { env.machine(:'machine-b', :dummy) }
+
+  subject do
+    # A simple class which simulates inclusion of VagrantHosts::Addresses
+    Class.new do
+      include VagrantHosts::Addresses
+      # Expose private methods included above for testing.
+      public *self.private_instance_methods
+
+      def initialize(env, machine)
+        # Create instance variables that VagrantHosts::Addresses expects to
+        # have access to.
+        @env = env
+        @machine = machine
+      end
+    end.new(env, machine_a)
+  end
+
+  # Mark test VMs as active.
+  before :each do
+    allow(env).to receive(:active_machines).and_return([
+      [:'machine-a', :dummy],
+      [:'machine-b', :dummy],
+    ])
+
+    # Give Machine B a SSH address.
+    allow(machine_b).to receive(:ssh_info).and_return({:host => '10.40.1.4'})
+  end
+
+  describe '#vagrant_hosts' do
+    it 'returns private_network entries for each machine' do
+      expect(subject.vagrant_hosts(env)).to include(
+        ['10.40.1.1', ['machine-a.testvm', 'machine-a']],
+        ['10.40.1.3', ['machine-a.testvm', 'machine-a']],
+        ['10.40.1.2', ['machine-b']],
+      )
+    end
+  end
+
+  describe '#collect_imports' do
+    it 'returns imports from other machines' do
+      config = VagrantHosts::Config.new
+      config.imports = ['global', 'ssh']
+      config.finalize!
+
+      expect(subject.collect_imports(machine_a, config)).to eq([
+        [IPAddr.new('10.40.1.2'), ['machine-b']],
+        [IPAddr.new('10.40.1.4'), ['machine-b']],
+      ])
+    end
+  end
+
+  describe '#all_hosts' do
+    it 'resolves special addresses and aliases' do
+      config = VagrantHosts::Config.new
+      config.add_host '@vagrant_private_networks', ['@vagrant_hostnames']
+      config.finalize!
+
+      expect(subject.all_hosts(config)).to include(
+        [IPAddr.new('10.40.1.1'), ['machine-a.testvm', 'machine-a']],
+      )
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -4,4 +4,6 @@ $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 # Acceptance tests are not loaded.
 ENV['VAGRANT_NO_PLUGINS'] = '1'
 
+# Load the vagrant-hosts plugin so that Provisioners and such can be found.
+require 'vagrant-hosts'
 require 'vagrant-spec/unit'

data/vagrant-hosts.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.files        = %x{git ls-files -z}.split("\0")
   gem.require_path = 'lib'
 
-  gem.add_development_dependency 'rake'
-  # Pin to 2.14.x for compatibility with vagrant-spec.
+  # Pinned for compatibility with vagrant-spec.
+  gem.add_development_dependency 'rake', '~> 10.0'
   gem.add_development_dependency 'rspec', '~> 2.14.0'
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hosts
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 description: |2
@@ -45,10 +45,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -66,9 +66,12 @@ files:
 - lib/vagrant-hosts/command/puppetize.rb
 - lib/vagrant-hosts/config.rb
 - lib/vagrant-hosts/config_builder.rb
+- lib/vagrant-hosts/config_builder/0_x.rb
+- lib/vagrant-hosts/config_builder/1_x.rb
 - lib/vagrant-hosts/plugin.rb
 - lib/vagrant-hosts/provisioner/hosts.rb
 - lib/vagrant-hosts/version.rb
+- spec/integration/addresses_spec.rb
 - spec/spec_helper.rb
 - spec/unit/config_spec.rb
 - tasks/spec.rake
@@ -84,17 +87,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Manage static DNS on vagrant guests