net-dns 0.8.0 → 0.9.0

data/.travis.yml

@@ -1,20 +1,13 @@
 language: ruby
 
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  # - jruby-18mode
-  # - jruby-19mode
-  - rbx-18mode
-  # - ruby-head
-  # - jruby-head
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - jruby-9.1.5.0
+  - ruby-head
 
-notifications:
-  recipients:
-    - weppos@weppos.net
-
-matrix:
-  allow_failures:
-    - rvm: 2.0.0
+cache:
+  - bundler

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Changelog
 
 
-## master
+## Release 0.9.0
+
+- FIXED: Fixed CI run (GH-77).
+
+- FIXED: Fixed deprecated references to Fixnum.
+
+- CHANGED: Major code cleanup.
+
+- CHANGED: Minimum Ruby version is now 2.1
+
+
+## Release 0.8.0
 
 - FIXED: undefined local variable or method `source_address_inet6' (GH-40). [Thanks @simsicon]
 

data/Gemfile

@@ -1,4 +1,8 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in whois.gemspec
 gemspec
+
+gem "minitest"
+gem "minitest-reporters"
+gem "rspec"
+gem "rubocop", require: false

data/LICENSE.txt

@@ -0,0 +1,56 @@
+net-dns is copyrighted free software by Marco Ceresa (@bluemonk) and Simone Carletti (@weppos).
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/README.md

@@ -12,16 +12,16 @@ Net::DNS is a DNS library written in pure Ruby. It started as a port of Perl Net
 
 ## Requirements
 
-* Ruby >= 1.8.7
+Ruby >= 2.1
 
 
 ## Installation
 
 The best way to install this library is via [RubyGems](https://rubygems.org/).
 
-    $ gem install net-dns
-
-You might need administrator privileges on your system to install the gem.
+```
+gem install net-dns
+```
 
 
 ## API Documentation
@@ -33,71 +33,80 @@ Visit the page http://rdoc.info/gems/net-dns
 
 The simplest way to use the library is to invoke the Resolver() method:
 
-    require 'rubygems' 
-    require 'net/dns'
-    p Resolver("www.google.com")
+```ruby
+require 'rubygems' 
+require 'net/dns'
+p Resolver("www.google.com")
+```
 
 The output is compatible with BIND zone files and it's the same you would get with the dig utility.
 
-    ;; Answer received from localhost:53 (212 bytes)
-    ;;
-    ;; HEADER SECTION
-    ;; id = 64075
-    ;; qr = 1       opCode: QUERY   aa = 0  tc = 0  rd = 1
-    ;; ra = 1       ad = 0  cd = 0  rcode = NoError
-    ;; qdCount = 1  anCount = 3     nsCount = 4     arCount = 4
-    
-    ;; QUESTION SECTION (1 record):
-    ;; google.com.                  IN      A
-    
-    ;; ANSWER SECTION (3 records):
-    google.com.             212     IN      A       74.125.45.100
-    google.com.             212     IN      A       74.125.67.100
-    google.com.             212     IN      A       209.85.171.100
-    
-    ;; AUTHORITY SECTION (4 records):
-    google.com.             345512  IN      NS      ns1.google.com.
-    google.com.             345512  IN      NS      ns4.google.com.
-    google.com.             345512  IN      NS      ns2.google.com.
-    google.com.             345512  IN      NS      ns3.google.com.
-    
-    ;; ADDITIONAL SECTION (4 records):
-    ns1.google.com.         170275  IN      A       216.239.32.10
-    ns2.google.com.         170275  IN      A       216.239.34.10
-    ns3.google.com.         170275  IN      A       216.239.36.10
-    ns4.google.com.         170275  IN      A       216.239.38.10
+```
+;; Answer received from localhost:53 (212 bytes)
+;;
+;; HEADER SECTION
+;; id = 64075
+;; qr = 1       opCode: QUERY   aa = 0  tc = 0  rd = 1
+;; ra = 1       ad = 0  cd = 0  rcode = NoError
+;; qdCount = 1  anCount = 3     nsCount = 4     arCount = 4
+
+;; QUESTION SECTION (1 record):
+;; google.com.                  IN      A
+
+;; ANSWER SECTION (3 records):
+google.com.             212     IN      A       74.125.45.100
+google.com.             212     IN      A       74.125.67.100
+google.com.             212     IN      A       209.85.171.100
+
+;; AUTHORITY SECTION (4 records):
+google.com.             345512  IN      NS      ns1.google.com.
+google.com.             345512  IN      NS      ns4.google.com.
+google.com.             345512  IN      NS      ns2.google.com.
+google.com.             345512  IN      NS      ns3.google.com.
+
+;; ADDITIONAL SECTION (4 records):
+ns1.google.com.         170275  IN      A       216.239.32.10
+ns2.google.com.         170275  IN      A       216.239.34.10
+ns3.google.com.         170275  IN      A       216.239.36.10
+ns4.google.com.         170275  IN      A       216.239.38.10
+```
 
 An optional block can be passed yielding the Net::DNS::Packet object
 
-    Resolver("www.google.com") { |packet| puts packet.size + " bytes" }
-    # => 484 bytes
+```ruby
+Resolver("www.google.com") { |packet| puts packet.size + " bytes" }
+# => 484 bytes
+```
 
 Same for Net::DNS::Resolver.start():
 
-    Net::DNS::Resolver.start("google.com").answer.size
-    # => 5
+```ruby
+Net::DNS::Resolver.start("google.com").answer.size
+# => 5
+```
 
 As optional parameters, +TYPE+ and +CLASS+ can be specified.
 
-    p Net::DNS::Resolver.start("google.com", Net::DNS::MX)
-    
-    ;; Answer received from localhost:53 (316 bytes)
-    ;;
-    ;; HEADER SECTION
-    ;; id = 59980
-    ;; qr = 1       opCode: QUERY   aa = 0  tc = 0  rd = 1
-    ;; ra = 1       ad = 0  cd = 0  rcode = NoError
-    ;; qdCount = 1  anCount = 4     nsCount = 4     arCount = 8
-    
-    ;; QUESTION SECTION (1 record):
-    ;; google.com.                  IN      MX
-    
-    ;; ANSWER SECTION (4 records):
-    google.com.             10800   IN      MX      10 smtp2.google.com.
-    google.com.             10800   IN      MX      10 smtp3.google.com.
-    google.com.             10800   IN      MX      10 smtp4.google.com.
-    google.com.             10800   IN      MX      10 smtp1.google.com.
+```ruby
+p Net::DNS::Resolver.start("google.com", Net::DNS::MX)
+
+;; Answer received from localhost:53 (316 bytes)
+;;
+;; HEADER SECTION
+;; id = 59980
+;; qr = 1       opCode: QUERY   aa = 0  tc = 0  rd = 1
+;; ra = 1       ad = 0  cd = 0  rcode = NoError
+;; qdCount = 1  anCount = 4     nsCount = 4     arCount = 8
 
+;; QUESTION SECTION (1 record):
+;; google.com.                  IN      MX
+
+;; ANSWER SECTION (4 records):
+google.com.             10800   IN      MX      10 smtp2.google.com.
+google.com.             10800   IN      MX      10 smtp3.google.com.
+google.com.             10800   IN      MX      10 smtp4.google.com.
+google.com.             10800   IN      MX      10 smtp1.google.com.
+```
 
 ## Handling the response packet
 
@@ -113,35 +122,43 @@ A DNS packet is divided into 5 sections:
 
 You can access each section by calling the attribute with the same name on a Packet object:
 
-    packet = Net::DNS::Resolver.start("google.com")
-    
-    header = packet.header
-    answer = packet.answer
-    
-    puts "The packet is #{packet.data.size} bytes"
-    puts "It contains #{header.anCount} answer entries"
-    
-    answer.any? {|ans| p ans}
-    
+```ruby
+packet = Net::DNS::Resolver.start("google.com")
+
+header = packet.header
+answer = packet.answer
+
+puts "The packet is #{packet.data.size} bytes"
+puts "It contains #{header.anCount} answer entries"
+
+answer.any? {|ans| p ans}
+```
+
 The output is 
 
-    The packet is 378 bytes
-    It contains 3 answer entries
-    google.com.             244     IN      A       74.125.45.100
-    google.com.             244     IN      A       74.125.67.100
-    google.com.             244     IN      A       209.85.171.100
+```
+The packet is 378 bytes
+It contains 3 answer entries
+google.com.             244     IN      A       74.125.45.100
+google.com.             244     IN      A       74.125.67.100
+google.com.             244     IN      A       209.85.171.100
+```
 
 A better way to handle the answer section is to use the iterators directly on a Packet object:
 
-    packet.each_address do |ip|
-      puts "#{ip} is alive" if Ping.pingecho(ip.to_s, 10, 80)
-    end
+```ruby
+packet.each_address do |ip|
+  puts "#{ip} is alive" if Ping.pingecho(ip.to_s, 10, 80)
+end
+```
 
 Gives:
 
-    74.125.45.100 is alive
-    74.125.67.100 is alive
-    209.85.171.100 is alive
+```
+74.125.45.100 is alive
+74.125.67.100 is alive
+209.85.171.100 is alive
+```
 
 
 ## License

data/Rakefile

@@ -1,71 +1,38 @@
-require 'rubygems'
-require 'bundler'
-
-$:.unshift(File.dirname(__FILE__) + "/lib")
-require 'net/dns'
-
-
-# Common package properties
-PKG_NAME    = ENV['PKG_NAME']    || 'net-dns'
-PKG_VERSION = ENV['PKG_VERSION'] || Net::DNS::VERSION
-
+require "bundler/gem_tasks"
 
 # Run test by default.
-task :default => :test
-
+task default: :test
+task test: %i[testunit spec]
 
-spec = Gem::Specification.new do |s|
-  s.name              = PKG_NAME
-  s.version           = PKG_VERSION
-  s.summary           = "Pure Ruby DNS library."
-  s.description       = "Net::DNS is a pure Ruby DNS library, with a clean OO interface and an extensible API."
-
-  s.required_ruby_version = ">= 1.8.7"
-
-  s.authors           = ["Marco Ceresa", "Simone Carletti"]
-  s.email             = ["ceresa@gmail.com", "weppos@weppos.net"]
-  s.homepage          = "http://github.com/bluemonk/net-dns"
-  s.rubyforge_project = "net-dns"
-
-  s.add_development_dependency "rake",  "~> 10.0"
-  s.add_development_dependency "yard"
+require 'rake/testtask'
 
-  s.files             = `git ls-files`.split("\n")
-  s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths     = %w( lib )
+Rake::TestTask.new(:testunit) do |t|
+  t.libs = %w[lib test]
+  t.pattern = "test/**/*_test.rb"
+  t.verbose = !ENV["VERBOSE"].nil?
+  t.warning = !ENV["WARNING"].nil?
 end
 
+require "rubocop/rake_task"
 
-require 'rubygems/package_task'
+RuboCop::RakeTask.new
 
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
+require 'rspec/core/rake_task'
+begin
+  require 'fuubar'
+rescue LoadError
 end
 
-desc "Build the gemspec file #{spec.name}.gemspec"
-task :gemspec do
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, "w") {|f| f << spec.to_ruby }
+RSpec::Core::RakeTask.new do |t|
+  t.verbose = !!ENV["VERBOSE"]
+  t.rspec_opts = []
+  t.rspec_opts << ['--format', 'Fuubar'] if defined?(Fuubar)
 end
 
-
-require 'rake/testtask'
-
-# Run all the tests in the /test folder
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"]
-  t.verbose = true
-end
-
-
-require 'yard'
 require 'yard/rake/yardoc_task'
 
-YARD::Rake::YardocTask.new(:yardoc)
-
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -I lib -r net/dns.rb"
+YARD::Rake::YardocTask.new(:yardoc) do |y|
+  y.options = ["--output-dir", "yardoc"]
 end
+
+CLOBBER.include "yardoc"

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "net/dns"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/demo/check_soa.rb

@@ -1,9 +1,8 @@
-#!/usr/bin/env ruby 
+#!/usr/bin/env ruby
 
-require 'rubygems' if "#{RUBY_VERSION}" < "1.9.0"
+require 'rubygems' if RUBY_VERSION.to_s < "1.9.0"
 require 'net/dns'
 
-
 #------------------------------------------------------------------------------
 # Get the domain from the command line.
 #------------------------------------------------------------------------------
@@ -16,100 +15,90 @@ domain = ARGV[0]
 # Find all the nameservers for the domain.
 #------------------------------------------------------------------------------
 
-res = Net::DNS::Resolver.new(:defname => false, :retry => 2)
+res = Net::DNS::Resolver.new(defname: false, retry: 2)
 
 ns_req = res.query(domain, Net::DNS::NS)
-unless ns_req and ns_req.header.anCount > 0
+unless ns_req && (ns_req.header.anCount > 0)
   raise ArgumentError, "No nameservers found for domain: #{res.errorstring}"
 end
 
-
 # Send out non-recursive queries
 res.recurse = false
 # Do not buffer standard out
-#| = 1;
-
+# | = 1;
 
 #------------------------------------------------------------------------------
 # Check the SOA record on each nameserver.
 #------------------------------------------------------------------------------
 
 ns_req.each_nameserver do |ns|
-  
   #----------------------------------------------------------------------
   # Set the resolver to query this nameserver.
   #----------------------------------------------------------------------
-  
+
   # In order to lookup the IP(s) of the nameserver, we need a Resolver
   # object that is set to our local, recursive nameserver.  So we create
   # a new object just to do that.
-  
+
   local_res = Net::DNS::Resolver.new
-  
+
   a_req = local_res.query(ns, Net::DNS::A)
-  
-  
-  unless a_req 
+
+  unless a_req
     puts "Can not find address for ns: " + res.errorstring + "\n"
     next
   end
-  
-  
-  a_req.each_address do |ip|
 
+  a_req.each_address do |ip|
     #----------------------------------------------------------------------
     # Ask this IP.
     #----------------------------------------------------------------------
-    res.nameservers=ip	
-    
+    res.nameservers = ip
+
     print "#{ns} (#{ip}): "
-    
+
     #----------------------------------------------------------------------
     # Get the SOA record.
     #----------------------------------------------------------------------
-    
+
     soa_req = res.send(domain, Net::DNS::SOA, Net::DNS::IN)
-    
-    if soa_req == nil
+
+    if soa_req.nil?
       puts res.errorstring, "\n"
       next
     end
-    
+
     #----------------------------------------------------------------------
     # Is this nameserver authoritative for the domain?
     #----------------------------------------------------------------------
-    
-    unless soa_req.header.auth? 
+
+    unless soa_req.header.auth?
       print "isn't authoritative for domain\n"
       next
     end
-    
+
     #----------------------------------------------------------------------
     # We should have received exactly one answer.
     #----------------------------------------------------------------------
-    
-    unless soa_req.header.anCount == 1 
+
+    unless soa_req.header.anCount == 1
       print "expected 1 answer, got " + soa_req.header.anCount.to_s + "\n"
       next
     end
-    
+
     #----------------------------------------------------------------------
     # Did we receive an SOA record?
     #----------------------------------------------------------------------
-    
+
     unless soa_req.answer[0].class == Net::DNS::RR::SOA
       print "expected SOA, got " + Net::DNS::RR::RRTypes.to_str(soa_req.answer[0].type) + "\n"
       next
     end
-    
+
     #----------------------------------------------------------------------
     # Print the serial number.
     #----------------------------------------------------------------------
-    
+
     print "has serial number " + soa_req.answer[0].serial.to_s + "\n"
-    
   end
 end
-
-
-