net-ping 1.4.0 → 1.4.1

data/CHANGES

@@ -1,3 +1,13 @@
+== 1.4.1 - 17-Mar-2011
+* Incorporated changes from Lukas Zapletal that alters the icmp tests to use
+  your localhost instead of going outside the network.
+* The http tests were similarly modified courtesy of fakeweb, which is now a
+  development dependency. Again, change from Lukas Zapletal.
+* The icmp tests were reworked for Windows Vista and later. This required the
+  addition of the win32-security library as a development dependency.
+* The Net::Ping::WMI class is no longer skipped on require or in tests since
+  JRuby now supports win32ole.
+
 == 1.4.0 - 14-Feb-2011
 * Added the redirect_limit accessor for the Net::Ping::HTTP class. This caps
   the number of redirects that are allowed before a ping is considered a
@@ -45,7 +55,7 @@
 == 1.3.2 - 21-Sep-2009
 * Doing a 'require "net/ping"' was not automatically loading the
   Net::Ping::WMI class on MS Windows. This has been fixed. Thanks go to
-  Joseph M. for the spot. 
+  Joseph M. for the spot.
 * Removed all $LOAD_PATH mangling for both the library and tests.
 * Fixed a bug in the Net::Ping::HTTP class where a failed redirect did
   not set the @exception and @warning instance variables properly.
@@ -116,7 +126,7 @@
 
 == 1.2.0 - 5-Dec-2006
 * Internal reorganization - each class now lives in its own file.
-* Added the Ping::ICMP class.  Thanks go to Jos Backus for contributing a 
+* Added the Ping::ICMP class.  Thanks go to Jos Backus for contributing a
   large part of the code.
 * The host argument is now optional in the constructor.  You can now specify
   it in the ping method instead.  Note that it must be specified in one place
@@ -199,7 +209,7 @@
 * Doc updates
 
 == 0.2.0 - 14-Feb-2003
-* The default behavior of PingTCP with regards to ECONNREFUSED is now 
+* The default behavior of PingTCP with regards to ECONNREFUSED is now
   configurable
 * Added a VERSION constant and method (to the base class)
 * Added a test suite (for those with testunit installed)

data/lib/net/ping.rb

@@ -10,8 +10,6 @@ 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 &&
-  RUBY_PLATFORM != 'java'
-then
+if Config::CONFIG['host_os'] =~ /msdos|mswin|cygwin|mingw|win32|windows/i
   require File.join(File.dirname(__FILE__), 'ping/wmi')
 end

data/lib/net/ping/ping.rb

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

data/net-ping.gemspec

@@ -3,7 +3,7 @@ require 'rbconfig'
 
 Gem::Specification.new do |gem|
   gem.name      = 'net-ping'
-  gem.version   = '1.4.0'
+  gem.version   = '1.4.1'
   gem.license   = 'Artistic 2.0'
   gem.author    = 'Daniel J. Berger'
   gem.email     = 'djberg96@gmail.com'
@@ -17,16 +17,16 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files  = ['README', 'CHANGES', 'doc/ping.txt']
 
   gem.add_development_dependency('test-unit', '>= 2.1.2')
+  gem.add_development_dependency('fakeweb', '>= 1.3.0')
 
   # These dependencies are for Net::Ping::External
-  if Config::CONFIG['host_os'] =~ /mswin|dos|win32|windows|cygwin|mingw/i &&
-    RUBY_PLATFORM != 'java'
-  then
+  if File::ALT_SEPARATOR && RUBY_PLATFORM != 'java'
     gem.platform = Gem::Platform::CURRENT
     gem.add_dependency('windows-pr', '>= 1.0.8')
+    gem.add_development_dependency('win32-security', '>= 1.0.8')
 
     if RUBY_VERSION.to_f < 1.9
-      gem.add_dependency('win32-open3', '>= 0.3.1') 
+      gem.add_dependency('win32-open3', '>= 0.3.1')
     end
   end
 

data/test/test_net_ping.rb

@@ -8,19 +8,30 @@ require 'test_net_ping_external'
 require 'test_net_ping_http'
 require 'test_net_ping_tcp'
 require 'test_net_ping_udp'
+require 'fakeweb'
 
-if Process.euid == 0
-  require 'test_net_ping_icmp'
+if File::ALT_SEPARATOR
+  require 'win32/security'
+  require 'windows/system_info'
+  include Windows::SystemInfo
+
+  if windows_version >= 6 && Win32::Security.elevated_security?
+    require 'test_net_ping_icmp'
+  end
+else
+  if Process.euid == 0
+    require 'test_net_ping_icmp'
+  end
 end
 
-if Config::CONFIG['host_os'] =~ /mswin|win32|dos|cygwin|mingw/i &&
-  RUBY_PLATFORM != 'java'
-then
+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.4.0', Net::Ping::VERSION)
+    assert_equal('1.4.1', Net::Ping::VERSION)
   end
 end
+
+FakeWeb.allow_net_connect = false

data/test/test_net_ping_http.rb

@@ -12,7 +12,16 @@ require 'net/ping/http'
 
 class TC_Net_Ping_HTTP < Test::Unit::TestCase
   def setup
-    @uri  = 'http://www.google.com/index.html'
+    @uri = 'http://www.google.com/index.html'
+    @uri_https = 'https://encrypted.google.com'
+
+    FakeWeb.register_uri(:get, @uri, :body => "PONG")
+    FakeWeb.register_uri(:get, @uri_https, :body => "PONG")
+    FakeWeb.register_uri(:get, "http://jigsaw.w3.org/HTTP/300/302.html", 
+                         :body => "PONG",
+                         :location => "#{@uri}",
+                         :status => ["302", "Found"])
+
     @http = Net::Ping::HTTP.new(@uri, 80, 30)
     @bad  = Net::Ping::HTTP.new('http://www.blabfoobarurghxxxx.com') # One hopes not
   end
@@ -150,13 +159,13 @@ class TC_Net_Ping_HTTP < Test::Unit::TestCase
   end
 
   test 'ping against https site defaults to port 443' do
-    @http = Net::Ping::HTTP.new("https://encrypted.google.com/")
+    @http = Net::Ping::HTTP.new(@uri_https)
     assert_equal(443, @http.port)
   end
 
   # This will generate a warning. Nothing I can do about it.
   test 'ping against https site works as expected' do
-    @http = Net::Ping::HTTP.new("https://encrypted.google.com/")
+    @http = Net::Ping::HTTP.new(@uri_https)
     assert_true(@http.ping)
   end
 

data/test/test_net_ping_icmp.rb

@@ -12,115 +12,105 @@ require 'test/unit'
 require 'net/ping/icmp'
 include Net
 
-unless Process.euid == 0
-   raise "The test:icmp task must be run with root privileges"
+if File::ALT_SEPARATOR
+  require 'win32/security'
+  require 'windows/system_info'
+  include Windows::SystemInfo
+
+  if windows_version >= 6 && !Win32::Security.elevated_security?
+    raise "The test:icmp task must be run with elevated security rights"
+  end
+else
+  unless Process.euid == 0
+    raise "The test:icmp task must be run with root privileges"
+  end
 end
 
 class TC_PingICMP < Test::Unit::TestCase
-   def self.startup
-      @@one_click = Config::CONFIG['host_os'] == 'mswin32'
-   end
-   
-   def setup
-      @host = "www.ruby-lang.org"
-      @icmp = Ping::ICMP.new(@host)
-   end
-
-   def test_ping
-      assert_respond_to(@icmp, :ping)
-      
-      omit_if(@@one_click, 'Unreliable socket library')
-
-      assert_nothing_raised{ @icmp.ping }
-      assert_nothing_raised{ @icmp.ping(@host) }
-   end
-
-   def test_ping_aliases_basic
-      assert_respond_to(@icmp, :ping?)
-      assert_respond_to(@icmp, :pingecho)
-
-      omit_if(@@one_click, 'Unreliable socket library')
-
-      assert_nothing_raised{ @icmp.ping? }
-      assert_nothing_raised{ @icmp.ping?(@host) }
-   end
-
-   def test_ping_returns_boolean
-      omit_if(@@one_click, 'Unreliable socket library')
-      assert_boolean(@icmp.pingecho)
-      assert_boolean(@icmp.pingecho(@host))
-   end
-   
-   def test_ping_expected_failure
-      omit_if(@@one_click, 'Unreliable socket library')
-      assert_false(Ping::ICMP.new('bogus').ping?)
-      assert_false(Ping::ICMP.new('http://www.asdfhjklasdfhlkj.com').ping?)      
-   end
-
-   def test_bind
-      omit_if(@@one_click, 'Unreliable socket library')
-      assert_respond_to(@icmp, :bind)
-      assert_nothing_raised{ @icmp.bind(Socket.gethostname) }
-      assert_nothing_raised{ @icmp.bind(Socket.gethostname, 80) }
-   end
-
-   def test_duration
-      omit_if(@@one_click, 'Unreliable socket library')
-      assert_nothing_raised{ @icmp.ping }
-      assert_respond_to(@icmp, :duration)
-      assert_kind_of(Float, @icmp.duration)
-   end
-
-   def test_host
-      assert_respond_to(@icmp, :host)
-      assert_respond_to(@icmp, :host=)
-      assert_equal('www.ruby-lang.org', @icmp.host)
-   end
-
-   def test_port
-      assert_respond_to(@icmp, :port)
-      assert_equal(nil, @icmp.port)
-   end
-
-   def test_timeout
-      assert_respond_to(@icmp, :timeout)
-      assert_respond_to(@icmp, :timeout=)
-      assert_equal(5, @icmp.timeout)
-   end
-
-   def test_exception
-      assert_respond_to(@icmp, :exception)
-      omit_if(@@one_click, 'Unreliable socket library')
-      assert_nothing_raised{ @icmp.ping }
-      assert_nil(@icmp.exception)
-   end
-
-   def test_warning
-      assert_respond_to(@icmp, :warning)
-   end
-
-   def test_data_size_get
-      assert_respond_to(@icmp, :data_size)
-      assert_equal(56, @icmp.data_size)
-   end
-
-   def test_data_size_set
-      assert_respond_to(@icmp, :data_size=)
-      assert_nothing_raised{ @icmp.data_size = 22 }
-   end
-
-   def test_odd_data_size_ok
-      assert_nothing_raised{ @icmp.data_size = 57 }
-      omit_if(@@one_click, 'Unreliable socket library')
-      assert_boolean(@icmp.ping)
-   end
-
-   def teardown
-      @host = nil
-      @icmp = nil
-   end
-   
-   def self.shutdown
-      @@one_click = nil      
-   end
+  def setup
+    @host = 'localhost'
+    @icmp = Ping::ICMP.new(@host)
+  end
+
+  def test_ping
+    assert_respond_to(@icmp, :ping)
+    assert_nothing_raised{ @icmp.ping }
+    assert_nothing_raised{ @icmp.ping(@host) }
+  end
+
+  def test_ping_aliases_basic
+    assert_respond_to(@icmp, :ping?)
+    assert_respond_to(@icmp, :pingecho)
+    assert_nothing_raised{ @icmp.ping? }
+    assert_nothing_raised{ @icmp.ping?(@host) }
+  end
+
+  def test_ping_returns_boolean
+    assert_boolean(@icmp.pingecho)
+    assert_boolean(@icmp.pingecho(@host))
+  end
+
+  def test_ping_expected_failure
+    assert_false(Ping::ICMP.new('bogus').ping?)
+    assert_false(Ping::ICMP.new('http://www.asdfhjklasdfhlkj.com').ping?)
+  end
+
+  def test_bind
+    assert_respond_to(@icmp, :bind)
+    assert_nothing_raised{ @icmp.bind(Socket.gethostname) }
+    assert_nothing_raised{ @icmp.bind(Socket.gethostname, 80) }
+  end
+
+  def test_duration
+    assert_nothing_raised{ @icmp.ping }
+    assert_respond_to(@icmp, :duration)
+    assert_kind_of(Float, @icmp.duration)
+  end
+
+  def test_host
+    assert_respond_to(@icmp, :host)
+    assert_respond_to(@icmp, :host=)
+    assert_equal('localhost', @icmp.host)
+  end
+
+  def test_port
+    assert_respond_to(@icmp, :port)
+    assert_equal(nil, @icmp.port)
+  end
+
+  def test_timeout
+    assert_respond_to(@icmp, :timeout)
+    assert_respond_to(@icmp, :timeout=)
+    assert_equal(5, @icmp.timeout)
+  end
+
+  def test_exception
+    assert_respond_to(@icmp, :exception)
+    assert_nothing_raised{ @icmp.ping }
+    assert_nil(@icmp.exception)
+  end
+
+  def test_warning
+    assert_respond_to(@icmp, :warning)
+  end
+
+  def test_data_size_get
+    assert_respond_to(@icmp, :data_size)
+    assert_equal(56, @icmp.data_size)
+  end
+
+  def test_data_size_set
+    assert_respond_to(@icmp, :data_size=)
+    assert_nothing_raised{ @icmp.data_size = 22 }
+  end
+
+  def test_odd_data_size_ok
+    assert_nothing_raised{ @icmp.data_size = 57 }
+    assert_boolean(@icmp.ping)
+  end
+
+  def teardown
+    @host = nil
+    @icmp = nil
+  end
 end

data/test/test_net_ping_tcp.rb

@@ -13,8 +13,8 @@ include Net
 
 class TC_PingTCP < Test::Unit::TestCase
   def setup
-    @host = 'www.ruby-lang.org'
-    @port = 'ftp'
+    @host = 'localhost'
+    @port = 22
     @tcp  = Ping::TCP.new(@host, @port)
   end
 
@@ -81,7 +81,7 @@ class TC_PingTCP < Test::Unit::TestCase
   def test_port
     assert_respond_to(@tcp, :port)
     assert_respond_to(@tcp, :port=)
-    assert_equal('ftp', @tcp.port)
+    assert_equal(22, @tcp.port)
   end
 
   def test_timeout

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-ping
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -07:00
+date: 2011-03-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,22 @@ dependencies:
         version: 2.1.2
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id002
 description: "    The net-ping library provides a ping interface for Ruby. It includes\n    separate TCP, HTTP, ICMP, UDP, WMI (for Windows) and external ping\n    classes.\n"
 email: djberg96@gmail.com
 executables: []