rubysl-resolv 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70fb96e5c839213a9643ffac29c5be3498aee4fa
-  data.tar.gz: 6ecacc7fa6ebf9243c40c33b3e233905a711a366
+  metadata.gz: 5a3b2d810058ec30f40edc3b93454a731d36630f
+  data.tar.gz: 23abe88f768bd21b940edc25c6dd4c6172941309
 SHA512:
-  metadata.gz: 9fcdec1fd50945fd720068ec027c820ba6644623c0bb94bc9917fd39fd0507fd81256c549ba77918cc40d45a540b1766d80b4fbb0eed54089e68b77f689a4406
-  data.tar.gz: 9fff4616e686c1c6905b46b3c7d5ef4b5233c410b2b0a41cfc2408b0e997d37e7a24b4f23403b27c51c1df50b714e4e87c6fdaf1d77a239d52f168b5614d6a31
+  metadata.gz: 6a620c040ab64339559397406c5ddce07a380bac977e4a0cb07228067417be5ab068711f25eac57144bb9ba5f36c849ed69780a8bd926705da361ac7a55e7417
+  data.tar.gz: 19dccd59c66773232a5572c1553597e95b3e436fc59dc0d990c7f31bd19bc93af734da9e696b9f4a1529314a5f28e1ee12456327ca75f8d3e41517e32883c1c9

data/MRI_LICENSE

@@ -0,0 +1,56 @@
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+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/lib/rubysl/resolv-replace.rb

@@ -0,0 +1 @@
+require 'rubysl/resolv/resolv-replace'

data/lib/rubysl/resolv/resolv-replace.rb

@@ -0,0 +1,74 @@
+require 'socket'
+require 'resolv'
+
+class << IPSocket
+  # :stopdoc:
+  alias original_resolv_getaddress getaddress
+  # :startdoc:
+  def getaddress(host)
+    begin
+      return Resolv.getaddress(host).to_s
+    rescue Resolv::ResolvError
+      raise SocketError, "Hostname not known: #{host}"
+    end
+  end
+end
+
+class TCPSocket < IPSocket
+  # :stopdoc:
+  alias original_resolv_initialize initialize
+  # :startdoc:
+  def initialize(host, serv, *rest)
+    rest[0] = IPSocket.getaddress(rest[0]) if rest[0]
+    original_resolv_initialize(IPSocket.getaddress(host), serv, *rest)
+  end
+end
+
+class UDPSocket < IPSocket
+  # :stopdoc:
+  alias original_resolv_bind bind
+  # :startdoc:
+  def bind(host, port)
+    host = IPSocket.getaddress(host) if host != ""
+    original_resolv_bind(host, port)
+  end
+
+  # :stopdoc:
+  alias original_resolv_connect connect
+  # :startdoc:
+  def connect(host, port)
+    original_resolv_connect(IPSocket.getaddress(host), port)
+  end
+
+  # :stopdoc:
+  alias original_resolv_send send
+  # :startdoc:
+  def send(mesg, flags, *rest)
+    if rest.length == 2
+      host, port = rest
+      begin
+        addrs = Resolv.getaddresses(host)
+      rescue Resolv::ResolvError
+        raise SocketError, "Hostname not known: #{host}"
+      end
+      addrs[0...-1].each {|addr|
+        begin
+          return original_resolv_send(mesg, flags, addr, port)
+        rescue SystemCallError
+        end
+      }
+      original_resolv_send(mesg, flags, addrs[-1], port)
+    else
+      original_resolv_send(mesg, flags, *rest)
+    end
+  end
+end
+
+class SOCKSSocket < TCPSocket
+  # :stopdoc:
+  alias original_resolv_initialize initialize
+  # :startdoc:
+  def initialize(host, serv)
+    original_resolv_initialize(IPSocket.getaddress(host), port)
+  end
+end if defined? SOCKSSocket

data/lib/rubysl/resolv/resolv.rb

@@ -1,5 +1,4 @@
 require 'socket'
-require 'fcntl'
 require 'timeout'
 require 'thread'
 
@@ -159,7 +158,7 @@ class Resolv
   ##
   # Indicates a timeout resolving a name or address.
 
-  class ResolvTimeout < TimeoutError; end
+  class ResolvTimeout < Timeout::Error; end
 
   ##
   # Resolv::Hosts is a hostname resolver that uses the system hosts file.
@@ -671,8 +670,8 @@ class Resolv
         timelimit = start + tout
         begin
           sender.send
-        rescue Errno::EHOSTUNREACH
-          # multi-homed IPv6 may generate this
+        rescue Errno::EHOSTUNREACH, # multi-homed IPv6 may generate this
+               Errno::ENETUNREACH
           raise ResolvTimeout
         end
         while true
@@ -1067,6 +1066,10 @@ class Resolv
             candidates = []
           end
           candidates.concat(@search.map {|domain| Name.new(name.to_a + domain)})
+          fname = Name.create("#{name}.")
+          if !candidates.include?(fname)
+            candidates << fname
+          end
         end
         return candidates
       end
@@ -1167,7 +1170,9 @@ class Resolv
       class Str # :nodoc:
         def initialize(string)
           @string = string
-          @downcase = string.downcase
+          # case insensivity of DNS labels doesn't apply non-ASCII characters. [RFC 4343]
+          # This assumes @string is given in ASCII compatible encoding.
+          @downcase = string.b.downcase
         end
         attr_reader :string, :downcase
 
@@ -1176,11 +1181,11 @@ class Resolv
         end
 
         def inspect
-          return "#<#{self.class} #{self.to_s}>"
+          return "#<#{self.class} #{self}>"
         end
 
         def ==(other)
-          return @downcase == other.downcase
+          return self.class == other.class && @downcase == other.downcase
         end
 
         def eql?(other)
@@ -1216,12 +1221,20 @@ class Resolv
       end
 
       def initialize(labels, absolute=true) # :nodoc:
+        labels = labels.map {|label|
+          case label
+          when String then Label::Str.new(label)
+          when Label::Str then label
+          else
+            raise ArgumentError, "unexpected label: #{label.inspect}"
+          end
+        }
         @labels = labels
         @absolute = absolute
       end
 
       def inspect # :nodoc:
-        "#<#{self.class}: #{self.to_s}#{@absolute ? '.' : ''}>"
+        "#<#{self.class}: #{self}#{@absolute ? '.' : ''}>"
       end
 
       ##
@@ -1233,7 +1246,8 @@ class Resolv
 
       def ==(other) # :nodoc:
         return false unless Name === other
-        return @labels.join == other.to_a.join && @absolute == other.absolute?
+        return false unless @absolute == other.absolute?
+        return @labels == other.to_a
       end
 
       alias eql? == # :nodoc:
@@ -1662,10 +1676,10 @@ class Resolv
         return false unless self.class == other.class
         s_ivars = self.instance_variables
         s_ivars.sort!
-        s_ivars.delete "@ttl"
+        s_ivars.delete :@ttl
         o_ivars = other.instance_variables
         o_ivars.sort!
-        o_ivars.delete "@ttl"
+        o_ivars.delete :@ttl
         return s_ivars == o_ivars &&
           s_ivars.collect {|name| self.instance_variable_get name} ==
             o_ivars.collect {|name| other.instance_variable_get name}
@@ -1678,7 +1692,7 @@ class Resolv
       def hash # :nodoc:
         h = 0
         vars = self.instance_variables
-        vars.delete "@ttl"
+        vars.delete :@ttl
         vars.each {|name|
           h ^= self.instance_variable_get(name).hash
         }
@@ -2347,7 +2361,7 @@ class Resolv
     end
 
     def inspect # :nodoc:
-      return "#<#{self.class} #{self.to_s}>"
+      return "#<#{self.class} #{self}>"
     end
 
     ##
@@ -2490,7 +2504,7 @@ class Resolv
     end
 
     def inspect # :nodoc:
-      return "#<#{self.class} #{self.to_s}>"
+      return "#<#{self.class} #{self}>"
     end
 
     ##
@@ -2640,7 +2654,7 @@ class Resolv
       end
 
       def inspect # :nodoc:
-        return "#<#{self.class} #{self.to_s}>"
+        return "#<#{self.class} #{self}>"
       end
 
       def ==(other) # :nodoc:
@@ -2729,7 +2743,7 @@ class Resolv
       end
 
       def inspect # :nodoc:
-        return "#<#{self.class} #{self.to_s}>"
+        return "#<#{self.class} #{self}>"
       end
 
       def ==(other) # :nodoc:
@@ -2791,7 +2805,7 @@ class Resolv
       end
 
       def inspect # :nodoc:
-        return "#<#{self.class} #{self.to_s}>"
+        return "#<#{self.class} #{self}>"
       end
 
       def ==(other) # :nodoc:

data/lib/rubysl/resolv/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module Resolv
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

metadata

@@ -1,67 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-resolv
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
+  name: bundler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: mspec
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-  type: :development
+  name: mspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: rubysl-prettyprint
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
+  name: rubysl-prettyprint
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -77,10 +77,13 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE
+- MRI_LICENSE
 - README.md
 - Rakefile
 - lib/resolv.rb
+- lib/rubysl/resolv-replace.rb
 - lib/rubysl/resolv.rb
+- lib/rubysl/resolv/resolv-replace.rb
 - lib/rubysl/resolv/resolv.rb
 - lib/rubysl/resolv/version.rb
 - rubysl-resolv.gemspec
@@ -108,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby standard library resolv.
@@ -117,3 +120,4 @@ test_files:
 - spec/get_addresses_spec.rb
 - spec/get_name_spec.rb
 - spec/get_names_spec.rb
+has_rdoc: