dnsruby 1.57.0 → 1.58.0

data/test/test_utils.rb

@@ -0,0 +1,49 @@
+require_relative 'spec_helper'
+
+# Use this in tests in the tests directory with:
+# require_relative 'test_utils'
+# include TestUtils
+
+module Dnsruby
+  module TestUtils
+
+    module_function
+
+    # Asserts that all exceptions whose type are the specified exception class
+    # or one of its subclasses are *not* raised.
+    #
+    # If any other kind of exception is raised, the test throws an exception
+    # (rather than failing).
+    #
+    # The test passes if and only if no exceptions are raised.
+    def assert_not_raised(exception_class, failure_message = nil)
+      begin
+        yield
+      rescue => e
+        if e.is_a?(exception_class)
+          flunk(failure_message || "An exception was not expected but was raised: #{e}")
+        else
+          raise e
+        end
+      end
+    end
+
+=begin
+  # This should result in a test failure:
+  def test_target_exception
+    assert_not_raised(ArgumentError, 'ArgumentError') { raise ArgumentError.new }
+  end
+
+  # This should result in a test error:
+  def test_other_exception
+    assert_not_raised(ArgumentError, 'RuntimeError') { raise RuntimeError.new }
+  end
+
+  # This should result in a passed test:
+  def test_no_exception
+    assert_not_raised(ArgumentError, 'No Error') { }
+  end
+=end
+  end
+end
+

data/test/ts_offline.rb

@@ -18,46 +18,64 @@ require_relative 'spec_helper'
 
 Dnsruby.log.level = Logger::FATAL
 
-require_relative 'tc_gpos.rb'
-require_relative 'tc_header.rb'
-require_relative "tc_name.rb"
-require_relative 'tc_message.rb'
-require_relative "tc_misc.rb"
-require_relative "tc_hash.rb"
-require_relative "tc_packet.rb"
-require_relative "tc_packet_unique_push.rb"
-require_relative "tc_question.rb"
-require_relative "tc_res_file.rb"
-require_relative "tc_res_opt.rb"
-require_relative "tc_res_config.rb"
-# require_relative "tc_res_env.rb"
-require_relative "tc_rr-txt.rb"
-require_relative "tc_rr-unknown.rb"
-require_relative "tc_rr.rb"
-require_relative "tc_rrset.rb"
-require_relative "tc_tkey.rb"
-require_relative "tc_update.rb"
-require_relative "tc_escapedchars.rb"
-require_relative "tc_dnskey.rb"
-require_relative "tc_rrsig.rb"
-require_relative "tc_nsec.rb"
-require_relative "tc_nsec3.rb"
-require_relative "tc_nsec3param.rb"
-require_relative "tc_ipseckey.rb"
-require_relative "tc_naptr.rb"
-
-begin
-  require "openssl"
-  OpenSSL::HMAC.digest(OpenSSL::Digest::MD5.new, "key", "data")
-  key = OpenSSL::PKey::RSA.new
-  key.e = 111
-
-  have_openssl=true
-rescue Exception => e
-    puts "-----------------------------------------------------------------------"
-    puts "OpenSSL not present (with full functionality) - skipping DS digest test"
-    puts "-----------------------------------------------------------------------"
+# We'll prepend 'tc_' and append '.rb' to these:
+TESTS = %w(
+    dnskey
+    escapedchars
+    gpos
+    hash
+    header
+    ipseckey
+    message
+    misc
+    name
+    naptr
+    nsec
+    nsec3
+    nsec3param
+    nxt
+    packet
+    packet_unique_push
+    question
+    res_config
+    res_file
+    res_opt
+    rr
+    rr-txt
+    rr-unknown
+    rrset
+    rrsig
+    tkey
+    update
+    zone_reader
+)
+
+# Omitted:
+#
+# tc_res_env
+
+
+TESTS.each { |test| require_relative "tc_#{test}.rb" }
+
+
+def have_open_ssl?
+  have_open_ssl = true
+  begin
+    require "openssl"
+    OpenSSL::HMAC.digest(OpenSSL::Digest::MD5.new, "key", "data")
+    key = OpenSSL::PKey::RSA.new
+    key.e = 111
+  rescue
+    have_open_ssl = false
+  end
+  have_open_ssl
 end
-if (have_openssl)
-    require_relative "tc_ds.rb"
+
+if have_open_ssl?
+  require_relative 'tc_ds.rb'
+else
+  puts "-----------------------------------------------------------------------"
+  puts "OpenSSL not present (with full functionality) - skipping DS digest test"
+  puts "-----------------------------------------------------------------------"
 end
+

data/test/ts_online.rb

@@ -17,40 +17,69 @@
 require_relative 'spec_helper'
 Dnsruby.log.level = Logger::FATAL
 
-# Disable these tests if we're not online
 require 'socket'
-sock = UDPSocket.new()
-online = false
-begin
-  sock.connect('193.0.14.129', # k.root-servers.net.
-    25)
-  online = true
-  sock.close
-rescue Exception => exception
-  puts "----------------------------------------"
-  puts "Cannot bind to socket:\n\t#{exception}\n"
-  puts "This is an indication you have network problems\n"
-  puts "\n\nNo online tests will be run!!\n\n"
-  puts "----------------------------------------"
+
+
+# Tells whether or not we can connect to the Internet.
+def online?
+  sock = UDPSocket.new()
+  online = false
+  begin
+    sock.connect('193.0.14.129', 25) # that address is k.root-servers.net
+    online = true
+    sock.close
+  rescue Exception => exception
+    puts "
+------------------------------------------------------------
+Cannot bind to socket:
+        #{exception}
+
+This is an indication you have network problems.
+No online tests will be run!!
+------------------------------------------------------------
+"
+  end
+  online
 end
-if (online)
+
+
+if online?
+  online_tests = %w(
+      axfr
+      hs
+      recur
+      resolv
+      resolver
+      tcp
+      tcp_pipelining
+  )
+
+  # Excluded are:
+  #
+  # inet6
+  # recurse
+  # queue
+  # soak
+
   #    OK - online and ready to go
-  print "Running online tests. These tests send UDP packets - some may be lost.\n"
-  print "If you get the odd timeout error with these tests, try running them again.\n"
-  print "It may just be that some UDP packets got lost the first time...\n"
-  require_relative "tc_resolver.rb"
-  require_relative "tc_dnsruby.rb"
-  require_relative "tc_hs.rb"
-  #   require_relative "tc_inet6.rb"
-  #   require_relative "tc_recurse.rb"
-  require_relative "tc_tcp.rb"
-#  require_relative "tc_queue.rb"
-  require_relative "tc_recur.rb"
-  #   require_relative "tc_soak.rb"
-
-  #  Check if we can contact the server - if we can't, then abort the test
+  puts '
+Running online tests. These tests send UDP packets - some may be lost.
+If you get the odd timeout error with these tests, try running them again.
+It may just be that some UDP packets got lost the first time...
+'
+
+  online_tests.each { |test| require_relative("tc_#{test}.rb") }
+end
+
+
+# We have set server_up to unconditionally return false.
+# Therefore, to avoid any misconception that this code could run,
+# I'm commenting it out.
+=begin
+def server_up?
+  false
+#  Check if we can contact the server - if we can't, then abort the test
   #  (but tell user that test has not been run due to connectivity problems)
-  server_up = false
 
   #  Disabling the attempt to connect to Nominet servers...
   #  begin
@@ -65,38 +94,40 @@ if (online)
   #    puts "\n\nNo tests targetting this server will be run!!\n\n"
   #    puts "----------------------------------------"
   #  end
+end
+
+
+if (server_up)
+
+  require_relative "tc_single_resolver.rb"
+  require_relative "tc_cache.rb"
+  require_relative "tc_dns.rb"
+  require_relative "tc_rr-opt.rb"
+  require_relative "tc_res_config.rb"
 
-  if (server_up)
-
-    require_relative "tc_single_resolver.rb"
-    require_relative "tc_axfr.rb"
-    require_relative "tc_cache.rb"
-    require_relative "tc_dns.rb"
-    require_relative "tc_rr-opt.rb"
-    require_relative "tc_res_config.rb"
-
-    have_openssl = false
-    begin
-      require "openssl"
-      OpenSSL::HMAC.digest(OpenSSL::Digest::MD5.new, "key", "data")
-      key = OpenSSL::PKey::RSA.new
-      key.e = 111
-
-      have_openssl=true
-    rescue Exception => e
-      puts "-------------------------------------------------------------------------"
-      puts "OpenSSL not present (with full functionality) - skipping TSIG/DNSSEC test"
-      puts "-------------------------------------------------------------------------"
-    end
-    if (have_openssl)
-      require_relative "tc_tsig.rb"
-      puts "------------------------------------------------------"
-      puts "Running DNSSEC test - may fail if OpenSSL not complete"
-      puts "------------------------------------------------------"
-      require_relative "tc_verifier.rb"
-      require_relative "tc_dlv.rb"
-      require_relative "tc_validator.rb"
-    end
+  have_openssl = false
+  begin
+    require "openssl"
+    OpenSSL::HMAC.digest(OpenSSL::Digest::MD5.new, "key", "data")
+    key = OpenSSL::PKey::RSA.new
+    key.e = 111
+
+    have_openssl=true
+  rescue Exception => e
+    puts "-------------------------------------------------------------------------"
+    puts "OpenSSL not present (with full functionality) - skipping TSIG/DNSSEC test"
+    puts "-------------------------------------------------------------------------"
+  end
+  if (have_openssl)
+    require_relative "tc_tsig.rb"
+    puts "------------------------------------------------------"
+    puts "Running DNSSEC test - may fail if OpenSSL not complete"
+    puts "------------------------------------------------------"
+    require_relative "tc_verifier.rb"
+    require_relative "tc_dlv.rb"
+    require_relative "tc_validator.rb"
+  end
+=end
 
 #    have_em = false
 #    begin
@@ -112,5 +143,3 @@ if (online)
 #      require 'test/tc_event_machine_res.rb'
 #      require 'test/tc_event_machine_deferrable.rb'
 #    end
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dnsruby
 version: !ruby/object:Gem::Version
-  version: 1.57.0
+  version: 1.58.0
 platform: ruby
 authors:
 - Alex Dalitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -72,6 +72,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.4'
+- !ruby/object:Gem::Dependency
+  name: rubydns
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: nio4r
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +152,8 @@ files:
 - dnsruby.gemspec
 - lib/dnsruby.rb
 - lib/dnsruby/DNS.rb
+- lib/dnsruby/bit_mapping.rb
+- lib/dnsruby/bitmap.rb
 - lib/dnsruby/cache.rb
 - lib/dnsruby/code_mapper.rb
 - lib/dnsruby/code_mappers.rb
@@ -167,6 +197,7 @@ files:
 - lib/dnsruby/resource/NSEC.rb
 - lib/dnsruby/resource/NSEC3.rb
 - lib/dnsruby/resource/NSEC3PARAM.rb
+- lib/dnsruby/resource/NXT.rb
 - lib/dnsruby/resource/OPT.rb
 - lib/dnsruby/resource/PX.rb
 - lib/dnsruby/resource/RP.rb
@@ -185,6 +216,7 @@ files:
 - lib/dnsruby/resource/domain_name.rb
 - lib/dnsruby/resource/generic.rb
 - lib/dnsruby/resource/resource.rb
+- lib/dnsruby/resource/type_bitmap.rb
 - lib/dnsruby/select_thread.rb
 - lib/dnsruby/single_resolver.rb
 - lib/dnsruby/single_verifier.rb
@@ -202,7 +234,6 @@ files:
 - test/tc_dlv.rb
 - test/tc_dns.rb
 - test/tc_dnskey.rb
-- test/tc_dnsruby.rb
 - test/tc_ds.rb
 - test/tc_escapedchars.rb
 - test/tc_gpos.rb
@@ -218,6 +249,7 @@ files:
 - test/tc_nsec.rb
 - test/tc_nsec3.rb
 - test/tc_nsec3param.rb
+- test/tc_nxt.rb
 - test/tc_packet.rb
 - test/tc_packet_unique_push.rb
 - test/tc_question.rb
@@ -227,6 +259,7 @@ files:
 - test/tc_res_env.rb
 - test/tc_res_file.rb
 - test/tc_res_opt.rb
+- test/tc_resolv.rb
 - test/tc_resolver.rb
 - test/tc_rr-opt.rb
 - test/tc_rr-txt.rb
@@ -239,11 +272,15 @@ files:
 - test/tc_soak_base.rb
 - test/tc_sshfp.rb
 - test/tc_tcp.rb
+- test/tc_tcp_pipelining.rb
 - test/tc_tkey.rb
 - test/tc_tsig.rb
 - test/tc_update.rb
 - test/tc_validator.rb
 - test/tc_verifier.rb
+- test/tc_zone_reader.rb
+- test/test_dnsserver.rb
+- test/test_utils.rb
 - test/ts_dnsruby.rb
 - test/ts_offline.rb
 - test/ts_online.rb

data/test/tc_dnsruby.rb

@@ -1,51 +0,0 @@
-# --
-# Copyright 2007 Nominet UK
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ++
-
-require_relative 'spec_helper'
-
-include Dnsruby
-class TestDnsruby < Minitest::Test
-  def test_dnsruby
-    a = Resolv.getaddress("google-public-dns-a.google.com.")
-    assert_equal(a.to_s, "8.8.8.8")
-    a = Resolv.getaddresses("google-public-dns-a.google.com.")
-    if (a.length == 1) 
-      assert(a.length==1, a.to_s + " should only have one response. Had " + a.length.to_s)
-      assert(a.any? {|s| s.to_s == ("8.8.8.8")})
-      Resolv.each_address("google-public-dns-a.google.com.") {|address| assert_equal(address, "8.8.8.8")}
-    else 
-      assert(a.length==2, a.to_s + " should have had two responses. Had " + a.length.to_s)
-      assert(a.any? {|s| s.to_s == ("8.8.8.8")})
-      assert(a.any? {|s| s.to_s == ("2001:4860:4860::8888")})
-      Resolv.each_address("google-public-dns-a.google.com.") {|address|
-        assert((address == "8.8.8.8") || (address = "2001:4860:4860::8888")) }
-    end
-
-    n = Resolv.getname("8.8.8.8")
-    assert_equal(n, "google-public-dns-a.google.com")
-    begin
-      ret = Resolv.getname("google-public-dns-a.google.com.")
-      assert(false, ret)
-    rescue Exception => e
-#      assert(e.kind_of?(ResolvError))
-      assert(e.kind_of?(Resolv::ResolvError), "Error was a #{e.class}: #{e}")
-    end
-    n = Resolv.getnames("8.8.8.8")
-    assert(n.length==1)
-    assert_equal(n[0], "google-public-dns-a.google.com")
-    Resolv.each_name("8.8.8.8") {|name| assert_equal(name, "google-public-dns-a.google.com")}
-  end
-end