net-ping 1.2.2 → 1.2.3

data/CHANGES

@@ -1,3 +1,13 @@
+== 1.2.3 - 13-Jan-2008
+* Fixed a bug in the checksum private method where it would die on odd data
+  sizes. Thanks go to Jake Douglas for the spot.
+* A Socket.get_sockaddr_in call in the Ping::ICMP class is no longer included
+  as part of the overall ping time. Thanks go again to Jake Douglas for
+  the spot.
+* Added data_size tests to the Ping::ICMP test suite.
+* Renamed and updated the test files. The test-unit 2.x gem is now a
+  prerequisite as a result.
+
 == 1.2.2 - 22-Jan-2008
 * Bug fix for Ping::External where it was not honoring the timeout value.
   Thanks go to Chris Morris for the spot and the patch.

data/MANIFEST

@@ -13,9 +13,9 @@
 * 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
+* test/test_net_ping_external.rb
+* test/test_net_ping_http.rb
+* test/test_net_ping_icmp.rb
+* test/test_net_ping_tcp.rb
+* test/test_net_ping_udp.rb
+* test/test_net_ping.rb

data/README

@@ -29,3 +29,8 @@
    The former has the advantage of being easier to remember and all inclusive,
    not to mention backwards compatible. The latter has the advantage of
    reducing your memory footprint.
+   
+== More documentation
+   If you installed this library via Rubygems, you can view the inline
+   documentation via ri or fire up 'gem server', and point your browser at
+   http://localhost:8808.

data/Rakefile

@@ -26,30 +26,36 @@ end
 
 Rake::TestTask.new("test") do |t|
    t.warning = true
-   t.test_files = FileList['test/ts_ping.rb']
+   t.verbose = true
+   t.test_files = FileList['test/test_net_ping.rb']
 end
 
 Rake::TestTask.new("test_external") do |t|
    t.warning = true
-   t.test_files = FileList['test/tc_pingexternal.rb']
+   t.verbose = true
+   t.test_files = FileList['test/test_net_ping_external.rb']
 end
 
 Rake::TestTask.new("test_http") do |t|
    t.warning = true
-   t.test_files = FileList['test/tc_pinghttp.rb']
+   t.verbose = true
+   t.test_files = FileList['test/test_net_ping_http.rb']
 end
 
 Rake::TestTask.new("test_icmp") do |t|
    t.warning = true
-   t.test_files = FileList['test/tc_pingicmp.rb']
+   t.verbose = true
+   t.test_files = FileList['test/test_net_ping_icmp.rb']
 end
 
 Rake::TestTask.new("test_tcp") do |t|
    t.warning = true
-   t.test_files = FileList['test/tc_pingtcp.rb']
+   t.verbose = true
+   t.test_files = FileList['test/test_net_ping_tcp.rb']
 end
 
 Rake::TestTask.new("test_udp") do |t|
    t.warning = true
-   t.test_files = FileList['test/tc_pingudp.rb']
-end
+   t.verbose = true
+   t.test_files = FileList['test/test_net_ping_udp.rb']
+end

data/lib/net/ping/http.rb

@@ -2,10 +2,11 @@ $LOAD_PATH.unshift File.dirname(__FILE__)
 require 'ping'
 require 'net/http'
 require 'uri'
+require 'rbconfig'
 
 # Force non-blocking Socket.getaddrinfo on Unix systems. Do not use on
 # Windows because it causes problems.
-unless RUBY_PLATFORM.match('mswin')
+unless Config::CONFIG['host_os'].match('mswin')
    require 'resolv-replace'
 end
 

data/lib/net/ping/icmp.rb

@@ -82,13 +82,13 @@ module Net
          checksum = checksum(msg)
          msg = [ICMP_ECHO, ICMP_SUBCODE, checksum, @pid, @seq, @data].pack(pstring)
 
-         start_time = Time.now
-
          begin
             saddr = Socket.pack_sockaddr_in(0, host)
          rescue Exception
 	         return bool
          end
+         
+         start_time = Time.now
 
          socket.send(msg, 0, saddr) # Send the message
 
@@ -152,7 +152,7 @@ module Net
          end
 
          if length % 2 > 0
-            check += msg[length-1, 1].unpack('C') << 8
+            check += msg[length-1, 1].unpack('C').first << 8
          end
 
          check = (check >> 16) + (check & 0xffff)

data/lib/net/ping/ping.rb

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

data/test/{ts_ping.rb → test_net_ping.rb}

@@ -1,18 +1,18 @@
 ######################################################################
-# ts_ping.rb
+# test_net_ping.rb
 #
 # Test suite for all the Ping subclasses.  Note that the PingICMP
 # class test won't be run unless this is run as a privileged process.
 ######################################################################
 $LOAD_PATH.unshift(Dir.pwd)
-$LOAD_PATH.unshift(Dir.pwd + "/lib")
-$LOAD_PATH.unshift(Dir.pwd + "/test")
+$LOAD_PATH.unshift(File.join(Dir.pwd, 'lib'))
+$LOAD_PATH.unshift(File.join(Dir.pwd, 'test'))
 
-require "tc_pingexternal"
-require "tc_pinghttp"
-require "tc_pingtcp"
-require "tc_pingudp"
+require "test_net_ping_external"
+require "test_net_ping_http"
+require "test_net_ping_tcp"
+require "test_net_ping_udp"
 
 if Process.euid == 0
-   require "tc_pingicmp"
+   require "test_net_ping_icmp"
 end

data/test/{tc_pingexternal.rb → test_net_ping_external.rb}

@@ -1,9 +1,12 @@
 #########################################################################
-# tc_pingexternal.rb
+# 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'
 include Net
@@ -17,7 +20,7 @@ class TC_PingExternal < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.2.2', PingExternal::VERSION)
+      assert_equal('1.2.3', PingExternal::VERSION)
    end
    
    def test_ping

data/test/{tc_pinghttp.rb → test_net_ping_http.rb}

@@ -1,9 +1,12 @@
 #################################################################################
-# tc_pinghttp.rb
+# test_net_ping_http.rb
 #
 # Test case for the Net::PingHTTP class. This should be run via the 'test' or
 # 'test_http' test task.
 #################################################################################
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
 require 'net/ping/http'
 include Net
@@ -16,7 +19,7 @@ class TC_PingHTTP < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.2.2', Ping::HTTP::VERSION)
+      assert_equal('1.2.3', Ping::HTTP::VERSION)
    end
    
    def test_ping

data/test/{tc_pingicmp.rb → test_net_ping_icmp.rb}

@@ -1,10 +1,13 @@
 #######################################################################
-# tc_pingicmp.rb
+# test_net_ping_icmp.rb
 #
 # Test case for the Net::PingICMP class.  You must run this test case
 # 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 'net/ping/icmp'
 include Net
@@ -20,7 +23,7 @@ class TC_PingICMP < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.2.2', PingICMP::VERSION)
+      assert_equal('1.2.3', PingICMP::VERSION)
    end
    
    def test_ping
@@ -29,13 +32,21 @@ class TC_PingICMP < Test::Unit::TestCase
       assert_nothing_raised{ @icmp.ping(@host) }
    end
 
-   def test_ping_aliases
+   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) }
-      assert_nothing_raised{ @icmp.pingecho }
-      assert_nothing_raised{ @icmp.pingecho(@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
@@ -77,6 +88,21 @@ class TC_PingICMP < Test::Unit::TestCase
       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

data/test/{tc_pingtcp.rb → test_net_ping_tcp.rb}

@@ -1,9 +1,12 @@
 #####################################################################
-# tc_pingtcp.rb
+# test_net_ping_tcp.rb
 #
 # 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 'net/ping/tcp'
 include Net
@@ -15,7 +18,7 @@ class TC_PingTCP < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.2.2', PingTCP::VERSION)
+      assert_equal('1.2.3', PingTCP::VERSION)
    end
    
    def test_ping

data/test/{tc_pingudp.rb → test_net_ping_udp.rb}

@@ -1,5 +1,5 @@
 ################################################################
-# tc_pingudp.rb
+# test_net_ping_udp.rb
 #
 # Test case for the Net::Ping::UDP class. This should be run
 # via the 'test' or 'test_udp' Rake task.
@@ -7,6 +7,9 @@
 # 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 'net/ping/udp'
 include Net
@@ -19,7 +22,7 @@ class TC_PingUDP < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.2.2', Ping::UDP::VERSION)
+      assert_equal('1.2.3', Ping::UDP::VERSION)
    end
    
    def test_ping

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ping
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-22 00:00:00 -07:00
+date: 2009-01-13 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.2
+    version: 
 description: A ping interface for Ruby. Includes TCP, HTTP, ICMP, UDP, and External ping interfaces.
 email: djberg96@gmail.com
 executables: []
@@ -24,22 +33,18 @@ extra_rdoc_files:
 - CHANGES
 - doc/ping.txt
 files: 
-- lib/net/CVS
 - lib/net/ping
 - lib/net/ping.rb
 - CHANGES
-- CVS
 - MANIFEST
 - Rakefile
 - README
-- test/CVS
-- test/tc_pingexternal.rb
-- test/tc_pinghttp.rb
-- test/tc_pingicmp.rb
-- test/tc_pingtcp.rb
-- test/tc_pingudp.rb
-- test/ts_ping.rb
-- lib/net/ping/CVS
+- test/test_net_ping.rb
+- test/test_net_ping_external.rb
+- test/test_net_ping_http.rb
+- test/test_net_ping_icmp.rb
+- test/test_net_ping_tcp.rb
+- test/test_net_ping_udp.rb
 - lib/net/ping/external.rb
 - lib/net/ping/http.rb
 - lib/net/ping/icmp.rb
@@ -69,9 +74,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: shards
-rubygems_version: 1.0.0
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A ping interface for Ruby.
 test_files: 
-- test/ts_ping.rb
+- test/test_net_ping.rb