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

data/lib/net/ping/wmi.rb

@@ -1,118 +1,118 @@
-require File.join(File.dirname(__FILE__), 'ping')
-require 'win32ole'
-
-# The Net module serves as a namespace only.
-#
-module Net
-   
-   # The Ping::WMI class encapsulates the Win32_PingStatus WMI class for
-   # MS Windows.
-   #
-   class Ping::WMI < Ping
-
-      PingStatus = Struct.new(
-         'PingStatus',
-         :address,
-         :buffer_size,
-         :no_fragmentation,
-         :primary_address_resolution_status,
-         :protocol_address,
-         :protocol_address_resolved,
-         :record_route,
-         :reply_inconsistency,
-         :reply_size,
-         :resolve_address_names,
-         :response_time,
-         :response_time_to_live,
-         :route_record,
-         :route_record_resolved,
-         :source_route,
-         :source_route_type,
-         :status_code,
-         :timeout,
-         :timestamp_record,
-         :timestamp_record_address,
-         :timestamp_record_address_resolved,
-         :timestamp_route,
-         :time_to_live,
-         :type_of_service
-      )
-
-      # Unlike the ping method for other Ping subclasses, this version returns
-      # a PingStatus struct which contains various bits of information about
-      # the results of the ping itself, such as response time.
-      #
-      # In addition, this version allows you to pass certain options that are
-      # then passed on to the underlying WQL query. See the MSDN documentation
-      # on Win32_PingStatus for details.
-      #
-      # Examples:
-      #
-      #  # Ping with no options
-      #  Ping::WMI.ping('www.perl.com')
-      #
-      #  # Ping with options
-      #  Ping::WMI.ping('www.perl.com', :BufferSize => 64, :NoFragmentation => true)
-      #--
-      # The PingStatus struct is a wrapper for the Win32_PingStatus WMI class.
-      #
-      def ping(host = @host, options = {})
-         super(host)
-
-         lhost = Socket.gethostname
-
-         cs = "winmgmts:{impersonationLevel=impersonate}!//#{lhost}/root/cimv2"
-         wmi = WIN32OLE.connect(cs)
-
-         query = "select * from win32_pingstatus where address = '#{host}'"
-
-         unless options.empty?
-            options.each{ |key, value|
-               if value.is_a?(String)
-                  query << " and #{key} = '#{value}'"
-               else
-                  query << " and #{key} = #{value}"
-               end
-            }
-         end
-
-         status = Struct::PingStatus.new
-
-         wmi.execquery(query).each{ |obj|
-            status.address                           = obj.Address
-            status.buffer_size                       = obj.BufferSize
-            status.no_fragmentation                  = obj.NoFragmentation
-            status.primary_address_resolution_status = obj.PrimaryAddressResolutionStatus
-            status.protocol_address                  = obj.ProtocolAddress
-            status.protocol_address_resolved         = obj.ProtocolAddressResolved
-            status.record_route                      = obj.RecordRoute 
-            status.reply_inconsistency               = obj.ReplyInconsistency
-            status.reply_size                        = obj.ReplySize
-            status.resolve_address_names             = obj.ResolveAddressNames
-            status.response_time                     = obj.ResponseTime
-            status.response_time_to_live             = obj.ResponseTimeToLive
-            status.route_record                      = obj.RouteRecord
-            status.route_record_resolved             = obj.RouteRecordResolved
-            status.source_route                      = obj.SourceRoute
-            status.source_route_type                 = obj.SourceRouteType
-            status.status_code                       = obj.StatusCode
-            status.timeout                           = obj.Timeout
-            status.timestamp_record                  = obj.TimeStampRecord
-            status.timestamp_record_address          = obj.TimeStampRecordAddress
-            status.timestamp_record_address_resolved = obj.TimeStampRecordAddressResolved
-            status.timestamp_route                   = obj.TimeStampRoute
-            status.time_to_live                      = obj.TimeToLive
-            status.type_of_service                   = obj.TypeOfService
-         }
-
-         status.freeze # Read-only data
-      end      
-
-      # Unlike Net::Ping::WMI#ping, this method returns true or false to
-      # indicate whether or not the ping was successful.
-      #
-      def ping?(host = @host, options = {})
-         ping(host, options).status_code == 0
-      end
-   end   
-end
+require File.join(File.dirname(__FILE__), 'ping')
+require 'win32ole'
+
+# The Net module serves as a namespace only.
+#
+module Net
+   
+   # The Ping::WMI class encapsulates the Win32_PingStatus WMI class for
+   # MS Windows.
+   #
+   class Ping::WMI < Ping
+
+      PingStatus = Struct.new(
+         'PingStatus',
+         :address,
+         :buffer_size,
+         :no_fragmentation,
+         :primary_address_resolution_status,
+         :protocol_address,
+         :protocol_address_resolved,
+         :record_route,
+         :reply_inconsistency,
+         :reply_size,
+         :resolve_address_names,
+         :response_time,
+         :response_time_to_live,
+         :route_record,
+         :route_record_resolved,
+         :source_route,
+         :source_route_type,
+         :status_code,
+         :timeout,
+         :timestamp_record,
+         :timestamp_record_address,
+         :timestamp_record_address_resolved,
+         :timestamp_route,
+         :time_to_live,
+         :type_of_service
+      )
+
+      # Unlike the ping method for other Ping subclasses, this version returns
+      # a PingStatus struct which contains various bits of information about
+      # the results of the ping itself, such as response time.
+      #
+      # In addition, this version allows you to pass certain options that are
+      # then passed on to the underlying WQL query. See the MSDN documentation
+      # on Win32_PingStatus for details.
+      #
+      # Examples:
+      #
+      #  # Ping with no options
+      #  Ping::WMI.ping('www.perl.com')
+      #
+      #  # Ping with options
+      #  Ping::WMI.ping('www.perl.com', :BufferSize => 64, :NoFragmentation => true)
+      #--
+      # The PingStatus struct is a wrapper for the Win32_PingStatus WMI class.
+      #
+      def ping(host = @host, options = {})
+         super(host)
+
+         lhost = Socket.gethostname
+
+         cs = "winmgmts:{impersonationLevel=impersonate}!//#{lhost}/root/cimv2"
+         wmi = WIN32OLE.connect(cs)
+
+         query = "select * from win32_pingstatus where address = '#{host}'"
+
+         unless options.empty?
+            options.each{ |key, value|
+               if value.is_a?(String)
+                  query << " and #{key} = '#{value}'"
+               else
+                  query << " and #{key} = #{value}"
+               end
+            }
+         end
+
+         status = Struct::PingStatus.new
+
+         wmi.execquery(query).each{ |obj|
+            status.address                           = obj.Address
+            status.buffer_size                       = obj.BufferSize
+            status.no_fragmentation                  = obj.NoFragmentation
+            status.primary_address_resolution_status = obj.PrimaryAddressResolutionStatus
+            status.protocol_address                  = obj.ProtocolAddress
+            status.protocol_address_resolved         = obj.ProtocolAddressResolved
+            status.record_route                      = obj.RecordRoute 
+            status.reply_inconsistency               = obj.ReplyInconsistency
+            status.reply_size                        = obj.ReplySize
+            status.resolve_address_names             = obj.ResolveAddressNames
+            status.response_time                     = obj.ResponseTime
+            status.response_time_to_live             = obj.ResponseTimeToLive
+            status.route_record                      = obj.RouteRecord
+            status.route_record_resolved             = obj.RouteRecordResolved
+            status.source_route                      = obj.SourceRoute
+            status.source_route_type                 = obj.SourceRouteType
+            status.status_code                       = obj.StatusCode
+            status.timeout                           = obj.Timeout
+            status.timestamp_record                  = obj.TimeStampRecord
+            status.timestamp_record_address          = obj.TimeStampRecordAddress
+            status.timestamp_record_address_resolved = obj.TimeStampRecordAddressResolved
+            status.timestamp_route                   = obj.TimeStampRoute
+            status.time_to_live                      = obj.TimeToLive
+            status.type_of_service                   = obj.TypeOfService
+         }
+
+         status.freeze # Read-only data
+      end      
+
+      # Unlike Net::Ping::WMI#ping, this method returns true or false to
+      # indicate whether or not the ping was successful.
+      #
+      def ping?(host = @host, options = {})
+         ping(host, options).status_code == 0
+      end
+   end   
+end

data/net-ping.gemspec

@@ -1,38 +1,43 @@
-require 'rubygems'
-require 'rbconfig'
-
-Gem::Specification.new do |gem|
-  gem.name      = 'net-ping'
-  gem.version   = '1.4.1'
-  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.add_development_dependency('test-unit', '>= 2.1.2')
-  gem.add_development_dependency('fakeweb', '>= 1.3.0')
-
-  # These dependencies are for Net::Ping::External
-  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')
-    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
-end
+require 'rubygems'
+require 'rbconfig'
+
+Gem::Specification.new do |spec|
+  spec.name      = 'net-ping'
+  spec.version   = '1.5.3'
+  spec.license   = 'Artistic 2.0'
+  spec.author    = 'Daniel J. Berger'
+  spec.email     = 'djberg96@gmail.com'
+  spec.homepage  = 'http://www.rubyforge.org/projects/shards'
+  spec.summary   = 'A ping interface for Ruby.'
+  spec.test_file = 'test/test_net_ping.rb'
+  spec.files     = Dir['**/*'].reject{ |f| f.include?('git') }
+
+  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('fakeweb', '>= 1.3.0')
+  spec.add_development_dependency('fakeldap', '~> 0.0.1')
+
+  if File::ALT_SEPARATOR && RUBY_PLATFORM != 'java'
+    spec.platform = Gem::Platform::CURRENT
+    spec.platform.cpu = 'universal'
+    spec.platform.version = nil
+
+    # Used primarily for icmp pings.
+    spec.add_development_dependency('win32-security', '>= 1.0.8')
+
+    if RUBY_VERSION.to_f < 1.9
+      spec.add_dependency('win32-open3', '>= 0.3.1')
+    end
+  end
+
+  spec.description = <<-EOF
+    The net-ping library provides a ping interface for Ruby. It includes
+    separate TCP, HTTP, LDAP, ICMP, UDP, WMI (for Windows) and external ping
+    classes.
+  EOF
+end

data/test/test_net_ping.rb

@@ -1,37 +1,37 @@
-######################################################################
-# test_net_ping.rb
-#
-# Test suite for all the Ping subclasses. Note that the Ping::ICMP
-# class test won't be run unless this is run as a privileged process.
-######################################################################
-require 'test_net_ping_external'
-require 'test_net_ping_http'
-require 'test_net_ping_tcp'
-require 'test_net_ping_udp'
-require 'fakeweb'
-
-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 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.1', Net::Ping::VERSION)
-  end
-end
-
-FakeWeb.allow_net_connect = false
+######################################################################
+# test_net_ping.rb
+#
+# Test suite for all the Ping subclasses. Note that the Ping::ICMP
+# class test won't be run unless this is run as a privileged process.
+######################################################################
+require 'test_net_ping_external'
+require 'test_net_ping_http'
+require 'test_net_ping_tcp'
+require 'test_net_ping_udp'
+require 'fakeweb'
+
+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 File::ALT_SEPARATOR
+  require 'test_net_ping_wmi'
+end
+
+class TC_Net_Ping < Test::Unit::TestCase
+  def test_net_ping_version
+    assert_equal('1.5.2', Net::Ping::VERSION)
+  end
+end
+
+FakeWeb.allow_net_connect = false

data/test/test_net_ping_external.rb

@@ -1,121 +1,128 @@
-#########################################################################
-# test_net_ping_external.rb
-#
-# Test case for the Net::PingExternal class. Run this via the 'test' or
-# 'test:external' rake task.
-#########################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
-require 'net/ping/external'
-
-class TC_Net_Ping_External < Test::Unit::TestCase
-  def setup
-    @host  = 'www.ruby-lang.org'
-    @bogus = 'foo.bar.baz'
-    @pe    = Net::Ping::External.new(@host)
-    @bad   = Net::Ping::External.new(@bogus)
-  end
-
-  test "ping basic functionality" do
-    assert_respond_to(@pe, :ping)
-  end
-
-  test "ping with no arguments" do
-    assert_nothing_raised{ @pe.ping }
-  end
-
-  test "ping accepts a hostname" do
-    assert_nothing_raised{ @pe.ping(@host) }
-  end
-
-  test "ping returns a boolean" do
-    assert_boolean(@pe.ping)
-    assert_boolean(@bad.ping)
-  end
-
-  test "ping? alias" do
-    assert_respond_to(@pe, :ping?)
-    assert_alias_method(@pe, :ping?, :ping)
-  end
-
-  test "pingecho alias" do
-    assert_nothing_raised{ @pe.pingecho }
-    assert_alias_method(@pe, :pingecho, :ping)
-  end
-
-  test "pinging a good host returns true" do
-    assert_true(@pe.ping?)
-  end
-
-  test "pinging a bogus host returns false" do
-    assert_false(@bad.ping?)
-  end
-
-  test "duration basic functionality" do
-    assert_nothing_raised{ @pe.ping }
-    assert_respond_to(@pe, :duration)
-    assert_kind_of(Float, @pe.duration)
-  end
-
-  test "host getter basic functionality" do
-    assert_respond_to(@pe, :host)
-    assert_equal('www.ruby-lang.org', @pe.host)
-  end
-
-  test "host setter basic functionality" do
-    assert_respond_to(@pe, :host=)
-    assert_nothing_raised{ @pe.host = @bad }
-    assert_equal(@bad, @pe.host)
-  end
-
-  test "port getter basic functionality" do
-    assert_respond_to(@pe, :port)
-    assert_equal(7, @pe.port)
-  end
-
-  test "port setter basic functionality" do
-    assert_respond_to(@pe, :port=)
-    assert_nothing_raised{ @pe.port = 90 }
-    assert_equal(90, @pe.port)
-  end
-
-  test "timeout getter basic functionality" do
-    assert_respond_to(@pe, :timeout)
-    assert_equal(5, @pe.timeout)
-  end
-
-  test "timeout setter basic functionality" do
-    assert_respond_to(@pe, :timeout=)
-    assert_nothing_raised{ @pe.timeout = 30 }
-    assert_equal(30, @pe.timeout)
-  end
-
-  test "exception method basic functionality" do
-    assert_respond_to(@pe, :exception)
-    assert_nil(@pe.exception)
-  end
-
-  test "pinging a bogus host stores exception data" do
-    assert_nothing_raised{ @bad.ping? }
-    assert_not_nil(@bad.exception)
-  end
-
-  test "pinging a good host results in no exception data" do
-    assert_nothing_raised{ @pe.ping }
-    assert_nil(@pe.exception)
-  end
-
-  test "warning basic functionality" do
-    assert_respond_to(@pe, :warning)
-    assert_nil(@pe.warning)
-  end
-
-  def teardown
-    @host  = nil
-    @bogus = nil
-    @pe    = nil
-    @bad   = nil
-  end
-end
+#########################################################################
+# test_net_ping_external.rb
+#
+# Test case for the Net::PingExternal class. Run this via the 'test' or
+# 'test:external' rake task.
+#########################################################################
+require 'rubygems'
+gem 'test-unit'
+
+require 'test/unit'
+require 'net/ping/external'
+
+class TC_Net_Ping_External < Test::Unit::TestCase
+  def setup
+    @host  = 'localhost'
+    @bogus = 'foo.bar.baz'
+    @pe    = Net::Ping::External.new(@host)
+    @bad   = Net::Ping::External.new(@bogus)
+  end
+
+  test "ping basic functionality" do
+    assert_respond_to(@pe, :ping)
+  end
+
+  test "ping with no arguments" do
+    assert_nothing_raised{ @pe.ping }
+  end
+
+  test "ping accepts a hostname" do
+    assert_nothing_raised{ @pe.ping(@host) }
+  end
+
+  test "ping returns a boolean" do
+    assert_boolean(@pe.ping)
+    assert_boolean(@bad.ping)
+  end
+
+  test "ping? alias" do
+    assert_respond_to(@pe, :ping?)
+    assert_alias_method(@pe, :ping?, :ping)
+  end
+
+  test "pingecho alias" do
+    assert_nothing_raised{ @pe.pingecho }
+    assert_alias_method(@pe, :pingecho, :ping)
+  end
+
+  test "pinging a good host returns true" do
+    assert_true(@pe.ping?)
+  end
+
+  test "pinging a bogus host returns false" do
+    assert_false(@bad.ping?)
+  end
+
+  test "duration basic functionality" do
+    assert_nothing_raised{ @pe.ping }
+    assert_respond_to(@pe, :duration)
+    assert_kind_of(Float, @pe.duration)
+  end
+
+  test "duration is unset if a bad ping follows a good ping" do
+    assert_nothing_raised{ @pe.ping }
+    assert_not_nil(@pe.duration)
+    assert_false(@pe.ping?(@bogus))
+    assert_nil(@pe.duration)
+  end
+
+  test "host getter basic functionality" do
+    assert_respond_to(@pe, :host)
+    assert_equal('localhost', @pe.host)
+  end
+
+  test "host setter basic functionality" do
+    assert_respond_to(@pe, :host=)
+    assert_nothing_raised{ @pe.host = @bad }
+    assert_equal(@bad, @pe.host)
+  end
+
+  test "port getter basic functionality" do
+    assert_respond_to(@pe, :port)
+    assert_equal(7, @pe.port)
+  end
+
+  test "port setter basic functionality" do
+    assert_respond_to(@pe, :port=)
+    assert_nothing_raised{ @pe.port = 90 }
+    assert_equal(90, @pe.port)
+  end
+
+  test "timeout getter basic functionality" do
+    assert_respond_to(@pe, :timeout)
+    assert_equal(5, @pe.timeout)
+  end
+
+  test "timeout setter basic functionality" do
+    assert_respond_to(@pe, :timeout=)
+    assert_nothing_raised{ @pe.timeout = 30 }
+    assert_equal(30, @pe.timeout)
+  end
+
+  test "exception method basic functionality" do
+    assert_respond_to(@pe, :exception)
+    assert_nil(@pe.exception)
+  end
+
+  test "pinging a bogus host stores exception data" do
+    assert_nothing_raised{ @bad.ping? }
+    assert_not_nil(@bad.exception)
+  end
+
+  test "pinging a good host results in no exception data" do
+    assert_nothing_raised{ @pe.ping }
+    assert_nil(@pe.exception)
+  end
+
+  test "warning basic functionality" do
+    assert_respond_to(@pe, :warning)
+    assert_nil(@pe.warning)
+  end
+
+  def teardown
+    @host  = nil
+    @bogus = nil
+    @pe    = nil
+    @bad   = nil
+  end
+end