net-dns 0.8.0 → 0.9.0

data/lib/net/dns/version.rb

@@ -1,16 +1,8 @@
+# frozen_string_literal: true
+
 module Net
   module DNS
-    module Version
-
-      MAJOR = 0
-      MINOR = 8
-      PATCH = 0
-      BUILD = nil
-
-      STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")
-    end
-
-    VERSION = Version::STRING
-
+    # The current library version.
+    VERSION = "0.9.0".freeze
   end
-end
+end

data/net-dns.gemspec

@@ -1,35 +1,23 @@
-# -*- encoding: utf-8 -*-
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+require "net/dns/version"
 
 Gem::Specification.new do |s|
-  s.name = "net-dns"
-  s.version = "0.8.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marco Ceresa", "Simone Carletti"]
-  s.date = "2013-05-08"
+  s.name        = "net-dns"
+  s.version     = Net::DNS::VERSION
+  s.authors     = ["Marco Ceresa", "Simone Carletti"]
+  s.email       = ["ceresa@gmail.com", "weppos@weppos.net"]
+  s.homepage    = "http://github.com/bluemonk/net-dns"
+  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.email = ["ceresa@gmail.com", "weppos@weppos.net"]
-  s.files = [".gitignore", ".travis.yml", "CHANGELOG.md", "Gemfile", "README.md", "Rakefile", "THANKS.rdoc", "demo/check_soa.rb", "demo/threads.rb", "fixtures/resolv.conf", "lib/net/dns.rb", "lib/net/dns/core_ext.rb", "lib/net/dns/header.rb", "lib/net/dns/names.rb", "lib/net/dns/packet.rb", "lib/net/dns/question.rb", "lib/net/dns/resolver.rb", "lib/net/dns/resolver/socks.rb", "lib/net/dns/resolver/timeouts.rb", "lib/net/dns/rr.rb", "lib/net/dns/rr/a.rb", "lib/net/dns/rr/aaaa.rb", "lib/net/dns/rr/classes.rb", "lib/net/dns/rr/cname.rb", "lib/net/dns/rr/hinfo.rb", "lib/net/dns/rr/mr.rb", "lib/net/dns/rr/mx.rb", "lib/net/dns/rr/ns.rb", "lib/net/dns/rr/null.rb", "lib/net/dns/rr/ptr.rb", "lib/net/dns/rr/soa.rb", "lib/net/dns/rr/srv.rb", "lib/net/dns/rr/txt.rb", "lib/net/dns/rr/types.rb", "lib/net/dns/version.rb", "net-dns.gemspec", "test/header_test.rb", "test/names_test.rb", "test/packet_test.rb", "test/question_test.rb", "test/resolver/timeouts_test.rb", "test/resolver_test.rb", "test/rr/a_test.rb", "test/rr/aaaa_test.rb", "test/rr/classes_test.rb", "test/rr/cname_test.rb", "test/rr/hinfo_test.rb", "test/rr/mr_test.rb", "test/rr/mx_test.rb", "test/rr/ns_test.rb", "test/rr/types_test.rb", "test/rr_test.rb", "test/test_helper.rb"]
-  s.homepage = "http://github.com/bluemonk/net-dns"
-  s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubyforge_project = "net-dns"
-  s.rubygems_version = "2.0.3"
-  s.summary = "Pure Ruby DNS library."
-  s.test_files = ["test/header_test.rb", "test/names_test.rb", "test/packet_test.rb", "test/question_test.rb", "test/resolver/timeouts_test.rb", "test/resolver_test.rb", "test/rr/a_test.rb", "test/rr/aaaa_test.rb", "test/rr/classes_test.rb", "test/rr/cname_test.rb", "test/rr/hinfo_test.rb", "test/rr/mr_test.rb", "test/rr/mx_test.rb", "test/rr/ns_test.rb", "test/rr/types_test.rb", "test/rr_test.rb", "test/test_helper.rb"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.required_ruby_version = ">= 2.1"
+
+  s.require_paths    = ["lib"]
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.extra_rdoc_files = %w[LICENSE.txt]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rake>, ["~> 10.0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-    else
-      s.add_dependency(%q<rake>, ["~> 10.0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rake>, ["~> 10.0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-  end
+  s.add_development_dependency "mocha"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "yard"
 end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+require 'rspec'
+require 'net/dns'
+
+unless defined?(SPEC_ROOT)
+  SPEC_ROOT = File.expand_path(__dir__)
+end
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(SPEC_ROOT, "support/**/*.rb")].each { |f| require f }
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+end

data/spec/unit/resolver/dns_timeout_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+require 'net/dns/resolver/timeouts'
+
+describe Net::DNS::Resolver::DnsTimeout do
+  subject { described_class.new(10) }
+
+  describe "#initialize" do
+    it "returns an instance of DnsTimeout" do
+      expect(subject.class).to be(described_class)
+    end
+
+    it "sets timeout" do
+      expect(described_class.new(0).seconds).to eq(0)
+      expect(described_class.new(10).seconds).to eq(10)
+    end
+
+    it "raises ArgumentError when timeout is invalid" do
+      expect { described_class.new(nil)   }.to raise_error(ArgumentError)
+      expect { described_class.new("")    }.to raise_error(ArgumentError)
+      expect { described_class.new("foo") }.to raise_error(ArgumentError)
+      expect { described_class.new(-1)    }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe "#to_s" do
+    it "returns the seconds" do
+      expect(subject.to_s).to eq("10")
+    end
+  end
+
+  describe "#timeout" do
+    it "requires a block" do
+      expect { subject.timeout }.to raise_error(LocalJumpError)
+    end
+  end
+end

data/spec/unit/resolver/tcp_timeout_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+require 'net/dns/resolver/timeouts'
+
+describe Net::DNS::Resolver::TcpTimeout do
+  subject { described_class.new(10) }
+
+  it "inherits from DnsTimeout" do
+    expect(described_class.ancestors).to include(Net::DNS::Resolver::DnsTimeout)
+  end
+
+  describe "#initialize" do
+    it "returns an instance of TcpTimeout" do
+      expect(subject.class).to be(described_class)
+    end
+
+    it "sets timeout" do
+      expect(described_class.new(0).seconds).to eq(0)
+      expect(described_class.new(10).seconds).to eq(10)
+    end
+
+    it "raises ArgumentError when timeout is invalid" do
+      expect { described_class.new(nil)   }.to raise_error(ArgumentError)
+      expect { described_class.new("")    }.to raise_error(ArgumentError)
+      expect { described_class.new("foo") }.to raise_error(ArgumentError)
+      expect { described_class.new(-1)    }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe "#to_s" do
+    it "returns infinite when seconds is 0" do
+      expect(described_class.new(0).to_s).to eq("infinite")
+    end
+
+    it "returns the seconds" do
+      expect(subject.to_s).to eq("10")
+    end
+  end
+
+  describe "#pretty_to_s" do
+    it "returns a more verbose version" do
+      expect(described_class.new(30).pretty_to_s).to eq("30 seconds")
+      expect(described_class.new(90).pretty_to_s).to eq("1 minutes and 30 seconds")
+      expect(described_class.new(3690).pretty_to_s).to eq("1 hours, 1 minutes and 30 seconds")
+    end
+  end
+end

data/spec/unit/resolver/udp_timeout_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+require 'net/dns/resolver/timeouts'
+
+describe Net::DNS::Resolver::UdpTimeout do
+  subject { described_class.new(10) }
+
+  it "inherits from DnsTimeout" do
+    expect(described_class.ancestors).to include(Net::DNS::Resolver::DnsTimeout)
+  end
+
+  describe "#initialize" do
+    it "returns an instance of TcpTimeout" do
+      expect(subject.class).to be(described_class)
+    end
+
+    it "sets timeout" do
+      expect(described_class.new(0).seconds).to eq(0)
+      expect(described_class.new(10).seconds).to eq(10)
+    end
+
+    it "raises ArgumentError when timeout is invalid" do
+      expect { described_class.new(nil)   }.to raise_error(ArgumentError)
+      expect { described_class.new("")    }.to raise_error(ArgumentError)
+      expect { described_class.new("foo") }.to raise_error(ArgumentError)
+      expect { described_class.new(-1)    }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe "#to_s" do
+    it "returns infinite when seconds is 0" do
+      expect(described_class.new(0).to_s).to eq("not defined")
+    end
+
+    it "returns the seconds" do
+      expect(subject.to_s).to eq("10")
+    end
+  end
+
+  describe "#pretty_to_s" do
+    it "returns a more verbose version" do
+      expect(described_class.new(30).pretty_to_s).to eq("30 seconds")
+      expect(described_class.new(90).pretty_to_s).to eq("1 minutes and 30 seconds")
+      expect(described_class.new(3690).pretty_to_s).to eq("1 hours, 1 minutes and 30 seconds")
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,4 +1,13 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+require "minitest/autorun"
+require "minitest/reporters"
 
-require 'test/unit'
-require 'net/dns'
+Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new(color: true)
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+require "net/dns"
+
+module Minitest::Assertions
+  def assert_nothing_raised(*)
+    yield
+  end
+end

data/test/{header_test.rb → unit/header_test.rb}

@@ -1,27 +1,26 @@
 require 'test_helper'
 require 'net/dns/header'
 
-class HeaderTest < Test::Unit::TestCase
+class HeaderTest < Minitest::Test
   include Net::DNS
-  
-  def setup
 
+  def setup
     @default = Header.new
-    @hash = Header.new(:id => 441,
-                       :qr => 1,
-                       :opCode => Header::IQUERY,
-                       :aa => 1,
-                       :tc => 1,
-                       :rd => 0,
-                       :cd => 0,
-                       :ad => 0,
-                       :ra => 1,
-                       :rCode => Header::RCode::FORMAT,
-                       :qdCount => 1,
-                       :anCount => 2,
-                       :nsCount => 3,
-                       :arCount => 3)
-    
+    @hash = Header.new(id: 441,
+                       qr: 1,
+                       opCode: Header::IQUERY,
+                       aa: 1,
+                       tc: 1,
+                       rd: 0,
+                       cd: 0,
+                       ad: 0,
+                       ra: 1,
+                       rCode: Header::RCode::FORMAT,
+                       qdCount: 1,
+                       anCount: 2,
+                       nsCount: 3,
+                       arCount: 3)
+
     @modified = Header.new
     @modified.id = 442
     @modified.qr = true
@@ -38,10 +37,10 @@ class HeaderTest < Test::Unit::TestCase
     @modified.arCount = 3
 
     @data = @modified.data
-    num = [(@data.unpack("n")[0]+1)].pack("n")
-    @data[0],@data[1] = num[0], num[1]
+    num = [(@data.unpack("n")[0] + 1)].pack("n")
+    @data[0] = num[0]
+    @data[1] = num[1]
     @binary = Header.parse(@data)
-    
   end
 
   def test_simple
@@ -60,7 +59,7 @@ class HeaderTest < Test::Unit::TestCase
     assert_equal(@default.nsCount, 0)
     assert_equal(@default.arCount, 0)
 
-    assert_equal(@hash.id, 441)    
+    assert_equal(@hash.id, 441)
     assert_equal(@hash.query?, false)
     assert_equal(@hash.response?, true)
     assert_equal(@hash.opCode, Header::IQUERY)
@@ -75,8 +74,8 @@ class HeaderTest < Test::Unit::TestCase
     assert_equal(@hash.anCount, 2)
     assert_equal(@hash.nsCount, 3)
     assert_equal(@hash.arCount, 3)
-    
-    assert_equal(@modified.id, 442)    
+
+    assert_equal(@modified.id, 442)
     assert_equal(@modified.query?, false)
     assert_equal(@modified.response?, true)
     assert_equal(@modified.opCode, Header::IQUERY)
@@ -91,10 +90,10 @@ class HeaderTest < Test::Unit::TestCase
     assert_equal(@modified.anCount, 2)
     assert_equal(@modified.nsCount, 3)
     assert_equal(@modified.arCount, 3)
-    
+
     assert_equal(@binary.data, @data)
 
-    assert_equal(@binary.id, 443)    
+    assert_equal(@binary.id, 443)
     assert_equal(@binary.query?, false)
     assert_equal(@binary.response?, true)
     assert_equal(@binary.opCode, Header::IQUERY)
@@ -109,59 +108,57 @@ class HeaderTest < Test::Unit::TestCase
     assert_equal(@binary.anCount, 2)
     assert_equal(@binary.nsCount, 3)
     assert_equal(@binary.arCount, 3)
-    
+
     assert_raises(ArgumentError) do
-      Header.new(Array.new)
+      Header.new([])
     end
     assert_raises(ArgumentError) do
-      Header.parse(Array.new)
+      Header.parse([])
     end
     assert_raises(ArgumentError) do
       Header.parse("aa")
     end
     assert_raises(ArgumentError) do
-      @default.id = 1000000
+      @default.id = 1_000_000
     end
     assert_raises(ArgumentError) do
-      @default.qr=2
+      @default.qr = 2
     end
     assert_raises(Header::WrongOpcodeError) do
-      @default.opCode=4
+      @default.opCode = 4
     end
     assert_raises(ArgumentError) do
-      @default.aa=2
+      @default.aa = 2
     end
     assert_raises(ArgumentError) do
-      @default.tc=2
+      @default.tc = 2
     end
     assert_raises(Header::WrongRecursiveError) do
-      @default.recursive=2
+      @default.recursive = 2
     end
     assert_raises(ArgumentError) do
-      @default.ra=2
+      @default.ra = 2
     end
     assert_raises(ArgumentError) do
-      @default.cd=2
+      @default.cd = 2
     end
     assert_raises(ArgumentError) do
-      @default.ad=2
+      @default.ad = 2
     end
     assert_raises(ArgumentError) do
-      @default.rCode=46
+      @default.rCode = 46
     end
     assert_raises(Header::WrongCountError) do
-      @default.qdCount=100000
+      @default.qdCount = 100_000
     end
     assert_raises(Header::WrongCountError) do
-      @default.anCount=100000
+      @default.anCount = 100_000
     end
     assert_raises(Header::WrongCountError) do
-      @default.nsCount=100000
+      @default.nsCount = 100_000
     end
     assert_raises(Header::WrongCountError) do
-      @default.arCount=100000
+      @default.arCount = 100_000
     end
-  end    
-
+  end
 end
-    

data/test/{names_test.rb → unit/names_test.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'net/dns/names'
 
-class NamesTest < Test::Unit::TestCase
+class NamesTest < Minitest::Test
   include Net::DNS::Names
 
   def test_long_names

data/test/{packet_test.rb → unit/packet_test.rb}

@@ -1,8 +1,7 @@
 require 'test_helper'
 require 'net/dns/packet'
 
-class PacketTest < Test::Unit::TestCase
-
+class PacketTest < Minitest::Test
   def setup
     @klass  = Net::DNS::Packet
     @domain = 'example.com'
@@ -23,7 +22,7 @@ class PacketTest < Test::Unit::TestCase
     @question = @klass.new(@domain).question.first
     assert_equal @domain, @question.qName
     assert_equal Net::DNS::RR::Types.new(Net::DNS::A).to_s, @question.qType.to_s
-    assert_equal Net::DNS::RR::Classes.new(Net::DNS::IN).to_s, @question.qClass.to_s 
+    assert_equal Net::DNS::RR::Classes.new(Net::DNS::IN).to_s, @question.qClass.to_s
 
     @question = @klass.new(@domain, Net::DNS::MX, Net::DNS::HS).question.first
     assert_equal @domain, @question.qName
@@ -45,5 +44,4 @@ class PacketTest < Test::Unit::TestCase
     assert_instance_of Array,               @record.additional
     assert_instance_of Net::DNS::RR::A,     @record.additional.first
   end
-
-end    
+end

data/test/{question_test.rb → unit/question_test.rb}

@@ -1,8 +1,7 @@
 require 'test_helper'
 require 'net/dns/question'
 
-class QuestionTest < Test::Unit::TestCase
-
+class QuestionTest < Minitest::Test
   def setup
     @domain = 'example.com.'
     @type   = 'MX'
@@ -10,7 +9,7 @@ class QuestionTest < Test::Unit::TestCase
     @data = "\006google\003com\000\000\001\000\001"
 
     @default = Net::DNS::Question.new(@domain)
-    @string  = Net::DNS::Question.new(@domain,@type,@cls)
+    @string  = Net::DNS::Question.new(@domain, @type, @cls)
     @binary  = Net::DNS::Question.parse(@data)
     @binary2 = Net::DNS::Question.parse(@string.data)
   end
@@ -41,7 +40,7 @@ class QuestionTest < Test::Unit::TestCase
       Net::DNS::Question.new("test{")
     end
     assert_raises(ArgumentError) do
-      Net::DNS::Question.parse(Array.new)
+      Net::DNS::Question.parse([])
     end
     assert_raises(ArgumentError) do
       Net::DNS::Question.parse("test")
@@ -79,5 +78,4 @@ class QuestionTest < Test::Unit::TestCase
     assert_equal  "supercalifragilistichespiralidoso.com IN      A       ",
                   Net::DNS::Question.new("supercalifragilistichespiralidoso.com").to_s
   end
-
 end