net-ping 1.2.0 → 1.2.1

data/CHANGES

@@ -1,3 +1,12 @@
+== 1.2.1 - 6-Apr-2007
+* For the Ping::External class, if a ping attempt results in 100% packet loss
+  it is now considered a failed ping, regardless of whether or not an error
+  was sent to stdout.
+* Fixed the Ping::External class for OS X.
+* Added a Rakefile. Installation and testing should now be run via Rake tasks.
+* Minor fix for the Ping::ICMP class where I had accidentally dup'd some
+  aliases. This was harmless, but did cause warnings with -w.
+
 == 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 

data/MANIFEST

@@ -1,25 +1,23 @@
-MANIFEST
-CHANGES
-README
-test.rb
-install.rb
-net-ping.gemspec
-
-examples/test_pingexternal.rb
-examples/test_pinghttp.rb
-examples/test_pingtcp.rb
-examples/test_pingudp.rb
-
-lib/net/ping.rb
-lib/net/ping/icmp.rb
-lib/net/ping/tcp.rb
-lib/net/ping/udp.rb
-lib/net/ping/http.rb
-lib/net/ping/external.rb
-
-test/tc_pingexternal.rb
-test/tc_pinghttp.rb
-test/tc_pingicmp.rb
-test/tc_pingtcp.rb
-test/tc_pingudp.rb
-test/ts_ping.rb
+* MANIFEST
+* CHANGES
+* Rakefile
+* README
+* test.rb
+* install.rb
+* net-ping.gemspec
+* examples/test_pingexternal.rb
+* examples/test_pinghttp.rb
+* examples/test_pingtcp.rb
+* examples/test_pingudp.rb
+* lib/net/ping.rb
+* lib/net/ping/icmp.rb
+* lib/net/ping/tcp.rb
+* lib/net/ping/udp.rb
+* lib/net/ping/http.rb
+* lib/net/ping/external.rb
+* test/tc_pingexternal.rb
+* test/tc_pinghttp.rb
+* test/tc_pingicmp.rb
+* test/tc_pingtcp.rb
+* test/tc_pingudp.rb
+* test/ts_ping.rb

data/README

@@ -7,12 +7,8 @@
      Net::Ping::External class.
 
 == Installation
-=== Manual Installation
-   ruby test.rb (optional)
-   ruby install.rb
-=== Gem Installation
-   ruby net-ping.gemspec
-   gem install net-ping-<version>.gem
+   rake test (optional)
+   rake install (standard) OR rake gem_install (gems)
 
 == Notes
    Please read the documentation.  Especially pay attention to the docs

data/Rakefile

@@ -0,0 +1,44 @@
+require 'rake'
+require 'rake/testtask'
+
+desc "Install the net-ping package without gems"
+task :install do
+   ruby 'install.rb'
+end
+
+desc "Create and install a net-ping gem"
+task :gem_install do
+   ruby 'net-ping.gemspec'
+   gem_file = Dir["*.gem"].first
+   sh "gem install #{gem_file}"
+end
+
+Rake::TestTask.new("test") do |t|
+   t.warning = true
+   t.test_files = FileList['test/ts_ping.rb']
+end
+
+Rake::TestTask.new("test_external") do |t|
+   t.warning = true
+   t.test_files = FileList['test/tc_pingexternal.rb']
+end
+
+Rake::TestTask.new("test_http") do |t|
+   t.warning = true
+   t.test_files = FileList['test/tc_pinghttp.rb']
+end
+
+Rake::TestTask.new("test_icmp") do |t|
+   t.warning = true
+   t.test_files = FileList['test/tc_pingicmp.rb']
+end
+
+Rake::TestTask.new("test_tcp") do |t|
+   t.warning = true
+   t.test_files = FileList['test/tc_pingtcp.rb']
+end
+
+Rake::TestTask.new("test_udp") do |t|
+   t.warning = true
+   t.test_files = FileList['test/tc_pingudp.rb']
+end

data/lib/net/ping/external.rb

@@ -18,7 +18,7 @@ module Net
          bool = false
          
          case RUBY_PLATFORM
-            when /linux|bsd/i
+            when /linux|bsd|osx|mach|darwin/i
                pstring += "-c 1 #{host}"
             when /solaris|sunos/i
                pstring += "#{host} 1"
@@ -65,7 +65,8 @@ module Net
                   no\ answer|
                   host\ unreachable|
                   could\ not\ find\ host|
-                  request\ timed\ out
+                  request\ timed\ out|
+                  100%\ packet\ loss
                /ix
                lines.each{ |e|
                   if regexp.match(e)

data/lib/net/ping/icmp.rb

@@ -158,9 +158,6 @@ module Net
          check = (check >> 16) + (check & 0xffff)
          return (~((check >> 16) + check) & 0xffff)
       end   
-
-      alias ping? ping
-      alias pingecho ping
    end
    
    # Alias for consistency with other ping related classes

data/lib/net/ping/ping.rb

@@ -3,7 +3,7 @@ require 'timeout'
 
 module Net
    class Ping
-      VERSION = '1.2.0'
+      VERSION = '1.2.1'
 
       # The host to ping.  In the case of Ping::HTTP, this is the URI.
       attr_accessor :host

data/test/tc_pingexternal.rb

@@ -1,15 +1,9 @@
-############################################
+#########################################################################
 # tc_pingexternal.rb
 #
-# Test case for the Net::PingExternal class
-############################################
-base = File.basename(Dir.pwd)
-
-if base == "test" || base =~ /net-pingsimple.*/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-end
-
+# Test case for the Net::PingExternal class. Run this via the 'test' or
+# 'test_external' rake task.
+#########################################################################
 require "test/unit"
 require "net/ping/external"
 include Net
@@ -23,16 +17,24 @@ class TC_PingExternal < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal("1.2.0", PingExternal::VERSION)
+      assert_equal("1.2.1", PingExternal::VERSION)
    end
    
    def test_ping
       assert_respond_to(@pe, :ping)
-      assert_respond_to(@pe, :ping?)
       assert_nothing_raised{ @pe.ping }
       assert_nothing_raised{ @pe.ping(@host) }
    end
 
+   def test_ping_aliases
+      assert_respond_to(@pe, :ping?)
+      assert_respond_to(@pe, :pingecho)
+      assert_nothing_raised{ @pe.ping? }
+      assert_nothing_raised{ @pe.ping?(@host) }
+      assert_nothing_raised{ @pe.pingecho }
+      assert_nothing_raised{ @pe.pingecho(@host) }
+   end
+
    def test_good_ping     
       assert_equal(true, @pe.ping?)
    end

data/test/tc_pinghttp.rb

@@ -1,15 +1,9 @@
-#########################################
+#################################################################################
 # tc_pinghttp.rb
 #
-# Test case for the Net::PingHTTP class.
-#########################################
-base = File.basename(Dir.pwd)
-
-if base == "test" || base =~ /net-pingsimple.*/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-end
-
+# Test case for the Net::PingHTTP class. This should be run via the 'test' or
+# 'test_http' test task.
+#################################################################################
 require "test/unit"
 require "net/ping/http"
 include Net
@@ -17,19 +11,24 @@ include Net
 class TC_PingHTTP < Test::Unit::TestCase
    def setup
       @uri  = "http://www.pragmaticprogrammer.com/index.html"
-      @http = Ping::HTTP.new(@uri)      
+      @http = Ping::HTTP.new(@uri, 80, 30)      
       @bad  = Ping::HTTP.new("http://www.blabfoobarurgh.com") # One hopes not
    end
 
    def test_version
-      assert_equal("1.2.0", PingHTTP::VERSION)
+      assert_equal("1.2.1", Ping::HTTP::VERSION)
    end
    
    def test_ping
       assert_respond_to(@http, :ping)
-      assert_respond_to(@http, :ping?)
       assert_nothing_raised{ @http.ping }
-      assert_raises(ArgumentError){ @http.ping(@host) }
+   end
+
+   def test_ping_aliases
+      assert_respond_to(@http, :ping?)
+      assert_respond_to(@http, :pingecho)
+      assert_nothing_raised{ @http.ping? }
+      assert_nothing_raised{ @http.pingecho }
    end
 
    def test_ping_success
@@ -61,7 +60,8 @@ class TC_PingHTTP < Test::Unit::TestCase
    def test_timeout
       assert_respond_to(@http, :timeout)
       assert_respond_to(@http, :timeout=)
-      assert_equal(5, @http.timeout)
+      assert_equal(30, @http.timeout)
+      assert_equal(5, @bad.timeout)
    end
 
    def test_exception

data/test/tc_pingicmp.rb

@@ -2,19 +2,17 @@
 # tc_pingicmp.rb
 #
 # Test case for the Net::PingICMP class.  You must run this test case
-# with root privileges on UNIX systems.
+# with root privileges on UNIX systems. This should be run via the
+# 'test' or 'test_icmp' Rake task.
 #######################################################################
-base = File.basename(Dir.pwd)
-
-if base == "test" || base =~ /net-pingsimple.*/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-end
-
 require "test/unit"
 require "net/ping/icmp"
 include Net
 
+unless Process.euid == 0
+   raise "The test_icmp task must be run with root privileges"
+end
+
 class TC_PingICMP < Test::Unit::TestCase
    def setup
       @host = "www.ruby-lang.org"
@@ -22,16 +20,24 @@ class TC_PingICMP < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal("1.2.0", PingICMP::VERSION)
+      assert_equal("1.2.1", PingICMP::VERSION)
    end
    
    def test_ping
       assert_respond_to(@icmp, :ping)
-      assert_respond_to(@icmp, :ping?)
       assert_nothing_raised{ @icmp.ping }
       assert_nothing_raised{ @icmp.ping(@host) }
    end
 
+   def test_ping_aliases
+      assert_respond_to(@icmp, :ping?)
+      assert_respond_to(@icmp, :pingecho)
+      assert_nothing_raised{ @icmp.ping? }
+      assert_nothing_raised{ @icmp.ping?(@host) }
+      assert_nothing_raised{ @icmp.pingecho }
+      assert_nothing_raised{ @icmp.pingecho(@host) }
+   end
+
    def test_bind
       assert_respond_to(@icmp, :bind)
       assert_nothing_raised{ @icmp.bind(Socket.gethostname) }
@@ -44,12 +50,6 @@ class TC_PingICMP < Test::Unit::TestCase
       assert_kind_of(Float, @icmp.duration)
    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=)

data/test/tc_pingtcp.rb

@@ -1,36 +1,38 @@
-#######################################
+#####################################################################
 # tc_pingtcp.rb
 #
-# Test case for the Net::PingTCP class
-#######################################
-base = File.basename(Dir.pwd)
-
-if base == "test" || base =~ /net-pingsimple.*/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-end
-
+# Test case for the Net::PingTCP class. This test should be run via
+# the 'test' or 'test_tcp' Rake task.
+#####################################################################
 require "test/unit"
 require "net/ping/tcp"
 include Net
 
 class TC_PingTCP < Test::Unit::TestCase
    def setup
-      @host  = "www.ruby-lang.org"
-      @tcp   = Ping::TCP.new(@host)
+      @host = "www.ruby-lang.org"
+      @tcp  = Ping::TCP.new(@host)
    end
 
    def test_version
-      assert_equal("1.2.0", PingTCP::VERSION, "Bad version constant")
+      assert_equal("1.2.1", PingTCP::VERSION)
    end
    
    def test_ping
       assert_respond_to(@tcp, :ping)
-      assert_respond_to(@tcp, :ping?)
       assert_nothing_raised{ @tcp.ping }
       assert_nothing_raised{ @tcp.ping(@host) }
    end
 
+   def test_ping_aliases
+      assert_respond_to(@tcp, :ping?)
+      assert_respond_to(@tcp, :pingecho)
+      assert_nothing_raised{ @tcp.ping? }
+      assert_nothing_raised{ @tcp.ping?(@host) }
+      assert_nothing_raised{ @tcp.pingecho }
+      assert_nothing_raised{ @tcp.pingecho(@host) }
+   end
+
    def test_ping_ecr_false
       msg = "+this test may fail depending on your network environment+"
       PingTCP.ecr = false
@@ -55,7 +57,7 @@ class TC_PingTCP < Test::Unit::TestCase
    def test_duration
       assert_nothing_raised{ @tcp.ping }
       assert_respond_to(@tcp, :duration)
-      assert_kind_of(Float, @tcp.duration)
+      assert_kind_of(Float, @tcp.duration, '+nil if the ping failed+')
    end
 
    def test_host

data/test/tc_pingudp.rb

@@ -1,18 +1,12 @@
 ################################################################
 # tc_pingudp.rb
 #
-# Test case for the Net::PingUDP class
+# Test case for the Net::Ping::UDP class. This should be run
+# via the 'test' or 'test_udp' Rake task.
 #
 # If someone could provide me a host where a udp ping actually
 # works, I would appreciate it. :)
 ################################################################
-base = File.basename(Dir.pwd)
-
-if base == "test" || base =~ /net-pingsimple.*/
-   Dir.chdir("..") if base == "test"
-   $LOAD_PATH.unshift(Dir.pwd + "/lib")
-end
-
 require "test/unit"
 require "net/ping/udp"
 include Net
@@ -24,16 +18,24 @@ class TC_PingUDP < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal("1.2.0", PingUDP::VERSION)
+      assert_equal("1.2.1", Ping::UDP::VERSION)
    end
    
    def test_ping
       assert_respond_to(@udp, :ping)
-      assert_respond_to(@udp, :ping?)
       assert_nothing_raised{ @udp.ping }
       assert_nothing_raised{ @udp.ping(@host) }
    end
 
+   def test_ping_aliases
+      assert_respond_to(@udp, :ping?)
+      assert_respond_to(@udp, :pingecho)
+      assert_nothing_raised{ @udp.ping? }
+      assert_nothing_raised{ @udp.ping?(@host) }
+      assert_nothing_raised{ @udp.pingecho }
+      assert_nothing_raised{ @udp.pingecho(@host) }
+   end
+
    def test_ping_standard
       assert_equal(false, @udp.ping?)
       assert_equal(false, @udp.exception.nil?, "Bad exception data")

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: net-ping
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2006-12-08 00:00:00 -07:00
+  version: 1.2.1
+date: 2007-04-06 00:00:00 -06:00
 summary: A ping interface for Ruby.
 require_paths: 
 - lib
@@ -34,6 +34,7 @@ files:
 - CHANGES
 - MANIFEST
 - README
+- Rakefile
 - test/tc_pingexternal.rb
 - test/tc_pinghttp.rb
 - test/tc_pingicmp.rb