rubydns 1.0.3 → 2.0.0.pre.rc1

data/rubydns.gemspec

@@ -28,14 +28,11 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 	spec.has_rdoc = "yard"
 	
-	spec.required_ruby_version = '>= 1.9.3'
+	spec.required_ruby_version = '>= 2.2.6'
 
-	spec.add_dependency("celluloid", "= 0.16.0")
-	spec.add_dependency("celluloid-io", "= 0.16.2")
-	spec.add_dependency("timers", "~> 4.0.1")
+	spec.add_dependency("async-dns", "~> 0.10")
 	
 	spec.add_development_dependency "bundler", "~> 1.3"
-	spec.add_development_dependency "process-daemon", "~> 0.5.5"
-	spec.add_development_dependency "rspec", "~> 3.2.0"
+	spec.add_development_dependency "rspec", "~> 3.4"
 	spec.add_development_dependency "rake"
 end

data/spec/rubydns/daemon_spec.rb

@@ -32,40 +32,44 @@ class BasicTestServer < Process::Daemon
 		File.expand_path("../tmp", __FILE__)
 	end
 
+	def reactor
+		Async::Reactor.new
+	end
+
 	def startup
-		Celluloid.boot
-		
-		# Start the RubyDNS server
-		RubyDNS::run_server(:listen => SERVER_PORTS) do
-			match("test.local", IN::A) do |transaction|
-				transaction.respond!("192.168.1.1")
-			end
+		reactor.run do
+			RubyDNS::run_server(listen: SERVER_PORTS) do
+				match("test.local", IN::A) do |transaction|
+					transaction.respond!("192.168.1.1")
+				end
 
-			match(/foo.*/, IN::A) do |transaction|
-				transaction.respond!("192.168.1.2")
-			end
+				match(/foo.*/, IN::A) do |transaction|
+					transaction.respond!("192.168.1.2")
+				end
 
-			match(/peername/, IN::A) do |transaction|
-				transaction.respond!(transaction[:peer])
-			end
+				match(/peername/, IN::A) do |transaction|
+					transaction.respond!(transaction[:peer])
+				end
 
-			# Default DNS handler
-			otherwise do |transaction|
-				transaction.fail!(:NXDomain)
+				# Default DNS handler
+				otherwise do |transaction|
+					transaction.fail!(:NXDomain)
+				end
 			end
 		end
 	end
+	
+	def shutdown
+		@reactor.stop
+	end
 end
 
 describe "RubyDNS Daemonized Server" do
+	include_context "reactor"
+	
 	before(:all) do
-		Celluloid.shutdown
-		
-		# Trying to fork with Celluloid running is a recipe for disaster.
 		# BasicTestServer.controller output: $stderr
 		BasicTestServer.start
-		
-		Celluloid.boot
 	end
 	
 	after(:all) do
@@ -75,7 +79,7 @@ describe "RubyDNS Daemonized Server" do
 	it "should resolve local domain correctly" do
 		expect(BasicTestServer.status).to be == :running
 		
-		resolver = RubyDNS::Resolver.new(BasicTestServer::SERVER_PORTS, search_domain: '')
+		resolver = RubyDNS::Resolver.new(BasicTestServer::SERVER_PORTS)
 	
 		response = resolver.query("test.local")
 		

data/spec/rubydns/injected_supervisor_spec.rb

@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 
 require 'rubydns'
-require 'rubydns/extensions/string'
+require 'async/dns/extensions/string'
 
 module RubyDNS::InjectedSupervisorSpec
 	class TestServer < RubyDNS::RuleBasedServer
@@ -33,13 +33,12 @@ module RubyDNS::InjectedSupervisorSpec
 	SERVER_PORTS = [[:udp, '127.0.0.1', 5520]]
 	IN = Resolv::DNS::Resource::IN
 	
-	describe "RubyDNS Injected Supervisor" do
-		before(:all) do
-			Celluloid.shutdown
-			Celluloid.boot
-			
+	describe "RubyDNS::run_server(server_class: ...)" do
+		include_context "reactor"
+		
+		let(:server) do
 			# Start the RubyDNS server
-			RubyDNS::run_server(listen: SERVER_PORTS, server_class: TestServer, asynchronous: true) do
+			RubyDNS::run_server(listen: SERVER_PORTS, server_class: TestServer) do
 				match("test_message", IN::TXT) do |transaction|
 					transaction.respond!(*test_message.chunked)
 				end
@@ -52,10 +51,14 @@ module RubyDNS::InjectedSupervisorSpec
 		end
 		
 		it "should use the injected class" do
+			task = server
+			
 			resolver = RubyDNS::Resolver.new(SERVER_PORTS)
 			response = resolver.query("test_message", IN::TXT)
 			text = response.answer.first
 			expect(text[2].strings.join).to be == 'Testing...'
+			
+			task.stop
 		end
 	end
 end

data/spec/rubydns/passthrough_spec.rb

@@ -28,12 +28,10 @@ module RubyDNS::PassthroughSpec
 	IN = Resolv::DNS::Resource::IN
 	
 	describe "RubyDNS Passthrough Server" do
-		before(:all) do
-			Celluloid.shutdown
-			Celluloid.boot
+		include_context "reactor"
 		
-			# Start the RubyDNS server
-			@server = RubyDNS::run_server(:listen => SERVER_PORTS, asynchronous: true) do
+		def run_server
+			task = RubyDNS::run_server(:listen => SERVER_PORTS) do
 				resolver = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
 			
 				match(/.*\.com/, IN::A) do |transaction|
@@ -49,30 +47,39 @@ module RubyDNS::PassthroughSpec
 					transaction.fail!(:NXDomain)
 				end
 			end
+			
+			yield
+			
+		ensure
+			task.stop
 		end
-	
-		it "should resolve domain correctly" do
-			resolver = RubyDNS::Resolver.new(SERVER_PORTS)
 		
-			response = resolver.query("google.com")
-			expect(response.ra).to be == 1
-		
-			answer = response.answer.first
-			expect(answer).not_to be == nil
-			expect(answer.count).to be > 0
-		
-			addresses = answer.select {|record| record.kind_of? Resolv::DNS::Resource::IN::A}
-			expect(addresses.size).to be > 0
+		it "should resolve domain correctly" do
+			run_server do
+				resolver = RubyDNS::Resolver.new(SERVER_PORTS, timeout: 1)
+				
+				response = resolver.query("google.com")
+				expect(response.ra).to be == 1
+			
+				answer = response.answer.first
+				expect(answer).not_to be == nil
+				expect(answer.count).to be > 0
+			
+				addresses = answer.select {|record| record.kind_of? Resolv::DNS::Resource::IN::A}
+				expect(addresses.size).to be > 0
+			end
 		end
 	
 		it "should resolve prefixed domain correctly" do
-			resolver = RubyDNS::Resolver.new(SERVER_PORTS)
-		
-			response = resolver.query("a-slashdot.org")
-			answer = response.answer.first
-		
-			expect(answer).not_to be == nil
-			expect(answer.count).to be > 0
+			run_server do
+				resolver = RubyDNS::Resolver.new(SERVER_PORTS)
+			
+				response = resolver.query("a-slashdot.org")
+				answer = response.answer.first
+			
+				expect(answer).not_to be == nil
+				expect(answer.count).to be > 0
+			end
 		end
 	end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,43 @@
+
+if ENV['COVERAGE'] || ENV['TRAVIS']
+	begin
+		require 'simplecov'
+		
+		SimpleCov.start do
+			add_filter "/spec/"
+		end
+		
+		if ENV['TRAVIS']
+			require 'coveralls'
+			Coveralls.wear!
+		end
+	rescue LoadError
+		warn "Could not load simplecov: #{$!}"
+	end
+end
+
+require "bundler/setup"
+require "async"
+require "async/tcp_socket"
+require "async/udp_socket"
+
+RSpec.shared_context "reactor" do
+	let(:reactor) {Async::Reactor.new}
+	
+	around(:each) do |example|
+		reactor.run do
+			example.run
+		end
+		
+		reactor.close
+	end
+end
+
+RSpec.configure do |config|
+	# Enable flags like --only-failures and --next-failure
+	config.example_status_persistence_file_path = ".rspec_status"
+
+	config.expect_with :rspec do |c|
+		c.syntax = :expect
+	end
+end

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rubydns
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0.pre.rc1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-- !ruby/object:Gem::Dependency
-  name: celluloid-io
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.16.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.16.2
-- !ruby/object:Gem::Dependency
-  name: timers
+  name: async-dns
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,34 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: process-daemon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +81,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".simplecov"
 - ".travis.yml"
 - ".yardopts"
@@ -132,47 +91,26 @@ files:
 - bin/rubydns-check
 - examples/Gemfile
 - examples/README.md
+- examples/basic-dns.rb
+- examples/cname.rb
 - examples/flakey-dns.rb
 - examples/fortune-dns.rb
 - examples/geoip-dns.rb
+- examples/simple.rb
+- examples/soa-dns.rb
+- examples/test-dns-1.rb
+- examples/test-dns-2.rb
 - examples/wikipedia-dns.rb
 - lib/rubydns.rb
-- lib/rubydns/chunked.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
-- lib/rubydns/system.rb
-- lib/rubydns/transaction.rb
-- lib/rubydns/transport.rb
+- lib/rubydns/rule_based_server.rb
 - lib/rubydns/version.rb
 - rubydns.gemspec
-- spec/rubydns/celluloid_bug_spec.rb
 - spec/rubydns/daemon_spec.rb
 - spec/rubydns/hosts.txt
 - spec/rubydns/injected_supervisor_spec.rb
-- spec/rubydns/ipv6_spec.rb
-- spec/rubydns/message_spec.rb
-- spec/rubydns/origin_spec.rb
 - spec/rubydns/passthrough_spec.rb
-- spec/rubydns/resolver_performance_spec.rb
-- spec/rubydns/resolver_spec.rb
 - spec/rubydns/rules_spec.rb
-- spec/rubydns/server/bind9/generate-local.rb
-- spec/rubydns/server/bind9/local.zone
-- spec/rubydns/server/bind9/named.conf
-- spec/rubydns/server/bind9/named.run
-- spec/rubydns/server/million.rb
-- spec/rubydns/server/rubydns.stackprof
-- spec/rubydns/server_performance_spec.rb
-- spec/rubydns/slow_server_spec.rb
-- spec/rubydns/socket_spec.rb
-- spec/rubydns/system_spec.rb
-- spec/rubydns/transaction_spec.rb
-- spec/rubydns/truncation_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.codeotaku.com/projects/rubydns
 licenses:
 - MIT
@@ -185,39 +123,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: An easy to use DNS server and resolver for Ruby.
 test_files:
-- spec/rubydns/celluloid_bug_spec.rb
 - spec/rubydns/daemon_spec.rb
 - spec/rubydns/hosts.txt
 - spec/rubydns/injected_supervisor_spec.rb
-- spec/rubydns/ipv6_spec.rb
-- spec/rubydns/message_spec.rb
-- spec/rubydns/origin_spec.rb
 - spec/rubydns/passthrough_spec.rb
-- spec/rubydns/resolver_performance_spec.rb
-- spec/rubydns/resolver_spec.rb
 - spec/rubydns/rules_spec.rb
-- spec/rubydns/server/bind9/generate-local.rb
-- spec/rubydns/server/bind9/local.zone
-- spec/rubydns/server/bind9/named.conf
-- spec/rubydns/server/bind9/named.run
-- spec/rubydns/server/million.rb
-- spec/rubydns/server/rubydns.stackprof
-- spec/rubydns/server_performance_spec.rb
-- spec/rubydns/slow_server_spec.rb
-- spec/rubydns/socket_spec.rb
-- spec/rubydns/system_spec.rb
-- spec/rubydns/transaction_spec.rb
-- spec/rubydns/truncation_spec.rb
+- spec/spec_helper.rb