net-ping 1.6.1 → 1.6.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzI5NjJkYzk2MzJmZjlhYzg1NWM1MTU1Y2M2NWIyNDczMDBjZTcwNQ==
+    MWEzZmUxOTg3ZmRmY2E1MDA5ZmNmZTdlMzk1ZGQ2NTM1NTkyMTM5Ng==
   data.tar.gz: !binary |-
-    ZWNmMzY1MzJkYTk5MmFmMWI0NDQ3Y2NiNTZhYjkwZTIzYjMxYTVmNw==
+    YzcwNTFlYzg0MzRlZjJhNjg2ZGMwYzg0ODBlMzQ0NTlhNTNhMjA5YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTBhYTQ3NjgyNWJhZWY0NzdlZThlY2M1YjE0MzIzNjQ0ZTQ2M2Y4OWZhNTY2
-    MWMzZmYwMTcxYjJmMDFmNjk3YWI0Mzk0NDlkNmUxOGZhZGFhZmFkMzJhZWNk
-    ZDVjNjNiZTE3OTAxZGQ3NDEyNTRlMjFkM2JmOTg2ZTA1ZmNkMWY=
+    MzQ3NDg1MzEzNTJiNDdlMjgxNzZiMDlhZDI5MzM0MzdmMDllOGU3NTBhYjgy
+    MDM1ZDU1MWJiMzYwYjZmZGU3NDAxZWQ4YzY1YzBlODkyNWRiMWExOTU4MjA2
+    MDkwMmQ0NDk1M2VjYWNlMDZlMGUyODM2NTUzNmFmNDAxYTY1Nzg=
   data.tar.gz: !binary |-
-    MjdjMGEzZDM1YzAwMWVmN2M1YWQwYjY3MTMzNjViMGM0Yjc4ZWM4ODk4MzY0
-    MDc2MzI1NGI2NzU1ODZiMGExMGE3ZTYwY2RjZjEzYzk0MWE4ZWNkM2FkZDBh
-    MDRlMjIzYTA2ZDU4ZGYyMmU4MDM3ZDM3MWNlN2Y1OWJlZjEyMTU=
+    ZGMxYjU3MjI3ZjM1OGNmMzc2NTg4NGI0YWI4MTEzNzU2YWJlOWI3OThjN2Zi
+    OWEyYTEyNTdlM2I4NjFiYmUwYWJjZWNmYTE3ZmNhMThlMmViNDY5NjIxZGNl
+    MTJmYjc0YjU5MTBhNjlhN2QwOWM1NDYwM2VhNjg1MzBkZjc0YTI=

data/CHANGES

@@ -1,3 +1,11 @@
+== 1.6.2 - 8-Aug-2013
+* Fixed a bug in the ICMP ping helper module. Thanks go to Yuichi
+  Tsunematsu for the spot.
+* The win32-security library is not just a development dependency. Thanks
+  again go to Yuichi Tsunematsu for the spot.
+* Updated the icmp ping tests.
+* Updated the gemspec for MS Windows.
+
 == 1.6.1 - 17-Jul-2013
 * Automatically set the scheme to "http" if not present when performing
   HTTP pings. See https://bugs.ruby-lang.org/issues/8645 for an issue

data/README

@@ -1,52 +1,54 @@
 == Description
-   A collection of classes that provide different ways to ping computers.
+  A collection of classes that provide different ways to ping computers.
 
 == Prerequisites
-   The win32-open3 (1.8.x) and windows-pr libraries are required on
-   MS Windows when using the Net::Ping::External class unless you're
-   using JRuby.
+  * ffi
+  * win32-security (MS Windows only)
+  * win32-open3 (Ruby 1.8.x on MS Windows only. Not required for JRuby)
+  * fakeweb (test only)
+  * test-unit (test only)
 
-   JRuby users should use 1.6.7 or later.
+  JRuby users should use JRuby 1.6.7 or later.
 
 == Installation
-   gem install net-ping
+  gem install net-ping
 
 == Notes
-   Please read the documentation under the 'doc' directory. Especially pay
-   attention to the documentation pertaining to ECONNREFUSED and TCP pings.
+  Please read the documentation under the 'doc' directory. Especially pay
+  attention to the documentation pertaining to ECONNREFUSED and TCP pings.
 
-   Also note the documentation regarding down hosts.
+  Also note the documentation regarding down hosts.
    
-   You do not need win32-open3 with Ruby 1.9.x. The open3 library that ships
-   as part of the Ruby standard library should work.
+  You do not need win32-open3 with Ruby 1.9.x. The open3 library that ships
+  as part of the Ruby standard library should work.
 
 == How to require net-ping
-   You can do either this:
+  You can do either this:
 
-   require 'net/ping'
+  require 'net/ping'
 
-   In which case you will get Net::Ping and all of its subclasses. Or,
-   you can load individual subclasses like this:
+  In which case you will get Net::Ping and all of its subclasses. Or,
+  you can load individual subclasses like this:
 
-   require 'net/ping/tcp'
+  require 'net/ping/tcp'
 
-   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.
+  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.
    
 == Known Issues
-   Older versions of Ruby 1.9.x may not work with UDP pings.
+  Older versions of Ruby 1.9.x may not work with UDP pings.
 
-   Older versions of JRuby will return false positives in UDP pings
-   because of an incorrect error class being raised. See JRuby-4896.
+  Older versions of JRuby will return false positives in UDP pings
+  because of an incorrect error class being raised. See JRuby-4896.
 
-   JRuby 1.6.7 or later is required for external pings because of a bug
-   in earlier versions with open3 and stream handling.
+  JRuby 1.6.7 or later is required for external pings because of a bug
+  in earlier versions with open3 and stream handling.
 
 == License
-   Artistic 2.0
+  Artistic 2.0
    
 == 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.
+  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/lib/net/ping/helper.rb

@@ -15,16 +15,18 @@ module Windows
 
   private
 
-  def LOWORD(l)
-    l & 0xffff
-  end
-
-  def LOBYTE(w)
-    w & 0xff
-  end
-
-  def HIBYTE(w)
-    w >> 8
+  class << self
+    def LOWORD(l)
+      l & 0xffff
+    end
+
+    def LOBYTE(w)
+      w & 0xff
+    end
+
+    def HIBYTE(w)
+      w >> 8
+    end
   end
 
   module_function :version

data/lib/net/ping/ping.rb

@@ -10,7 +10,7 @@ module Net
    #
    class Ping
       # The version of the net-ping library.
-      VERSION = '1.6.1'
+      VERSION = '1.6.2'
 
       # 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 |spec|
   spec.name      = 'net-ping'
-  spec.version   = '1.6.1'
+  spec.version   = '1.6.2'
   spec.license   = 'Artistic 2.0'
   spec.author    = 'Daniel J. Berger'
   spec.email     = 'djberg96@gmail.com'
@@ -21,15 +21,16 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('fakeweb', '>= 1.3.0')
   spec.add_development_dependency('rake')
 
-  if File::ALT_SEPARATOR && RUBY_PLATFORM != 'java'
-    spec.platform = Gem::Platform::CURRENT
-    spec.platform.cpu = 'universal'
+  if File::ALT_SEPARATOR
+    require 'rbconfig'
+    arch = RbConfig::CONFIG['build_os']
+    spec.platform = Gem::Platform.new(['universal', arch])
     spec.platform.version = nil
 
-    # Used primarily for icmp pings.
-    spec.add_development_dependency('win32-security', '>= 0.2.0')
+    # Used for icmp pings.
+    spec.add_dependency('win32-security', '>= 0.2.0')
 
-    if RUBY_VERSION.to_f < 1.9
+    if RUBY_VERSION.to_f < 1.9 && RUBY_PLATFORM != 'java'
       spec.add_dependency('win32-open3', '>= 0.3.1')
     end
   end

data/test/test_net_ping.rb

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

data/test/test_net_ping_icmp.rb

@@ -7,14 +7,11 @@
 #######################################################################
 require 'test-unit'
 require 'net/ping/icmp'
-include Net
 
 if File::ALT_SEPARATOR
   require 'win32/security'
-  require 'windows/system_info'
-  include Windows::SystemInfo
 
-  if windows_version >= 6 && !Win32::Security.elevated_security?
+  unless Win32::Security.elevated_security?
     raise "The test:icmp task must be run with elevated security rights"
   end
 else
@@ -26,86 +23,111 @@ end
 class TC_PingICMP < Test::Unit::TestCase
   def setup
     @host = '127.0.0.1' # 'localhost'
-    @icmp = Ping::ICMP.new(@host)
+    @icmp = Net::Ping::ICMP.new(@host)
   end
 
-  def test_ping
+  test "icmp ping basic functionality" do
     assert_respond_to(@icmp, :ping)
     assert_nothing_raised{ @icmp.ping }
+  end
+
+  test "icmp ping accepts a host" do
     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) }
+  test "icmp ping returns a boolean" do
+    assert_boolean(@icmp.ping)
+    assert_boolean(@icmp.ping(@host))
   end
 
-  def test_ping_returns_boolean
-    assert_boolean(@icmp.pingecho)
-    assert_boolean(@icmp.pingecho(@host))
+  test "icmp ping of local host is successful" do
+    assert_true(Net::Ping::ICMP.new(@host).ping?)
+    assert_true(Net::Ping::ICMP.new('192.168.0.1').ping?)
   end
 
-  def test_ping_expected_success
-    assert_true(Ping::ICMP.new(@host).ping?)
+  test "ping? is an alias for ping" do
+    assert_respond_to(@icmp, :ping?)
+    assert_alias_method(@icmp, :ping?, :ping)
   end
 
-  def test_ping_expected_failure
-    assert_false(Ping::ICMP.new('bogus').ping?)
-    assert_false(Ping::ICMP.new('http://www.asdfhjklasdfhlkj.com').ping?)
+  test "pingecho is an alias for ping" do
+    assert_respond_to(@icmp, :pingecho)
+    assert_alias_method(@icmp, :pingecho, :ping)
+  end
+
+  test "icmp ping fails if host is invalid" do
+    assert_false(Net::Ping::ICMP.new('bogus').ping?)
+    assert_false(Net::Ping::ICMP.new('http://www.asdfhjklasdfhlkj.com').ping?)
   end
 
-  def test_bind
+  test "bind method basic functionality" do
     assert_respond_to(@icmp, :bind)
     assert_nothing_raised{ @icmp.bind(Socket.gethostname) }
     assert_nothing_raised{ @icmp.bind(Socket.gethostname, 80) }
   end
 
-  def test_duration
+  test "duration method basic functionality" do
     assert_nothing_raised{ @icmp.ping }
     assert_respond_to(@icmp, :duration)
     assert_kind_of(Float, @icmp.duration)
   end
 
-  def test_host
+  test "host getter method basic functionality" do
     assert_respond_to(@icmp, :host)
-    assert_respond_to(@icmp, :host=)
     assert_equal(@host, @icmp.host)
   end
 
-  def test_port
+  test "host setter method basic functionality" do
+    assert_respond_to(@icmp, :host=)
+    assert_nothing_raised{ @icmp.host = '192.168.0.1' }
+    assert_equal(@icmp.host, '192.168.0.1')
+  end
+
+  test "port method basic functionality" do
     assert_respond_to(@icmp, :port)
     assert_equal(nil, @icmp.port)
   end
 
-  def test_timeout
+  test "timeout getter method basic functionality" do
     assert_respond_to(@icmp, :timeout)
-    assert_respond_to(@icmp, :timeout=)
     assert_equal(5, @icmp.timeout)
   end
 
-  def test_exception
+  test "timeout setter method basic functionality" do
+    assert_respond_to(@icmp, :timeout=)
+    assert_nothing_raised{ @icmp.timeout = 7 }
+    assert_equal(7, @icmp.timeout)
+  end
+
+  test "exception method basic functionality" do
     assert_respond_to(@icmp, :exception)
     assert_nothing_raised{ @icmp.ping }
+  end
+
+  test "exception method returns nil if no ping has happened yet" do
     assert_nil(@icmp.exception)
   end
 
-  def test_warning
+  test "warning method basic functionality" do
     assert_respond_to(@icmp, :warning)
   end
 
-  def test_data_size_get
+  test "data_size getter method basic functionality" do
     assert_respond_to(@icmp, :data_size)
+    assert_nothing_raised{ @icmp.data_size }
+    assert_kind_of(Numeric, @icmp.data_size)
+  end
+
+  test "data_size returns expected value" do
     assert_equal(56, @icmp.data_size)
   end
 
-  def test_data_size_set
+  test "data_size setter method basic functionality" do
     assert_respond_to(@icmp, :data_size=)
     assert_nothing_raised{ @icmp.data_size = 22 }
   end
 
-  def test_odd_data_size_ok
+  test "setting an odd data_size is valid" do
     assert_nothing_raised{ @icmp.data_size = 57 }
     assert_boolean(@icmp.ping)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-ping
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi