utils/tester.rb in devdnsd-2.2.0 vs utils/tester.rb in devdnsd-2.3.0

@@ -3,11 +3,10 @@
 #
 # This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <[e-mail]>.
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
-basedir = File.expand_path(File.dirname(__FILE__))
 require "rubygems"
 require "bovem"
 require "net/dns"
 
 # Patch to avoid resolving of hostname containing numbers.
@@ -30,20 +29,20 @@
 
   def make_query_packet(string, type, cls)
     if string.is_a?(IPAddr) then
       name = string.reverse
       type = Net::DNS::PTR
-      @logger.warn "PTR query required for address #{string}, changing type to PTR"
+      @logger.warn("PTR query required for address #{string}, changing type to PTR")
     elsif is_ip_address?(string) # See if it's an IP or IPv6 address
       begin
         name = IPAddr.new(string.chomp(".")).reverse
         type = Net::DNS::PTR
       rescue ArgumentError
-        name = string if valid? string
+        name = string if valid?(string)
       end
     else
-      name = string if valid? string
+      name = string if valid?(string)
     end
 
     # Create the packet
     packet = Net::DNS::Packet.new(name, type, cls)
 
@@ -69,10 +68,10 @@
   logger = Bovem::Logger.new("/dev/null", Bovem::Logger::DEBUG) if !logger
   logger.info(::Bovem::Console.replace_markers("Resolving address {mark=bright}#{address}{/mark} with type {mark=bright}#{type}{/mark} at nameserver {mark=bright}#{nameserver}{/mark}:{mark=bright}#{port.to_s}{/mark} ..."))
   tmpfile = "/tmp/devdnsd-test-tester-#{Time.now.strftime("%Y%m%d-%H:%M:%S")}"
 
   begin
-    Net::DNS::Resolver.new(:nameservers => nameserver, :port => port.to_i, :recursive => false, :udp_timeout => 1, :log_file => tmpfile).search(address, type).answer.each do |answer|
+    Net::DNS::Resolver.new(nameservers: nameserver, port: port.to_i, recursive: false, udp_timeout: 1, log_file: tmpfile).search(address, type).answer.each do |answer|
       type = answer.type.upcase.to_sym
 
       result = case type
         when :MX then answer.exchange.gsub(/\.$/, "")
         when :CNAME then answer.cname.gsub(/\.$/, "")
\ No newline at end of file