Endpoints is now first argument of server class.

README.md

@@ -47,7 +47,7 @@ IN = Resolv::DNS::Resource::IN
 UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
 
 # Start the RubyDNS server
-RubyDNS::run_server(:listen => INTERFACES) do
+RubyDNS::run_server(INTERFACES) do
 	match(%r{test.local}, IN::A) do |transaction|
 		transaction.respond!("10.0.0.80")
 	end

examples/basic-dns.rb

@@ -12,7 +12,7 @@
 UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
 
 # Start the RubyDNS server
-RubyDNS::run_server(:listen => INTERFACES) do
+RubyDNS::run_server(INTERFACES) do
 	match(%r{test.local}, IN::A) do |transaction|
 		transaction.respond!("10.0.0.80")
 	end

examples/cname.rb

@@ -13,7 +13,7 @@
 
 UPSTREAM = RubyDNS::Resolver.new([[:udp, "8.8.8.8", 53], [:tcp, "8.8.8.8", 53]])
 
-RubyDNS::run_server(:listen => INTERFACES) do
+RubyDNS::run_server(INTERFACES) do
 	# How to respond to something other than what was requested.
 	match(//, IN::A) do |transaction|
 		transaction.respond!(Name.create('foo.bar'), resource_class: IN::CNAME)

examples/flakey-dns.rb

@@ -38,7 +38,7 @@ class FlakeyDNS < Process::Daemon
 	IN = Resolv::DNS::Resource::IN
 
 	def startup
-		RubyDNS.run_server(listen: INTERFACES) do
+		RubyDNS.run_server(INTERFACES) do
 			# Use a Celluloid supervisor so the system recovers if the actor dies
 			fallback_resolver_supervisor =
 			  RubyDNS::Resolver.supervise(RubyDNS::System.nameservers)

examples/geoip-dns.rb

@@ -57,7 +57,7 @@ class GeoIPDNS < Process::Daemon
 	IN = Resolv::DNS::Resource::IN
 
 	def startup
-		RubyDNS.run_server(listen: INTERFACES) do
+		RubyDNS.run_server(INTERFACES) do
 			fallback_resolver_supervisor = RubyDNS::Resolver.supervise(RubyDNS::System.nameservers)
 
 			match(//, IN::A) do |transaction|

examples/simple.rb

@@ -13,7 +13,7 @@
 UPSTREAM = RubyDNS::Resolver.new([[:udp, '8.8.8.8', 53], [:tcp, '8.8.8.8', 53]])
 
 # Start the RubyDNS server
-RubyDNS.run_server(listen: INTERFACES) do
+RubyDNS.run_server(INTERFACES) do
 	match(/test.mydomain.org/, IN::A) do |transaction|
 			transaction.respond!('10.0.0.80')
 	end

examples/soa-dns.rb

@@ -27,7 +27,7 @@
 Name = Resolv::DNS::Name
 IN = Resolv::DNS::Resource::IN
 
-RubyDNS.run_server(listen: [[:udp, '0.0.0.0', 5400]]) do
+RubyDNS.run_server([[:udp, '0.0.0.0', 5400]]) do
 	# SOA Record
 	#   dig @localhost -p 5400 SOA mydomain.org
 	match('mydomain.org', IN::SOA) do |transaction|

examples/test-dns-1.rb

@@ -37,7 +37,7 @@
 	# [:tcp, '::0', 5300],
 ]
 
-RubyDNS.run_server(listen: INTERFACES) do
+RubyDNS.run_server(INTERFACES) do
 	# % dig +nocmd +noall +answer @localhost ANY dev.mydomain.org
 	# dev.mydomain.org.	16000	IN	A	10.0.0.80
 	# dev.mydomain.org.	16000	IN	MX	10 mail.mydomain.org.

examples/test-dns-2.rb

@@ -61,7 +61,7 @@ def startup
 		$stderr.sync = true
 
 		# Start the RubyDNS server
-		RubyDNS.run_server(listen: INTERFACES) do
+		RubyDNS.run_server(INTERFACES) do
 			on(:start) do
 				RExec.change_user(RUN_AS)
 			end

lib/rubydns.rb

@@ -28,8 +28,13 @@ module RubyDNS
 	Resolver = Async::DNS::Resolver
 
 	# Run a server with the given rules.
-	def self.run_server (server_class: RuleBasedServer, **options, &block)
-		server = server_class.new(**options, &block)
+	def self.run_server (*args, server_class: RuleBasedServer, **options, &block)
+		if listen = options.delete(:listen)
+			warn "Using `listen:` option is deprecated, please pass as the first argument."
+			args.unshift(listen)
+		end
+
+		server = server_class.new(*args, **options, &block)
 
 		server.run
 	end

lib/rubydns/rule_based_server.rb

@@ -100,8 +100,8 @@ def to_s
 		#		end
 		#	end
 		#
-		def initialize(options = {}, &block)
-			super(options)
+		def initialize(*args, &block)
+			super(*args)
 
 			@events = {}
 			@rules = []

rubydns.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
 	spec.required_ruby_version = '>= 2.2.6'
 
-	spec.add_dependency("async-dns", "~> 0.12")
+	spec.add_dependency("async-dns", "~> 1.0")
 	spec.add_development_dependency("async-rspec", "~> 1.0")
 
 	spec.add_development_dependency "bundler", "~> 1.3"

spec/rubydns/daemon_spec.rb

@@ -38,7 +38,7 @@ def reactor
 
 	def startup
 		reactor.run do
-			RubyDNS::run_server(listen: SERVER_PORTS) do
+			RubyDNS::run_server(SERVER_PORTS) do
 				match("test.local", IN::A) do |transaction|
 					transaction.respond!("192.168.1.1")
 				end

spec/rubydns/injected_supervisor_spec.rb

@@ -38,7 +38,7 @@ def test_message
 
 		let(:server) do
 			# Start the RubyDNS server
-			RubyDNS::run_server(listen: SERVER_PORTS, server_class: TestServer) do
+			RubyDNS::run_server(SERVER_PORTS, server_class: TestServer) do
 				match("test_message", IN::TXT) do |transaction|
 					transaction.respond!(*test_message.chunked)
 				end

spec/rubydns/passthrough_spec.rb

@@ -31,7 +31,7 @@ module RubyDNS::PassthroughSpec
 		include_context Async::RSpec::Reactor
 
 		def run_server
-			task = RubyDNS::run_server(:listen => SERVER_PORTS) do
+			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|