net-ping 1.7.8 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b64d1fdb2f212bd7212e479b46b84c5b7fb6015
-  data.tar.gz: de13dd9eef7ec47b5625e56bf4f562950e6d79ef
+  metadata.gz: 17e2c148e3e4f0ac06b324b666351eb4f485e44c
+  data.tar.gz: b19d20fd8a675c101df2b4bffa9664800e60a7bb
 SHA512:
-  metadata.gz: 224d9695832c1359e637c946d021c204b86ce94bd652ec3c597b414ea68e1098122c84f9a9bf839a3b91d4e23e2f492e7d4c3231d070051e10091ec6ca72fced
-  data.tar.gz: 6635c45ac8bde019c7cf218e6fa96396bc7ee79323618156d3644349b313dad709e9034b970616d3ca20039a617202992aa8502278fbf4cd67a2f0c886d3f399
+  metadata.gz: 226c87f3679a0e5b22a164acc01f552c43734c215a675f54cf36754149ce400c8e23fc44559cf0f902c967850ab602ed1d0ee29f43727cc0f158cddedb9f804a
+  data.tar.gz: 236d2377a2419d400f78260337c0e892fa7a42d4599a9d5ca3c9534a9cec0ae45865c39bc6c184667e068edff2c3274ebbbd639b8c465b241abe9b4cb57df6a9

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    net-ping (1.7.8)
+    net-ping (1.7.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
     fakeweb (1.3.0)
-    power_assert (0.2.4)
-    rake (10.4.2)
-    test-unit (3.1.3)
+    power_assert (0.3.0)
+    rake (11.2.2)
+    test-unit (3.2.1)
       power_assert
 
 PLATFORMS
@@ -22,4 +22,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/lib/net/ping/external.rb

@@ -53,7 +53,6 @@ module Net
 
         Open3.popen3(*pcmd) do |stdin, stdout, stderr, thread|
           stdin.close
-          @end_time = Time.now
           err = stderr.gets # Can't chomp yet, might be nil
 
           case thread.value.exitstatus
@@ -91,7 +90,7 @@ module Net
       end
 
       # There is no duration if the ping failed
-      @duration = @end_time - start_time if bool
+      @duration = Time.now - start_time if bool
 
       bool
     end
@@ -134,7 +133,6 @@ module Net
 
         Open3.popen3(*pcmd) do |stdin, stdout, stderr, thread|
           stdin.close
-          @end_time = Time.now
           err = stderr.gets # Can't chomp yet, might be nil
 
           case thread.value.exitstatus
@@ -172,7 +170,7 @@ module Net
       end
 
       # There is no duration if the ping failed
-      @duration = @end_time - start_time if bool
+      @duration = Time.now - start_time if bool
 
       bool
     end

data/lib/net/ping/http.rb

@@ -131,8 +131,6 @@ module Net
       bool
     end
 
-    alias ping? ping
-    alias pingecho ping
     alias follow_redirect? follow_redirect
     alias uri host
     alias uri= host=

data/lib/net/ping/icmp.rb

@@ -147,13 +147,8 @@ module Net
 
       # There is no duration if the ping failed
       @duration = Time.now - start_time if bool
-
-      return bool
     end
 
-    alias ping? ping
-    alias pingecho ping
-
     private
 
     # Perform a checksum on the message.  This is the sum of all the short

data/lib/net/ping/ping.rb

@@ -89,8 +89,12 @@ module Net
          @warning   = nil
          @duration  = nil
       end
-
-      alias ping? ping
+ 
+      def ping?(host = @host)
+        !!ping(host)
+      end
+       
       alias pingecho ping
+
    end
 end

data/lib/net/ping/tcp.rb

@@ -38,7 +38,6 @@ module Net
       super(host)
 
       bool = false
-      start_time = Time.now
 
       # Failure here most likely means bad host, so just bail.
       begin
@@ -55,6 +54,8 @@ module Net
         # This may not be entirely necessary
         sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 
+        start_time = Time.now
+
         begin
           # Where addr[0][3] is an IP address
           sock.connect_nonblock(Socket.pack_sockaddr_in(port, addr[0][3]))
@@ -95,13 +96,9 @@ module Net
 
       # There is no duration if the ping failed
       @duration = Time.now - start_time if bool
-
-      bool
     end
 
-    alias ping? ping
-    alias pingecho ping
-
+  
     # Class method aliases. DEPRECATED.
     class << self
       alias econnrefused service_check

data/lib/net/ping/udp.rb

@@ -113,7 +113,5 @@ module Net
       bool
     end
 
-    alias ping? ping
-    alias pingecho ping
   end
 end

data/net-ping.gemspec

@@ -3,7 +3,7 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'net-ping'
-  spec.version   = '1.7.8'
+  spec.version   = '2.0.1'
   spec.license   = 'Artistic 2.0'
   spec.author    = 'Chris Chernesky'
   spec.email     = 'chris.netping@tinderglow.com'
@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   # The TCP Ping class requires this for non-blocking sockets.
   spec.required_ruby_version = ">= 1.9.3"
 
-  spec.add_development_dependency('test-unit')
-  spec.add_development_dependency('fakeweb')
-  spec.add_development_dependency('rake')
+  spec.add_development_dependency('test-unit', '~> 0')
+  spec.add_development_dependency('fakeweb', '~> 0')
+  spec.add_development_dependency('rake', '~> 0')
 
   if File::ALT_SEPARATOR
     require 'rbconfig'

data/test/test_net_ping_http.rb

@@ -71,12 +71,12 @@ class TC_Net_Ping_HTTP < Test::Unit::TestCase
     assert_boolean(@bad.ping?)
   end
 
-  test 'ping? is an alias for ping' do
-    assert_alias_method(@http, :ping?, :ping)
+  test "ping? is inherited" do
+    assert_respond_to(@http, :ping?)
   end
 
-  test 'pingecho is an alias for ping' do
-    assert_alias_method(@http, :pingecho, :ping)
+  test "pingecho is inherited" do
+    assert_respond_to(@http, :pingecho)
   end
 
   test 'ping should succeed for a valid website' do

data/test/test_net_ping_icmp.rb

@@ -43,16 +43,16 @@ class TC_PingICMP < Test::Unit::TestCase
     assert_nothing_raised{ @icmp.ping(@host) }
   end
 
-  test "icmp ping returns a boolean" do
+  test "icmp ping returns a float" do
     omit_if(@@jruby)
-    assert_boolean(@icmp.ping)
-    assert_boolean(@icmp.ping(@host))
+    assert_kind_of(Float, @icmp.ping)
+    assert_kind_of(Float, @icmp.ping(@host))
   end
 
   test "icmp ping of local host is successful" do
     omit_if(@@jruby)
     assert_true(Net::Ping::ICMP.new(@host).ping?)
-    assert_true(Net::Ping::ICMP.new('192.168.0.1').ping?)
+    assert_true(Net::Ping::ICMP.new('127.0.0.1').ping?)
   end
 
   test "threaded icmp ping returns expected results" do
@@ -78,14 +78,12 @@ class TC_PingICMP < Test::Unit::TestCase
     threads.each{ |t| t.join }
   end
 
-  test "ping? is an alias for ping" do
+  test "ping? is inherited" do
     assert_respond_to(@icmp, :ping?)
-    assert_alias_method(@icmp, :ping?, :ping)
   end
 
-  test "pingecho is an alias for ping" do
+  test "pingecho is inherited" do
     assert_respond_to(@icmp, :pingecho)
-    assert_alias_method(@icmp, :pingecho, :ping)
   end
 
   test "icmp ping fails if host is invalid" do
@@ -171,7 +169,7 @@ class TC_PingICMP < Test::Unit::TestCase
   test "setting an odd data_size is valid" do
     omit_if(@@jruby)
     assert_nothing_raised{ @icmp.data_size = 57 }
-    assert_boolean(@icmp.ping)
+    assert_kind_of(Float, @icmp.ping)
   end
 
   def teardown

data/test/test_net_ping_udp.rb

@@ -26,14 +26,12 @@ class TC_Net_Ping_UDP < Test::Unit::TestCase
     assert_nothing_raised{ @udp.ping(@host) }
   end
 
-  test "ping? is an alias for ping" do
+  test "ping? is inherited" do
     assert_respond_to(@udp, :ping?)
-    assert_alias_method(@udp, :ping?, :ping)
   end
 
-  test "pingecho is an alias for ping" do
+  test "pingecho is inherited" do
     assert_respond_to(@udp, :pingecho)
-    assert_alias_method(@udp, :pingecho, :ping)
   end
 
   test "a successful udp ping returns true" do

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: net-ping
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 2.0.1
 platform: ruby
 authors:
 - Chris Chernesky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -111,9 +111,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A ping interface for Ruby.
 test_files:
 - test/test_net_ping.rb
+has_rdoc: