vagrant-dns 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e10dc6e9ae63d965ec678d7bb481a48cfb81fa1f
-  data.tar.gz: 673770b40b4723277f9db600302018a0b7f7a201
+  metadata.gz: 1b5a5f6e14ebc5f918008c61685cfbf769596db1
+  data.tar.gz: 2c3dfff6cf22d3960c4dcc12e783577a4e232cfe
 SHA512:
-  metadata.gz: 79631a6d0a2c2c909bb076ab5c94fcaba0765cfc0d5fad27363d5b39813807c22800c8a2334e86db514901f63ff522ae6053a47f81beb8fff575fd0e66faa3fd
-  data.tar.gz: 1ee7d0ea094ba2909b4a2e6eccf5949e5d87eae2e7044f50959da5083dfdcf8e1e2e48061f21073d26874bf28d963981bed0c631c3ffe54d698d4eb4e4b5d5cc
+  metadata.gz: 6193969e02c212e396979e3cd69be02be51b86145cea153e65acea7511db177bfe4b1c75ddc3b49a80fc4dd3f63557c49da54ec935dd792c8f8f7b060dcd6b09
+  data.tar.gz: 3fdcefc945ecbc726e58d69c967e336ede6bd5392c89c0ba6d121ec5635f55975b3641f1c9c7526fc32fcddc4e8295ac1bef5d2c5d3ed2c69505e6f3b0cce203

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 test/acceptance/artifacts
 tmp
+testdrive/.vagrant

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.1.0
+
+* Fixes handling of networks without static IP, such as DHCP. [GH-37], [GH-39], [GH-50]
+* Add support for boxes with `public_network` and static IP.
+* Breaking: No longer falls back to `127.0.0.1` when no IP could be found.
+* Log messages will now be tagged with the related box (vm) and `[vagrant-dns]`
+* Develepment targets Vagrant 1.9.3
+
 # 1.0.0
 
 * 🎉Release as 1.0 [GH-34]

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
-ruby '2.0.0'
+ruby(ENV['TEST_RUBY_VERSION'] || '~> 2.2.5')
 
-ENV['TEST_VAGRANT_VERSION'] ||= '~> v1.7.4'
+ENV['TEST_VAGRANT_VERSION'] ||= 'v1.9.3'
 
 # Using the :plugins group causes Vagrant to automagially load auto_network
 # during acceptance tests.

data/lib/vagrant-dns/configurator.rb

@@ -31,22 +31,34 @@ module VagrantDNS
       end
 
       def register_patterns!
-        registry = YAML.load(File.read(config_file)) if File.exists?(config_file)
-        registry ||= {}
         opts     = dns_options(vm)
+
         patterns = opts[:patterns] || default_patterns(opts)
-        networks = opts[:networks]
-        network = {}
-        networks.each do |nw|
-          network = nw if nw.first == :private_network
+        if patterns.empty?
+         vm.ui.warn '[vagrant-dns] TLD but no host_name given. No patterns will be configured.'
+         return
         end
 
-        if ! network.empty?
-          ip     = network.last[:ip]
-        else
-          ip     = '127.0.0.1'
+        network = opts[:networks].find do |nw|
+          nw.first == :private_network && nw.last[:ip]
+        end
+
+        unless network
+          network = opts[:networks].find do |nw|
+            nw.first == :public_network && nw.last[:ip]
+          end
         end
 
+        unless network
+          vm.ui.warn '[vagrant-dns] Could not find any static network IP. No patterns will be configured.'
+          return
+        end
+
+        ip = network.last[:ip]
+
+        registry = YAML.load(File.read(config_file)) if File.exists?(config_file)
+        registry ||= {}
+
         patterns.each do |p|
           p = p.source if p.respond_to? :source # Regexp#to_s is unusable
           registry[p] = ip
@@ -66,7 +78,6 @@ module VagrantDNS
         if opts[:host_name]
           opts[:tlds].map { |tld| /^.*#{opts[:host_name]}.#{tld}$/ }
         else
-          warn 'TLD but no host_name given. No patterns will be configured.'
           []
         end
       end

data/lib/vagrant-dns/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dns
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/vagrant-dns.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{vagrant-dns manages DNS records of vagrant machines}
   gem.homepage      = ""
 
-  gem.files         = `git ls-files`.split($\)
+  gem.files         = `git ls-files`.split($\).reject { |f| f.match(%r{^(test|testdrive)/}) }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "vagrant-dns"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dns
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Florian Gilcher
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !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: vagrant-dns is a vagrant plugin that manages DNS records associated with
@@ -62,7 +62,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -78,10 +78,6 @@ files:
 - lib/vagrant-dns/service.rb
 - lib/vagrant-dns/version.rb
 - tasks/acceptance.rake
-- test/acceptance/dns/dns_spec.rb
-- test/acceptance/skeletons/dns/Vagrantfile
-- testdrive/Vagrantfile
-- testdrive/bin/vagrant
 - vagrant-dns.gemspec
 - vagrant-spec.config.rb
 homepage: ''
@@ -93,20 +89,18 @@ 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.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: vagrant-dns manages DNS records of vagrant machines
-test_files:
-- test/acceptance/dns/dns_spec.rb
-- test/acceptance/skeletons/dns/Vagrantfile
+test_files: []

data/test/acceptance/dns/dns_spec.rb

@@ -1,72 +0,0 @@
-shared_examples 'provider/dns' do |provider, options|
-
-  if !File.file?(options[:box])
-    raise ArgumentError,
-      "A box file #{options[:box]} must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
-  end
-
-  include_context 'acceptance'
-
-  let(:box_ip) { '10.10.10.101' }
-  let(:tld)    { 'spec' }
-  let(:name)   { 'single.testbox.spec' }
-
-  before do
-    ENV['VAGRANT_DEFAULT_PROVIDER'] = provider
-    environment.skeleton('dns')
-  end
-
-  describe 'installation' do
-    it 'creates and removes resolver link' do
-      assert_execute('vagrant', 'dns', '--install', '--with-sudo')
-      assert_execute('ls', "/etc/resolver/#{tld}")
-
-      assert_execute('vagrant', 'dns', '--uninstall', '--with-sudo')
-      result = execute('ls', "/etc/resolver/#{tld}")
-      expect(result).to_not exit_with(0)
-    end
-  end
-
-  describe 'running' do
-    before do
-      assert_execute('vagrant', 'box', 'add', 'box', options[:box])
-      assert_execute('vagrant', 'dns', '--install', '--with-sudo')
-      assert_execute('vagrant', 'up', "--provider=#{provider}")
-    end
-
-    after do
-      # Ensure any VMs that survived tests are cleaned up.
-      assert_execute('vagrant', 'destroy', '--force', log: false)
-      assert_execute('vagrant', 'dns', '--uninstall', '--with-sudo')
-    end
-
-    it 'auto-starts the DNS daemon' do
-      assert_execute('pgrep', '-lf', 'vagrant-dns')
-    end
-
-    it 'registered as a resolver' do
-      expected_output = <<-TXT
-  domain   : #{tld}
-  nameserver[0] : 127.0.0.1
-  port     : 5333
-  flags    : Request A records, Request AAAA records
-  reach    : Reachable,Local Address
-      TXT
-
-      result = assert_execute('scutil', '--dns')
-      expect(result.stdout).to include(expected_output)
-    end
-
-    it 'responds to host-names' do
-      result = assert_execute('dscacheutil', '-q', 'host', '-a', 'name', "#{name}")
-      expect(result.stdout).to include("ip_address: #{box_ip}")
-
-      result = assert_execute('dscacheutil', '-q', 'host', '-a', 'name', "www.#{name}")
-      expect(result.stdout).to include("ip_address: #{box_ip}")
-
-      result = execute('dscacheutil', '-q', 'host', '-a', 'name', "notthere.#{tld}")
-      expect(result.stdout).to_not include("ip_address: #{box_ip}")
-    end
-  end
-
-end

data/test/acceptance/skeletons/dns/Vagrantfile

@@ -1,12 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.box = "box"
-  config.vm.network :private_network, ip: '10.10.10.101'
-
-  config.dns.tld      = 'spec'
-  config.dns.patterns = /^.*single.testbox.spec$/
-
-  VagrantDNS::Config.listen = [[:udp, "0.0.0.0", 5333]]
-end

data/testdrive/Vagrantfile

@@ -1,21 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
-
-  # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box     = 'precise32'
-  config.vm.box_url = 'http://files.vagrantup.com/precise32.box'
-
-  config.dns.tld      = "test"
-  config.dns.patterns = /^.*machine.test$/
-
-  config.vm.hostname = "machine"
-  config.vm.network :private_network, ip: "33.33.33.60"
-
-
-  VagrantDNS::Config.listen = [[:udp, "0.0.0.0", 5300]]
-end

data/testdrive/bin/vagrant

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-TESTDRIVE=${VAGRANT_DEV:-$(dirname "$(cd "$(dirname "$0")" && pwd)")}
-
-VAGRANT_DEFAULT_PROVIDER=virtualbox \
-VAGRANT_HOME=${TESTDRIVE}/.vagrant.d \
-bundle exec vagrant $@