net-dns 0.9.0 → 0.20.0

data/lib/net/dns/resolver.rb

@@ -16,7 +16,7 @@ require 'net/dns/resolver/timeouts'
 #   Resolver("www.google.com") { |packet| puts packet.size + " bytes" }
 #   # => 484 bytes
 #
-def Resolver(name, type = Net::DNS::A, cls = Net::DNS::IN, &block)
+def Resolver(name, type = Net::DNS::A, cls = Net::DNS::IN)
   resolver = Net::DNS::Resolver.start(name, type, cls)
   if block_given?
     yield resolver
@@ -231,9 +231,9 @@ module Net
       # Net::DNS::Resolver Perl module.
       #
       def initialize(config = {})
-        raise ArgumentError, "Expected `config' to be a Hash" unless config.is_a?(Hash)
+        config.is_a?(Hash) or
+            raise(ArgumentError, "Expected `config' to be a Hash")
 
-        # config.downcase_keys!
         @config = Defaults.merge config
         @raw = false
 
@@ -402,12 +402,11 @@ module Net
       # The default is port 53.
       #
       def port=(num)
-        if (0..65_535).cover? num
-          @config[:port] = num
-          @logger.info "Port number changed to #{num}"
-        else
-          raise ArgumentError, "Wrong port number #{num}"
-        end
+        (0..65_535).cover?(num) or
+            raise(ArgumentError, "Wrong port number #{num}")
+
+        @config[:port] = num
+        @logger.info "Port number changed to #{num}"
       end
 
       # Get the value of the source port number.
@@ -431,15 +430,12 @@ module Net
       # underlaying layers.
       #
       def source_port=(num)
-        unless root?
-          raise ResolverPermissionError, "Are you root?"
-        end
+        root? or
+            raise(ResolverPermissionError, "Are you root?")
+        (0..65_535).cover?(num) or
+            raise(ArgumentError, "Wrong port number #{num}")
 
-        if (0..65_535).cover?(num)
-          @config[:source_port] = num
-        else
-          raise ArgumentError, "Wrong port number #{num}"
-        end
+        @config[:source_port] = num
       end
       alias srcport= source_port=
 
@@ -482,13 +478,12 @@ module Net
       # The default is 0.0.0.0, meaning any local address (chosen on routing needs).
       #
       def source_address=(addr)
-        unless addr.respond_to? :to_s
-          raise ArgumentError, "Wrong address argument #{addr}"
-        end
+        addr.respond_to?(:to_s) or
+            raise(ArgumentError, "Wrong address argument #{addr}")
 
         begin
           port = rand(1024..65_023)
-          @logger.warn "Try to determine state of source address #{addr} with port #{port}"
+          @logger.info "Try to determine state of source address #{addr} with port #{port}"
           a = TCPServer.new(addr.to_s, port)
         rescue SystemCallError => e
           case e.errno
@@ -527,12 +522,11 @@ module Net
 
       # Set the retrasmission interval in seconds. Default 5 seconds.
       def retry_interval=(num)
-        if num > 0
-          @config[:retry_interval] = num
-          @logger.info "Retransmission interval changed to #{num} seconds"
-        else
-          raise ArgumentError, "Interval must be positive"
-        end
+        num.positive? or
+            raise(ArgumentError, "Interval must be positive")
+
+        @config[:retry_interval] = num
+        @logger.info "Retransmission interval changed to #{num} seconds"
       end
       alias retrans= retry_interval=
 
@@ -547,12 +541,11 @@ module Net
       # Set the number of times the resolver will try a query.
       # Default 4 times.
       def retry_number=(num)
-        if num.is_a?(Integer) && (num > 0)
-          @config[:retry_number] = num
-          @logger.info "Retrasmissions number changed to #{num}"
-        else
-          raise ArgumentError, "Retry value must be a positive integer"
-        end
+        (num.is_a?(Integer) && (num > 0)) or
+            raise(ArgumentError, "Retry value must be a positive integer")
+
+        @config[:retry_number] = num
+        @logger.info "Retrasmissions number changed to #{num}"
       end
       alias_method('retry=', 'retry_number=')
 
@@ -778,7 +771,6 @@ module Net
       # the old one, which will then be impossibile to recover.
       #
       def log_file=(log)
-        @logger.close
         @config[:log_file] = log
         @logger = Logger.new(@config[:log_file])
         @logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
@@ -802,12 +794,10 @@ module Net
       # Note that this will destroy the precedent logger.
       #
       def logger=(logger)
-        if logger.is_a? Logger
-          @logger.close
-          @logger = logger
-        else
-          raise ArgumentError, "Argument must be an instance of Logger class"
-        end
+        logger.is_a?(Logger) or
+            raise(ArgumentError, "Argument must be an instance of Logger class")
+
+        @logger = logger
       end
 
       # Set the log level for the built-in logging facility.
@@ -948,9 +938,8 @@ module Net
       # were any records in the answer section.
       #
       def query(argument, type = Net::DNS::A, cls = Net::DNS::IN)
-        if @config[:nameservers].empty?
-          raise Resolver::Error, "No nameservers specified!"
-        end
+        !@config[:nameservers].empty? or
+            raise(Resolver::Error, "No nameservers specified!")
 
         method = :query_udp
         packet = if argument.is_a? Net::DNS::Packet
@@ -987,10 +976,10 @@ module Net
 
         if type == Net::DNS::AXFR
           if @raw
-            @logger.warn "AXFR query, switching to TCP over RAW socket"
+            @logger.info "AXFR query, switching to TCP over RAW socket"
             method = :send_raw_tcp
           else
-            @logger.warn "AXFR query, switching to TCP"
+            @logger.info "AXFR query, switching to TCP"
             method = :query_tcp
           end
         end
@@ -1085,14 +1074,14 @@ module Net
         if ENV['LOCALDOMAIN']
           self.domain = ENV['LOCALDOMAIN']
         end
-        if ENV['RES_OPTIONS']
-          ENV['RES_OPTIONS'].split(" ").each do |opt|
-            name, val = opt.split(":")
-            begin
-              eval("self.#{name} = #{val}")
-            rescue NoMethodError
-              raise ArgumentError, "Invalid ENV option #{name}"
-            end
+        return unless ENV['RES_OPTIONS']
+
+        ENV['RES_OPTIONS'].split(" ").each do |opt|
+          name, val = opt.split(":")
+          begin
+            eval("self.#{name} = #{val}")
+          rescue NoMethodError
+            raise ArgumentError, "Invalid ENV option #{name}"
           end
         end
       end
@@ -1136,12 +1125,11 @@ module Net
         packet
       end
 
-      def query_tcp(packet, packet_data)
+      def query_tcp(_packet, packet_data)
         ans = nil
         length = [packet_data.size].pack("n")
 
         @config[:nameservers].each do |ns|
-          begin
             buffer = ""
             socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
             socket.bind(Socket.pack_sockaddr_in(@config[:source_port], @config[:source_address].to_s))
@@ -1153,12 +1141,12 @@ module Net
               @logger.info "Contacting nameserver #{ns} port #{@config[:port]}"
               socket.write(length + packet_data)
               ans = socket.recv(Net::DNS::INT16SZ)
-              len = ans.unpack("n")[0]
+              len = ans.unpack1("n")
 
               @logger.info "Receiving #{len} bytes..."
 
               if len == 0
-                @logger.warn "Receiving 0 lenght packet from nameserver #{ns}, trying next."
+                @logger.warn "Receiving 0 length packet from nameserver #{ns}, trying next."
                 next
               end
 
@@ -1174,16 +1162,16 @@ module Net
               end
             end
             return [buffer, ["", @config[:port], ns.to_s, ns.to_s]]
-          rescue TimeoutError
+        rescue Timeout::Error
             @logger.warn "Nameserver #{ns} not responding within TCP timeout, trying next one"
             next
-          ensure
+        ensure
             socket.close
-          end
         end
+        ans
       end
 
-      def query_udp(packet, packet_data)
+      def query_udp(_packet, packet_data)
         socket4 = UDPSocket.new
         socket4.bind(@config[:source_address].to_s, @config[:source_port])
         socket6 = UDPSocket.new(Socket::AF_INET6)
@@ -1192,7 +1180,6 @@ module Net
         ans = nil
         response = ""
         @config[:nameservers].each do |ns|
-          begin
             @config[:udp_timeout].timeout do
               @logger.info "Contacting nameserver #{ns} port #{@config[:port]}"
               ans = if ns.ipv6?
@@ -1204,21 +1191,19 @@ module Net
               end
             end
             break if ans
-          rescue TimeoutError
+        rescue Timeout::Error
             @logger.warn "Nameserver #{ns} not responding within UDP timeout, trying next one"
             next
-          end
         end
         ans
       end
 
       # FIXME: a ? method should never raise.
       def valid?(name)
-        if name =~ /[^-\w\.]/
-          raise ArgumentError, "Invalid domain name #{name}"
-        else
-          true
-        end
+        name !~ /[^-\w\.\*]/ or
+            raise(ArgumentError, "Invalid domain name #{name}")
+
+        true
       end
     end
   end

data/lib/net/dns/rr/a.rb

@@ -84,10 +84,9 @@ module Net
           address = case input
           when IPAddr
             input
-          when Integer # Address in numeric form
-            tmp = [(input >> 24), (input >> 16) & 0xFF, (input >> 8) & 0xFF, input & 0xFF]
-            tmp = tmp.collect(&:to_s).join(".")
-            IPAddr.new(tmp)
+          # Address in numeric form
+          when Integer
+            IPAddr.new(input, Socket::AF_INET)
           when String
             IPAddr.new(input)
           else

data/lib/net/dns/rr/aaaa.rb

@@ -38,11 +38,9 @@ module Net
         private
 
         def subclass_new_from_hash(options)
-          if options.key?(:address)
-            @address = check_address(options[:address])
-          else
-            raise ArgumentError, ":address field is mandatory"
-          end
+          raise ArgumentError, ":address field is mandatory" unless options.key?(:address)
+
+          @address = check_address(options[:address])
         end
 
         def subclass_new_from_string(str)

data/lib/net/dns/rr/classes.rb

@@ -34,9 +34,9 @@ module Net
             initialize_from_num(@@default)
           end
 
-          if @str.nil? || @num.nil?
-            raise ArgumentError, "Unable to create a `Classes' from `#{cls}'"
-          end
+          return unless @str.nil? || @num.nil?
+
+          raise ArgumentError, "Unable to create a `Classes' from `#{cls}'"
         end
 
         # Returns the class in number format
@@ -67,11 +67,9 @@ module Net
         # Be able to control the default class to assign when
         # cls argument is +nil+. Default to +IN+
         def self.default=(str)
-          if CLASSES[str]
-            @@default = CLASSES[str]
-          else
-            raise ArgumentError, "Unknown class `#{str}'"
-          end
+          raise ArgumentError, "Unknown class `#{str}'" unless CLASSES[str]
+
+          @@default = CLASSES[str]
         end
 
         # Returns whether <tt>cls</tt> is a valid RR class.

data/lib/net/dns/rr/cname.rb

@@ -27,11 +27,9 @@ module Net # :nodoc:
         private
 
         def subclass_new_from_hash(options)
-          if options.key?(:cname)
-            @cname = check_name(options[:cname])
-          else
-            raise ArgumentError, ":cname field is mandatory"
-          end
+          raise ArgumentError, ":cname field is mandatory" unless options.key?(:cname)
+
+          @cname = check_name(options[:cname])
         end
 
         def subclass_new_from_string(str)

data/lib/net/dns/rr/hinfo.rb

@@ -40,12 +40,10 @@ module Net # :nodoc:
         private
 
         def subclass_new_from_hash(options)
-          if options.key?(:cpu) && options.key?(:os)
-            @cpu = options[:cpu]
-            @os  = options[:os]
-          else
-            raise ArgumentError, ":cpu and :os fields are mandatory"
-          end
+          raise ArgumentError, ":cpu and :os fields are mandatory" unless options.key?(:cpu) && options.key?(:os)
+
+          @cpu = options[:cpu]
+          @os  = options[:os]
         end
 
         def subclass_new_from_string(str)
@@ -53,12 +51,12 @@ module Net # :nodoc:
         end
 
         def subclass_new_from_binary(data, offset)
-          len = data.unpack("@#{offset} C").first
+          len = data.unpack1("@#{offset} C")
           offset += 1
           @cpu = data[offset..(offset + len)]
           offset += len
 
-          len = data.unpack("@#{offset} C").first
+          len = data.unpack1("@#{offset} C")
           offset += 1
           @os = data[offset..(offset + len)]
           offset += len
@@ -73,11 +71,9 @@ module Net # :nodoc:
         end
 
         def check_hinfo(input)
-          if input.to_s.strip =~ /^(?:["']?(.*?)["']?)\s+(?:["']?(.*?)["']?)$/
-            [Regexp.last_match(1), Regexp.last_match(2)]
-          else
-            raise ArgumentError, "Invalid HINFO Section `#{input}'"
-          end
+          raise ArgumentError, "Invalid HINFO Section `#{input}'" unless input.to_s.strip =~ /^(?:["']?(.*?)["']?)\s+(?:["']?(.*?)["']?)$/
+
+          [Regexp.last_match(1), Regexp.last_match(2)]
         end
 
         def build_pack

data/lib/net/dns/rr/mr.rb

@@ -23,11 +23,9 @@ module Net # :nodoc:
         private
 
         def subclass_new_from_hash(options)
-          if options.key?(:newname)
-            @newname = check_name(options[:newname])
-          else
-            raise ArgumentError, ":newname field is mandatory"
-          end
+          raise ArgumentError, ":newname field is mandatory" unless options.key?(:newname)
+
+          @newname = check_name(options[:newname])
         end
 
         def subclass_new_from_string(str)

data/lib/net/dns/rr/mx.rb

@@ -32,12 +32,10 @@ module Net # :nodoc:
         private
 
         def subclass_new_from_hash(options)
-          if options.key?(:preference) && options.key?(:exchange)
-            @preference = options[:preference].to_i
-            @exchange = options[:exchange]
-          else
-            raise ArgumentError, ":preference and :exchange fields are mandatory"
-          end
+          raise ArgumentError, ":preference and :exchange fields are mandatory" unless options.key?(:preference) && options.key?(:exchange)
+
+          @preference = options[:preference].to_i
+          @exchange = options[:exchange]
         end
 
         def subclass_new_from_string(str)
@@ -45,7 +43,7 @@ module Net # :nodoc:
         end
 
         def subclass_new_from_binary(data, offset)
-          @preference = data.unpack("@#{offset} n")[0]
+          @preference = data.unpack1("@#{offset} n")
           offset += 2
           @exchange, offset = dn_expand(data, offset)
           offset

data/lib/net/dns/rr/ns.rb

@@ -23,11 +23,9 @@ module Net # :nodoc:
         private
 
         def subclass_new_from_hash(options)
-          if options.key?(:nsdname)
-            @nsdname = check_name(options[:nsdname])
-          else
-            raise ArgumentError, ":nsdname field is mandatory"
-          end
+          raise ArgumentError, ":nsdname field is mandatory" unless options.key?(:nsdname)
+
+          @nsdname = check_name(options[:nsdname])
         end
 
         def subclass_new_from_string(str)

data/lib/net/dns/rr/null.rb

@@ -23,11 +23,9 @@ module Net # :nodoc:
         end
 
         def subclass_new_from_hash(args)
-          if args.key? :null
-            @null = args[:null]
-          else
-            raise ArgumentError, ":null field is mandatory but missing"
-          end
+          raise ArgumentError, ":null field is mandatory but missing" unless args.key? :null
+
+          @null = args[:null]
         end
 
         def subclass_new_from_string(str)

data/lib/net/dns/rr/ptr.rb

@@ -40,11 +40,9 @@ module Net
         end
 
         def subclass_new_from_hash(args)
-          if args.key?(:ptrdname) || args.key?(:ptr)
-            @ptrdname = args[:ptrdname]
-          else
-            raise ArgumentError, ":ptrdname or :ptr field is mandatory"
-          end
+          raise ArgumentError, ":ptrdname or :ptr field is mandatory" unless args.key?(:ptrdname) || args.key?(:ptr)
+
+          @ptrdname = args[:ptrdname]
         end
 
         def subclass_new_from_string(str)

data/lib/net/dns/rr/soa.rb

@@ -5,7 +5,13 @@ module Net # :nodoc:
       # RR type SOA
       #------------------------------------------------------------
       class SOA < RR
-        attr_reader :mname, :rname, :serial, :refresh, :retry, :expire, :minimum
+        attr_reader :mname
+        attr_reader :rname
+        attr_reader :serial
+        attr_reader :refresh
+        attr_reader :retry
+        attr_reader :expire
+        attr_reader :minimum
 
         private
 
@@ -41,11 +47,9 @@ module Net # :nodoc:
         end
 
         def number?(num)
-          if num.is_a?(Integer) && (num > 0)
-            true
-          else
-            raise ArgumentError, "Wrong format field: #{num} not a number or less than zero"
-          end
+          raise ArgumentError, "Wrong format field: #{num} not a number or less than zero" unless num.is_a?(Integer) && (num > 0)
+
+          true
         end
 
         def subclass_new_from_string(str)
@@ -61,7 +65,7 @@ module Net # :nodoc:
           @mname, offset = dn_expand(data, offset)
           @rname, offset = dn_expand(data, offset)
           @serial, @refresh, @retry, @expire, @minimum = data.unpack("@#{offset} N5")
-          offset + 5 * Net::DNS::INT32SZ
+          offset + (5 * Net::DNS::INT32SZ)
         end
 
         private

data/lib/net/dns/rr/srv.rb

@@ -5,7 +5,10 @@ module Net # :nodoc:
       # RR type SRV
       #------------------------------------------------------------
       class SRV < RR
-        attr_reader :priority, :weight, :port, :host
+        attr_reader :priority
+        attr_reader :weight
+        attr_reader :port
+        attr_reader :host
 
         private
 
@@ -20,7 +23,7 @@ module Net # :nodoc:
 
           @host = []
           while offset < off_end
-            len = data.unpack("@#{offset} C")[0]
+            len = data.unpack1("@#{offset} C")
             offset += 1
             str = data[offset..offset + len - 1]
             offset += len

data/lib/net/dns/rr/txt.rb

@@ -23,11 +23,9 @@ module Net # :nodoc:
         end
 
         def subclass_new_from_hash(args)
-          if args.key? :txt
-            @txt = args[:txt].strip
-          else
-            raise ArgumentError, ":txt field is mandatory but missing"
-          end
+          raise ArgumentError, ":txt field is mandatory but missing" unless args.key? :txt
+
+          @txt = args[:txt].strip
         end
 
         def subclass_new_from_string(str)
@@ -38,7 +36,7 @@ module Net # :nodoc:
           off_end = offset + @rdlength
           @txt = ""
           while offset < off_end
-            len = data.unpack("@#{offset} C")[0]
+            len = data.unpack1("@#{offset} C")
             offset += 1
             str = data[offset..offset + len - 1]
             offset += len