net-ping 1.7.2-universal-mingw32 → 1.7.3-universal-mingw32

data/lib/net/ping/tcp.rb

@@ -1,102 +1,102 @@
-require File.join(File.dirname(__FILE__), 'ping')
-
-# The Net module serves as a namespace only.
-module Net
-
-  # With a TCP ping simply try to open a connection. If we are successful,
-  # assume success. In either case close the connection to be polite.
-  #
-  class Ping::TCP < Ping
-    @@service_check = false
-
-    # Returns whether or not Errno::ECONNREFUSED is considered a successful
-    # ping. The default is false.
-    #
-    def self.service_check
-      @@service_check
-    end
-
-    # Sets whether or not an Errno::ECONNREFUSED should be considered a
-    # successful ping.
-    #
-    def self.service_check=(bool)
-      unless bool.kind_of?(TrueClass) || bool.kind_of?(FalseClass)
-        raise ArgumentError, 'argument must be true or false'
-      end
-      @@service_check = bool
-    end
-
-    # This method attempts to ping a host and port using a TCPSocket with
-    # the host, port and timeout values passed in the constructor.  Returns
-    # true if successful, or false otherwise.
-    #
-    # Note that, by default, an Errno::ECONNREFUSED return result will be
-    # considered a failed ping.  See the documentation for the
-    # Ping::TCP.service_check= method if you wish to change this behavior.
-    #
-    def ping(host=@host)
-      super(host)
-
-      bool = false
-      start_time = Time.now
-
-      # Failure here most likely means bad host, so just bail.
-      begin
-        addr = Socket.getaddrinfo(host, port)
-      rescue SocketError => err
-        @exception = err
-        return false
-      end
-
-      begin
-        # Where addr[0][0] is likely AF_INET.
-        sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
-
-        # This may not be entirely necessary
-        sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-
-        begin
-          # Where addr[0][3] is an IP address
-          sock.connect_nonblock(Socket.pack_sockaddr_in(port, addr[0][3]))
-        rescue Errno::EINPROGRESS
-          # No-op, continue below
-        rescue Exception => err
-          # Something has gone horribly wrong
-          @exception = err
-          return false
-        end
-
-        resp = IO.select(nil, [sock], nil, timeout)
-
-        # Assume ECONNREFUSED at this point
-        if resp.nil?
-          if @@service_check
-            bool = true
-          else
-            @exception = Errno::ECONNREFUSED
-          end
-        else
-          bool = true
-        end
-      ensure
-        sock.close if sock
-      end
-
-      # There is no duration if the ping failed
-      @duration = Time.now - start_time if bool
-
-      bool
-    end
-
-    alias ping? ping
-    alias pingecho ping
-
-    # Class method aliases. DEPRECATED.
-    class << self
-      alias econnrefused service_check
-      alias econnrefused= service_check=
-      alias ecr service_check
-      alias ecr= service_check=
-    end
-  end
-end
+require File.join(File.dirname(__FILE__), 'ping')
+
+# The Net module serves as a namespace only.
+module Net
+
+  # With a TCP ping simply try to open a connection. If we are successful,
+  # assume success. In either case close the connection to be polite.
+  #
+  class Ping::TCP < Ping
+    @@service_check = false
+
+    # Returns whether or not Errno::ECONNREFUSED is considered a successful
+    # ping. The default is false.
+    #
+    def self.service_check
+      @@service_check
+    end
+
+    # Sets whether or not an Errno::ECONNREFUSED should be considered a
+    # successful ping.
+    #
+    def self.service_check=(bool)
+      unless bool.kind_of?(TrueClass) || bool.kind_of?(FalseClass)
+        raise ArgumentError, 'argument must be true or false'
+      end
+      @@service_check = bool
+    end
+
+    # This method attempts to ping a host and port using a TCPSocket with
+    # the host, port and timeout values passed in the constructor.  Returns
+    # true if successful, or false otherwise.
+    #
+    # Note that, by default, an Errno::ECONNREFUSED return result will be
+    # considered a failed ping.  See the documentation for the
+    # Ping::TCP.service_check= method if you wish to change this behavior.
+    #
+    def ping(host=@host)
+      super(host)
+
+      bool = false
+      start_time = Time.now
+
+      # Failure here most likely means bad host, so just bail.
+      begin
+        addr = Socket.getaddrinfo(host, port)
+      rescue SocketError => err
+        @exception = err
+        return false
+      end
+
+      begin
+        # Where addr[0][0] is likely AF_INET.
+        sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
+
+        # This may not be entirely necessary
+        sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+        begin
+          # Where addr[0][3] is an IP address
+          sock.connect_nonblock(Socket.pack_sockaddr_in(port, addr[0][3]))
+        rescue Errno::EINPROGRESS
+          # No-op, continue below
+        rescue Exception => err
+          # Something has gone horribly wrong
+          @exception = err
+          return false
+        end
+
+        resp = IO.select(nil, [sock], nil, timeout)
+
+        # Assume ECONNREFUSED at this point
+        if resp.nil?
+          if @@service_check
+            bool = true
+          else
+            @exception = Errno::ECONNREFUSED
+          end
+        else
+          bool = true
+        end
+      ensure
+        sock.close if sock
+      end
+
+      # There is no duration if the ping failed
+      @duration = Time.now - start_time if bool
+
+      bool
+    end
+
+    alias ping? ping
+    alias pingecho ping
+
+    # Class method aliases. DEPRECATED.
+    class << self
+      alias econnrefused service_check
+      alias econnrefused= service_check=
+      alias ecr service_check
+      alias ecr= service_check=
+    end
+  end
+end

data/net-ping.gemspec

@@ -1,40 +1,39 @@
-require 'rubygems'
-require 'rbconfig'
-
-Gem::Specification.new do |spec|
-  spec.name      = 'net-ping'
-  spec.version   = '1.7.2'
-  spec.license   = 'Artistic 2.0'
-  spec.author    = 'Daniel J. Berger'
-  spec.email     = 'djberg96@gmail.com'
-  spec.homepage  = 'https://github.com/djberg96/net-ping'
-  spec.summary   = 'A ping interface for Ruby.'
-  spec.test_file = 'test/test_net_ping.rb'
-  spec.files     = Dir['**/*'].reject{ |f| f.include?('git') }
-
-  spec.rubyforge_project = 'shards'
-  spec.extra_rdoc_files  = ['README', 'CHANGES', 'doc/ping.txt']
-
-  # The TCP Ping class requires this for non-blocking sockets.
-  spec.required_ruby_version = ">= 1.9.1"
-
-  spec.add_development_dependency('test-unit')
-  spec.add_development_dependency('fakeweb')
-  spec.add_development_dependency('rake')
-
-  if File::ALT_SEPARATOR
-    require 'rbconfig'
-    arch = RbConfig::CONFIG['build_os']
-    spec.platform = Gem::Platform.new(['universal', arch])
-    spec.platform.version = nil
-
-    # Used for icmp pings.
-    spec.add_dependency('win32-security', '>= 0.2.0')
-  end
-
-  spec.description = <<-EOF
-    The net-ping library provides a ping interface for Ruby. It includes
-    separate TCP, HTTP, LDAP, ICMP, UDP, WMI (for Windows) and external ping
-    classes.
-  EOF
-end
+require 'rubygems'
+require 'rbconfig'
+
+Gem::Specification.new do |spec|
+  spec.name      = 'net-ping'
+  spec.version   = '1.7.3'
+  spec.license   = 'Artistic 2.0'
+  spec.author    = 'Daniel J. Berger'
+  spec.email     = 'djberg96@gmail.com'
+  spec.homepage  = 'https://github.com/djberg96/net-ping'
+  spec.summary   = 'A ping interface for Ruby.'
+  spec.test_file = 'test/test_net_ping.rb'
+  spec.files     = Dir['**/*'].reject{ |f| f.include?('git') }
+
+  spec.extra_rdoc_files  = ['README', 'CHANGES', 'doc/ping.txt']
+
+  # The TCP Ping class requires this for non-blocking sockets.
+  spec.required_ruby_version = ">= 1.9.3"
+
+  spec.add_development_dependency('test-unit')
+  spec.add_development_dependency('fakeweb')
+  spec.add_development_dependency('rake')
+
+  if File::ALT_SEPARATOR
+    require 'rbconfig'
+    arch = RbConfig::CONFIG['build_os']
+    spec.platform = Gem::Platform.new(['universal', arch])
+    spec.platform.version = nil
+
+    # Used for icmp pings.
+    spec.add_dependency('win32-security', '>= 0.2.0')
+  end
+
+  spec.description = <<-EOF
+    The net-ping library provides a ping interface for Ruby. It includes
+    separate TCP, HTTP, LDAP, ICMP, UDP, WMI (for Windows) and external ping
+    classes.
+  EOF
+end

data/test/test_net_ping.rb

@@ -1,35 +1,35 @@
-######################################################################
-# test_net_ping.rb
-#
-# Test suite for all the Ping subclasses. Note that the Ping::ICMP
-# class test won't be run unless this is run as a privileged process.
-######################################################################
-require 'test_net_ping_external'
-require 'test_net_ping_http'
-require 'test_net_ping_tcp'
-require 'test_net_ping_udp'
-require 'fakeweb'
-
-if File::ALT_SEPARATOR
-  require 'win32/security'
-
-  if Win32::Security.elevated_security?
-    require 'test_net_ping_icmp'
-  end
-else
-  if Process.euid == 0
-    require 'test_net_ping_icmp'
-  end
-end
-
-if File::ALT_SEPARATOR
-  require 'test_net_ping_wmi'
-end
-
-class TC_Net_Ping < Test::Unit::TestCase
-  def test_net_ping_version
-    assert_equal('1.7.2', Net::Ping::VERSION)
-  end
-end
-
-FakeWeb.allow_net_connect = false
+######################################################################
+# test_net_ping.rb
+#
+# Test suite for all the Ping subclasses. Note that the Ping::ICMP
+# class test won't be run unless this is run as a privileged process.
+######################################################################
+require 'test_net_ping_external'
+require 'test_net_ping_http'
+require 'test_net_ping_tcp'
+require 'test_net_ping_udp'
+require 'fakeweb'
+
+if File::ALT_SEPARATOR
+  require 'win32/security'
+
+  if Win32::Security.elevated_security?
+    require 'test_net_ping_icmp'
+  end
+else
+  if Process.euid == 0
+    require 'test_net_ping_icmp'
+  end
+end
+
+if File::ALT_SEPARATOR
+  require 'test_net_ping_wmi'
+end
+
+class TC_Net_Ping < Test::Unit::TestCase
+  def test_net_ping_version
+    assert_equal('1.7.3', Net::Ping::VERSION)
+  end
+end
+
+FakeWeb.allow_net_connect = false

data/test/test_net_ping_external.rb

@@ -1,129 +1,138 @@
-#########################################################################
-# test_net_ping_external.rb
-#
-# Test case for the Net::PingExternal class. Run this via the 'test' or
-# 'test:external' rake task.
-#
-# WARNING: I've noticed that test failures will occur if you're using
-# OpenDNS. This is apparently caused by them messing with upstream
-# replies for advertising purposes.
-#########################################################################
-require 'test-unit'
-require 'net/ping/external'
-
-class TC_Net_Ping_External < Test::Unit::TestCase
-  def setup
-    @host  = 'localhost'
-    @bogus = 'foo.bar.baz'
-    @pe    = Net::Ping::External.new(@host)
-    @bad   = Net::Ping::External.new(@bogus)
-  end
-
-  test "ping basic functionality" do
-    assert_respond_to(@pe, :ping)
-  end
-
-  test "ping with no arguments" do
-    assert_nothing_raised{ @pe.ping }
-  end
-
-  test "ping accepts a hostname" do
-    assert_nothing_raised{ @pe.ping(@host) }
-  end
-
-  test "ping returns a boolean" do
-    assert_boolean(@pe.ping)
-    assert_boolean(@bad.ping)
-  end
-
-  test "ping? alias" do
-    assert_respond_to(@pe, :ping?)
-    assert_alias_method(@pe, :ping?, :ping)
-  end
-
-  test "pingecho alias" do
-    assert_nothing_raised{ @pe.pingecho }
-    assert_alias_method(@pe, :pingecho, :ping)
-  end
-
-  test "pinging a good host returns true" do
-    assert_true(@pe.ping?)
-  end
-
-  test "pinging a bogus host returns false" do
-    assert_false(@bad.ping?)
-  end
-
-  test "duration basic functionality" do
-    assert_nothing_raised{ @pe.ping }
-    assert_respond_to(@pe, :duration)
-    assert_kind_of(Float, @pe.duration)
-  end
-
-  test "duration is unset if a bad ping follows a good ping" do
-    assert_nothing_raised{ @pe.ping }
-    assert_not_nil(@pe.duration)
-    assert_false(@pe.ping?(@bogus))
-    assert_nil(@pe.duration)
-  end
-
-  test "host getter basic functionality" do
-    assert_respond_to(@pe, :host)
-    assert_equal('localhost', @pe.host)
-  end
-
-  test "host setter basic functionality" do
-    assert_respond_to(@pe, :host=)
-    assert_nothing_raised{ @pe.host = @bad }
-    assert_equal(@bad, @pe.host)
-  end
-
-  test "port getter basic functionality" do
-    assert_respond_to(@pe, :port)
-    assert_equal(7, @pe.port)
-  end
-
-  test "port setter basic functionality" do
-    assert_respond_to(@pe, :port=)
-    assert_nothing_raised{ @pe.port = 90 }
-    assert_equal(90, @pe.port)
-  end
-
-  test "timeout getter basic functionality" do
-    assert_respond_to(@pe, :timeout)
-    assert_equal(5, @pe.timeout)
-  end
-
-  test "timeout setter basic functionality" do
-    assert_respond_to(@pe, :timeout=)
-    assert_nothing_raised{ @pe.timeout = 30 }
-    assert_equal(30, @pe.timeout)
-  end
-
-  test "exception method basic functionality" do
-    assert_respond_to(@pe, :exception)
-    assert_nil(@pe.exception)
-  end
-
-  test "pinging a bogus host stores exception data" do
-    assert_nothing_raised{ @bad.ping? }
-    assert_not_nil(@bad.exception)
-  end
-
-  test "pinging a good host results in no exception data" do
-    assert_nothing_raised{ @pe.ping }
-    assert_nil(@pe.exception)
-  end
-
-  test "warning basic functionality" do
-    assert_respond_to(@pe, :warning)
-    assert_nil(@pe.warning)
-  end
-
-  def teardown
-    @host  = nil
-    @bogus = nil
-    @pe    = nil
-    @bad   = nil
-  end
-end
+#########################################################################
+# test_net_ping_external.rb
+#
+# Test case for the Net::PingExternal class. Run this via the 'test' or
+# 'test:external' rake task.
+#
+# WARNING: I've noticed that test failures will occur if you're using
+# OpenDNS. This is apparently caused by them messing with upstream
+# replies for advertising purposes.
+#########################################################################
+require 'test-unit'
+require 'net/ping/external'
+
+class TC_Net_Ping_External < Test::Unit::TestCase
+  def setup
+    @host  = 'localhost'
+    @bogus = 'foo.bar.baz'
+    @pe    = Net::Ping::External.new(@host)
+    @bad   = Net::Ping::External.new(@bogus)
+  end
+
+  test "ping basic functionality" do
+    assert_respond_to(@pe, :ping)
+  end
+
+  test "ping with no arguments" do
+    assert_nothing_raised{ @pe.ping }
+  end
+
+  test "ping accepts a hostname" do
+    assert_nothing_raised{ @pe.ping(@host) }
+  end
+
+  test "ping returns a boolean" do
+    assert_boolean(@pe.ping)
+    assert_boolean(@bad.ping)
+  end
+
+  test "ping? alias" do
+    assert_respond_to(@pe, :ping?)
+    assert_alias_method(@pe, :ping?, :ping)
+  end
+
+  test "pingecho alias" do
+    assert_nothing_raised{ @pe.pingecho }
+    assert_alias_method(@pe, :pingecho, :ping)
+  end
+
+  test "pinging a good host returns true" do
+    assert_true(@pe.ping?)
+  end
+
+  test "pinging a bogus host returns false" do
+    assert_false(@bad.ping?)
+  end
+
+  test "duration basic functionality" do
+    assert_nothing_raised{ @pe.ping }
+    assert_respond_to(@pe, :duration)
+    assert_kind_of(Float, @pe.duration)
+  end
+
+  test "duration is unset if a bad ping follows a good ping" do
+    assert_nothing_raised{ @pe.ping }
+    assert_not_nil(@pe.duration)
+    assert_false(@pe.ping?(@bogus))
+    assert_nil(@pe.duration)
+  end
+
+  test "host getter basic functionality" do
+    assert_respond_to(@pe, :host)
+    assert_equal('localhost', @pe.host)
+  end
+
+  test "host setter basic functionality" do
+    assert_respond_to(@pe, :host=)
+    assert_nothing_raised{ @pe.host = @bad }
+    assert_equal(@bad, @pe.host)
+  end
+
+  test "port getter basic functionality" do
+    assert_respond_to(@pe, :port)
+    assert_equal(7, @pe.port)
+  end
+
+  test "port setter basic functionality" do
+    assert_respond_to(@pe, :port=)
+    assert_nothing_raised{ @pe.port = 90 }
+    assert_equal(90, @pe.port)
+  end
+
+  test "timeout getter basic functionality" do
+    assert_respond_to(@pe, :timeout)
+    assert_equal(5, @pe.timeout)
+  end
+
+  test "timeout setter basic functionality" do
+    assert_respond_to(@pe, :timeout=)
+    assert_nothing_raised{ @pe.timeout = 30 }
+    assert_equal(30, @pe.timeout)
+  end
+
+  test "exception method basic functionality" do
+    assert_respond_to(@pe, :exception)
+    assert_nil(@pe.exception)
+  end
+
+  test "pinging a bogus host stores exception data" do
+    assert_nothing_raised{ @bad.ping? }
+    assert_not_nil(@bad.exception)
+  end
+
+  test "pinging a good host results in no exception data" do
+    assert_nothing_raised{ @pe.ping }
+    assert_nil(@pe.exception)
+  end
+
+  test "warning basic functionality" do
+    assert_respond_to(@pe, :warning)
+    assert_nil(@pe.warning)
+  end
+
+  test "timing out causes expected result" do
+    ext = Net::Ping::External.new('foo.bar.baz', nil, 1)
+    start = Time.now
+    assert_false(ext.ping?)
+    elapsed = Time.now - start
+    assert_true(elapsed < 2.5, "Actual elapsed: #{elapsed}")
+    assert_not_nil(ext.exception)
+  end
+
+  def teardown
+    @host  = nil
+    @bogus = nil
+    @pe    = nil
+    @bad   = nil
+  end
+end