net-ping 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96a4aeabebdb1bf7c3347538c1ad96428e5d7386
-  data.tar.gz: 6434d02460e9ff981db346adde0664029a7e0de0
+  metadata.gz: 361926b3f3ac0c0f3bceb71cffe723bf10e70503
+  data.tar.gz: 6a0b1f3e9269a1b76ca3d5ba111178295a2ffd91
 SHA512:
-  metadata.gz: e8075c1a265cd6d0e911e5e4a6a2e38d377d0c00d5a76c05cee37e089f40a51a7405051280e299ba168e8db7854387dd49a334fcc6c12f98cfc17cdebd91b26a
-  data.tar.gz: 8a450d951dafecd0133a85c16f01568c39c6ec6dbea07760b149d9b8f27dfc5de957e3fc4ffb950b1b49328b490377b123e3c031b82faf8f99f3aa74a541fce7
+  metadata.gz: d445f63c02d900806db92f9e6a88afa463503865332d1a56629d8775b3d7f5916aa3697320da631093861d4256d884bf84c806270be3e4309d7c5e8142774131
+  data.tar.gz: 6aa45f6d23a07235f5ff7f1fef3c72efdc82a5b4943b70da3830e5916e3299fc363f8d53e4ff9674c2247e4696ccd04c470fb6555cf3fa118a693aab6cb26df0

data/CHANGES

@@ -1,3 +1,17 @@
+== 1.7.4 - 16-Apr-2014
+* Remove the Timeout block for the Ping::HTTP class because it wasn't working
+  with JRuby. Instead, we use the builtin open_timeout and read_timeout
+  accessors on the underlying http request. Thanks go to Ian Heggie for the
+  spot.
+* The Ping::HTTP#ping? more robustly parses out the port from the uri argument
+  if provided. In addition, the default port is again set back to 80 as a
+  last resort in the constructor.
+* Added timeout and port tests for the Ping::HTTP class.
+* If a host is unreachable explicitly set the result to false regardless of
+  the actual exit status. This appears to only affect Windows 7 and later.
+* Reinstated the Timeout block for the Ping::ICMP class. Without it, threaded
+  pings could end up in an infinite loop. Thanks go to muirmanders for the spot.
+
 == 1.7.3 - 3-Apr-2014
 * Removed the Timeout block for the Ping::External class as it apparently
   hasn't worked with open3 for some time. Instead, it now uses your command

data/lib/net/ping/external.rb

@@ -49,7 +49,14 @@ module Net
 
           case thread.value.exitstatus
             when 0
-              bool = true  # Success, at least one response.
+              info = stdout.read
+              if info =~ /unreachable/ix # Windows
+                bool = false
+                @exception = "host unreachable"
+              else
+                bool = true  # Success, at least one response.
+              end
+
               if err & err =~ /warning/i
                 @warning = err.chomp
               end

data/lib/net/ping/http.rb

@@ -42,7 +42,7 @@ module Net
     attr_reader :code
 
     # Creates and returns a new Ping::HTTP object. The default port is the
-    # port associated with the URI. The default timeout is 5 seconds.
+    # port associated with the URI or 80. The default timeout is 5 seconds.
     #
     def initialize(uri=nil, port=nil, timeout=5)
       @follow_redirect = true
@@ -52,6 +52,9 @@ module Net
       @code            = nil
 
       port ||= URI.parse(uri).port if uri
+      port ||= 80
+
+      @port = port
 
       super(uri, port, timeout)
     end
@@ -80,8 +83,10 @@ module Net
 
       uri = URI.parse(host)
 
-      # A port provided here overrides anything provided in constructor
-      port = URI.split(host)[3] || @port
+      # A port provided here via the host argument overrides anything
+      # provided in constructor.
+      #
+      port = URI.split(host)[3] || URI.parse(host).port || @port
       port = port.to_i
 
       start_time = Time.now
@@ -103,7 +108,7 @@ module Net
             redirect = URI.parse(response['location'])
             redirect = uri + redirect if redirect.relative?
             response = do_ping(redirect, port)
-            rlimit   += 1
+            rlimit += 1
           end
 
           if response.is_a?(Net::HTTPSuccess)
@@ -140,31 +145,43 @@ module Net
 
     def do_ping(uri, port)
       response = nil
-      proxy    = uri.find_proxy || URI.parse("")
+      proxy = uri.find_proxy || URI.parse("")
+
       begin
         uri_path = uri.path.empty? ? '/' : uri.path
-        headers  = { }
-        headers["User-Agent"] = user_agent unless user_agent.nil?
-        Timeout.timeout(@timeout) do
-          http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new(uri.host, port)
-          @proxied = http.proxy?
-          if @get_request == true
-            request = Net::HTTP::Get.new(uri_path)
-          else
-            request = Net::HTTP::Head.new(uri_path)
-          end
 
-          if uri.scheme == 'https'
-            http.use_ssl     = true
-            http.verify_mode = @ssl_verify_mode
-          end
+        headers = {}
+        headers["User-Agent"] = user_agent if user_agent
+
+        http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new(uri.host, port)
+
+        http.open_timeout = timeout
+        http.read_timeout = timeout
 
-          response = http.start { |h| h.request(request) }
+        @proxied = http.proxy?
+
+        if @get_request == true
+          request = Net::HTTP::Get.new(uri_path)
+        else
+          request = Net::HTTP::Head.new(uri_path)
+        end
+
+        if uri.scheme == 'https'
+          http.use_ssl = true
+          http.verify_mode = @ssl_verify_mode
         end
+
+        response = http.start{ |h|
+          h.open_timeout = timeout
+          h.read_timeout = timeout
+          h.request(request)
+        }
       rescue Exception => err
         @exception = err.message
       end
+
       @code = response.code if response
+
       response
     end
   end

data/lib/net/ping/icmp.rb

@@ -107,36 +107,38 @@ module Net
       socket.send(msg, 0, saddr) # Send the message
 
       begin
-        while true
-          io_array = select([socket], nil, nil, timeout)
-
-          if io_array.nil? || io_array[0].empty?
-            @exception = "timeout" if io_array.nil?
-            return false
-          end
-
-          ping_id = nil
-          seq = nil
-
-          data = socket.recvfrom(1500).first
-          type = data[20, 2].unpack('C2').first
-
-          case type
-            when ICMP_ECHOREPLY
-              if data.length >= 28
-                ping_id, seq = data[24, 4].unpack('n3')
-              end
-            else
-              if data.length > 56
-                ping_id, seq = data[52, 4].unpack('n3')
-              end
+        Timeout.timeout(@timeout){
+          while true
+            io_array = select([socket], nil, nil, timeout)
+
+            if io_array.nil? || io_array[0].empty?
+              @exception = "timeout" if io_array.nil?
+              return false
+            end
+
+            ping_id = nil
+            seq = nil
+
+            data = socket.recvfrom(1500).first
+            type = data[20, 2].unpack('C2').first
+
+            case type
+              when ICMP_ECHOREPLY
+                if data.length >= 28
+                  ping_id, seq = data[24, 4].unpack('n3')
+                end
+              else
+                if data.length > 56
+                  ping_id, seq = data[52, 4].unpack('n3')
+                end
+            end
+
+            if ping_id == @ping_id && seq == @seq && type == ICMP_ECHOREPLY
+              bool = true
+              break
+            end
           end
-
-          if ping_id == @ping_id && seq == @seq && type == ICMP_ECHOREPLY
-            bool = true
-            break
-          end
-        end
+        }
       rescue Exception => err
         @exception = err
       ensure

data/lib/net/ping/ping.rb

@@ -10,7 +10,7 @@ module Net
    #
    class Ping
       # The version of the net-ping library.
-      VERSION = '1.7.3'
+      VERSION = '1.7.4'
 
       # 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 |spec|
   spec.name      = 'net-ping'
-  spec.version   = '1.7.3'
+  spec.version   = '1.7.4'
   spec.license   = 'Artistic 2.0'
   spec.author    = 'Daniel J. Berger'
   spec.email     = 'djberg96@gmail.com'

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.7.3', Net::Ping::VERSION)
+    assert_equal('1.7.4', Net::Ping::VERSION)
   end
 end
 

data/test/test_net_ping_external.rb

@@ -129,6 +129,11 @@ class TC_Net_Ping_External < Test::Unit::TestCase
     assert_not_nil(ext.exception)
   end
 
+  test "pinging an unreachable host on the same subnet returns false" do
+    @bad = Net::Ping::External.new('192.168.0.99')
+    assert_false(@bad.ping?)
+  end
+
   def teardown
     @host  = nil
     @bogus = nil

data/test/test_net_ping_http.rb

@@ -91,8 +91,10 @@ class TC_Net_Ping_HTTP < Test::Unit::TestCase
     assert_respond_to(@http, :port=)
   end
 
-  test 'port attribute expected value' do
+  test 'port attribute is set to expected value' do
     assert_equal(80, @http.port)
+    assert_equal(443, Net::Ping::HTTP.new('https://github.com/path').port)
+    assert_equal(80, Net::Ping::HTTP.new.port)
   end
 
   test 'timeout attribute basic functionality' do
@@ -105,6 +107,14 @@ class TC_Net_Ping_HTTP < Test::Unit::TestCase
     assert_equal(5, @bad.timeout)
   end
 
+  # TODO: Figure out how to do this with FakeWeb.
+  test 'ping fails if timeout exceeded' do
+    FakeWeb.allow_net_connect = true
+    @http = Net::Ping::HTTP.new('https://github.com/path', 80, 0.01)
+    assert_false(@http.ping?)
+    assert_equal('execution expired', @http.exception)
+  end
+
   test 'exception attribute basic functionality' do
     assert_respond_to(@http, :exception)
     assert_nil(@http.exception)

data/test/test_net_ping_icmp.rb

@@ -138,7 +138,7 @@ class TC_PingICMP < Test::Unit::TestCase
     omit_if(@@jruby)
     icmp = Net::Ping::ICMP.new('bogus.com', nil, 0.000001)
     assert_false(icmp.ping?)
-    assert_equal('timeout', icmp.exception)
+    assert_kind_of(Timeout::Error, icmp.exception)
   end
 
   test "exception method basic functionality" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-ping
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit