net-ping 1.4.1-x86-mingw32 → 1.5.3-x86-mingw32

data/examples/example_pingexternal.rb

@@ -1,16 +1,16 @@
-########################################################################
-# example_pingexternal.rb
-#
-# A short sample program demonstrating an external ping. You can run
-# this program via the example:external task. Modify as you see fit.
-########################################################################
-require 'net/ping'
-
-good = 'www.rubyforge.org'
-bad  = 'foo.bar.baz'
-
-p1 = Net::Ping::External.new(good)
-p p1.ping?
-
-p2 = Net::Ping::External.new(bad)
-p p2.ping?
+########################################################################
+# example_pingexternal.rb
+#
+# A short sample program demonstrating an external ping. You can run
+# this program via the example:external task. Modify as you see fit.
+########################################################################
+require 'net/ping'
+
+good = 'www.rubyforge.org'
+bad  = 'foo.bar.baz'
+
+p1 = Net::Ping::External.new(good)
+p p1.ping?
+
+p2 = Net::Ping::External.new(bad)
+p p2.ping?

data/examples/example_pinghttp.rb

@@ -1,22 +1,22 @@
-########################################################################
-# example_pinghttp.rb
-#
-# A short sample program demonstrating an http ping. You can run
-# this program via the example:http task. Modify as you see fit.
-########################################################################
-require 'net/ping'
-
-good = 'http://www.google.com/index.html'
-bad  = 'http://www.ruby-lang.org/index.html'
-
-puts "== Good ping, no redirect"
-
-p1 = Net::Ping::HTTP.new(good)
-p p1.ping?
-
-puts "== Bad ping"
-
-p2 = Net::Ping::HTTP.new(bad)
-p p2.ping?
-p p2.warning
-p p2.exception
+########################################################################
+# example_pinghttp.rb
+#
+# A short sample program demonstrating an http ping. You can run
+# this program via the example:http task. Modify as you see fit.
+########################################################################
+require 'net/ping'
+
+good = 'http://www.google.com/index.html'
+bad  = 'http://www.ruby-lang.org/index.html'
+
+puts "== Good ping, no redirect"
+
+p1 = Net::Ping::HTTP.new(good)
+p p1.ping?
+
+puts "== Bad ping"
+
+p2 = Net::Ping::HTTP.new(bad)
+p p2.ping?
+p p2.warning
+p p2.exception

data/examples/example_pingldap.rb

@@ -0,0 +1,22 @@
+########################################################################
+# example_pingldap.rb
+#
+# A short sample program demonstrating an ldap ping. You can run
+# this program via the example:ldap task. Modify as you see fit.
+########################################################################
+require 'net/ping/ldap'
+
+good = 'ldap://localhost'
+bad  = 'ldap://example.com'
+
+puts "== Good ping (if you have an ldap server at #{good})"
+
+p1 = Net::Ping::LDAP.new(good)
+p p1.ping?
+
+puts "== Bad ping"
+
+p2 = Net::Ping::LDAP.new(bad)
+p p2.ping?
+p p2.warning
+p p2.exception

data/examples/example_pingtcp.rb

@@ -1,16 +1,16 @@
-########################################################################
-# example_pingtcp.rb
-#
-# A short sample program demonstrating a tcp ping. You can run
-# this program via the example:tcp task. Modify as you see fit.
-########################################################################
-require 'net/ping'
-
-good = 'www.google.com'
-bad  = 'foo.bar.baz'
-
-p1 = Net::Ping::TCP.new(good, 'http')
-p p1.ping?
-
-p2 = Net::Ping::TCP.new(bad)
-p p2.ping?
+########################################################################
+# example_pingtcp.rb
+#
+# A short sample program demonstrating a tcp ping. You can run
+# this program via the example:tcp task. Modify as you see fit.
+########################################################################
+require 'net/ping'
+
+good = 'www.google.com'
+bad  = 'foo.bar.baz'
+
+p1 = Net::Ping::TCP.new(good, 'http')
+p p1.ping?
+
+p2 = Net::Ping::TCP.new(bad)
+p p2.ping?

data/examples/example_pingudp.rb

@@ -1,12 +1,12 @@
-########################################################################
-# example_pingudp.rb
-#
-# A short sample program demonstrating a UDP ping. You can run
-# this program via the example:udp task. Modify as you see fit.
-########################################################################
-require 'net/ping'
-
-host = 'www.google.com'
-
-u = Net::Ping::UDP.new(host)
-p u.ping?
+########################################################################
+# example_pingudp.rb
+#
+# A short sample program demonstrating a UDP ping. You can run
+# this program via the example:udp task. Modify as you see fit.
+########################################################################
+require 'net/ping'
+
+host = 'www.google.com'
+
+u = Net::Ping::UDP.new(host)
+p u.ping?

data/lib/net/ping.rb

@@ -1,15 +1,18 @@
-# By doing a "require 'net/ping'" you are requiring every subclass.  If you
-# want to require a specific ping type only, do "require 'net/ping/tcp'",
-# for example.
-#
-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')
-
-if Config::CONFIG['host_os'] =~ /msdos|mswin|cygwin|mingw|win32|windows/i
-  require File.join(File.dirname(__FILE__), 'ping/wmi')
-end
+# By doing a "require 'net/ping'" you are requiring every subclass.  If you
+# want to require a specific ping type only, do "require 'net/ping/tcp'",
+# for example.
+#
+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 File.join(File.dirname(__FILE__), 'ping/ldap')
+
+RbConfig = Config unless Object.const_defined?(:RbConfig)
+
+if RbConfig::CONFIG['host_os'] =~ /msdos|mswin|cygwin|mingw|win32|windows/i
+  require File.join(File.dirname(__FILE__), 'ping/wmi')
+end

data/lib/net/ping/external.rb

@@ -1,126 +1,122 @@
-require 'rbconfig'
-require File.join(File.dirname(__FILE__), 'ping')
-
-if Config::CONFIG['host_os'] =~ /mswin|win32|msdos|cygwin|mingw|windows/i &&
-  RUBY_PLATFORM != 'java'
-then
-  if RUBY_VERSION.to_f < 1.9
-    require 'win32/open3'
-  end
-  require 'windows/console'
-else
-  require 'open3'            
-end
-
-# The Net module serves as a namespace only.
-module Net
-
-  # The Ping::External class encapsulates methods for external (system) pings.
-  class Ping::External < Ping
-
-    CWINDOWS = Config::CONFIG['host_os'] =~ /mswin|win32|msdos|cygwin|mingw|windows/i &&
-      RUBY_PLATFORM != 'java'
-      
-    if CWINDOWS
-      include Windows::Console
-    end 
-   
-    # Pings the host using your system's ping utility and checks for any
-    # errors or warnings. Returns true if successful, or false if not.
-    # 
-    # If the ping failed then the Ping::External#exception method should
-    # 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)
-      super(host)
-
-      stdin, stdout, stderr = ""
-      pstring = "ping "
-      bool    = false
-      orig_cp = nil
-       
-      case Config::CONFIG['host_os']
-        when /linux|bsd|osx|mach|darwin/i
-          pstring += "-c 1 #{host}"
-        when /solaris|sunos/i
-          pstring += "#{host} 1"
-        when /hpux/i
-          pstring += "#{host} -n 1"
-        when /win32|windows|msdos|mswin|cygwin|mingw/i
-          if RUBY_PLATFORM != 'java'
-            orig_cp = GetConsoleCP()
-            SetConsoleCP(437) if orig_cp != 437 # United States
-          end
-          pstring += "-n 1 #{host}"
-        else
-          pstring += "#{host}"
-      end
-       
-      start_time = Time.now
-       
-      begin
-        err = nil
-
-        Timeout.timeout(@timeout){
-          stdin, stdout, stderr = Open3.popen3(pstring)
-          err = stderr.gets # Can't chomp yet, might be nil
-        }
-
-        stdin.close
-        stderr.close
-
-        if CWINDOWS && GetConsoleCP() != orig_cp
-          SetConsoleCP(orig_cp)
-        end
-      
-        unless err.nil?
-          if err =~ /warning/i
-            @warning = err.chomp
-            bool = true
-          else
-            @exception = err.chomp
-          end
-        # The "no answer" response goes to stdout, not stderr, so check it
-        else
-          lines = stdout.readlines
-          stdout.close
-          if lines.nil? || lines.empty?
-            bool = true
-          else
-            regexp = /
-              no\ answer|
-              host\ unreachable|
-              could\ not\ find\ host|
-              request\ timed\ out|
-              100%\ packet\ loss
-            /ix
-
-            lines.each{ |line|
-              if regexp.match(line)
-                @exception = line.chomp
-                break
-              end
-            }
-
-            bool = true unless @exception
-          end
-        end
-      rescue Exception => error
-        @exception = error.message 
-      ensure
-        stdin.close  if stdin  && !stdin.closed?
-        stdout.close if stdout && !stdout.closed?
-        stderr.close if stderr && !stderr.closed?
-      end
-
-      # There is no duration if the ping failed
-      @duration = Time.now - start_time if bool
-
-      bool
-    end
-
-    alias ping? ping
-    alias pingecho ping
-  end
-end
+require 'ffi'
+require 'rbconfig'
+
+require File.join(File.dirname(__FILE__), 'ping')
+
+if File::ALT_SEPARATOR && RUBY_VERSION.to_f < 1.9 && RUBY_PLATFORM != 'java'
+  require 'win32/open3'
+else
+  require 'open3'
+end
+
+# The Net module serves as a namespace only.
+module Net
+
+  # The Ping::External class encapsulates methods for external (system) pings.
+  class Ping::External < Ping
+
+    if File::ALT_SEPARATOR
+      extend FFI::Library
+      ffi_lib 'kernel32'
+
+      attach_function :SetConsoleCP, [:uint], :bool
+      attach_function :GetConsoleCP, [], :uint
+    end
+
+    # Pings the host using your system's ping utility and checks for any
+    # errors or warnings. Returns true if successful, or false if not.
+    #
+    # If the ping failed then the Ping::External#exception method should
+    # 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)
+      super(host)
+
+      stdin = stdout = stderr = nil
+      pstring = "ping "
+      bool    = false
+      orig_cp = nil
+
+      case RbConfig::CONFIG['host_os']
+        when /linux|bsd|osx|mach|darwin/i
+          pstring += "-c 1 #{host}"
+        when /solaris|sunos/i
+          pstring += "#{host} 1"
+        when /hpux/i
+          pstring += "#{host} -n 1"
+        when /win32|windows|msdos|mswin|cygwin|mingw/i
+          orig_cp = GetConsoleCP()
+          SetConsoleCP(437) if orig_cp != 437 # United States
+          pstring += "-n 1 #{host}"
+        else
+          pstring += "#{host}"
+      end
+
+      start_time = Time.now
+
+      begin
+        err = nil
+
+        Timeout.timeout(@timeout){
+          stdin, stdout, stderr = Open3.popen3(pstring)
+          err = stderr.gets # Can't chomp yet, might be nil
+        }
+
+        stdin.close
+        stderr.close
+
+        if File::ALT_SEPARATOR && GetConsoleCP() != orig_cp
+          SetConsoleCP(orig_cp)
+        end
+
+        unless err.nil?
+          if err =~ /warning/i
+            @warning = err.chomp
+            bool = true
+          else
+            @exception = err.chomp
+          end
+        # The "no answer" response goes to stdout, not stderr, so check it
+        else
+          lines = stdout.readlines
+          stdout.close
+          if lines.nil? || lines.empty?
+            bool = true
+          else
+            regexp = /
+              no\ answer|
+              host\ unreachable|
+              could\ not\ find\ host|
+              request\ timed\ out|
+              100%\ packet\ loss
+            /ix
+
+            lines.each{ |line|
+              if regexp.match(line)
+                @exception = line.chomp
+                break
+              end
+            }
+
+            bool = true unless @exception
+          end
+        end
+      rescue Exception => error
+        @exception = error.message
+      ensure
+        stdin.close  if stdin  && !stdin.closed?
+        stdout.close if stdout && !stdout.closed?
+        stderr.close if stderr && !stderr.closed?
+      end
+
+      # There is no duration if the ping failed
+      @duration = Time.now - start_time if bool
+
+      bool
+    end
+
+    alias ping? ping
+    alias pingecho ping
+  end
+end

data/lib/net/ping/http.rb

@@ -1,120 +1,149 @@
-require File.join(File.dirname(__FILE__), 'ping')
-require 'net/http'
-require 'net/https'
-require 'uri'
-
-# Force non-blocking Socket.getaddrinfo on Unix systems. Do not use on
-# Windows because it (ironically) causes blocking problems.
-unless File::ALT_SEPARATOR
-  require 'resolv-replace'
-end
-
-# The Net module serves as a namespace only.
-module Net
-
-  # The Ping::HTTP class encapsulates methods for HTTP pings.
-  class Ping::HTTP < Ping
-
-    # By default an http ping will follow a redirect and give you the result
-    # of the final URI.  If this value is set to false, then it will not
-    # follow a redirect and will return false immediately on a redirect.
-    #
-    attr_accessor :follow_redirect
-
-    # The maximum number of redirects allowed. The default is 5.
-    attr_accessor :redirect_limit
-
-    # The user agent used for the HTTP request. The default is nil.
-    attr_accessor :user_agent
-
-    # Creates and returns a new Ping::HTTP object. The default port is the
-    # port associated with the URI. The default timeout is 5 seconds.
-    #
-    def initialize(uri=nil, port=nil, timeout=5)
-      @follow_redirect = true
-      @redirect_limit  = 5
-
-      port ||= URI.parse(uri).port if uri
-
-      super(uri, port, timeout)
-    end
-
-    # Looks for an HTTP response from the URI passed to the constructor.
-    # If the result is a kind of Net::HTTPSuccess then the ping was
-    # successful and true is returned.  Otherwise, false is returned
-    # and the Ping::HTTP#exception method should contain a string
-    # indicating what went wrong.
-    #
-    # If the HTTP#follow_redirect accessor is set to true (which it is
-    # by default) and a redirect occurs during the ping, then the
-    # HTTP#warning attribute is set to the redirect message, but the
-    # return result is still true. If it's set to false then a redirect
-    # response is considered a failed ping.
-    #
-    # If no file or path is specified in the URI, then '/' is assumed.
-    #
-    def ping(host = @host)
-      super(host)
-      bool = false
-      uri = URI.parse(host)
-
-      start_time = Time.now
-
-      begin
-        response = nil
-        uri_path = uri.path.empty? ? '/' : uri.path
-        headers = { }
-        headers["User-Agent"] = user_agent unless user_agent.nil?
-        Timeout.timeout(@timeout) do
-          http = Net::HTTP.new(uri.host, uri.port)
-          http.use_ssl = (uri.scheme == 'https')
-          request = Net::HTTP::Get.new(uri_path)
-          response = http.start{ |h| h.request(request) }
-        end
-      rescue Exception => err
-        @exception = err.message
-      else
-        if response.is_a?(Net::HTTPSuccess)
-          bool = true
-        else
-          if @follow_redirect
-            @warning = response.message
-            rlimit = 0
-
-            # Any response code in the 300 range is a redirect
-            while response.code.to_i >= 300 && response.code.to_i < 400
-              if rlimit >= redirect_limit
-                @exception = "Redirect limit exceeded"
-                break
-              end
-              redirect = URI.parse(response['location'])
-              redirect = uri + redirect if redirect.relative?
-              response = Net::HTTP.get_response(redirect.host, redirect.path, @port)
-              rlimit += 1
-            end
-
-            if response.is_a?(Net::HTTPSuccess)
-              bool = true
-            else
-              @warning = nil
-              @exception ||= response.message
-            end
-          else
-            @exception = response.message
-          end
-        end
-      end
-
-      # There is no duration if the ping failed
-      @duration = Time.now - start_time if bool
-
-      bool
-    end
-
-    alias ping? ping
-    alias pingecho ping
-    alias follow_redirect? follow_redirect
-    alias uri host
-    alias uri= host=
-  end
-end
+require File.join(File.dirname(__FILE__), 'ping')
+require 'net/http'
+require 'net/https'
+require 'uri'
+
+# Force non-blocking Socket.getaddrinfo on Unix systems. Do not use on
+# Windows because it (ironically) causes blocking problems.
+unless File::ALT_SEPARATOR
+  require 'resolv-replace'
+end
+
+# The Net module serves as a namespace only.
+module Net
+
+  # The Ping::HTTP class encapsulates methods for HTTP pings.
+  class Ping::HTTP < Ping
+
+    # By default an http ping will follow a redirect and give you the result
+    # of the final URI.  If this value is set to false, then it will not
+    # follow a redirect and will return false immediately on a redirect.
+    #
+    attr_accessor :follow_redirect
+
+    # The maximum number of redirects allowed. The default is 5.
+    attr_accessor :redirect_limit
+
+    # The user agent used for the HTTP request. The default is nil.
+    attr_accessor :user_agent
+
+    # OpenSSL certificate verification mode. The default is VERIFY_NONE.
+    attr_accessor :ssl_verify_mode
+
+    # Use GET request instead HEAD. The default is false.
+    attr_accessor :get_request
+
+    # Creates and returns a new Ping::HTTP object. The default port is the
+    # port associated with the URI. The default timeout is 5 seconds.
+    #
+    def initialize(uri=nil, port=nil, timeout=5)
+      @follow_redirect = true
+      @redirect_limit  = 5
+      @ssl_verify_mode = OpenSSL::SSL::VERIFY_NONE
+      @get_request = false
+
+      port ||= URI.parse(uri).port if uri
+
+      super(uri, port, timeout)
+    end
+
+    # Looks for an HTTP response from the URI passed to the constructor.
+    # If the result is a kind of Net::HTTPSuccess then the ping was
+    # successful and true is returned.  Otherwise, false is returned
+    # and the Ping::HTTP#exception method should contain a string
+    # indicating what went wrong.
+    #
+    # If the HTTP#follow_redirect accessor is set to true (which it is
+    # by default) and a redirect occurs during the ping, then the
+    # HTTP#warning attribute is set to the redirect message, but the
+    # return result is still true. If it's set to false then a redirect
+    # response is considered a failed ping.
+    #
+    # If no file or path is specified in the URI, then '/' is assumed.
+    #
+    def ping(host = @host)
+      super(host)
+      bool = false
+      uri = URI.parse(host)
+
+      start_time = Time.now
+
+      response = do_ping(uri)
+
+      if response.is_a?(Net::HTTPSuccess)
+        bool = true
+      elsif redirect?(response) # Check code, HTTPRedirection does not always work
+        if @follow_redirect
+          @warning = response.message
+          rlimit = 0
+
+          while redirect?(response)
+            if rlimit >= redirect_limit
+              @exception = "Redirect limit exceeded"
+              break
+            end
+            redirect = URI.parse(response['location'])
+            redirect = uri + redirect if redirect.relative?
+            response = do_ping(redirect)
+            rlimit += 1
+          end
+
+          if response.is_a?(Net::HTTPSuccess)
+            bool = true
+          else
+            @warning = nil
+            @exception ||= response.message
+          end
+
+        else
+          @exception = response.message
+        end
+      end
+
+      # There is no duration if the ping failed
+      @duration = Time.now - start_time if bool
+
+      bool
+    end
+
+    alias ping? ping
+    alias pingecho ping
+    alias follow_redirect? follow_redirect
+    alias uri host
+    alias uri= host=
+
+    private
+
+    def redirect?(response)
+      response && response.code.to_i >= 300 && response.code.to_i < 400
+    end
+
+    def do_ping(uri)
+      response = nil
+      begin
+        uri_path = uri.path.empty? ? '/' : uri.path
+        headers = { }
+        headers["User-Agent"] = user_agent unless user_agent.nil?
+        Timeout.timeout(@timeout) do
+          http = Net::HTTP.new(uri.host, uri.port)
+
+          if uri.scheme == 'https'
+            http.use_ssl = true
+            http.verify_mode = @ssl_verify_mode
+          end
+
+          if @get_request == true
+            request = Net::HTTP::Get.new(uri_path)
+          else
+            request = Net::HTTP::Head.new(uri_path)
+          end
+
+          response = http.start{ |h| h.request(request) }
+        end
+      rescue Exception => err
+        @exception = err.message
+      end
+      response
+    end
+  end
+end