@@ -11,6 +11,8 @@ * CHANGED: DnsTimeout#timeout now raises LocalJumpError instead of DnsTimeoutArgumentError when block is missing. +* FIXED: Cleaned up require dependency and recursive require statements. + == Release 0.4 CHANGELOG @@ -6,7 +6,11 @@ # ## -module Net # :nodoc: + +require 'net/dns/resolver' + + +module Net module DNS # Version of the library @@ -113,5 +117,5 @@ module Net # :nodoc: include QueryTypes include QueryClasses - end # module DNS -end # module Net + end +end \ No newline at end of file lib/net/dns.rb @@ -2,7 +2,6 @@ # $Id: Header.rb,v 1.5 2006/07/30 16:54:28 bluemonk Exp $ #+++ -require 'net/dns' module Net # :nodoc: module DNS lib/net/dns/header.rb @@ -1,6 +1,5 @@ require 'logger' require 'net/dns/names/names' -require 'net/dns' require 'net/dns/header' require 'net/dns/question' require 'net/dns/rr' lib/net/dns/packet.rb @@ -2,10 +2,6 @@ # $Id: Question.rb,v 1.8 2006/07/28 19:00:03 bluemonk Exp $ #+++ -require 'net/dns' -require 'net/dns/names/names' -require 'net/dns/rr/types' -require 'net/dns/rr/classes' module Net # :nodoc: module DNS lib/net/dns/question.rb @@ -3,12 +3,9 @@ # - require 'rbconfig' require 'socket' require 'timeout' -require 'ipaddr' -require 'logger' require 'net/dns/packet' require 'net/dns/resolver/timeouts' lib/net/dns/resolver.rb @@ -2,12 +2,13 @@ # $Id: RR.rb,v 1.19 2006/07/28 07:33:36 bluemonk Exp $ # + +require 'ipaddr' require 'net/dns/names/names' require 'net/dns/rr/types' require 'net/dns/rr/classes' - -%w[a ns mx cname txt soa ptr aaaa mr].each do |file| +%w(a ns mx cname txt soa ptr aaaa mr).each do |file| require "net/dns/rr/#{file}" end lib/net/dns/rr.rb @@ -6,8 +6,6 @@ # ## -require 'ipaddr' - module Net # :nodoc: module DNS lib/net/dns/rr/a.rb @@ -6,8 +6,6 @@ # ## -require 'ipaddr' - module Net module DNS lib/net/dns/rr/aaaa.rb @@ -1,4 +1,4 @@ -module Net # :nodoc: +module Net module DNS class RR lib/net/dns/rr/classes.rb @@ -2,4 +2,4 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') require 'rubygems' require 'test/unit' -require 'net/dns/dns' \ No newline at end of file +require 'net/dns' \ No newline at end of file test/test_helper.rb 529e3cf1ac5f1f4fe53e167d90a4d4ed1a8fb05e Simone Carletti weppos@weppos.net http://github.com/bluemonk/net-dns/commit/43f9ee2834d7cc3dcc19b47371e3ffccccff0fb4 43f9ee2834d7cc3dcc19b47371e3ffccccff0fb4 2009-06-26T14:29:01-07:00 2009-06-26T14:29:01-07:00 Cleaned up require dependency and recursive require statements. 09543be1ca71efd7b001051ad6a054e583fa81d9 Simone Carletti weppos@weppos.net