network_tester 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35a1998a26cc7e58e5c875dac52472539087416c
-  data.tar.gz: e5a40c6a4c7d63d397fd58b1fd434deeb52cd08d
+  metadata.gz: 845e649b2814eba0b003a70d4112d88aa984aed6
+  data.tar.gz: 559e9d4c9dfe2c15af953a2e9fba8c27c9981aa4
 SHA512:
-  metadata.gz: 23ebbf73708083944ddf01d3f831c626192afe73840a7720ce7d99d8c51a18873626c35ea2d275ac78bc07d0072153db8df2f3e238bef150c0a079f1a3960331
-  data.tar.gz: b8536ba796365ade62fdbf1c99904487476052d2f4482f7a5661f070996f9ac9459a505ebdbb1c459cc7b9dd19e80050addeaf1dccd2566decd806cffa2b7844
+  metadata.gz: 420e176e1841deda99fa900679539a51a6fe0ac906d313b186890aa0d254fa91022558078e48ba8132dedeacb2f3c903c65e610c9cdaaae0380158692503def1
+  data.tar.gz: 88b7b16826eb4a58225914c541447ef14231902fe845d8cbff63854448ffdc9b32aefa5ea4330f76844ae5dbf6c81bc49b0274fbfe8405a7bcd5a2ba573fd3e2

data/bin/network_tester

@@ -5,9 +5,6 @@ $LOAD_PATH.unshift Pathname.new(__FILE__).dirname + '..'
 
 require_relative '../lib/network_tester'
 
-puts 'asdfjlfdls'
-puts ARGV.inspect
-maxtime = 70
-maxtime = Integer(ARGV[0]) if ARGV.size>0
-puts maxtime
-NetworkTester::loop(nil, 'google.com', maxtime)
+default_maxtime = 70
+default_maxtime = Integer(ARGV[0]) if ARGV.size>0
+NetworkTester::loop(nil, 'google.com', default_maxtime)

data/lib/network_tester.rb

@@ -8,7 +8,7 @@ module NetworkTester
     while (max_count.nil? or count<max_count)
       time = pingr
       if time.nil?
-        puts "' '*50}error"
+        puts "#{' '*50}error"
       else
         time = Integer(Float(time))
         puts "#{'*'*(Integer(time/5))} #{time}"
@@ -16,10 +16,13 @@ module NetworkTester
       notifier(time, maxtime)
       sleep 1
     end
+  rescue Interrupt
   end
 
   def pingr(addr='google.com')
-    result = `ping -c 1 -t 1 #{addr} 2>/dev/null`
+    timeout_arg = mac? ? '-t' : '-W'
+    cmd = "ping -c 1 #{timeout_arg} 1 #{addr} "
+    result = `#{cmd} 2>/dev/null`
     timerow = nil
     result.split("\n").detect do |r|
       if r.match(/time/)
@@ -49,11 +52,15 @@ module NetworkTester
   end
 
   def notify(msg='da', rate=600)
-    if `uname -s`.chomp=='Darwin'
+    if mac?
       `say #{msg.inspect} -r #{[rate,400].max}`
     else
-      puts "\a", "*********"*10, msg.inspect
+      puts "\a#{' '*20}#{'-'*10} too long: #{msg.inspect}"
     end
     msg
   end
+
+  def mac?
+    `uname -s`.chomp=='Darwin'
+  end
 end

data/lib/network_tester/version.rb

@@ -1,3 +1,3 @@
 module NetworkTester
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: network_tester
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - bmd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler