vagrant-rubydns 0.2.0 → 0.2.1

data/lib/vagrant-rubydns/server.rb

@@ -2,36 +2,53 @@ require 'rubydns'
 
 module VagrantRubydns
   class Server < RExec::Daemon::Base
-
-    INTERFACES = [
-      [:udp, "0.0.0.0", 10053],
-      [:tcp, "0.0.0.0", 10053]
-    ]
     Name = Resolv::DNS::Name
-    IN = Resolv::DNS::Resource::IN
+    IN   = Resolv::DNS::Resource::IN
+
+    def self.port
+      @port ||= 10053
+    end
+
+    def self.port=(port)
+      @port = port
+    end
+
+    def self.upstream_servers
+      [[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]]
+    end
+
+    def self.interfaces
+      [
+        [:udp, "0.0.0.0", port],
+        [:tcp, "0.0.0.0", port]
+      ]
+    end
 
     def self.upstream
-      @upstream ||= RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
+      @upstream ||= RubyDNS::Resolver.new(upstream_servers)
     end
 
-    def self.logfile
-      VagrantRubydns.working_dir.join('server.log')
+    def self.pid
+      RExec::Daemon::ProcessFile.recall(self)
     end
 
     # For RExec
-    @@base_directory = VagrantRubydns.working_dir
+    def self.working_directory
+      VagrantRubydns.working_dir
+    end
 
     def self.running?
       RExec::Daemon::ProcessFile.status(self) == :running
     end
 
     def self.prefork
+      super
       ResolverConfig.ensure_config_exists
     end
 
     def self.run
       server = self
-      RubyDNS::run_server(:listen => INTERFACES) do
+      RubyDNS::run_server(:listen => interfaces) do
         self.logger.level = Logger::INFO
         
         match(/.*/, IN::A) do |transaction|

data/lib/vagrant-rubydns/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Rubydns
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/test/support/test_server_daemon.rb

@@ -0,0 +1,40 @@
+# Set test port so there's nothing colliding
+VagrantRubydns::Server.port = 11153
+
+module SilenceOutput
+  def silence
+    orig_out, orig_err = $stdout, $stderr
+    $stdout, $stderr   = StringIO.new, StringIO.new
+
+    yield
+  ensure
+    $stdout = orig_out
+    $stderr = orig_err
+  end
+
+  def start
+    silence { super }
+  end
+
+  def stop
+    silence { super }
+  end
+end
+
+class VagrantRubydns::Server
+  extend SilenceOutput
+end
+
+module TestServerHooks
+  def teardown
+    super
+    # Cleanup any stray server instances from tests
+    if VagrantRubydns::Server.running?
+      VagrantRubydns::Server.stop
+    end
+  end
+end
+
+class MiniTest::Spec
+  include TestServerHooks
+end

data/test/test_helper.rb

@@ -39,9 +39,15 @@ def fake_environment_with_machine(hostname, ip)
   { machine: machine, ui: FakeUI, global_config: env.config_global }
 end
 
+class MiniTest::Spec
+  alias_method :hush, :capture_io
+end
+
 # order is important on these
-require 'support/fake_working_dir'
 require 'support/clear_dependent_vms'
 
 require 'support/fake_ui'
-require 'support/disable_server_daemon'
+require 'support/test_server_daemon'
+
+# need to be last; don't want to delete dir out from servers before they clean up
+require 'support/fake_working_dir'

data/test/vagrant-rubydns/action/setup_test.rb

@@ -50,9 +50,12 @@ module VagrantRubydns
         env = fake_environment_with_machine('somehost.vagrant.dev', '1.2.3.4')
 
         Server.start
+        original_pid = Server.pid
+
         setup.call(env)
 
-        Server.start_count.must_equal 1
+        Server.running?.must_equal true
+        Server.pid.must_equal original_pid
       end
 
       it "does nothing if it is not enabled via config" do

data/test/vagrant-rubydns/action/teardown_test.rb

@@ -44,7 +44,7 @@ module VagrantRubydns
         Server.start
         teardown.call(env)
 
-        Server.stop_count.must_equal 1
+        Server.running?.must_equal false
       end
 
       it "leaves the rubydns server when other dependent vms exist" do
@@ -58,7 +58,7 @@ module VagrantRubydns
         Server.start
         teardown.call(env)
 
-        Server.stop_count.must_equal 0
+        Server.running?.must_equal true
       end
 
       it "leaves the server alone if it's not running" do
@@ -68,7 +68,7 @@ module VagrantRubydns
 
         teardown.call(env)
 
-        Server.stop_count.must_equal 0
+        Server.running?.must_equal false
       end
 
       it "does nothing when rubydns is disabled" do

data/test/vagrant-rubydns/server_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+module VagrantRubydns
+  describe Server do
+    after {
+      if Server.running?
+        Server.stop
+      end
+    }
+    describe 'start/stop' do
+      it 'starts and stops a daemon' do
+        hush { Server.start }
+
+        Server.running?.must_equal true
+
+        hush { Server.stop }
+
+        Server.running?.must_equal false
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rubydns
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydns
@@ -87,13 +87,14 @@ files:
 - lib/vagrant-rubydns/util.rb
 - lib/vagrant-rubydns/version.rb
 - test/support/clear_dependent_vms.rb
-- test/support/disable_server_daemon.rb
 - test/support/fake_ui.rb
 - test/support/fake_working_dir.rb
+- test/support/test_server_daemon.rb
 - test/test_helper.rb
 - test/vagrant-rubydns/action/setup_test.rb
 - test/vagrant-rubydns/action/teardown_test.rb
 - test/vagrant-rubydns/dependent_vms_test.rb
+- test/vagrant-rubydns/server_test.rb
 - test/vagrant-rubydns/store_test.rb
 - vagrant-rubydns.gemspec
 homepage: ''
@@ -123,12 +124,13 @@ specification_version: 3
 summary: a simple dns server for vagrant guests
 test_files:
 - test/support/clear_dependent_vms.rb
-- test/support/disable_server_daemon.rb
 - test/support/fake_ui.rb
 - test/support/fake_working_dir.rb
+- test/support/test_server_daemon.rb
 - test/test_helper.rb
 - test/vagrant-rubydns/action/setup_test.rb
 - test/vagrant-rubydns/action/teardown_test.rb
 - test/vagrant-rubydns/dependent_vms_test.rb
+- test/vagrant-rubydns/server_test.rb
 - test/vagrant-rubydns/store_test.rb
 has_rdoc: 

data/test/support/disable_server_daemon.rb

@@ -1,37 +0,0 @@
-class VagrantRubydns::Server < RExec::Daemon::Base
-  def self.start
-    @start_count += 1
-  end
-
-  def self.stop
-    @stop_count += 1
-  end
-
-  def self.running?
-    @start_count > 0
-  end
-
-  def self.clear!
-    @start_count = 0
-    @stop_count = 0
-  end
-
-  def self.start_count
-    @start_count
-  end
-
-  def self.stop_count
-    @stop_count
-  end
-end
-
-module FakeServerHooks
-  def setup
-    super
-    VagrantRubydns::Server.clear!
-  end
-end
-
-class MiniTest::Spec
-  include FakeServerHooks
-end