rubydns 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccdcf756b8a2f0e55cd79870c6d02e2780555989
-  data.tar.gz: 2f71470c5156ec98b3072d5fedfd59a38f7ca548
+  metadata.gz: ca335a666974f8ec5e2a9c3cfe075e2d156593f0
+  data.tar.gz: ff3d9313d716dcf7c25cf40272fc97e7a36c508e
 SHA512:
-  metadata.gz: c53c978b9e44687be068ddad06922f6f84ef243b951077b38fbbba5e3b119d6b6e2ebbd9b6e6049dcf942662fd3531b875438f651d92e0e72252af1aa964c9a4
-  data.tar.gz: 7314c0a9b60a96262f2c0dee723c193a79f61676ae6404acc852d74d7462eb6f28b08e76428a11c61c11409877252dfdf543615edb38896738fad6237ddc05d2
+  metadata.gz: 4603602b5a55406025fb7064a6e4ed002bbeec6216397f458ca1f0105eeecda08d90d66cc360440cbdd8e3d172e38cad114130a988ec9830919ade26e0339506
+  data.tar.gz: 9f9efda65a0c352060278fb229f4d61b9a35514b13e4fab35ad996bb3a37dfc973589ea1614e928230828b47b648f2418c1aeabef67b4f7b50612f06ef3dfd05

data/.travis.yml

@@ -1,6 +1,4 @@
 language: ruby
 rvm:
-rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0

data/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-	gem "rake"
+	gem "minitest"
 end

data/README.md

@@ -1,14 +1,14 @@
 # RubyDNS
 
-RubyDNS is a high-performance DNS server which can be easily integrated into other projects or used as a stand-alone daemon (via RExec). By default it uses rule-based pattern matching. Results can be hard-coded, computed, fetched from a remote DNS server or fetched from a local cache, depending on requirements.
+RubyDNS is a high-performance DNS server which can be easily integrated into other projects or used as a stand-alone daemon. By default it uses rule-based pattern matching. Results can be hard-coded, computed, fetched from a remote DNS server or fetched from a local cache, depending on requirements.
 
 In addition, RubyDNS includes a high-performance asynchronous DNS resolver built on top of EventMachine. This module can be used by itself in client applications without using the full RubyDNS server stack.
 
 For examples and documentation please see the main [project page][1].
 
-[1]: http://www.oriontransfer.co.nz/gems/rubydns
+[1]: http://www.codeotaku.com/projects/rubydns/
 
-[![Build Status](https://secure.travis-ci.org/ioquatix/rubydns.png)](http://travis-ci.org/ioquatix/rubydns)
+[![Build Status](https://travis-ci.org/ioquatix/rubydns.svg)](https://travis-ci.org/ioquatix/rubydns)
 [![Code Climate](https://codeclimate.com/github/ioquatix/rubydns.png)](https://codeclimate.com/github/ioquatix/rubydns)
 
 ## Installation
@@ -42,7 +42,7 @@ This is copied from `test/examples/test-dns-2.rb`. It has been simplified slight
 	# Use upstream DNS for name resolution.
 	UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
 
-	def self.run
+	def startup
 	    # Start the RubyDNS server
 	    RubyDNS::run_server(:listen => INTERFACES) do
 	        match(/test.mydomain.org/, IN::A) do |transaction|
@@ -81,6 +81,10 @@ This is the best way to integrate with other projects.
 
 ## Compatibility
 
+### Migrating from RubyDNS 0.7.x to 0.8.x
+
+The primary change is the removal of the dependency on `RExec` which was used for daemons and the addition of the testing dependency `process-daemon`. In order to create and run your own daemon, you may use `process-daemon` or another tool of your choice.
+
 ### Migrating from RubyDNS 0.6.x to 0.7.x
 
 The asynchronous deferred processing became the default and only method for processing requests in `0.7.0`. This simplifies the API but there were a few changes, notably the removal of `defer!` and the addition of `defer`. The reason for this was due to issues relating to deferred processing and the flow of control, which were confusing and introduced bugs in specific situations. Now, you can assume flow control through the entire block even with non-blocking functions.
@@ -180,6 +184,7 @@ becomes
 
 * Support for more features of DNS such as zone transfer.
 * Support reverse records more easily.
+* Some kind of system level integration, e.g. registering a DNS server with the currently running system resolver.
 
 ## License
 

data/lib/rubydns/binary_string.rb

@@ -1,4 +1,3 @@
-
 # Copyright, 2009, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/rubydns/extensions/string.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rubydns/chunked'
+require_relative '../chunked'
 
 class String
 	# Chunk a string which is required for the TEXT `resource_class`.

data/lib/rubydns/handler.rb

@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rubydns/message'
-require 'rubydns/binary_string'
+require_relative 'message'
+require_relative 'binary_string'
 
 module RubyDNS
 	# @returns the [port, ip address] of the given connection.

data/lib/rubydns/{extensions/logger.rb → logger.rb}

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'logger'
+
 module RubyDNS
 	# Logs an exception nicely to a standard `Logger`.
 	def self.log_exception(logger, exception)
@@ -25,6 +27,5 @@ module RubyDNS
 		if exception.backtrace
 			Array(exception.backtrace).each { |at| logger.error at }
 		end
-		
 	end
 end

data/lib/rubydns/message.rb

@@ -24,7 +24,8 @@ require 'resolv'
 
 require 'base64'
 
-require 'rubydns/extensions/resolv'
+require_relative 'logger'
+require_relative 'extensions/resolv'
 
 module RubyDNS
 	UDP_TRUNCATION_SIZE = 512

data/lib/rubydns/resolver.rb

@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rubydns/message'
-require 'rubydns/binary_string'
+require_relative 'message'
+require_relative 'binary_string'
 
 module RubyDNS
 	class InvalidProtocolError < StandardError

data/lib/rubydns/server.rb

@@ -20,8 +20,8 @@
 
 require 'fiber'
 
-require 'rubydns/transaction'
-require 'rubydns/extensions/logger'
+require_relative 'transaction'
+require_relative 'logger'
 
 module RubyDNS
 	
@@ -37,8 +37,8 @@ module RubyDNS
 		#		end
 		#	end
 		#
-		def initialize
-			@logger = Logger.new($stderr)
+		def initialize(options)
+			@logger = options[:logger] || Logger.new($stderr)
 		end
 
 		attr_accessor :logger
@@ -208,8 +208,8 @@ module RubyDNS
 		#		end
 		#	end
 		#
-		def initialize(&block)
-			super()
+		def initialize(options = {}, &block)
+			super(options)
 			
 			@events = {}
 			@rules = []
@@ -235,7 +235,7 @@ module RubyDNS
 		# Register a named event which may be invoked later using #fire
 		#
 		#	on(:start) do |server|
-		#		RExec.change_user(RUN_AS)
+		#		Process::Daemon::Permissions.change_user(RUN_AS)
 		#	end
 		def on(event_name, &block)
 			@events[event_name] = block

data/lib/rubydns/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module RubyDNS
-	VERSION = "0.7.3"
+	VERSION = "0.8.0"
 end

data/lib/rubydns.rb

@@ -18,22 +18,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rubydns/version'
+require_relative 'rubydns/version'
 
-require 'rubydns/message'
-require 'rubydns/server'
-require 'rubydns/resolver'
-require 'rubydns/handler'
-
-require 'logger'
-
-require 'rexec'
-require 'rexec/daemon'
-
-require 'rubydns/handler'
+require_relative 'rubydns/message'
+require_relative 'rubydns/server'
+require_relative 'rubydns/resolver'
+require_relative 'rubydns/handler'
 
 module RubyDNS
-	
 	# Run a server with the given rules.
 	def self.run_server (options = {}, &block)
 		server = RubyDNS::RuleBasedServer.new(&block)
@@ -44,6 +36,4 @@ module RubyDNS
 		
 		server.fire(:stop)
 	end
-	
-	
 end

data/rubydns.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
 	spec.description   = <<-EOF
 		RubyDNS is a high-performance DNS server which can be easily integrated into
-		other projects or used as a stand-alone daemon (via RExec). By default it uses
+		other projects or used as a stand-alone daemon. By default it uses
 		rule-based pattern matching. Results can be hard-coded, computed, fetched from
 		a remote DNS server or fetched from a local cache, depending on requirements.
 
@@ -26,11 +26,13 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
-
+	spec.has_rdoc = "yard"
+	
 	spec.required_ruby_version = '>= 1.9.3'
 
-	spec.add_dependency("rexec", "~> 1.6.2")
 	spec.add_dependency("eventmachine", "~> 1.0.0")
-
-	spec.has_rdoc = "yard"
+	
+	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "process-daemon", "~> 0.5.0"
+	spec.add_development_dependency "rake"
 end

data/test/examples/dropping-dns.rb

@@ -20,22 +20,16 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rubygems'
+require 'process/daemon'
 
-require 'rexec'
-require 'rexec/daemon'
-
-require 'rubygems'
 require 'rubydns'
-
-require 'rubydns/resolver'
 require 'rubydns/system'
 
 INTERFACES = [
 	[:udp, "0.0.0.0", 5300]
 ]
 
-class DroppingDaemon < RExec::Daemon::Base
+class DroppingDaemon < Process::Daemon
 	# You can specify a specific directory to use for run-time information (pid, logs, etc):
 	# @@base_directory = File.expand_path("../", __FILE__)
 	# @@base_directory = "/var"
@@ -44,7 +38,7 @@ class DroppingDaemon < RExec::Daemon::Base
 	IN = Resolv::DNS::Resource::IN
 	R = RubyDNS::Resolver.new(RubyDNS::System::nameservers)
 	
-	def self.run
+	def startup
 		RubyDNS::run_server(:listen => INTERFACES) do
 			# Fail the resolution of certain domains ;)
 			match(/(m?i?c?r?o?s?o?f?t)/) do |transaction, match_data|

data/test/examples/fortune-dns.rb

@@ -23,8 +23,7 @@
 
 require 'rubygems'
 
-require 'rexec'
-require 'rexec/daemon'
+require 'process/daemon'
 
 require 'rubygems'
 
@@ -43,13 +42,13 @@ end
 
 # To use, start the daemon and try:
 # dig @localhost fortune CNAME
-class FortuneDNS < RExec::Daemon::Base
+class FortuneDNS < Process::Daemon
 	@@base_directory = File.dirname(__FILE__)
 
 	Name = Resolv::DNS::Name
 	IN = Resolv::DNS::Resource::IN
 
-	def self.run
+	def startup
 		# Don't buffer output (for debug purposes)
 		$stderr.sync = true
 		

data/test/examples/geoip-dns.rb

@@ -20,17 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rubygems'
-
 require 'geoip'
 
-require 'rexec'
-require 'rexec/daemon'
+require 'process-daemon'
 
-require 'rubygems'
 require 'rubydns'
-
-require 'rubydns/resolver'
 require 'rubydns/system'
 
 INTERFACES = [
@@ -40,7 +34,7 @@ INTERFACES = [
 # This daemon requires the file downloaded from http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
 # For more information, please see http://www.maxmind.com/en/geolite and http://geoip.rubyforge.org
 
-class GeoIPDNSDaemon < RExec::Daemon::Base
+class GeoIPDNSDaemon < Process::Daemon
 	# You can specify a specific directory to use for run-time information (pid, logs, etc):
 	# @@base_directory = File.expand_path("../", __FILE__)
 	# @@base_directory = "/var"
@@ -50,7 +44,7 @@ class GeoIPDNSDaemon < RExec::Daemon::Base
 	R = RubyDNS::Resolver.new(RubyDNS::System::nameservers)
 	GEO = GeoIP.new(File.expand_path('../GeoLiteCountry.dat', __FILE__))
 	
-	def self.run
+	def startup
 		RubyDNS::run_server(:listen => INTERFACES) do
 			match(//, IN::A) do |transaction|
 				location = nil

data/test/examples/test-dns-2.rb

@@ -20,10 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rubygems'
-require 'rexec'
-require 'rexec/daemon'
 require 'rubydns'
+require 'process-daemon'
 
 # To run this command, use the standard daemon syntax as root
 # ./daemon2.rb start
@@ -51,14 +49,14 @@ if RExec.current_user != "root"
 end
 
 # The Daemon itself
-class Server < RExec::Daemon::Base
+class Server < Process::Daemon
 	Name = Resolv::DNS::Name
 	IN = Resolv::DNS::Resource::IN
 
 	# Use upstream DNS for name resolution.
 	UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
 
-	def self.run
+	def startup
 		# Don't buffer output (for debug purposes)
 		$stderr.sync = true
 		

data/test/examples/wikipedia-dns.rb

@@ -21,16 +21,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rubygems'
-
-require 'rexec'
-require 'rexec/daemon'
-
-require 'rubygems'
-
 require 'rubydns'
 require 'rubydns/extensions/string'
 
+require 'process/daemon'
+
 require 'em-http'
 require 'cgi'
 require 'nokogiri'
@@ -61,13 +56,13 @@ end
 
 # To use, start the daemon and try:
 # dig @localhost fortune CNAME
-class WikipediaDNS < RExec::Daemon::Base
+class WikipediaDNS < Process::Daemon
 	@@base_directory = File.dirname(__FILE__)
 
 	Name = Resolv::DNS::Name
 	IN = Resolv::DNS::Resource::IN
 
-	def self.run
+	def startup
 		# Don't buffer output (for debug purposes)
 		$stderr.sync = true
 		

data/test/test_daemon.rb

@@ -20,21 +20,20 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'helper'
-require 'pathname'
+require 'minitest/autorun'
 
 require 'rubydns'
-require 'rubydns/resolver'
 
-require 'rexec'
-require 'rexec/daemon'
+require 'process/daemon'
 
-class BasicTestServer < RExec::Daemon::Base
+class BasicTestServer < Process::Daemon
 	SERVER_PORTS = [[:udp, '127.0.0.1', 5350], [:tcp, '127.0.0.1', 5350]]
 
 	@@base_directory = File.dirname(__FILE__)
 
-	def self.run
+	IN = Resolv::DNS::Resource::IN
+
+	def startup
 		# Start the RubyDNS server
 		RubyDNS::run_server(:listen => SERVER_PORTS) do
 			match("test.local", IN::A) do |transaction|
@@ -53,19 +52,19 @@ class BasicTestServer < RExec::Daemon::Base
 	end
 end
 
-class DaemonTest < Test::Unit::TestCase
+class DaemonTest < MiniTest::Test
 	def setup
-		$stderr.puts "Starting test server..."
+		BasicTestServer.controller output: File.open("/dev/null", "w")
+		
 		BasicTestServer.start
 	end
 	
 	def teardown
-		$stderr.puts "Stoping test server..."
 		BasicTestServer.stop
 	end
 	
 	def test_basic_dns
-		assert_equal :running, RExec::Daemon::ProcessFile.status(BasicTestServer)
+		assert_equal :running, BasicTestServer.status
 		
 		EventMachine.run do
 			resolver = RubyDNS::Resolver.new(BasicTestServer::SERVER_PORTS)
@@ -82,7 +81,7 @@ class DaemonTest < Test::Unit::TestCase
 	end
 	
 	def test_pattern_matching
-		assert_equal :running, RExec::Daemon::ProcessFile.status(BasicTestServer)
+		assert_equal :running, BasicTestServer.status
 
 		EventMachine.run do
 			resolver = RubyDNS::Resolver.new(BasicTestServer::SERVER_PORTS)

data/test/test_message.rb

@@ -1,41 +1,65 @@
+#!/usr/bin/env ruby
+
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'minitest/autorun'
+
 require 'rubydns'
 
-class MessageTest < Test::Unit::TestCase
+class MessageTest < MiniTest::Test
 	def setup
 	end
 	
 	def teardown
 	end
 
-  def hex2bin(hexstring)
-    ret = "\x00" * (hexstring.length / 2)
-    ret.force_encoding("BINARY")
-    offset = 0
-    while offset < hexstring.length
-      hex_byte = hexstring[offset..(offset+1)]
-      ret.setbyte(offset/2, hex_byte.to_i(16))
-      offset += 2
-    end
-    ret
-  end
+	def hex2bin(hexstring)
+		ret = "\x00" * (hexstring.length / 2)
+		ret.force_encoding("BINARY")
+		offset = 0
+		while offset < hexstring.length
+			hex_byte = hexstring[offset..(offset+1)]
+			ret.setbyte(offset/2, hex_byte.to_i(16))
+			offset += 2
+		end
+		ret
+	end
 
 	def test_good_decode
-    data = hex2bin("1d008180000100080000000103777777057961686f6f03636f6d0000010001c00c000500010000012c000f0666642d667033037767310162c010c02b000500010000012c00090664732d667033c032c046000500010000003c00150e64732d616e792d6670332d6c666203776131c036c05b000500010000012c00120f64732d616e792d6670332d7265616cc06ac07c000100010000003c0004628afc1ec07c000100010000003c0004628bb495c07c000100010000003c0004628bb718c07c000100010000003c0004628afd6d0000291000000000000000")
+		data = hex2bin("1d008180000100080000000103777777057961686f6f03636f6d0000010001c00c000500010000012c000f0666642d667033037767310162c010c02b000500010000012c00090664732d667033c032c046000500010000003c00150e64732d616e792d6670332d6c666203776131c036c05b000500010000012c00120f64732d616e792d6670332d7265616cc06ac07c000100010000003c0004628afc1ec07c000100010000003c0004628bb495c07c000100010000003c0004628bb718c07c000100010000003c0004628afd6d0000291000000000000000")
 		
-    decoded = RubyDNS.decode_message(data)
-    assert_equal(RubyDNS::Message, decoded.class)
-    assert_equal(0x1d00, decoded.id)
-    assert_equal(1, decoded.question.count)
-    assert_equal(8, decoded.answer.count)
-    assert_equal(0, decoded.authority.count)
-    assert_equal(1, decoded.additional.count)
+		decoded = RubyDNS.decode_message(data)
+		assert_equal(RubyDNS::Message, decoded.class)
+		assert_equal(0x1d00, decoded.id)
+		assert_equal(1, decoded.question.count)
+		assert_equal(8, decoded.answer.count)
+		assert_equal(0, decoded.authority.count)
+		assert_equal(1, decoded.additional.count)
 	end
 	
 	def test_bad_AAAA_length
-    data = hex2bin("ea9e8180000100010000000108626169636169636e03636f6d00001c0001c00c001c00010000011e000432177b770000291000000000000000")
+		data = hex2bin("ea9e8180000100010000000108626169636169636e03636f6d00001c0001c00c001c00010000011e000432177b770000291000000000000000")
 		
-    assert_raise(Resolv::DNS::DecodeError) do
-      RubyDNS.decode_message(data)
-    end
+		assert_raises Resolv::DNS::DecodeError do
+			RubyDNS.decode_message(data)
+		end
 	end
 end

data/test/test_passthrough.rb

@@ -20,21 +20,23 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'helper'
-require 'pathname'
+require 'minitest/autorun'
 
 require 'rubydns'
-require 'rubydns/resolver'
 
-require 'rexec'
-require 'rexec/daemon'
+require 'process/daemon'
 
-class TestPassthroughServer < RExec::Daemon::Base
+class PassthroughServer < Process::Daemon
 	SERVER_PORTS = [[:udp, '127.0.0.1', 5340], [:tcp, '127.0.0.1', 5340]]
 	
-	@@base_directory = File.dirname(__FILE__)
-
-	def self.run
+	def working_directory
+		File.join(__dir__, "tmp")
+	end
+	
+	Name = Resolv::DNS::Name
+	IN = Resolv::DNS::Resource::IN
+	
+	def startup
 		resolver = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
 		
 		# Start the RubyDNS server
@@ -55,28 +57,32 @@ class TestPassthroughServer < RExec::Daemon::Base
 	end
 end
 
-class PassthroughTest < Test::Unit::TestCase
-	# LOG_PATH = File.join(__dir__, "log/TestPassthroughServer.log")
-	
+class PassthroughTest < MiniTest::Test
 	def setup
-		# system("rm", LOG_PATH)
-		TestPassthroughServer.start
+		PassthroughServer.controller output: File.open("/dev/null", "w")
+		
+		PassthroughServer.start
 	end
 	
 	def teardown
-		TestPassthroughServer.stop
-		# system("cat", LOG_PATH)
+		PassthroughServer.stop
 	end
 	
 	def test_basic_dns
 		answer = nil, response = nil
 		
-		assert_equal :running, RExec::Daemon::ProcessFile.status(TestPassthroughServer)
+		assert_equal :running, PassthroughServer.status
 		
 		EventMachine.run do
-			resolver = RubyDNS::Resolver.new(TestPassthroughServer::SERVER_PORTS)
-		
+			resolver = RubyDNS::Resolver.new(
+				PassthroughServer::SERVER_PORTS, 
+				# Enable this to get more debug output from the resolver:
+				# :logger => Logger.new($stderr)
+			)
+			
 			resolver.query("google.com") do |response|
+				refute_kind_of RubyDNS::ResolutionFailure, response
+				
 				assert_equal 1, response.ra
 				
 				answer = response.answer.first
@@ -86,20 +92,22 @@ class PassthroughTest < Test::Unit::TestCase
 		end
 		
 		# Check whether we got some useful records in the answer:
-		assert_not_nil answer
+		refute_nil answer
 		assert answer.count > 0
-		assert answer.any? {|record| record.kind_of? Resolv::DNS::Resource::IN::A }
+		assert answer.any? {|record| record.kind_of? Resolv::DNS::Resource::IN::A}
 	end
 	
 	def test_basic_dns_prefix
 		answer = nil
 		
-		assert_equal :running, RExec::Daemon::ProcessFile.status(TestPassthroughServer)
+		assert_equal :running, PassthroughServer.status
 		
 		EventMachine.run do
-			resolver = RubyDNS::Resolver.new(TestPassthroughServer::SERVER_PORTS)
+			resolver = RubyDNS::Resolver.new(PassthroughServer::SERVER_PORTS)
 		
 			resolver.query("a-slashdot.org") do |response|
+				refute_kind_of RubyDNS::ResolutionFailure, response
+				
 				answer = response.answer.first
 				
 				EventMachine.stop

data/test/test_resolver.rb

@@ -20,10 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'helper'
+require 'minitest/autorun'
+
 require 'rubydns'
 
-class ResolverTest < Test::Unit::TestCase
+class ResolverTest < MiniTest::Test
 	def test_basic_resolver
 		resolver = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
 		

data/test/test_rules.rb

@@ -20,18 +20,18 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'helper'
-require 'pathname'
+require 'minitest/autorun'
 
 require 'rubydns'
-require 'rubydns/resolver'
-require 'rubydns/extensions/string'
 
-class RulesTest < Test::Unit::TestCase
+class RulesTest < MiniTest::Test
 	IN = Resolv::DNS::Resource::IN
 	
 	def setup
-		@server = RubyDNS::Server.new
+		@logger = Logger.new($stderr)
+		@logger.level = Logger::INFO
+		
+		@server = RubyDNS::Server.new(logger: @logger)
 		@true_callback = Proc.new { true }
 	end
 	

data/test/test_slow_server.rb

@@ -20,22 +20,24 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'helper'
-require 'pathname'
+require 'minitest/autorun'
 
 require 'rubydns'
-require 'rubydns/resolver'
-require 'rubydns/extensions/string'
 
-class SlowServer < RExec::Daemon::Base
+require 'process/daemon'
+
+class SlowServer < Process::Daemon
 	SERVER_PORTS = [[:udp, '127.0.0.1', 5330], [:tcp, '127.0.0.1', 5330]]
 	
 	@@base_directory = File.dirname(__FILE__)
 
-	Name = Resolv::DNS::Name
+	def working_directory
+		File.join(__dir__, "tmp")
+	end
+	
 	IN = Resolv::DNS::Resource::IN
-
-	def self.run
+	
+	def startup
 		RubyDNS::run_server(:listen => SERVER_PORTS) do
 			match(/\.*.com/, IN::A) do |transaction|
 				defer do |fiber|
@@ -55,8 +57,9 @@ class SlowServer < RExec::Daemon::Base
 	end
 end
 
-class SlowServerTest < Test::Unit::TestCase
+class SlowServerTest < MiniTest::Test
 	def setup
+		SlowServer.controller output: File.open("/dev/null", "w")
 		SlowServer.start
 	end
 	
@@ -64,6 +67,8 @@ class SlowServerTest < Test::Unit::TestCase
 		SlowServer.stop
 	end
 	
+	IN = Resolv::DNS::Resource::IN
+	
 	def test_timeout
 		start_time = Time.now
 		end_time = nil
@@ -82,7 +87,7 @@ class SlowServerTest < Test::Unit::TestCase
 			end
 		end
 		
-		assert (end_time - start_time) <= 2.5, "Response should fail within timeout period."
+		assert_operator end_time - start_time, :<=, 2.5, "Response should fail within timeout period."
 		assert_equal RubyDNS::ResolutionFailure, got_response.class, "Response should be resolution failure."
 	end
 	
@@ -100,7 +105,7 @@ class SlowServerTest < Test::Unit::TestCase
 			end
 		end
 		
-		assert (end_time - start_time) > 2.0
+		assert_operator end_time - start_time, :>, 2.0, "Response should fail within timeout period."
 	end
 	
 	def test_normal_request
@@ -117,6 +122,6 @@ class SlowServerTest < Test::Unit::TestCase
 			end
 		end
 		
-		assert (end_time - start_time) < 2.0
+		assert_operator end_time - start_time, :<, 2.0, "Response should fail immediately"
 	end
 end

data/test/test_system.rb

@@ -20,15 +20,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'helper'
-require 'pathname'
+require 'minitest/autorun'
 
 require 'rubydns'
 require 'rubydns/system'
 
-require 'rexec'
-
-class SystemTest < Test::Unit::TestCase
+class SystemTest < MiniTest::Test
 	def test_system_nameservers
 		# There technically should be at least one nameserver:
 		resolver = RubyDNS::Resolver.new(RubyDNS::System::nameservers)

data/test/test_truncation.rb

@@ -20,22 +20,25 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'helper'
-require 'pathname'
+require 'minitest/autorun'
 
 require 'rubydns'
-require 'rubydns/resolver'
 require 'rubydns/extensions/string'
 
-class TruncatedServer < RExec::Daemon::Base
+require 'process/daemon'
+
+class TruncatedServer < Process::Daemon
 	SERVER_PORTS = [[:udp, '127.0.0.1', 5320], [:tcp, '127.0.0.1', 5320]]
 	
 	@@base_directory = File.dirname(__FILE__)
-
-	Name = Resolv::DNS::Name
+	
+	def working_directory
+		File.join(__dir__, "tmp")
+	end
+	
 	IN = Resolv::DNS::Resource::IN
-
-	def self.run
+	
+	def startup
 		# RubyDNS::log_bad_messages!("bad.log")
 		
 		# Start the RubyDNS server
@@ -53,8 +56,10 @@ class TruncatedServer < RExec::Daemon::Base
 	end
 end
 
-class TruncationTest < Test::Unit::TestCase
+class TruncationTest < MiniTest::Test
 	def setup
+		TruncatedServer.controller output: File.open("/dev/null", "w")
+		
 		TruncatedServer.start
 	end
 	
@@ -62,11 +67,15 @@ class TruncationTest < Test::Unit::TestCase
 		TruncatedServer.stop
 	end
 	
+	IN = Resolv::DNS::Resource::IN
+	
 	def test_tcp_failover
 		resolver = RubyDNS::Resolver.new(TruncatedServer::SERVER_PORTS)
 		
 		EventMachine::run do
 			resolver.query("truncation", IN::TXT) do |response|
+				refute_kind_of RubyDNS::ResolutionFailure, response
+				
 				text = response.answer.first
 				
 				assert_equal "Hello World! " * 100, text[2].strings.join

metadata

@@ -1,50 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rexec
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
+        version: '1.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: process-daemon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "\t\tRubyDNS is a high-performance DNS server which can be easily integrated
-  into\n\t\tother projects or used as a stand-alone daemon (via RExec). By default
-  it uses\n\t\trule-based pattern matching. Results can be hard-coded, computed, fetched
-  from\n\t\ta remote DNS server or fetched from a local cache, depending on requirements.\n\n\t\tIn
-  addition, RubyDNS includes a high-performance asynchronous DNS resolver\n\t\tbuilt
-  on top of EventMachine. This module can be used by itself in client\n\t\tapplications
-  without using the full RubyDNS server stack.\n"
+  into\n\t\tother projects or used as a stand-alone daemon. By default it uses\n\t\trule-based
+  pattern matching. Results can be hard-coded, computed, fetched from\n\t\ta remote
+  DNS server or fetched from a local cache, depending on requirements.\n\n\t\tIn addition,
+  RubyDNS includes a high-performance asynchronous DNS resolver\n\t\tbuilt on top
+  of EventMachine. This module can be used by itself in client\n\t\tapplications without
+  using the full RubyDNS server stack.\n"
 email:
 - samuel.williams@oriontransfer.co.nz
 executables:
@@ -64,10 +92,10 @@ files:
 - lib/rubydns.rb
 - lib/rubydns/binary_string.rb
 - lib/rubydns/chunked.rb
-- lib/rubydns/extensions/logger.rb
 - lib/rubydns/extensions/resolv.rb
 - lib/rubydns/extensions/string.rb
 - lib/rubydns/handler.rb
+- lib/rubydns/logger.rb
 - lib/rubydns/message.rb
 - lib/rubydns/resolver.rb
 - lib/rubydns/server.rb
@@ -82,7 +110,6 @@ files:
 - test/examples/test-dns-1.rb
 - test/examples/test-dns-2.rb
 - test/examples/wikipedia-dns.rb
-- test/helper.rb
 - test/hosts.txt
 - test/test_daemon.rb
 - test/test_domains.txt
@@ -125,7 +152,6 @@ test_files:
 - test/examples/test-dns-1.rb
 - test/examples/test-dns-2.rb
 - test/examples/wikipedia-dns.rb
-- test/helper.rb
 - test/hosts.txt
 - test/test_daemon.rb
 - test/test_domains.txt

data/test/helper.rb

@@ -1,9 +0,0 @@
-
-$LOAD_PATH.unshift File.expand_path("../../lib/", __FILE__)
-
-require 'rubygems'
-require 'test/unit'
-require 'resolv'
-
-Name = Resolv::DNS::Name
-IN = Resolv::DNS::Resource::IN