net-ping 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e2c148e3e4f0ac06b324b666351eb4f485e44c
-  data.tar.gz: b19d20fd8a675c101df2b4bffa9664800e60a7bb
+  metadata.gz: f9ddc576d5378243648c90de748b4c0c9114642d
+  data.tar.gz: 92f7b54ac2ba20c14600d8c8c411698e1452b859
 SHA512:
-  metadata.gz: 226c87f3679a0e5b22a164acc01f552c43734c215a675f54cf36754149ce400c8e23fc44559cf0f902c967850ab602ed1d0ee29f43727cc0f158cddedb9f804a
-  data.tar.gz: 236d2377a2419d400f78260337c0e892fa7a42d4599a9d5ca3c9534a9cec0ae45865c39bc6c184667e068edff2c3274ebbbd639b8c465b241abe9b4cb57df6a9
+  metadata.gz: 916179b9dcef791923c9d93d1af8ee642687a655843522f0ac972aa2fa0aec10f91806f06be0eb25090d2dd9bf92c9a6fca37cda08dd2e5dd2bfa4165750d506
+  data.tar.gz: 6b98685b066ddeb79cdd6f835077f36543d5411a8ab72f93c4aab3b152004636ebc8d16248cddffafc67202b98db1f7b09acdda045cf8e7e288747b3402596b7

data/Gemfile

@@ -1,2 +1,2 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -1,15 +1,24 @@
 PATH
   remote: .
   specs:
-    net-ping (1.7.7)
+    net-ping (2.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    byebug (9.1.0)
+    coderay (1.1.2)
     fakeweb (1.3.0)
-    power_assert (0.3.0)
-    rake (11.2.2)
-    test-unit (3.2.1)
+    method_source (0.8.2)
+    power_assert (1.1.0)
+    pry (0.11.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+    pry-byebug (3.5.0)
+      byebug (~> 9.1)
+      pry (~> 0.10)
+    rake (12.1.0)
+    test-unit (3.2.6)
       power_assert
 
 PLATFORMS
@@ -18,8 +27,9 @@ PLATFORMS
 DEPENDENCIES
   fakeweb
   net-ping!
+  pry-byebug
   rake
   test-unit
 
 BUNDLED WITH
-   1.11.2
+   1.15.3

data/lib/net/ping/icmp.rb

@@ -28,7 +28,21 @@ module Net
     # UNIX systems), and the port value is ignored.
     #
     def initialize(host=nil, port=nil, timeout=5)
-      raise 'requires root privileges' if Process.euid > 0
+      begin
+        # If we have cap2, but not are root, or have net_raw, raise an error
+        require 'cap2'
+        current_process = Cap2.process
+        unless Process.euid == 0 \
+          || current_process.permitted?(:net_raw) \
+          && current_process.enabled?(:net_raw)
+          raise StandardError 'requires root privileges or setcap net_raw'
+        end
+      rescue LoadError
+        # Without cap2, raise error if we are not root
+        unless Process.euid == 0
+          raise StandardError 'requires root privileges or setcap net_raw'
+        end
+      end
 
       if File::ALT_SEPARATOR
         unless Win32::Security.elevated_security?
@@ -112,7 +126,7 @@ module Net
             io_array = select([socket], nil, nil, timeout)
 
             if io_array.nil? || io_array[0].empty?
-              @exception = "timeout" if io_array.nil?
+              raise Timeout::Error if io_array.nil?
               return false
             end
 

data/net-ping.gemspec

@@ -3,7 +3,7 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'net-ping'
-  spec.version   = '2.0.1'
+  spec.version   = '2.0.2'
   spec.license   = 'Artistic 2.0'
   spec.author    = 'Chris Chernesky'
   spec.email     = 'chris.netping@tinderglow.com'
@@ -17,9 +17,10 @@ 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', '~> 0')
-  spec.add_development_dependency('fakeweb', '~> 0')
-  spec.add_development_dependency('rake', '~> 0')
+  spec.add_development_dependency('test-unit', '>= 0')
+  spec.add_development_dependency('fakeweb', '>= 0')
+  spec.add_development_dependency('rake', '>= 0')
+  spec.add_development_dependency('pry-byebug', '>= 0')
 
   if File::ALT_SEPARATOR
     require 'rbconfig'

data/test/test_net_ping.rb

@@ -17,8 +17,19 @@ if File::ALT_SEPARATOR
     require 'test_net_ping_icmp'
   end
 else
-  if Process.euid == 0
-    require 'test_net_ping_icmp'
+  # If cap2 is availble, check if we are root, or our process has net_raw,
+  # then include ICMP tests
+  begin
+    require 'cap2'
+    current_process = Cap2.process
+    if Process.euid == 0 \
+      || current_process.permitted?(:net_raw) \
+      && current_process.enabled?(:net_raw)
+      require 'test_net_ping_icmp'
+    end
+  rescue LoadError
+    # If we don't have cap2, include ICMP tests if we are root
+    require 'test_net_ping_icmp' if Process.euid == 0
   end
 end
 

data/test/test_net_ping_icmp.rb

@@ -16,9 +16,23 @@ if File::ALT_SEPARATOR
     raise "The test:icmp task must be run with elevated security rights"
   end
 else
-  unless Process.euid == 0
-    raise "The test:icmp task must be run with root privileges"
+
+  begin
+    # If we have cap2; raise error unless we are root, or have net_raw
+    require 'cap2'
+    current_process = Cap2.process
+    unless Process.euid == 0 \
+      || current_process.permitted?(:net_raw) \
+      && current_process.enabled?(:net_raw)
+      raise StandardError 'requires root privileges or setcap net_raw'
+    end
+  rescue LoadError
+    # Without cap2; raise error unless we are root
+    unless Process.euid == 0
+      raise StandardError 'requires root privileges or setcap net_raw'
+    end
   end
+
 end
 
 class TC_PingICMP < Test::Unit::TestCase
@@ -134,7 +148,7 @@ class TC_PingICMP < Test::Unit::TestCase
 
   test "timeout works as expected" do
     omit_if(@@jruby)
-    icmp = Net::Ping::ICMP.new('bogus.com', nil, 0.000001)
+    icmp = Net::Ping::ICMP.new('8.8.8.8', nil, 0.000001)
     assert_false(icmp.ping?)
     assert_kind_of(Timeout::Error, icmp.exception)
   end

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: net-ping
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Chris Chernesky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2017-10-17 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'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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
@@ -83,6 +97,7 @@ files:
 - lib/net/ping/tcp.rb
 - lib/net/ping/udp.rb
 - lib/net/ping/wmi.rb
+- net-ping-2.0.1.gem
 - net-ping.gemspec
 - test/test_net_ping.rb
 - test/test_net_ping_external.rb
@@ -111,10 +126,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A ping interface for Ruby.
 test_files:
 - test/test_net_ping.rb
-has_rdoc: