net-ping 1.3.2 → 1.3.3

data/lib/net/ping/ping.rb

@@ -10,12 +10,12 @@ module Net
    #
    class Ping
       # The version of the net-ping library.
-      VERSION = '1.3.2'
+      VERSION = '1.3.3'
 
-      # The host to ping.  In the case of Ping::HTTP, this is the URI.
+      # The host to ping. In the case of Ping::HTTP, this is the URI.
       attr_accessor :host
 
-      # The port to ping.  This is set to the echo port (7) by default. The
+      # The port to ping. This is set to the echo port (7) by default. The
       # Ping::HTTP class defaults to port 80.
       #
       attr_accessor :port

data/lib/net/ping/tcp.rb

@@ -3,81 +3,81 @@ 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
+  # 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
+    # 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
+    # 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)
+    # 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
-         tcp = nil
-         start_time = Time.now
+      bool = false
+      tcp = nil
+      start_time = Time.now
 
-         begin
-            Timeout.timeout(@timeout){
-               begin
-                  tcp = TCPSocket.new(host, @port)
-               rescue Errno::ECONNREFUSED => err
-                  if @@service_check
-                     bool = true
-                  else
-                     @exception = err
-                  end
-               rescue Exception => err
-                  @exception = err
-               else
-                  bool = true
-               end
-            }
-         rescue Timeout::Error => err
+      begin
+        Timeout.timeout(@timeout){
+          begin
+            tcp = TCPSocket.new(host, @port)
+          rescue Errno::ECONNREFUSED => err
+            if @@service_check
+              bool = true
+            else
+              @exception = err
+            end
+          rescue Exception => err
             @exception = err
-         ensure
-            tcp.close if tcp
-         end
+          else
+            bool = true
+          end
+        }
+      rescue Timeout::Error => err
+        @exception = err
+      ensure
+        tcp.close if tcp
+      end
 
-         # There is no duration if the ping failed
-         @duration = Time.now - start_time if bool
+      # There is no duration if the ping failed
+      @duration = Time.now - start_time if bool
 
-         bool
-      end
+      bool
+    end
 
-      alias ping? ping
-      alias pingecho ping
+    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
+    # 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/lib/net/ping/udp.rb

@@ -3,117 +3,117 @@ require File.join(File.dirname(__FILE__), 'ping')
 # The Net module serves as a namespace only.
 module Net
 
-   # The Ping::UDP class encapsulates methods for UDP pings.
-   class Ping::UDP < Ping
-      @@service_check = true
+  # The Ping::UDP class encapsulates methods for UDP pings.
+  class Ping::UDP < Ping
+    @@service_check = true
       
-      # Returns whether or not the connect behavior should enforce remote
-      # service availability as well as reachability. The default is true.
-      #
-      def self.service_check
-         @@service_check
-      end
+    # Returns whether or not the connect behavior should enforce remote
+    # service availability as well as reachability. The default is true.
+    #
+    def self.service_check
+      @@service_check
+    end
       
-      # Set whether or not the connect behavior should enforce remote
-      # service availability as well as reachability. If set to false
-      # then Errno::ECONNREFUSED or Errno::ECONNRESET will be considered
-      # a successful ping, meaning no actual data handshaking is required.
-      # By default, if either of those errors occurs it is considered a failed
-      # 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         
+    # Set whether or not the connect behavior should enforce remote
+    # service availability as well as reachability. If set to false
+    # then Errno::ECONNREFUSED or Errno::ECONNRESET will be considered
+    # a successful ping, meaning no actual data handshaking is required.
+    # By default, if either of those errors occurs it is considered a failed
+    # 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
       
-      # The maximum data size that can be sent in a UDP ping.
-      MAX_DATA = 64
+    # The maximum data size that can be sent in a UDP ping.
+    MAX_DATA = 64
       
-      # The data to send to the remote host. By default this is 'ping'.
-      # This should be MAX_DATA size characters or less.
-      # 
-      attr_reader :data
+    # The data to send to the remote host. By default this is 'ping'.
+    # This should be MAX_DATA size characters or less.
+    # 
+    attr_reader :data
       
-      # Creates and returns a new Ping::UDP object.  This is effectively
-      # identical to its superclass constructor.
-      # 
-      def initialize(host=nil, port=nil, timeout=5)
-         @data = 'ping'
+    # Creates and returns a new Ping::UDP object.  This is effectively
+    # identical to its superclass constructor.
+    # 
+    def initialize(host=nil, port=nil, timeout=5)
+      @data = 'ping'
 
-         super(host, port, timeout)
+      super(host, port, timeout)
 
-         @bind_host = nil
-         @bind_port = nil
-      end
+      @bind_host = nil
+      @bind_port = nil
+    end
       
-      # Sets the data string sent to the remote host. This value cannot have
-      # a size greater than MAX_DATA.
-      # 
-      def data=(string)
-         if string.size > MAX_DATA
-            err = "cannot set data string larger than #{MAX_DATA} characters"
-            raise ArgumentError, err
-         end
+    # Sets the data string sent to the remote host. This value cannot have
+    # a size greater than MAX_DATA.
+    # 
+    def data=(string)
+       if string.size > MAX_DATA
+         err = "cannot set data string larger than #{MAX_DATA} characters"
+         raise ArgumentError, err
+       end
          
-         @data = string
-      end
+       @data = string
+    end
 
-      # Associates the local end of the UDP connection with the given +host+
-      # and +port+. This is essentially a wrapper for UDPSocket#bind.
-      #
-      def bind(host, port)
-         @bind_host = host
-         @bind_port = port
-      end
+    # Associates the local end of the UDP connection with the given +host+
+    # and +port+. This is essentially a wrapper for UDPSocket#bind.
+    #
+    def bind(host, port)
+      @bind_host = host
+      @bind_port = port
+    end
 
-      # Sends a simple text string to the host and checks the return string. If
-      # the string sent and the string returned are a match then the ping was
-      # successful and true is returned. Otherwise, false is returned.
-      #
-      def ping(host = @host)
-         super(host)
+    # Sends a simple text string to the host and checks the return string. If
+    # the string sent and the string returned are a match then the ping was
+    # successful and true is returned. Otherwise, false is returned.
+    #
+    def ping(host = @host)
+      super(host)
 
-         bool = false
-         udp     = UDPSocket.open
-         array   = []
+      bool  = false
+      udp   = UDPSocket.open
+      array = []
 
-         if @bind_host
-            udp.bind(@bind_host, @bind_port)
-         end
+      if @bind_host
+        udp.bind(@bind_host, @bind_port)
+      end
 
-         start_time = Time.now
+      start_time = Time.now
 
-         begin
-            Timeout.timeout(@timeout){
-               udp.connect(host, @port)
-               udp.send(@data, 0)
-               array = udp.recvfrom(MAX_DATA)
-            }
-         rescue Errno::ECONNREFUSED, Errno::ECONNRESET => err
-            if @@service_check
-               @exception = err
-            else
-               bool = true
-            end
-         rescue Exception => err
-            @exception = err
-         else
-            if array[0] == @data
-               bool = true
-            end
-         ensure
-            udp.close if udp
-         end
+      begin
+        Timeout.timeout(@timeout){
+          udp.connect(host, @port)
+          udp.send(@data, 0)
+          array = udp.recvfrom(MAX_DATA)
+        }
+      rescue Errno::ECONNREFUSED, Errno::ECONNRESET => err
+        if @@service_check
+          @exception = err
+        else
+          bool = true
+        end
+      rescue Exception => err
+        @exception = err
+      else
+        if array[0] == @data
+          bool = true
+        end
+      ensure
+        udp.close if udp
+      end
 
-         # There is no duration if the ping failed
-         @duration = Time.now - start_time if bool
+      # There is no duration if the ping failed
+      @duration = Time.now - start_time if bool
 
-         bool
-      end
+      bool
+    end
 
-      alias ping? ping
-      alias pingecho ping
-   end
+    alias ping? ping
+    alias pingecho ping
+  end
 end

data/net-ping.gemspec

@@ -2,35 +2,37 @@ require 'rubygems'
 require 'rbconfig'
 
 Gem::Specification.new do |gem|
-   gem.name      = 'net-ping'
-   gem.version   = '1.3.2'
-   gem.license   = 'Artistic 2.0'
-   gem.author    = 'Daniel J. Berger'
-   gem.email     = 'djberg96@gmail.com'
-   gem.homepage  = 'http://www.rubyforge.org/projects/shards'
-   gem.summary   = 'A ping interface for Ruby.'
-   gem.test_file = 'test/test_net_ping.rb'
-   gem.has_rdoc  = true
-   gem.files     = Dir['**/*'].reject{ |f| f.include?('CVS') }
+  gem.name      = 'net-ping'
+  gem.version   = '1.3.3'
+  gem.license   = 'Artistic 2.0'
+  gem.author    = 'Daniel J. Berger'
+  gem.email     = 'djberg96@gmail.com'
+  gem.homepage  = 'http://www.rubyforge.org/projects/shards'
+  gem.summary   = 'A ping interface for Ruby.'
+  gem.test_file = 'test/test_net_ping.rb'
+  gem.has_rdoc  = true
+  gem.files     = Dir['**/*'].reject{ |f| f.include?('git') }
 
-   gem.rubyforge_project = 'shards'
-   gem.extra_rdoc_files  = ['README', 'CHANGES', 'doc/ping.txt']
+  gem.rubyforge_project = 'shards'
+  gem.extra_rdoc_files  = ['README', 'CHANGES', 'doc/ping.txt']
 
-   gem.add_development_dependency('test-unit', '>= 2.0.3')
+  gem.add_development_dependency('test-unit', '>= 2.0.9')
 
-   # These dependencies are for Net::Ping::External
-   if Config::CONFIG['host_os'] =~ /mswin|dos|win32|cygwin|mingw/i
-      gem.platform = Gem::Platform::CURRENT
-      gem.add_dependency('windows-pr', '>= 1.0.8')
+  # These dependencies are for Net::Ping::External
+  if Config::CONFIG['host_os'] =~ /mswin|dos|win32|cygwin|mingw/i &&
+    RUBY_PLATFORM != 'java'
+  then
+    gem.platform = Gem::Platform::CURRENT
+    gem.add_dependency('windows-pr', '>= 1.0.8')
 
-      if RUBY_VERSION.to_f < 1.9
-         gem.add_dependency('win32-open3', '>= 0.3.1') 
-      end
-   end
+    if RUBY_VERSION.to_f < 1.9
+      gem.add_dependency('win32-open3', '>= 0.3.1') 
+    end
+  end
 
-   gem.description = <<-EOF
-      The net-ping library provides a ping interface for Ruby. It includes
-      separate TCP, HTTP, ICMP, UDP, WMI (for Windows) and external ping
-      classes.
-   EOF
+  gem.description = <<-EOF
+    The net-ping library provides a ping interface for Ruby. It includes
+    separate TCP, HTTP, ICMP, UDP, WMI (for Windows) and external ping
+    classes.
+  EOF
 end

data/test/test_net_ping.rb

@@ -10,9 +10,17 @@ require 'test_net_ping_tcp'
 require 'test_net_ping_udp'
 
 if Process.euid == 0
-   require 'test_net_ping_icmp'
+  require 'test_net_ping_icmp'
 end
 
-if Config::CONFIG['host_os'] =~ /mswin|win32|dos|cygwin|mingw/i
-   require 'test_net_ping_wmi'
+if Config::CONFIG['host_os'] =~ /mswin|win32|dos|cygwin|mingw/i &&
+  RUBY_PLATFORM != 'java'
+then
+  require 'test_net_ping_wmi'
+end
+
+class TC_Net_Ping < Test::Unit::TestCase
+  def test_net_ping_version
+    assert_equal('1.3.3', Net::Ping::VERSION)
+  end
 end