plr-speedtest 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0ddae132c5759e03856c57ef9ee506a88baabb09696808367c00460717931c7
-  data.tar.gz: 3d56192d309f05170919119ce85884e7e4f3a988a34476b3a9fa95d7e77c82b5
+  metadata.gz: e37d03e016955b5ce893aa87d117b5e5fb797bbd87756418c8bd6f4c6f127ffe
+  data.tar.gz: a8b5d4f80ea96ef5a526969fb4652509d26ffe81821a0531854b8fda2270bccc
 SHA512:
-  metadata.gz: a1f22c27c463f286cada30d926683a4b318e989cc4d1f9aaeb1bb31b2ef9388952b2d02a09046d53a1f2471a001c48d7139c937c4bc0e4392b2567ce9f7343bb
-  data.tar.gz: e3173ba212eff79ee42fe75b1fcb77cb608dddf452e57faaf3ea834f97367d8694c3f0b852393c9afd2fa56e5f989aeafc113a6524d1da2d319e5a3ae8d27d8e
+  metadata.gz: 53456327b24e161a54775411def4e8ca19df19def67f68e39e515d1d1f295325bc106f631bfe47836d44d1953368fc58c3fe1bb02d495af978f0d4c5be73adc5
+  data.tar.gz: 241016c035003d8ad6db32d025947faadcd08345cdd2d045d4a4499181dfd4368163c9fa44aebd6f5983fb6069dd8b2bba438815084c4653f414aae4b5eeeaf2

data/lib/speedtest/version.rb

@@ -1,3 +1,3 @@
 module Speedtest
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/speedtest.rb

@@ -24,12 +24,15 @@ module Speedtest
       @upload_size = options[:upload_size]             || 1_000_000
       @logger = options[:logger]
       @skip_servers = options[:skip_servers]           || []
+      @skip_latency_min_ms = options[:skip_latency_min_ms] || 0
 
       @ping_runs = 2 if @ping_runs < 2
     end
 
     def run()
       server = pick_server
+      raise FailedTransfer, "Failed to find a suitable server" unless server
+
       @server_root = server[:url]
       log "Server #{@server_root}"
 
@@ -147,7 +150,7 @@ module Speedtest
       .sort_by { |x| x[:distance] }
 
       # sort the nearest 10 by download latency
-      latency_sorted_servers = sorted_servers[0..9].map { |x|
+      latency_sorted_servers = sorted_servers[0..20].map { |x|
         {
         :latency => ping(x[:url]),
         :url => x[:url]
@@ -155,14 +158,27 @@ module Speedtest
       }.sort_by { |x| x[:latency] }
 
       latency_sorted_servers.reject! do |s|
+        skip = false
+
+        if s[:latency] < @skip_latency_min_ms
+          log "Skipping #{s} because latency (#{s[:latency]}) is below threshold (#{@skip_latency_min_ms})"
+          skip = true
+        end
+
         if @skip_servers.include?(s[:url])
-          log "Skipping #{s}"
-          true
+          log "Skipping #{s} because url in skip list"
+          skip = true
         end
+
+        skip
       end
 
       selected = latency_sorted_servers.detect { |s| validate_server_transfer(s[:url]) }
-      log "Automatically selected server: #{selected[:url]} - #{selected[:latency]} ms"
+      if selected
+        log "Automatically selected server: #{selected[:url]} - #{selected[:latency]} ms"
+      else
+        error "Cannot find any server matching the requirements"
+      end
 
       selected
     end
@@ -202,6 +218,6 @@ module Speedtest
 end
 
 if __FILE__ == $PROGRAM_NAME
-  x = Speedtest::Test.new(ARGV)
+  x = Speedtest::Test.new(min_transfer_secs: 10, download_size: 1000, upload_size: 100_000, num_threads: 10, logger: Logger.new(STDOUT), skip_latency_min_ms: 40)
   x.run
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plr-speedtest
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Pete Myron
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-13 00:00:00.000000000 Z
+date: 2018-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty