net-ping 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c09b778ab3eddc24d819fc4855f648350760930
-  data.tar.gz: 209507d7dafc6ebe9b8229c27c4f9be27aa54e70
+  metadata.gz: 96c46fa2d17c2e28a06b71883b77a7a5a67f8ceb
+  data.tar.gz: 8866c7f3dd99b1206be6d1de5af8c1c55e6e046e
 SHA512:
-  metadata.gz: a06111adfb673c48c85f6fc4ff993c3fce368cdcee0f7cc47fb9a651a198cf550847fade4df2dfcb57c071240690ac05db1c8ec7a6189c1226a124265703781f
-  data.tar.gz: 1c2e9622a0a092ded3f1cd6bae7b15cdb382183eadcafcbfa73e4dc4bedcb3e09d5247e2bf752c3fe40f76eadfba3c2463c4ae4e6fc2fe48072be37bfffa9b3a
+  metadata.gz: 2c74009e6ff5a7c497f7286260b7aa8570a669747943eb337f8850cbf111516a70bf8d74742bb697680c258c3dddc2f22e840dd5c2da3b23d6ff0e81d3db1022
+  data.tar.gz: a2735b50295f1d9e2a3f359341777f951dca9c6e4e415f4f816358d35e399f0fe771e4093ec57131e8720b18d93c0e4b5e9c9ed5ad993caf3f5e77be7a9189c2

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.7.6 - 13-Dec-2014
+* Changed TCP handling yet again, as it was returning false positives. Thanks
+  go to Marcos Piccinini for the spot.
+
 == 1.7.5 - 2-Nov-2014
 * Added packet count and intervals for external pings. Thanks go to Jack Hayter
   for the patch.

data/Rakefile

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

data/lib/net/ping.rb

@@ -4,14 +4,14 @@
 #
 require 'rbconfig'
 
-require File.join(File.dirname(__FILE__), 'ping/tcp')
-require File.join(File.dirname(__FILE__), 'ping/udp')
-require File.join(File.dirname(__FILE__), 'ping/icmp')
-require File.join(File.dirname(__FILE__), 'ping/external')
-require File.join(File.dirname(__FILE__), 'ping/http')
+require_relative 'ping/tcp'
+require_relative 'ping/udp'
+require_relative 'ping/icmp'
+require_relative 'ping/external'
+require_relative 'ping/http'
 
 RbConfig = Config unless Object.const_defined?(:RbConfig)
 
 if File::ALT_SEPARATOR
-  require File.join(File.dirname(__FILE__), 'ping/wmi')
+  require_relative 'ping/wmi'
 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.5'
+      VERSION = '1.7.6'
 
       # The host to ping. In the case of Ping::HTTP, this is the URI.
       attr_accessor :host

data/lib/net/ping/tcp.rb

@@ -68,17 +68,23 @@ module Net
 
         resp = IO.select(nil, [sock], nil, timeout)
 
-        if @@service_check
-          bool = true
-        elsif resp.nil?
-          # Assume ECONNREFUSED at this point
-          @exception = Errno::ECONNREFUSED
+        if resp.nil? # Assume ECONNREFUSED if nil
+          if @@service_check
+            bool = true
+          else
+            bool = false
+            @exception = Errno::ECONNREFUSED
+          end
         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
+          if sockopt.int != 0
+            if @@service_check && sockopt.int == Errno::ECONNREFUSED::Errno
+              bool = true
+            else
+              bool = false
+              @exception = SystemCallError.new(sockopt.int)
+            end
           else
             bool = true
           end

data/net-ping.gemspec

@@ -3,7 +3,7 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'net-ping'
-  spec.version   = '1.7.5'
+  spec.version   = '1.7.6'
   spec.license   = 'Artistic 2.0'
   spec.author    = 'Daniel J. Berger'
   spec.email     = 'djberg96@gmail.com'
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   if File::ALT_SEPARATOR
     require 'rbconfig'
-    arch = RbConfig::CONFIG['build_os']
+    arch = RbConfig::CONFIG['build_os'] || 'mingw32' # JRuby
     spec.platform = Gem::Platform.new(['universal', arch])
     spec.platform.version = nil
 

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.5', Net::Ping::VERSION)
+    assert_equal('1.7.6', 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.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A ping interface for Ruby.