net-ping 1.5.3-x86-mingw32 → 1.6.1-x86-mingw32

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmEyMGYyYjAyZjY0Zjc4ZGUxMTEyZGY5MWVjMzkzODYxNTMyNjY4ZQ==
+  data.tar.gz: !binary |-
+    MTdkNzBmZGJjYjFiYjA5ZWM1NDE4ODg4YTc5NjlmYTU0MGE4ZDc4Nw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YTU5NjA4NGVlMWFkYzMxYTUwMjYxNTk0NmI3NTQzNWI5OTgzZDlkZTM5MDk4
+    NDA5OGI3MzUxOTkyZGFiZWI4OTllY2RlM2Q4ODY3ZTc5ZmRjYTQ3MWYyMmRl
+    ODg0N2M1YjA1YjlmMmVlMTQ1MWM3OTAyMmZiNmFlN2Q0MDk2MmQ=
+  data.tar.gz: !binary |-
+    ZDU5YWZmMzE3NzA4MDZhOGI0YmNkMWFjZDNjNTY2ZTdkZjFlODVjMzg2YmQy
+    YWM0MjY1ZDk4YzhmMTc2OTIyNmVkMTFjMjJhMzIzNGEwODc4ZmYxZTNkZGUw
+    OWJiZWYwYzRmNDMzNTQyZjdiOGU5NGY3YzM2ZTJjZTBlYTU2ZTM=

data/CHANGES

@@ -1,3 +1,24 @@
+== 1.6.1 - 17-Jul-2013
+* Automatically set the scheme to "http" if not present when performing
+  HTTP pings. See https://bugs.ruby-lang.org/issues/8645 for an issue
+  with the uri library that led to this change. Thanks go to Preston Lee
+  for the spot.
+* Removed the windows/system_info dependency, since it added other
+  dependencies just to check the Windows version. Instead, I added a
+  helper file that adds some needed Windows functions using FFI.
+* Added Rake as a development dependency and updated the Gemfile
+  source because Bundler. Thanks to Jean-Philippe Doyle for the patches.
+* Added some warning text to the Net::Ping::External tests for users
+  who are using OpenDNS. In short, you will probably get test failures
+  and surprising true results for bad hosts.
+
+== 1.6.0 - 19-Mar-2013
+* Split out the ldap portion of the code into its own branch.
+* Don't require resolv-replace on Ruby 1.9.3 or later.
+* Now gets proxy information from the http_proxy, https_proxy, and
+  no_proxy environment variables and uses that when making requests.
+  Thanks go to Kevin Olbrich for the patch.
+ 
 == 1.5.3 - 29-Feb-2012
 * Removed the Windows::Console dependency and replaced it with FFI since there
   were only two functions needed. This had the nice side effect of making it

data/Gemfile

@@ -0,0 +1,2 @@
+source 'http://rubygems.org'
+gemspec

data/Rakefile

@@ -9,7 +9,12 @@ namespace 'gem' do
   desc 'Create the net-ping gem'
   task :create => [:clean] do
     spec = eval(IO.read('net-ping.gemspec'))
-    Gem::Builder.new(spec).build
+    if Gem::VERSION.to_f < 2.0
+      Gem::Builder.new(spec).build
+    else
+      require 'rubygems/package'
+      Gem::Package.build(spec)
+    end
   end
 
   desc 'Install the net-ping gem'
@@ -39,11 +44,6 @@ namespace 'example' do
   task :udp do
      ruby '-Ilib examples/example_pingudp.rb'
   end
-
-  desc 'Run the ldap ping example program'
-  task :ldap do
-     ruby '-Ilib examples/example_pingldap.rb'
-  end
 end
 
 Rake::TestTask.new do |t|
@@ -89,12 +89,6 @@ namespace 'test' do
      t.verbose = true
      t.test_files = FileList['test/test_net_ping_wmi.rb']
   end
-
-  Rake::TestTask.new('ldap') do |t|
-     t.warning = true
-     t.verbose = true
-     t.test_files = FileList['test/test_net_ping_ldap.rb']
-  end
 end
 
 task :default => :test

data/lib/net/ping.rb

@@ -9,10 +9,9 @@ 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
+if File::ALT_SEPARATOR
   require File.join(File.dirname(__FILE__), 'ping/wmi')
 end

data/lib/net/ping/helper.rb

@@ -0,0 +1,31 @@
+require 'ffi'
+
+module Windows
+  extend FFI::Library
+  ffi_lib :kernel32
+
+  attach_function :GetVersion, [], :ulong
+
+  def version
+    version = GetVersion()
+    major = LOBYTE(LOWORD(version))
+    minor = HIBYTE(LOWORD(version))
+    eval("Float(#{major}.#{minor})")
+  end
+
+  private
+
+  def LOWORD(l)
+    l & 0xffff
+  end
+
+  def LOBYTE(w)
+    w & 0xff
+  end
+
+  def HIBYTE(w)
+    w >> 8
+  end
+
+  module_function :version
+end

data/lib/net/ping/http.rb

@@ -2,10 +2,11 @@ require File.join(File.dirname(__FILE__), 'ping')
 require 'net/http'
 require 'net/https'
 require 'uri'
+require 'open-uri'
 
 # Force non-blocking Socket.getaddrinfo on Unix systems. Do not use on
 # Windows because it (ironically) causes blocking problems.
-unless File::ALT_SEPARATOR
+unless File::ALT_SEPARATOR or RUBY_VERSION >= "1.9.3"
   require 'resolv-replace'
 end
 
@@ -33,6 +34,9 @@ module Net
     # Use GET request instead HEAD. The default is false.
     attr_accessor :get_request
 
+    # was this ping proxied?
+    attr_accessor :proxied
+
     # Creates and returns a new Ping::HTTP object. The default port is the
     # port associated with the URI. The default timeout is 5 seconds.
     #
@@ -40,7 +44,7 @@ module Net
       @follow_redirect = true
       @redirect_limit  = 5
       @ssl_verify_mode = OpenSSL::SSL::VERIFY_NONE
-      @get_request = false
+      @get_request     = false
 
       port ||= URI.parse(uri).port if uri
 
@@ -60,10 +64,15 @@ module Net
     # response is considered a failed ping.
     #
     # If no file or path is specified in the URI, then '/' is assumed.
+    # If no scheme is present in the URI, then 'http' is assumed.
     #
     def ping(host = @host)
       super(host)
       bool = false
+
+      # See https://bugs.ruby-lang.org/issues/8645
+      host = "http://#{host}" unless host.include?("http")
+
       uri = URI.parse(host)
 
       start_time = Time.now
@@ -75,7 +84,7 @@ module Net
       elsif redirect?(response) # Check code, HTTPRedirection does not always work
         if @follow_redirect
           @warning = response.message
-          rlimit = 0
+          rlimit   = 0
 
           while redirect?(response)
             if rlimit >= redirect_limit
@@ -85,13 +94,13 @@ module Net
             redirect = URI.parse(response['location'])
             redirect = uri + redirect if redirect.relative?
             response = do_ping(redirect)
-            rlimit += 1
+            rlimit   += 1
           end
 
           if response.is_a?(Net::HTTPSuccess)
             bool = true
           else
-            @warning = nil
+            @warning   = nil
             @exception ||= response.message
           end
 
@@ -120,25 +129,26 @@ module Net
 
     def do_ping(uri)
       response = nil
+      proxy    = uri.find_proxy || URI.parse("")
       begin
         uri_path = uri.path.empty? ? '/' : uri.path
-        headers = { }
+        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
-
+          http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new(uri.host, uri.port)
+          @proxied = http.proxy?
           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) }
+          if uri.scheme == 'https'
+            http.use_ssl     = true
+            http.verify_mode = @ssl_verify_mode
+          end
+
+          response = http.start { |h| h.request(request) }
         end
       rescue Exception => err
         @exception = err.message

data/lib/net/ping/icmp.rb

@@ -2,8 +2,7 @@ require File.join(File.dirname(__FILE__), 'ping')
 
 if File::ALT_SEPARATOR
   require 'win32/security'
-  require 'windows/system_info'
-  include Windows::SystemInfo
+  require File.join(File.dirname(__FILE__), 'helper')
 end
 
 # The Net module serves as a namespace only.
@@ -32,7 +31,7 @@ module Net
     def initialize(host=nil, port=nil, timeout=5)
       raise 'requires root privileges' if Process.euid > 0
 
-      if File::ALT_SEPARATOR && windows_version >= 6
+      if File::ALT_SEPARATOR && Windows.version >= 6
         unless Win32::Security.elevated_security?
           raise 'requires elevated security'
         end

data/lib/net/ping/ping.rb

@@ -10,7 +10,7 @@ module Net
    #
    class Ping
       # The version of the net-ping library.
-      VERSION = '1.5.2'
+      VERSION = '1.6.1'
 
       # The host to ping. In the case of Ping::HTTP, this is the URI.
       attr_accessor :host

data/net-ping.gemspec

@@ -3,11 +3,11 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'net-ping'
-  spec.version   = '1.5.3'
+  spec.version   = '1.6.1'
   spec.license   = 'Artistic 2.0'
   spec.author    = 'Daniel J. Berger'
   spec.email     = 'djberg96@gmail.com'
-  spec.homepage  = 'http://www.rubyforge.org/projects/shards'
+  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') }
@@ -15,12 +15,11 @@ Gem::Specification.new do |spec|
   spec.rubyforge_project = 'shards'
   spec.extra_rdoc_files  = ['README', 'CHANGES', 'doc/ping.txt']
 
-  spec.add_dependency('net-ldap', '~> 0.2.2')
   spec.add_dependency('ffi', '>= 1.0.0')
 
-  spec.add_development_dependency('test-unit', '>= 2.1.2')
+  spec.add_development_dependency('test-unit', '>= 2.5.0')
   spec.add_development_dependency('fakeweb', '>= 1.3.0')
-  spec.add_development_dependency('fakeldap', '~> 0.0.1')
+  spec.add_development_dependency('rake')
 
   if File::ALT_SEPARATOR && RUBY_PLATFORM != 'java'
     spec.platform = Gem::Platform::CURRENT
@@ -28,7 +27,7 @@ Gem::Specification.new do |spec|
     spec.platform.version = nil
 
     # Used primarily for icmp pings.
-    spec.add_development_dependency('win32-security', '>= 1.0.8')
+    spec.add_development_dependency('win32-security', '>= 0.2.0')
 
     if RUBY_VERSION.to_f < 1.9
       spec.add_dependency('win32-open3', '>= 0.3.1')

data/test/test_net_ping.rb

@@ -12,10 +12,8 @@ require 'fakeweb'
 
 if File::ALT_SEPARATOR
   require 'win32/security'
-  require 'windows/system_info'
-  include Windows::SystemInfo
 
-  if windows_version >= 6 && Win32::Security.elevated_security?
+  if Win32::Security.elevated_security?
     require 'test_net_ping_icmp'
   end
 else
@@ -30,7 +28,7 @@ end
 
 class TC_Net_Ping < Test::Unit::TestCase
   def test_net_ping_version
-    assert_equal('1.5.2', Net::Ping::VERSION)
+    assert_equal('1.6.1', Net::Ping::VERSION)
   end
 end
 

data/test/test_net_ping_external.rb

@@ -3,11 +3,12 @@
 #
 # 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 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'net/ping/external'
 
 class TC_Net_Ping_External < Test::Unit::TestCase

data/test/test_net_ping_http.rb

@@ -4,25 +4,29 @@
 # Test case for the Net::PingHTTP class. This should be run via the 'test' or
 # 'test:http' Rake task.
 #################################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
+require 'fakeweb'
 require 'net/ping/http'
 
 class TC_Net_Ping_HTTP < Test::Unit::TestCase
   def setup
+    ENV['http_proxy'] = ENV['https_proxy'] = ENV['no_proxy'] = nil
     @uri = 'http://www.google.com/index.html'
     @uri_https = 'https://encrypted.google.com'
+    @proxy = 'http://username:password@proxymoxie:3128'
+    FakeWeb.allow_net_connect = false
 
     FakeWeb.register_uri(:get, @uri, :body => "PONG")
     FakeWeb.register_uri(:head, @uri, :body => "PONG")
     FakeWeb.register_uri(:head, @uri_https, :body => "PONG")
+    FakeWeb.register_uri(:get, @uri_https, :body => "PONG")
     FakeWeb.register_uri(:head, "http://jigsaw.w3.org/HTTP/300/302.html",
                          :body => "PONG",
                          :location => "#{@uri}",
                          :status => ["302", "Found"])
 
+    FakeWeb.register_uri(:any, 'http://www.blabfoobarurghxxxx.com', :exception => SocketError)
+
     @http = Net::Ping::HTTP.new(@uri, 80, 30)
     @bad  = Net::Ping::HTTP.new('http://www.blabfoobarurghxxxx.com') # One hopes not
   end
@@ -175,6 +179,30 @@ class TC_Net_Ping_HTTP < Test::Unit::TestCase
     assert_true(@http.ping)
   end
 
+  test 'ping with http proxy' do
+    ENV['http_proxy'] = "http://proxymoxie:3128"
+    @http = Net::Ping::HTTP.new(@uri)
+    @http.get_request = true
+    assert_true(@http.ping)
+    assert_true(@http.proxied)
+  end
+
+  test 'ping with https proxy' do
+    ENV['https_proxy'] = "http://proxymoxie:3128"
+    @http = Net::Ping::HTTP.new(@uri_https)
+    @http.get_request = true
+    assert_true(@http.ping)
+    assert_true(@http.proxied)
+  end
+
+  test 'ping with no_proxy' do
+    ENV['no_proxy'] = "google.com"
+    @http = Net::Ping::HTTP.new(@uri)
+    @http.get_request = true
+    assert_true(@http.ping)
+    assert_false(@http.proxied)
+  end
+
   def teardown
     @uri  = nil
     @http = nil

data/test/test_net_ping_icmp.rb

@@ -5,10 +5,7 @@
 # with root privileges on UNIX systems. This should be run via the
 # 'test' or 'test:icmp' Rake task.
 #######################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'net/ping/icmp'
 include Net
 

data/test/test_net_ping_tcp.rb

@@ -4,10 +4,7 @@
 # Test case for the Net::PingTCP class. This test should be run via
 # the 'test' or 'test:tcp' Rake task.
 #####################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'net/ping/tcp'
 include Net
 

data/test/test_net_ping_udp.rb

@@ -7,10 +7,7 @@
 # If someone could provide me a host where a udp ping actually
 # works (with a service check), I would appreciate it. :)
 ########################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'net/ping/udp'
 
 class TC_Net_Ping_UDP < Test::Unit::TestCase

data/test/test_net_ping_wmi.rb

@@ -5,18 +5,15 @@
 # run MS Windows.  You should run this test via the 'test' or
 # 'test:wmi' Rake task.
 #######################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'net/ping/wmi'
 include Net
 
 class TC_Ping_WMI < Test::Unit::TestCase
    def self.startup
-      @@windows = Config::CONFIG['host_os'] =~ /mswin|win32|dos|cygwin|mingw/i
+      @@windows = File::ALT_SEPARATOR
    end
-   
+
    def setup
       @host = "www.ruby-lang.org"
       @wmi = Ping::WMI.new(@host) if @@windows
@@ -55,11 +52,11 @@ class TC_Ping_WMI < Test::Unit::TestCase
       assert_boolean(@wmi.ping?)
       assert_boolean(@wmi.ping?(@host))
    end
-   
+
    def test_ping_expected_failure
       omit_unless(@@windows, 'skipped on Unix platforms')
       assert_false(Ping::WMI.new('bogus').ping?)
-      assert_false(Ping::WMI.new('http://www.asdfhjklasdfhlkj.com').ping?)      
+      assert_false(Ping::WMI.new('http://www.asdfhjklasdfhlkj.com').ping?)
    end
 
    def test_exception
@@ -77,7 +74,7 @@ class TC_Ping_WMI < Test::Unit::TestCase
       @host = nil
       @wmi  = nil
    end
-   
+
    def self.shutdown
       @@windows = nil
    end

metadata

@@ -1,156 +1,106 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: net-ping
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 3
-  version: 1.5.3
+version: !ruby/object:Gem::Version
+  version: 1.6.1
 platform: x86-mingw32
-authors: 
+authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: net-ldap
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 2
-        - 2
-        version: 0.2.2
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2013-07-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakeldap
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: win32-security
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 0
-        - 8
-        version: 1.0.8
+  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: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: win32-open3
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
-        version: 0.3.1
-  type: :runtime
-  version_requirements: *id007
-description: "    The net-ping library provides a ping interface for Ruby. It includes\n    separate TCP, HTTP, LDAP, ICMP, UDP, WMI (for Windows) and external ping\n    classes.\n"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+description: ! "    The net-ping library provides a ping interface for Ruby. It includes\n
+  \   separate TCP, HTTP, LDAP, ICMP, UDP, WMI (for Windows) and external ping\n    classes.\n"
 email: djberg96@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - CHANGES
 - doc/ping.txt
-files: 
+files:
 - CHANGES
 - doc/ping.txt
 - examples/example_pingexternal.rb
 - examples/example_pinghttp.rb
-- examples/example_pingldap.rb
 - examples/example_pingtcp.rb
 - examples/example_pingudp.rb
+- Gemfile
 - lib/net/ping/external.rb
+- lib/net/ping/helper.rb
 - lib/net/ping/http.rb
 - lib/net/ping/icmp.rb
-- lib/net/ping/ldap.rb
 - lib/net/ping/ping.rb
 - lib/net/ping/tcp.rb
 - lib/net/ping/udp.rb
@@ -164,42 +114,32 @@ files:
 - test/test_net_ping_external.rb
 - test/test_net_ping_http.rb
 - test/test_net_ping_icmp.rb
-- test/test_net_ping_ldap.rb
 - test/test_net_ping_tcp.rb
 - test/test_net_ping_udp.rb
 - test/test_net_ping_wmi.rb
-homepage: http://www.rubyforge.org/projects/shards
-licenses: 
+homepage: https://github.com/djberg96/net-ping
+licenses:
 - Artistic 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: shards
-rubygems_version: 1.8.10
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A ping interface for Ruby.
-test_files: 
+test_files:
 - test/test_net_ping.rb

data/examples/example_pingldap.rb

@@ -1,22 +0,0 @@
-########################################################################
-# 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/lib/net/ping/ldap.rb

@@ -1,107 +0,0 @@
-require File.join(File.dirname(__FILE__), 'ping')
-require 'net/ldap'
-require 'uri'
-
-
-# The Net module serves as a namespace only.
-module Net
-
-  # The Ping::LDAP class encapsulates methods for LDAP pings.
-  class Ping::LDAP < Ping
-
-    # uri contains the URI object for the request
-    #
-    attr_accessor :uri
-
-    # username and password may be set for ping using
-    # an authenticated LDAP bind
-    #
-    attr_accessor :username
-    attr_accessor :password
-
-    # set/get the encryption method. By default nil,
-    # but may be set to :simple_tls
-    #
-    attr_accessor :encryption
-    def encryption=(value)
-      @encryption = (value.is_a? Symbol) ? value : value.to_sym
-    end
-
-    # Creates and returns a new Ping::LDAP object.
-    # The default +timeout+ is 5 seconds.
-    #
-    # +uri+ string is expected to be a full URI with scheme (ldap/ldaps)
-    # and optionally the port (else default port is assumed) e.g.
-    #   ldap://my.ldap.host.com
-    #   ldap://my.ldap.host.com:1389
-    #   ldaps://my.ldap.host.com
-    #   ldaps://my.ldap.host.com:6636
-    #
-    # If a plain hostname is provided as the +uri+, a default port of 389 is assumed
-    #
-    def initialize(uri=nil, timeout=5)
-      host, port = decode_uri(uri)
-      super(host, port, timeout)
-    end
-
-    # method used to decode uri string
-    #
-    def decode_uri(value)
-      @uri = URI.parse(value)
-      if uri.scheme =~ /ldap/
-        p = @port = uri.port
-        h = @host = uri.host
-        @encryption = uri.scheme=='ldaps' ? :simple_tls : nil
-      else
-        h = value
-        p = 389
-      end
-      [h, p]
-    end
-
-    # constructs the LDAP configuration structure
-    #
-    def config
-      {
-        :host => uri.host,
-        :port => uri.port,
-        :encryption => encryption
-      }.merge(
-        (username && password) ?
-        { :auth => {:method => :simple, :username => username, :password => password} } :
-        { :auth => {:method => :anonymous} }
-      )
-    end
-
-    # perform ping, optionally providing the ping destination uri
-    #
-    def ping(host = nil)
-      decode_uri(host) if host
-      super(@host)
-      
-      bool = false
-
-      start_time = Time.now
-
-      begin
-        Timeout.timeout(@timeout) do
-          Net::LDAP.new( config  ).bind
-        end
-      rescue Net::LDAP::LdapError => e
-        @exception = e.message
-      rescue Exception => e
-        @exception = e.message
-      else
-        bool = true
-      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/test/test_net_ping_ldap.rb

@@ -1,200 +0,0 @@
-#################################################################################
-# test_net_ping_http.rb
-#
-# Test case for the Net::PingHTTP class. This should be run via the 'test' or
-# 'test:http' Rake task.
-#################################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
-require 'net/ping/ldap'
-require 'fakeldap'
-
-class TC_Net_Ping_LDAP < Test::Unit::TestCase
-  class << self
-    def startup
-      @@host = 'localhost'
-      @@port = 2389
-      @@uri = "ldap://#{@@host}:#{@@port}"
-      @@timeout = 30
-      @@cn = 'el.Daper'
-      @@password = 'ldappassword'
-      
-      @@ldap_server = FakeLDAP::Server.new(:port => @@port)
-      @@ldap_server.run_tcpserver
-      @@ldap_server.add_user("cn=#{@@cn},ou=USERS,dc=example,dc=com", @@password)
-    end
-    def shutdown
-      @@ldap_server.stop
-    end
-  end
-  def setup
-    @ldap = Net::Ping::LDAP.new(@@uri, @@timeout)
-    @ldap.username = @@cn
-    @ldap.password = @@password
-    @bogus = 'ldap://blabfoobarurghxxxx.com' # One hopes so
-    @bad  = Net::Ping::LDAP.new(@bogus)
-  end
-
-  def teardown
-    @ldap = nil
-  end
-
-  test 'ping basic functionality' do
-    assert_respond_to(@ldap, :ping)
-    assert_nothing_raised{ @ldap.ping }
-  end
-
-  test 'ping returns a boolean value' do
-    assert_boolean(@ldap.ping?)
-    assert_boolean(@bad.ping?)
-  end
-
-  test 'ping? is an alias for ping' do
-    assert_alias_method(@ldap, :ping?, :ping)
-  end
-
-  test 'pingecho is an alias for ping' do
-    assert_alias_method(@ldap, :pingecho, :ping)
-  end
-
-  test 'ping should succeed for a valid website' do
-    assert_true(@ldap.ping?)
-  end
-
-  test 'ping should fail for an invalid website' do
-    assert_false(@bad.ping?)
-  end
-
-  test 'duration basic functionality' do
-    assert_respond_to(@ldap, :duration)
-    assert_nothing_raised{ @ldap.ping }
-  end
-
-  test 'duration returns a float value on a successful ping' do
-    assert_true(@ldap.ping)
-    assert_kind_of(Float, @ldap.duration)
-  end
-
-  test 'duration is nil on an unsuccessful ping' do
-    assert_false(@bad.ping)
-    assert_nil(@ldap.duration)
-  end
-
-  test "duration is unset if a bad ping follows a good ping" do
-    assert_true{ @ldap.ping }
-    assert_not_nil(@ldap.duration)
-    assert_false(@ldap.ping?(@bogus))
-    assert_nil(@ldap.duration)
-  end
-
-  test 'host attribute basic functionality' do
-    assert_respond_to(@ldap, :host)
-    assert_respond_to(@ldap, :host=)
-    assert_equal(@@host, @ldap.host)
-  end
-  
-  test 'port attribute basic functionality' do
-    assert_respond_to(@ldap, :port)
-    assert_respond_to(@ldap, :port=)
-  end
-
-  test 'port attribute expected value' do
-    assert_equal(@@port, @ldap.port)
-  end
-
-  test 'timeout attribute basic functionality' do
-    assert_respond_to(@ldap, :timeout)
-    assert_respond_to(@ldap, :timeout=)
-  end
-
-  test 'timeout attribute expected values' do
-    assert_equal(@@timeout, @ldap.timeout)
-    assert_equal(5, @bad.timeout)
-  end
-
-  test 'exception attribute basic functionality' do
-    assert_respond_to(@ldap, :exception)
-    assert_nil(@ldap.exception)
-  end
-
-  test 'exception attribute is nil if the ping is successful' do
-    assert_true(@ldap.ping)
-    assert_nil(@ldap.exception)
-  end
-
-  test 'exception attribute is not nil if the ping is unsuccessful' do
-    assert_false(@bad.ping)
-    assert_not_nil(@bad.exception)
-  end
-
-  test 'warning attribute basic functionality' do
-    assert_respond_to(@ldap, :warning)
-    assert_nil(@ldap.warning)
-  end
-
-  test 'uri attribute basic functionality' do
-    assert_respond_to(@ldap, :uri)
-    assert_respond_to(@ldap, :uri=)
-  end
-
-  test 'username attribute basic functionality' do
-    assert_respond_to(@ldap, :username)
-    assert_respond_to(@ldap, :username=)
-  end
-
-  test 'password attribute basic functionality' do
-    assert_respond_to(@ldap, :password)
-    assert_respond_to(@ldap, :password=)
-  end
-
-  test 'encryption attribute basic functionality' do
-    assert_respond_to(@ldap, :encryption)
-    assert_respond_to(@ldap, :encryption=)
-  end
-
-  test 'encryption defaults to nil for ldap' do
-    assert_nil(Net::Ping::LDAP.new('ldap://somehost.example.net').encryption)
-  end
-
-  test 'encryption defaults to simple_tls for ldaps' do
-    assert_equal(:simple_tls, Net::Ping::LDAP.new('ldaps://somehost.example.net').encryption)
-  end
-
-  test 'port defaults to 389 for ldap' do
-    assert_equal(389, Net::Ping::LDAP.new('ldap://somehost.example.net').port)
-  end
-
-  test 'port defaults to 636 for ldaps' do
-    assert_equal(636, Net::Ping::LDAP.new('ldaps://somehost.example.net').port)
-  end
-
-  test 'port extracted from uri if provided' do
-    assert_equal(12345, Net::Ping::LDAP.new('ldap://somehost.example.net:12345').port)
-    assert_equal(12345, Net::Ping::LDAP.new('ldaps://somehost.example.net:12345').port)
-  end
-
-  test 'encryption setting is forced to symbol' do
-    @ldap.encryption = 'simple_tls'
-    assert_true( @ldap.encryption.is_a? Symbol )
-    assert_true( @ldap.config[:encryption].is_a? Symbol )
-  end
-
-  test 'username/password set in config auth section' do
-    @ldap.username, @ldap.password = 'fred', 'derf'
-    assert_equal('fred', @ldap.config[:auth][:username] )
-    assert_equal('derf', @ldap.config[:auth][:password] )
-  end
-
-  test 'auth method defaults to simple if username/password set' do
-    @ldap.username, @ldap.password = 'fred', 'derf'
-    assert_equal(:simple, @ldap.config[:auth][:method] )
-  end
-
-  test 'if no username/password then defaults to auth anonymous' do
-    @ldap.username = @ldap.password = nil
-    assert_equal({:method => :anonymous}, @ldap.config[:auth] )
-  end
-
-end