vagrant-hosts 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc25e420c49e7f62fdb74de109d2d297bbcd04ef
-  data.tar.gz: 84dc84eaf30ba2d749dd691568aabd97fe1bc8bb
+  metadata.gz: b3e9f58247879332b3031dceff8009a6e305642a
+  data.tar.gz: fdc56fdde18bceb36882a38c6a2511c238399806
 SHA512:
-  metadata.gz: f5fa318724084c3ad5ba7323330ab0550cef794a8bedbde25eed798648a3987de7289e4d90f2d98a6542368bce6cb211326aef1d55120b04e9cf70b1fbde0a78
-  data.tar.gz: 5576b69d80d8ea0c2f7338aead65a83142ccb3afb5d4782dda9555e50972dee7c310206ff8096a54fe6cefdea4bf2b768f7231010c8f3fb381fe7037a6b07065
+  metadata.gz: 7ed4b370ea69eb8192194357ccfd5dd2d8ff62faf8fa8e1683c53ba15aabfa4870d77d7635c36b110b728810318b6ebc8e248404153b9ade8b6684c8c063fbc0
+  data.tar.gz: 2250d47993c1bb57f64b6b8427a22b5e231835f8167454fc0c0b753f9f03c7c898257155b7d91622222c9010061e20bae35968f75ba03201f9f18c10ede06c28

data/.travis.yml

@@ -2,6 +2,12 @@
 language: ruby
 sudo: false
 before_install:
+  # TODO: Remove along with all BUNDLER_VERSION hackery once support for
+  # Vagrant < 1.9 is dropped.
+  #
+  # Travis has taken to installing Bundler as a "default" gem which locks
+  # it down and makes it extremely frustrating to use a different version.
+  - "find /home/travis/.rvm/rubies -wholename '*default/bundler-*.gemspec' -delete"
   - gem install bundler --version $BUNDLER_VERSION
 install: bundle _${BUNDLER_VERSION}_ install --without development
 script: bundle _${BUNDLER_VERSION}_ exec rspec --color --format documentation
@@ -14,13 +20,13 @@ env:
 
 matrix:
   include:
-    - rvm: 2.0.0
-      env: TEST_VAGRANT_VERSION=v1.6.5 BUNDLER_VERSION=1.6.9
     - rvm: 2.0.0
       env: TEST_VAGRANT_VERSION=v1.7.4 BUNDLER_VERSION=1.10.5
-
-    - rvm: 2.2.3
-      env: TEST_VAGRANT_VERSION=v1.8.1 BUNDLER_VERSION=1.10.6
-    - rvm: 2.2.3
-      env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.10.6
-
+    - rvm: 2.2.5
+      env: TEST_VAGRANT_VERSION=v1.8.7 BUNDLER_VERSION=1.12.5
+    - rvm: 2.3.4
+      env: TEST_VAGRANT_VERSION=v1.9.8 BUNDLER_VERSION=1.16.1
+    - rvm: 2.4.4
+      env: TEST_VAGRANT_VERSION=v2.0.4 BUNDLER_VERSION=1.16.1
+    - rvm: 2.4.4
+      env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.16.1

data/CHANGELOG

@@ -1,6 +1,30 @@
 CHANGELOG
 =========
 
+2.8.1
+-----
+
+2018-05-02
+
+This is a backwards compatible bugfix release.
+
+  * Added test coverage for Vagrant 1.9 and 2.0
+
+  * Deprecated support for vagrant versions earlier than 1.8. These will be
+    removed in the next major release.
+
+  * Hostnames are now resolved to IP addresses using the Addrinfo library
+    which wraps the system resolver. Previously the Resolv library was used
+    which is a pure-Ruby DNS resolver that did not pick up system-specific
+    configuration or behavior.
+
+  * Host synchronization is supported for FreeBSD, thanks to Brian Shumate.
+
+  * Errors that occur during host sync are now trapped and logged. This
+    means that an unreachable host will no longer block other operations
+    like `vagrant destroy`.
+
+
 2.8.0
 -----
 

data/Gemfile

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
+require 'rubygems/version'
 
-ENV['TEST_VAGRANT_VERSION'] ||= 'v1.8.1'
+vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.0.4'
+vagrant_version = nil
 
 # Wrapping gemspec in the :plugins group causes Vagrant 1.5 and newer to
 # automagically load this plugin during acceptance tests.
@@ -9,19 +11,30 @@ group :plugins do
 end
 
 group :development do
-  gem 'yard', '~> 0.8.7'
+  gem 'yard', '~> 0.9.11'
   gem 'redcarpet'
 end
 
 group :test do
-  if ENV['TEST_VAGRANT_VERSION'] == 'HEAD'
-    gem 'vagrant', :github => 'mitchellh/vagrant', :branch => 'master'
+  case vagrant_branch
+  when /head/i
+    gem 'vagrant', :git => 'https://github.com/hashicorp/vagrant.git',
+      :branch => 'master'
   else
-    gem 'vagrant', :github => 'mitchellh/vagrant', :tag => ENV['TEST_VAGRANT_VERSION']
+    vagrant_version = Gem::Version.new(vagrant_branch.sub(/^v/, ''))
+    gem 'vagrant', :git => 'https://github.com/hashicorp/vagrant.git',
+      :tag => vagrant_branch
   end
 
-  # 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'
+  if vagrant_branch.match(/head/i) || (vagrant_version > Gem::Version.new('1.9.3'))
+    # Pinned on 4/11/2017. Compatible with Vagrant > 1.9.3.
+    gem 'vagrant-spec', :git => 'https://github.com/hashicorp/vagrant-spec.git',
+      :ref => '1d09951'
+  elsif vagrant_version
+    # Pinned on 12/10/2014. Compatible with Vagrant 1.6.x -- 1.9.3.
+    gem 'vagrant-spec', :git => 'https://github.com/hashicorp/vagrant-spec.git',
+      :ref => '1df5a3a'
+  end
 end
 
 eval_gemfile "#{__FILE__}.local" if File.exists? "#{__FILE__}.local"

data/lib/vagrant-hosts/action/version_check.rb

@@ -0,0 +1,25 @@
+require 'vagrant/version'
+require 'rubygems/version'
+
+# Check for deprecated Vagrant versions
+module VagrantHosts::Action
+  class VersionCheck
+    MINIMUM_VERSION = '1.8.0'
+
+    def initialize(app, env)
+      @app = app
+    end
+
+    def call(env)
+      unless Gem::Version.new(Vagrant::VERSION) > Gem::Version.new(MINIMUM_VERSION)
+        env[:env].ui.warn I18n.t(
+          'vagrant_hosts.action.version_check.deprecated_vagrant_version',
+          minimum_version: MINIMUM_VERSION,
+          vagrant_version: Vagrant::VERSION
+        )
+      end
+
+      @app.call(env)
+    end
+  end
+end

data/lib/vagrant-hosts/addresses.rb

@@ -1,5 +1,7 @@
-require 'resolv'
 require 'ipaddr'
+require 'socket' # For Addrinfo
+
+require 'vagrant/errors'
 
 module VagrantHosts::Addresses
 
@@ -11,6 +13,10 @@ module VagrantHosts::Addresses
   # @since 2.7.0
   CACHE ||= {}
 
+  class UnresolvableHostname < ::Vagrant::Errors::VagrantError
+    error_key(:unresolvable_hostname, 'vagrant_hosts.errors')
+  end
+
   private
 
   def all_hosts(config)
@@ -92,7 +98,16 @@ module VagrantHosts::Addresses
       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)
+          begin
+            hosts.concat resolve_host_entries(p.config.exports[k], m)
+          rescue Vagrant::Errors::VagrantError => e
+            machine.ui.error I18n.t(
+              'vagrant_hosts.errors.collection_failed',
+              :host   => m.name.to_s,
+              :error_class => e.class,
+              :message => e.message
+            )
+          end
         end
       end
     end
@@ -184,9 +199,8 @@ module VagrantHosts::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.
+  # @raise [VagrantHosts::Addresses::UnresolvableHostname] If `address` is a
+  #   maformed IP address or unresolvable hostname.
   #
   # @return [IPAddr] An IP address.
   #
@@ -195,8 +209,23 @@ module VagrantHosts::Addresses
     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))
+      nil
+    end
+
+    ip ||= begin
+      # Wasn't an IP address. Resolve it. The "@vagrant_ssh" returns a
+      # hostname instead of IP when the AWS provider is in use.
+      #
+      # NOTE: Name resolution is done using Ruby's Addrinfo instead of Resolv
+      # as Addrinfo always uses the system resolver library and thus picks up
+      # platform-specific behavior such as the OS X /etc/resolver/ directory.
+      IPAddr.new(Addrinfo.ip(address).ip_address)
+    rescue IPAddr::InvalidAddressError, SocketError
+      nil
+    end
+
+    if ip.nil?
+      raise UnresolvableHostname, address: address
     end
 
     ip

data/lib/vagrant-hosts/plugin.rb

@@ -22,7 +22,7 @@ class VagrantHosts::Plugin < Vagrant.plugin(2)
 
   # Guest capabilities for vagrant-hosts
 
-  [:darwin, :linux, :solaris, :solaris11].each do |os|
+  [:darwin, :freebsd, :linux, :solaris, :solaris11].each do |os|
     guest_capability(os, 'sync_hosts') do
       require_relative 'cap'
       VagrantHosts::Cap::SyncHosts::POSIX
@@ -35,7 +35,7 @@ class VagrantHosts::Plugin < Vagrant.plugin(2)
   end
 
 
-  [:darwin, :linux, :solaris, :solaris11].each do |os|
+  [:darwin, :freebsd, :linux, :solaris, :solaris11].each do |os|
     guest_capability(os, 'network_facts') do
       require_relative 'cap'
       VagrantHosts::Cap::Facts::POSIX
@@ -52,6 +52,12 @@ class VagrantHosts::Plugin < Vagrant.plugin(2)
     VagrantHosts::Command
   end
 
+  # Internal action hooks
+  action_hook('Vagrant Hosts: vagrant version check', :environment_load) do |hook|
+    require 'vagrant-hosts/action/version_check'
+    hook.prepend VagrantHosts::Action::VersionCheck
+  end
+
   # ConfigBuilder tie-ins
 
   def self.config_builder_hook

data/lib/vagrant-hosts/version.rb

@@ -1,3 +1,3 @@
 module VagrantHosts
-  VERSION = '2.8.0'
+  VERSION = '2.8.1'.freeze
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 # Disable Vagrant autoloading so that other plugins defined in the Gemfile for
 # Acceptance tests are not loaded.
 ENV['VAGRANT_NO_PLUGINS'] = '1'
+ENV['VAGRANT_DISABLE_PLUGIN_INIT'] = '1'
 
 # Load the vagrant-hosts plugin so that Provisioners and such can be found.
 require 'vagrant-hosts'

data/spec/unit/addresses_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+require 'vagrant-hosts/addresses'
+
+describe 'VagrantHosts::Addresses' do
+  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
+    end.new
+  end
+
+  describe '#resolve_ip' do
+    it 'raises an error when passed an unresolvable hostname' do
+      expect{ subject.resolve_ip('somewhere.bogusdomain') }.to \
+        raise_error(VagrantHosts::Addresses::UnresolvableHostname, /somewhere.bogusdomain/)
+    end
+  end
+end

data/templates/locales/en.yml

@@ -1,3 +1,20 @@
 ---
 en:
-  vagrant_hosts: {}
+  vagrant_hosts:
+    action:
+      version_check:
+        deprecated_vagrant_version: |-
+          The vagrant-hosts plugin has deprecated support for Vagrant
+          versions older than %{minimum_version}. Support for version %{vagrant_version}
+          will be removed in the next major release of the plugin.
+    errors:
+      unresolvable_hostname: |-
+        The hostname, %{address}, was not a valid IP address or resolvable hostname.
+      collection_failed: |-
+        An error of type %{error_class} occurred while collecting
+        host info from %{host}:
+
+        %{message}
+
+        If this was caused by a transient condition, then the next
+        sync should succeed.

data/vagrant-hosts.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |gem|
     Manage static DNS entries and configuration for Vagrant guests.
   EOD
 
-  gem.authors  = 'Adrien Thebo'
-  gem.email    = 'adrien@somethingsinistral.net'
-  gem.homepage = 'https://github.com/adrienthebo/vagrant-hosts'
+  gem.authors  = ['Adrien Thebo', 'Charlie Sharpsteen']
+  gem.email    = ['adrien@somethingsinistral.net', 'source@sharpsteen.net']
+  gem.homepage = 'https://github.com/oscar-stack/vagrant-hosts'
 
   gem.has_rdoc = true
   gem.license  = 'Apache 2.0'

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hosts
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Adrien Thebo
+- Charlie Sharpsteen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -40,7 +41,9 @@ dependencies:
         version: 2.14.0
 description: |2
       Manage static DNS entries and configuration for Vagrant guests.
-email: adrien@somethingsinistral.net
+email:
+- adrien@somethingsinistral.net
+- source@sharpsteen.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -55,6 +58,7 @@ files:
 - README.markdown
 - Rakefile
 - lib/vagrant-hosts.rb
+- lib/vagrant-hosts/action/version_check.rb
 - lib/vagrant-hosts/addresses.rb
 - lib/vagrant-hosts/cap.rb
 - lib/vagrant-hosts/cap/facts/base.rb
@@ -76,11 +80,12 @@ files:
 - lib/vagrant-hosts/version.rb
 - spec/integration/addresses_spec.rb
 - spec/spec_helper.rb
+- spec/unit/addresses_spec.rb
 - spec/unit/config_spec.rb
 - tasks/spec.rake
 - templates/locales/en.yml
 - vagrant-hosts.gemspec
-homepage: https://github.com/adrienthebo/vagrant-hosts
+homepage: https://github.com/oscar-stack/vagrant-hosts
 licenses:
 - Apache 2.0
 metadata: {}
@@ -100,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Manage static DNS on vagrant guests
 test_files: []
-has_rdoc: true