net-ping 1.3.6 → 1.3.7

data/CHANGES

@@ -1,3 +1,8 @@
+== 1.3.7 - 14-Oct-2010
+* Wrapped the ICMP ping in a while loop that breaks on success to prevent
+  the ping from failing too early. Thanks go to Benny Holmgren for the
+  spot and the patch.
+
 == 1.3.6 - 4-Sep-2010
 * Fixed variable naming issue in Net::Ping::External. Thanks go to taw
   for the spot.

data/lib/net/ping/icmp.rb

@@ -97,33 +97,36 @@ module Net
 
          begin
             Timeout.timeout(@timeout){
-               io_array = select([socket], nil, nil, timeout)
-
-               if io_array.nil? || io_array[0].empty?
-                  return false
-               end
-
-               pid = nil
-               seq = nil
-
-               data, sender  = socket.recvfrom(1500)
-               port, host    = Socket.unpack_sockaddr_in(sender)
-               type, subcode = data[20, 2].unpack('C2')
-
-               case type
-                  when ICMP_ECHOREPLY
-                     if data.length >= 28
-                        pid, seq = data[24, 4].unpack('n3')
-                     end
-                  else
-                     if data.length > 56
-                        pid, seq = data[52, 4].unpack('n3')
-                     end
-               end
-
-               if pid == @pid && seq == @seq && type == ICMP_ECHOREPLY
-                  bool = true
-               end
+              while true
+                 io_array = select([socket], nil, nil, timeout)
+
+                 if io_array.nil? || io_array[0].empty?
+                    return false
+                 end
+
+                 pid = nil
+                 seq = nil
+
+                 data, sender  = socket.recvfrom(1500)
+                 port, host    = Socket.unpack_sockaddr_in(sender)
+                 type, subcode = data[20, 2].unpack('C2')
+
+                 case type
+                    when ICMP_ECHOREPLY
+                       if data.length >= 28
+                          pid, seq = data[24, 4].unpack('n3')
+                       end
+                    else
+                       if data.length > 56
+                          pid, seq = data[52, 4].unpack('n3')
+                       end
+                 end
+
+                 if pid == @pid && seq == @seq && type == ICMP_ECHOREPLY
+                    bool = true
+                    break
+                 end
+              end
             }
          rescue Exception => err
             @exception = err

data/lib/net/ping/ping.rb

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

data/net-ping.gemspec

@@ -3,7 +3,7 @@ require 'rbconfig'
 
 Gem::Specification.new do |gem|
   gem.name      = 'net-ping'
-  gem.version   = '1.3.6'
+  gem.version   = '1.3.7'
   gem.license   = 'Artistic 2.0'
   gem.author    = 'Daniel J. Berger'
   gem.email     = 'djberg96@gmail.com'

data/test/test_net_ping.rb

@@ -21,6 +21,6 @@ end
 
 class TC_Net_Ping < Test::Unit::TestCase
   def test_net_ping_version
-    assert_equal('1.3.6', Net::Ping::VERSION)
+    assert_equal('1.3.7', Net::Ping::VERSION)
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-ping
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 3
-  - 6
-  version: 1.3.6
+  - 7
+  version: 1.3.7
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-05 00:00:00 -06:00
+date: 2010-10-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 2
         - 0
@@ -77,23 +80,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: shards
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A ping interface for Ruby.