net-ping 1.6.2 → 1.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWEzZmUxOTg3ZmRmY2E1MDA5ZmNmZTdlMzk1ZGQ2NTM1NTkyMTM5Ng==
+    ZTJmYTMzNzE5ZjJkYTIwYjk4NWI2YTZhNGIxZmJkNDU0NjEzZmQwZA==
   data.tar.gz: !binary |-
-    YzcwNTFlYzg0MzRlZjJhNjg2ZGMwYzg0ODBlMzQ0NTlhNTNhMjA5YQ==
+    NDk5MzhkOWIwZDI2MDU5MmZiOWIxYjljZGFmNDcxZWQxMTIzOTczMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzQ3NDg1MzEzNTJiNDdlMjgxNzZiMDlhZDI5MzM0MzdmMDllOGU3NTBhYjgy
-    MDM1ZDU1MWJiMzYwYjZmZGU3NDAxZWQ4YzY1YzBlODkyNWRiMWExOTU4MjA2
-    MDkwMmQ0NDk1M2VjYWNlMDZlMGUyODM2NTUzNmFmNDAxYTY1Nzg=
+    ZmMxMDk1OGEwYjdhNWY0NzhlOTE3Yzc4YjAyNTIzYWQxYmU3ZDJiN2RkZWNh
+    MzAwNGZmMTYwMWNlNmVmOTk1ZjQzOTI4Mjk1M2VjMmIwZDFkYjk5MmNkNTk1
+    MjI4NGVkMjU2YzZlMDYxYTE0NGRjOGE0ZjJjYTZkZTk2ZWRhYjg=
   data.tar.gz: !binary |-
-    ZGMxYjU3MjI3ZjM1OGNmMzc2NTg4NGI0YWI4MTEzNzU2YWJlOWI3OThjN2Zi
-    OWEyYTEyNTdlM2I4NjFiYmUwYWJjZWNmYTE3ZmNhMThlMmViNDY5NjIxZGNl
-    MTJmYjc0YjU5MTBhNjlhN2QwOWM1NDYwM2VhNjg1MzBkZjc0YTI=
+    YzFmZjVhYzhjZDQ5YjBhN2I0Yjg5NGM4ZDQ2ZWQyNWM2YWYyZWRiZDQ2ODUy
+    OWNlOTAyYjUxOTBlZGVhMTIxNWI4MmFhN2ZlMTQ3NGZlYjhlMDQzOTJhNmE2
+    NDRjNzBhOTJmZmU3ODM2MjRmZjBhODZiZTI3NTMwMjY1Y2QyYmM=

data/CHANGES

@@ -1,3 +1,10 @@
+== 1.7.0 - 25-Aug-2013
+* Now requires Ruby 1.9.x or later.
+* Replaced the main ping code for the Ping::TCP class. The timeout module
+  really doesn't work very well with sockets, and so a raw socket approach
+  combined with IO.select is now used instead.
+* Updates to the doc/ping.txt file.
+
 == 1.6.2 - 8-Aug-2013
 * Fixed a bug in the ICMP ping helper module. Thanks go to Yuichi
   Tsunematsu for the spot.

data/doc/ping.txt

@@ -48,7 +48,7 @@
    All Ping classes are children of the Ping parent class (which should
    never be instantiated directly).
 
-   The Ping::ICMP class requires root privileges on UNIX systems.
+   The Ping::ICMP class requires root/administrative privileges.
 
    The Ping::WMI class only works on MS Windows.
 
@@ -136,30 +136,6 @@ Ping::WMI#ping(host, options={})
 Ping::WMI#ping?(host, options={})
    Returns whether or not the ping succeeded.
 
-== Ping::LDAP
-Ping::LDAP.new(uri=nil, timeout=5)
-   Performs a 'ping' to an LDAP server in the form of either an anonymous
-   or an authenticated LDAP bind.
-   Identical to Net::Ping.new except that, instead of a host, the first
-   argument is a URI.
-   The default +timeout+ is 5 seconds.
-  
-   +uri+ string is expected to be a full URI with scheme (ldap/ldaps)
-   and optionally the port (else default port is assumed) e.g.
-    ldap://my.ldap.host.com
-    ldap://my.ldap.host.com:1389
-    ldaps://my.ldap.host.com
-    ldaps://my.ldap.host.com:6636
-  
-  If a plain hostname is provided as the +uri+, a default port of 389 is assumed
-
-Ping::LDAP#encryption
-   Set/get the encyption method. By default is nil, but may be set to :simple_tls
-
-Ping::LDAP#username
-Ping::LDAP#password
-   set/get the username and password for ping using and authenticated bind.
-
 = Common Instance Methods
 Ping#exception
    Returns the error string that was set if a ping call failed.  If an exception
@@ -242,10 +218,6 @@ Ping#warning
    You may see a test failure from the test_net_ping_tcp test case. You can
    ignore these.
    
-   The socket library that ships with the Windows One-Click installer has
-   known issues. This may cause the Ping::ICMP class to fail. In fact, I
-   make an effort to skip those tests if I detect the one-click installer.
-
    UDP pings may not work with older versions of Ruby 1.9.x.
 
    Please report any bugs on the project page at
@@ -263,7 +235,7 @@ Ping#warning
    Artistic 2.0
 
 = Copyright
-   (C) 2003-2010 Daniel J. Berger, All Rights Reserved
+   (C) 2003-2013 Daniel J. Berger, All Rights Reserved
 
 = Warranty
    This package is provided "as is" and without any express or

data/lib/net/ping/ping.rb

@@ -10,7 +10,7 @@ module Net
    #
    class Ping
       # The version of the net-ping library.
-      VERSION = '1.6.2'
+      VERSION = '1.7.0'
 
       # The host to ping. In the case of Ping::HTTP, this is the URI.
       attr_accessor :host

data/lib/net/ping/tcp.rb

@@ -11,14 +11,14 @@ module Net
 
     # Returns whether or not Errno::ECONNREFUSED is considered a successful
     # ping. The default is false.
-    # 
+    #
     def self.service_check
       @@service_check
     end
 
     # Sets whether or not an Errno::ECONNREFUSED should be considered a
     # successful ping.
-    # 
+    #
     def self.service_check=(bool)
       unless bool.kind_of?(TrueClass) || bool.kind_of?(FalseClass)
         raise ArgumentError, 'argument must be true or false'
@@ -29,38 +29,58 @@ module Net
     # This method attempts to ping a host and port using a TCPSocket with
     # the host, port and timeout values passed in the constructor.  Returns
     # true if successful, or false otherwise.
-    # 
+    #
     # Note that, by default, an Errno::ECONNREFUSED return result will be
     # considered a failed ping.  See the documentation for the
     # Ping::TCP.service_check= method if you wish to change this behavior.
-    # 
+    #
     def ping(host=@host)
       super(host)
 
       bool = false
-      tcp = nil
       start_time = Time.now
 
+      # Failure here most likely means bad host, so just bail.
       begin
-        Timeout.timeout(@timeout){
-          begin
-            tcp = TCPSocket.new(host, @port)
-          rescue Errno::ECONNREFUSED => err
-            if @@service_check
-              bool = true
-            else
-              @exception = err
-            end
-          rescue Exception => err
-            @exception = err
-          else
+        addr = Socket.getaddrinfo(host, port)
+      rescue SocketError => err
+        @exception = err
+        bool = false
+        return
+      end
+
+      begin
+        # Where addr[0][0] is likely AF_INET.
+        sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
+
+        # This may not be entirely necessary
+        sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+        begin
+          # Where addr[0][3] is an IP address
+          sock.connect_nonblock(Socket.pack_sockaddr_in(port, addr[0][3]))
+        rescue Errno::EINPROGRESS
+          # No-op, continue below
+        rescue Exception => err
+          # Something has gone horribly wrong
+          @exception = err
+          return false
+        end
+
+        resp = IO.select(nil, [sock], nil, timeout)
+
+        # Assume ECONNREFUSED at this point
+        if resp.nil?
+          if @@service_check
             bool = true
+          else
+            @exception = Errno::ECONNREFUSED
           end
-        }
-      rescue Timeout::Error => err
-        @exception = err
+        else
+          bool = true
+        end
       ensure
-        tcp.close if tcp
+        sock.close if sock
       end
 
       # There is no duration if the ping failed
@@ -71,13 +91,13 @@ module Net
 
     alias ping? ping
     alias pingecho ping
-      
+
     # Class method aliases. DEPRECATED.
     class << self
       alias econnrefused service_check
       alias econnrefused= service_check=
       alias ecr service_check
-      alias ecr= service_check=         
+      alias ecr= service_check=
     end
   end
 end

data/net-ping.gemspec

@@ -3,7 +3,7 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'net-ping'
-  spec.version   = '1.6.2'
+  spec.version   = '1.7.0'
   spec.license   = 'Artistic 2.0'
   spec.author    = 'Daniel J. Berger'
   spec.email     = 'djberg96@gmail.com'
@@ -15,6 +15,9 @@ Gem::Specification.new do |spec|
   spec.rubyforge_project = 'shards'
   spec.extra_rdoc_files  = ['README', 'CHANGES', 'doc/ping.txt']
 
+  # The TCP Ping class requires this for non-blocking sockets.
+  spec.required_ruby_version = ">= 1.9.1"
+
   spec.add_dependency('ffi', '>= 1.0.0')
 
   spec.add_development_dependency('test-unit', '>= 2.5.0')

data/test/test_net_ping.rb

@@ -28,7 +28,7 @@ end
 
 class TC_Net_Ping < Test::Unit::TestCase
   def test_net_ping_version
-    assert_equal('1.6.2', Net::Ping::VERSION)
+    assert_equal('1.7.0', Net::Ping::VERSION)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-ping
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='