net-ping 1.7.5-universal-mingw32 → 1.7.6-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76094b959b0147e022534d183b4589dea46af3e3
-  data.tar.gz: b15a4a418e5c43b7d14b92b5bdee5015c697a807
+  metadata.gz: 7df0afd38d955fcbb3ef3cf956b6ec18cb2110cd
+  data.tar.gz: 697dc0c6610691001c4803e370c0e34ef485b9af
 SHA512:
-  metadata.gz: 7bed079dbbeeab53dd88f1efc8d876629a4ae8d4f80b003ce36320bf180510ee24af29ca38c9c3aa14d8364dc3fdd5532a20abbcfbf1a956889be0708acbbd87
-  data.tar.gz: 8822d0928c89bca134bf1ec39c9373c04cef29044a0ef2b9aeca3b907e4c326eaddb69ca63356cb0522d52b7d611136beb4ad9fe8fe5c2354c498ebd6eff9847
+  metadata.gz: 5d2da808ee32c4d7cfa9126b1403c2d5756c1d20eaa21a9076599af5d4297d28b3045c17f3997c71bb859f794ee2cb410b6cc82d621d918acaa195a42fc9399f
+  data.tar.gz: 476833a09b47a9b182bfe719d5ec5623231cd16825b3ea91e66b78f6c522fe010cc391dac4182cb4c0bde99f0829c548968faeac4c20bf695c849912198c6f9e

data/CHANGES

@@ -1,3 +1,9 @@
+== 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.
+* Now uses relative_require internally.
+* Minor tweaks to the gemspec and Rakefile for JRuby.
+
 == 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,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: net-ping
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: universal-mingw32
 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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: win32-security
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
 description: |2
@@ -114,17 +114,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A ping interface for Ruby.