network_tester 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d981a82ffbaed7c2de639e754bf576cc84bd110ea735750a9c74b162d31889e
-  data.tar.gz: 34bf36d32fc919dc0b0dbf51e390db420d7bc3607512f1768273bf5fa537fae0
+  metadata.gz: c34cef054f5d83352dc9ba90dede6ff13a591111718cce5690058c967b0eede7
+  data.tar.gz: 68ce2bb1b2b083d57362b221f1490ea9a73c7f315694232a3e5151910ab73f70
 SHA512:
-  metadata.gz: ff0da3b02794ba829b41ac98f646ed30a5faa55c55258c615b99d60c681698352f17e03de7f91973d98a2fd82e1b9c92e54dfa7d27ef536a6a67ef4cc9070636
-  data.tar.gz: dbed8732f9f572a905b084aec1f624f0d909f6c3df998c35120cbdfb3419c1fcf4330db78290c98fb762302d9e34282f7954337c6734a8ccda10192a3d155642
+  metadata.gz: 442168411af60214c6e4250add31def93869268cc1c313bc8d5c2244223ffa386e087b0c891852388a118d3cb37054fec561ceadabaca7b0a2c598f1be01443b
+  data.tar.gz: 574afd62cc5a9b3914a2b3b651be6a1e607d46ce2d915f6b0bf3cd87cda2b3c810a91556917f3e4ca22ca4f5a65325395c2c0840a4fa97d39b63b470b815e782

data/README.md

@@ -27,6 +27,9 @@ After installing the gem, you may need to open a new shell, and then type:
     network_tester [options]
     network_tester [maxtime] [address]
 
+Positional arguments can be given in any order. Integers are treated as
+the alert threshold; anything else as the host.
+
 ### Options
 
     -a, --address ADDRESS   Host to ping (default: google.com)
@@ -38,8 +41,10 @@ After installing the gem, you may need to open a new shell, and then type:
 
     network_tester                       # ping google.com, alert above 70ms
     network_tester 100                   # ping google.com, alert above 100ms
-    network_tester 100 8.8.8.8          # ping 8.8.8.8, alert above 100ms
-    network_tester -a 8.8.8.8 -m 100   # same, using named options
+    network_tester yahoo.com             # ping yahoo.com, alert above 70ms
+    network_tester 100 yahoo.com        # ping yahoo.com, alert above 100ms
+    network_tester yahoo.com 100        # same as above
+    network_tester -a 8.8.8.8 -m 100   # using named options
 
 ## Development
 

data/bin/network_tester

@@ -12,10 +12,15 @@ OptionParser.new do |opts|
     Usage: network_tester [options]
            network_tester [maxtime] [address]
 
+    Positional arguments can be given in any order. Integers are
+    treated as the alert threshold; anything else as the host.
+
     Examples:
       network_tester                  # ping google.com, alert above 70ms
       network_tester 100              # ping google.com, alert above 100ms
-      network_tester 100 8.8.8.8     # ping 8.8.8.8, alert above 100ms
+      network_tester yahoo.com        # ping yahoo.com, alert above 70ms
+      network_tester 100 yahoo.com   # ping yahoo.com, alert above 100ms
+      network_tester yahoo.com 100   # same as above
 
     Options:
   BANNER
@@ -39,8 +44,13 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-# Remaining positional args: [maxtime] [address]
-options[:maxtime] = Integer(ARGV[0]) if ARGV[0]
-options[:address] = ARGV[1] if ARGV[1]
+# Positional args in any order: integers are maxtime, anything else is address
+ARGV.each do |arg|
+  if arg.match?(/\A\d+\z/)
+    options[:maxtime] = Integer(arg)
+  else
+    options[:address] = arg
+  end
+end
 
 NetworkTester.loop(nil, options[:address], options[:maxtime])

data/lib/network_tester/version.rb

@@ -1,3 +1,3 @@
 module NetworkTester
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/network_tester.rb

@@ -1,3 +1,4 @@
+require "shellwords"
 require_relative "network_tester/version"
 
 module NetworkTester
@@ -21,22 +22,12 @@ module NetworkTester
 
   def pingr(addr='google.com')
     timeout_arg = mac? ? '-t' : '-W'
-    cmd = "ping -c 1 #{timeout_arg} 1 #{addr} "
+    cmd = "ping -c 1 #{timeout_arg} 1 #{Shellwords.shellescape(addr)}"
     result = `#{cmd} 2>/dev/null`
-    timerow = nil
-    result.split("\n").detect do |r|
-      if r.match(/time/)
-        timerow = r.match(/cmp_seq.*time=([^ ]*)/)
-      end
-    end
-
-    if timerow.nil?
-      nil
-    else
-      timerow[1] 
-    end
+    match = result.match(/time=([^\s]+)/)
+    match&.[](1)
   end
- 
+
   def notifier(time, maxtime=70)
     if time.nil?
       return notify('error')
@@ -53,7 +44,7 @@ module NetworkTester
 
   def notify(msg='da', rate=600)
     if mac?
-      `say #{msg.inspect} -r #{[rate,400].max}`
+      system("say", msg.to_s, "-r", [rate, 400].max.to_s)
     else
       puts "\a#{' '*20}#{'-'*10} too long: #{msg.inspect}"
     end

data/network_tester.gemspec

@@ -10,16 +10,17 @@ Gem::Specification.new do |spec|
   spec.email         = ["brian@murphydye.com"]
 
   spec.summary       = %q{Test network with audible pings.}
-  spec.description   = %q{}
-  spec.homepage      = ''
+  spec.description   = %q{Continuously pings a host and announces response times. Alerts audibly when latency exceeds a threshold.}
+  spec.homepage      = "https://github.com/brianmd/network_tester"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 2.7"
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.executables   = ['network_tester']
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", ">= 2.1"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 12.3.3"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: network_tester
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - bmd
@@ -13,14 +13,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
@@ -41,17 +41,18 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: ''
+        version: '3.0'
+description: Continuously pings a host and announces response times. Alerts audibly
+  when latency exceeds a threshold.
 email:
 - brian@murphydye.com
 executables:
@@ -71,7 +72,7 @@ files:
 - lib/network_tester.rb
 - lib/network_tester/version.rb
 - network_tester.gemspec
-homepage: ''
+homepage: https://github.com/brianmd/network_tester
 licenses:
 - MIT
 metadata: {}
@@ -82,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="