vagrant-dns 0.5.0 → 0.6.0.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 50a969b5fa509b2a185b0962b5b13afad83c4254
+  data.tar.gz: 9e3c9a15a55c8d3c42283b13650f118b3945deb5
+SHA512:
+  metadata.gz: 2ffb83a8cd804bbcf2af794a31756bbd3e6428ea00db3feb5ef0d9dc872fc4c4e3d50063c8e0ab779d4fe2bbcaa30def4a5f7f94ac2e3af7cfae87880335278f
+  data.tar.gz: 3d3c4d0c8d0476f6d627f58135003cdf16eafdc6b4435f85e87b9bd408548f565e0586094b3d265825e0fb4242cf3c991aa11f7f92cdacf3fb13a1a92f6893db

data/.gitignore

@@ -14,4 +14,5 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
+test/acceptance/artifacts
 tmp

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.6.0 (unreleased / beta1)
+
+This is a intermediate release towards v1.0.0
+
+* Using RubyDNS ~> 0.8.4
+* New option to un/install system files using `sudo` (restoring 0.4 behavior). Add `--with-sudo` to  `--install`, `--uninstall` or `--purge`. [GH-26]
+* Use new vagrant >= 1.5 development patterns [GH-31]
+* Add acceptance test using vagrant-spec
+* Moved sample `Vagrantfile` into `/testdrive` which also contains a small wrapper script `bin/vagrant` to move "vagrant home" into a sandbox.
+
 # v0.4.1
 
 * Fixes an issue with not configured private networks [GH-21], [GH-19]

data/Gemfile

@@ -1,11 +1,29 @@
 source 'https://rubygems.org'
+ruby '2.0.0'
 
-# Specify your gem's dependencies in vagrant-dns.gemspec
-gemspec
+ENV['TEST_VAGRANT_VERSION'] ||= '~> v1.6.2'
 
-group :development do
-  # We depend on Vagrant for development, but we don't add it as a
-  # gem dependency because we expect to be installed within the
-  # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+# Using the :plugins group causes Vagrant to automagially load auto_network
+# during acceptance tests.
+group :plugins do
+  gemspec
+end
+
+group :test, :development do
+  if ENV['TEST_VAGRANT_VERSION'] == 'HEAD'
+    gem 'vagrant', :github => 'mitchellh/vagrant', :branch => 'master'
+  else
+    gem 'vagrant', :github => 'mitchellh/vagrant', :tag => ENV['TEST_VAGRANT_VERSION']
+  end
+  gem 'rubydns', :github => 'ioquatix/rubydns', :branch => 'master'
+end
+
+group :test do
+  # Pinned on 05/05/2014. Compatible with Vagrant 1.5.x and 1.6.x.
+  gem 'vagrant-spec', :github => 'mitchellh/vagrant-spec', :ref => 'aae28ee'
+  gem 'rake'
+end
+
+if File.exists? "#{__FILE__}.local"
+  eval(File.read("#{__FILE__}.local"), binding)
 end

data/Rakefile

@@ -1,2 +1,7 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+task_dir = File.expand_path("../tasks", __FILE__)
+Dir["#{task_dir}/**/*.rake"].each do |task_file|
+  load task_file
+end

data/lib/vagrant-dns/command.rb

@@ -11,7 +11,7 @@ module VagrantDNS
     def execute
       options = {}
       opts = OptionParser.new do |opts|
-        opts.banner = "Usage: vagrant dns [vm-name] [-i|--install] [-u|--uninstall] [--pruge] [-s|--start] [-S|--stop] [-r|--restart] [-o|--ontop]"
+        opts.banner = "Usage: vagrant dns [vm-name] [-i|--install] [-u|--uninstall] [--with-sudo] [--pruge] [-s|--start] [-S|--stop] [-r|--restart] [-o|--ontop]"
         opts.separator ""
 
         opts.on("--install", "-i", "Install DNS config for machine domain") do
@@ -22,8 +22,11 @@ module VagrantDNS
           options[:uninstall] = true
         end
 
+        opts.on("--with-sudo", "In conjunction with `--install`, `--uninstall`, `--purge`: Run using `sudo` instead of `osascript`. Useful for automated scripts running as sudoer.") do
+          options[:installer_opts] = { exec_style: :sudo }
+        end
+
         opts.on("--purge", "Uninstall DNS config and remove DNS configurations of all machines.") do
-          options[:uninstall] = true
           options[:purge] = true
         end
 
@@ -49,14 +52,9 @@ module VagrantDNS
 
       vms = argv unless argv.empty?
 
-      if options[:uninstall]
+      if options[:uninstall] || options[:purge]
         manage_service(vms, options.merge(stop: true))
         manage_installation(vms, options)
-
-        if options[:purge]
-          require 'fileutils'
-          FileUtils.rm_r(tmp_path)
-        end
       else
         build_config(vms, options)
         manage_service(vms, options)
@@ -69,12 +67,15 @@ module VagrantDNS
 
     def manage_installation(vms, options)
       if Vagrant::Util::Platform.darwin?
-        installer = VagrantDNS::Installers::Mac.new(tmp_path)
+        installer_options = options.fetch(:installer_opts, {})
+        installer = VagrantDNS::Installers::Mac.new(tmp_path, installer_options)
 
         if options[:install]
           installer.install!
         elsif options[:uninstall]
           installer.uninstall!
+        elsif options[:purge]
+          installer.purge!
         end
       else
         raise 'installing and uninstalling is only supported on Mac OS X at the moment.'

data/lib/vagrant-dns/installers/mac.rb

@@ -1,36 +1,66 @@
 module VagrantDNS
   module Installers
     class Mac
-      attr_accessor :tmp_path, :install_path
+      EXEC_STYLES = %i{osa sudo}
 
-      def initialize(tmp_path, install_path = "/etc/resolver")
-        self.tmp_path, self.install_path = tmp_path, install_path
+      attr_accessor :tmp_path, :install_path, :exec_style
+
+      def initialize(tmp_path, options = {})
+        self.tmp_path     = tmp_path
+        self.install_path = options.fetch(:install_path, "/etc/resolver")
+        self.exec_style   = options.fetch(:exec_style, :osa)
       end
 
       def install!
         require 'fileutils'
 
-        command = "mkdir -p #{install_path}\n"
-        registered_resolvers.each do |resolver|
-          command += "ln -sf #{resolver} #{install_path}\n"
+        commands = [
+          ['mkdir', '-p', install_path]
+        ]
+
+        commands += registered_resolvers.map do |resolver|
+          ['ln', '-sf', resolver.shellescape, install_path.shellescape]
         end
-        `osascript -e 'do shell script \"#{command}\" with administrator privileges'`
+
+        exec(*commands)
       end
 
       def uninstall!
         require 'fileutils'
 
-        command = ""
-        registered_resolvers.each do |r|
+        commands = registered_resolvers.map do |r|
           installed_resolver = File.join(install_path, File.basename(r))
-          command += "rm -rf #{installed_resolver}\n"
+          ['rm', '-rf', installed_resolver]
         end
-        `osascript -e 'do shell script \"#{command}\" with administrator privileges'`
+
+        exec(*commands)
+      end
+
+      def purge!
+        require 'fileutils'
+        uninstall!
+        FileUtils.rm_r(tmp_path)
       end
 
       def registered_resolvers
         Dir[File.join(tmp_path, "resolver", "*")]
       end
+
+      def exec(*commands)
+        return if !commands || commands.empty?
+
+        case exec_style
+        when :osa
+          cmd_script = commands.map {|line| line.join ' ' }.join($/)
+          system 'osascript', '-e', "do shell script \"#{cmd_script}\" with administrator privileges"
+        when :sudo
+          commands.each do |c|
+            system 'sudo', *c
+          end
+        else
+          raise ArgumentError, "Unsupported execution style: #{exec_style}. Use one of #{EXEC_STYLES.map(&:inspect).join(' ')}"
+        end
+      end
     end
   end
 end

data/lib/vagrant-dns/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dns
-    VERSION = "0.5.0"
+    VERSION = "0.6.0.beta1"
   end
 end

data/tasks/acceptance.rake

@@ -0,0 +1,25 @@
+namespace :acceptance do
+  ARTIFACT_DIR = File.join('test', 'acceptance', 'artifacts')
+  TEST_BOXES = {
+    :virtualbox => 'http://files.vagrantup.com/precise32.box'
+  }
+
+  directory ARTIFACT_DIR
+  TEST_BOXES.each do |(provider, box_url)|
+    file File.join(ARTIFACT_DIR, "#{provider}.box") => ARTIFACT_DIR do |path|
+      puts 'Downloading: ' + box_url
+      Kernel.system 'curl', '-L', '-o', path.to_s, box_url
+    end
+  end
+
+  desc 'downloads test boxes and other artifacts'
+  task :setup => TEST_BOXES.map { |(provider, box_url)| File.join(ARTIFACT_DIR, "#{provider}.box") }
+
+  desc 'runs acceptance tests'
+  task :run => :setup do
+    command = 'vagrant-spec test'
+    puts command
+    puts
+    exec(command)
+  end
+end

data/test/acceptance/dns/dns_spec.rb

@@ -0,0 +1,72 @@
+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

@@ -0,0 +1,12 @@
+# -*- 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/{Vagrantfile → testdrive/Vagrantfile}

@@ -1,21 +1,21 @@
 # -*- 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 = "base"
+  config.vm.box     = 'precise32'
+  config.vm.box_url = 'http://files.vagrantup.com/precise32.box'
 
-  config.dns.tld = "dev"
-  config.dns.patterns = /^.*machine.dev$/
+  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

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

data/vagrant-dns.gemspec

@@ -16,5 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Vagrant::Dns::VERSION
 
   gem.add_dependency "daemons"
-  gem.add_dependency "rubydns", "~> 0.6.0"
+  gem.add_dependency "rubydns", '~> 0.8.4'
+
+  gem.add_development_dependency 'rspec', '~> 2.14.0'
 end

data/vagrant-spec.config.rb

@@ -0,0 +1,15 @@
+require 'pathname'
+require "vagrant-spec/acceptance"
+
+Vagrant::Spec::Acceptance.configure do |c|
+  acceptance_dir = Pathname.new File.expand_path("../test/acceptance", __FILE__)
+
+  c.component_paths = [acceptance_dir.to_s]
+  c.skeleton_paths = [(acceptance_dir + 'skeletons').to_s]
+
+  c.provider 'virtualbox',
+    box: (acceptance_dir + 'artifacts' + 'virtualbox.box').to_s,
+    env_vars: {
+      'VBOX_USER_HOME' => '{{homedir}}',
+    }
+end

metadata

@@ -1,48 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dns
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0.beta1
 platform: ruby
 authors:
 - Florian Gilcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.4
+- !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
   local machines.
 email:
@@ -58,7 +67,6 @@ files:
 - PLATFORM_SUPPORT.md
 - README.md
 - Rakefile
-- Vagrantfile
 - lib/vagrant-dns.rb
 - lib/vagrant-dns/command.rb
 - lib/vagrant-dns/config.rb
@@ -67,30 +75,36 @@ files:
 - lib/vagrant-dns/restart_middleware.rb
 - 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: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: vagrant-dns manages DNS records of vagrant machines
-test_files: []
-has_rdoc: 
+test_files:
+- test/acceptance/dns/dns_spec.rb
+- test/acceptance/skeletons/dns/Vagrantfile