Merge pull request #1 from djberg96/master

sync with upstream

CHANGES

@@ -1,6 +1,9 @@
-== 1.6.0 - ???
-* Split out the ldap portion of the code into its own library.
+== 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

Rakefile

@@ -39,11 +39,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 +84,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

lib/net/ping.rb

@@ -9,10 +9,9 @@
 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

lib/net/ping/ping.rb

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

net-ping.gemspec

@@ -3,7 +3,7 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'net-ping'
-  spec.version   = '1.5.3'
+  spec.version   = '1.6.0'
   spec.license   = 'Artistic 2.0'
   spec.author    = 'Daniel J. Berger'
   spec.email     = 'djberg96@gmail.com'
@@ -15,12 +15,10 @@ 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.5.0')
   spec.add_development_dependency('fakeweb', '>= 1.3.0')
-  spec.add_development_dependency('fakeldap', '~> 0.0.1')
 
   if File::ALT_SEPARATOR && RUBY_PLATFORM != 'java'
     spec.platform = Gem::Platform::CURRENT

test/test_net_ping.rb

@@ -28,7 +28,7 @@
 
 class TC_Net_Ping < Test::Unit::TestCase
   def test_net_ping_version
-    assert_equal('1.5.3', Net::Ping::VERSION)
+    assert_equal('1.6.0', Net::Ping::VERSION)
   end
 end