net-ping 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 361926b3f3ac0c0f3bceb71cffe723bf10e70503
-  data.tar.gz: 6a0b1f3e9269a1b76ca3d5ba111178295a2ffd91
+  metadata.gz: 6c09b778ab3eddc24d819fc4855f648350760930
+  data.tar.gz: 209507d7dafc6ebe9b8229c27c4f9be27aa54e70
 SHA512:
-  metadata.gz: d445f63c02d900806db92f9e6a88afa463503865332d1a56629d8775b3d7f5916aa3697320da631093861d4256d884bf84c806270be3e4309d7c5e8142774131
-  data.tar.gz: 6aa45f6d23a07235f5ff7f1fef3c72efdc82a5b4943b70da3830e5916e3299fc363f8d53e4ff9674c2247e4696ccd04c470fb6555cf3fa118a693aab6cb26df0
+  metadata.gz: a06111adfb673c48c85f6fc4ff993c3fce368cdcee0f7cc47fb9a651a198cf550847fade4df2dfcb57c071240690ac05db1c8ec7a6189c1226a124265703781f
+  data.tar.gz: 1c2e9622a0a092ded3f1cd6bae7b15cdb382183eadcafcbfa73e4dc4bedcb3e09d5247e2bf752c3fe40f76eadfba3c2463c4ae4e6fc2fe48072be37bfffa9b3a

data/CHANGES

@@ -1,3 +1,9 @@
+== 1.7.5 - 2-Nov-2014
+* Added packet count and intervals for external pings. Thanks go to Jack Hayter
+  for the patch.
+* No longer report closed TCP port as active. Thanks go to Joshua Yanovski for
+  the spot and patch.
+
 == 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

data/MANIFEST

@@ -1,5 +1,6 @@
-* MANIFEST
 * CHANGES
+* Gemfile
+* MANIFEST
 * Rakefile
 * README
 * net-ping.gemspec

data/README

@@ -13,6 +13,10 @@
 == Installation
   gem install net-ping
 
+== Maintainer Wanted!
+  I would very much like to turn this gem over to someone who is using it
+  more actively than I am. Please let me know if you are interested!
+
 == Notes
   Please read the documentation under the 'doc' directory. Especially pay
   attention to the documentation pertaining to ECONNREFUSED and TCP pings.

data/Rakefile

@@ -20,7 +20,7 @@ namespace 'gem' do
   desc 'Install the net-ping gem'
   task :install => [:create] do
     gem_file = Dir["*.gem"].first
-    sh "gem install #{gem_file}"
+    sh "gem install -l #{gem_file}"
   end
 end
 

data/lib/net/ping/external.rb

@@ -15,7 +15,15 @@ module Net
     # contain a string indicating what went wrong. If the ping succeeded then
     # the Ping::External#warning method may or may not contain a value.
     #
-    def ping(host = @host)
+    def ping(host = @host, count = 1, interval = 1, timeout = @timeout)
+
+      raise "Count must be an integer" unless count.is_a? Integer
+      raise "Timeout must be a number" unless timeout.is_a? Numeric
+
+      unless interval.is_a?(Numeric) && interval >= 0.2
+        raise "Interval must be a decimal greater than or equal to 0.2"
+      end
+
       super(host)
 
       pcmd = ['ping']
@@ -23,17 +31,17 @@ module Net
 
       case RbConfig::CONFIG['host_os']
         when /linux/i
-          pcmd += ['-c', '1', '-W', @timeout.to_s, host]
+          pcmd += ['-c', count.to_s, '-W', timeout.to_s, host, '-i', interval.to_s]
         when /aix/i
-          pcmd += ['-c', '1', '-w', @timeout.to_s, host]
+          pcmd += ['-c', count.to_s, '-w', timeout.to_s, host]
         when /bsd|osx|mach|darwin/i
-          pcmd += ['-c', '1', '-t', @timeout.to_s, host]
+          pcmd += ['-c', count.to_s, '-t', timeout.to_s, host]
         when /solaris|sunos/i
-          pcmd += [host, @timeout.to_s]
+          pcmd += [host, timeout.to_s]
         when /hpux/i
-          pcmd += [host, '-n1', '-m', @timeout.to_s]
+          pcmd += [host, "-n#{count.to_s}", '-m', timeout.to_s]
         when /win32|windows|msdos|mswin|cygwin|mingw/i
-          pcmd += ['-n', '1', '-w', (@timeout * 1000).to_s, host]
+          pcmd += ['-n', count.to_s, '-w', (timeout * 1000).to_s, host]
         else
           pcmd += [host]
       end

data/lib/net/ping/ping.rb

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

data/lib/net/ping/tcp.rb

@@ -68,15 +68,20 @@ module Net
 
         resp = IO.select(nil, [sock], nil, timeout)
 
-        # Assume ECONNREFUSED at this point
-        if resp.nil?
-          if @@service_check
-            bool = true
-          else
+        if @@service_check
+          bool = true
+        elsif resp.nil?
+          # Assume ECONNREFUSED at this point
+          @exception = Errno::ECONNREFUSED
+        else
+          sockopt = sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_ERROR)
+
+          # Check to see if ECONNREFUSED actually occurred.
+          if sockopt.int == Errno::ECONNREFUSED::Errno
             @exception = Errno::ECONNREFUSED
+          else
+            bool = true
           end
-        else
-          bool = true
         end
       ensure
         sock.close if sock

data/net-ping.gemspec

@@ -3,7 +3,7 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'net-ping'
-  spec.version   = '1.7.4'
+  spec.version   = '1.7.5'
   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.4', Net::Ping::VERSION)
+    assert_equal('1.7.5', Net::Ping::VERSION)
   end
 end
 

metadata

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