plr-speedtest 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55d8ad59a06d925a76c6a9a5097034ff454bf0f9c60ec1d1fd3c4cc2abd70fd5
-  data.tar.gz: 96160eb37e01c31d0c0b2eabc79e521ec0795b9ca07da20acd41aef2c35ff4c1
+  metadata.gz: d0ddae132c5759e03856c57ef9ee506a88baabb09696808367c00460717931c7
+  data.tar.gz: 3d56192d309f05170919119ce85884e7e4f3a988a34476b3a9fa95d7e77c82b5
 SHA512:
-  metadata.gz: 751405ec1d2fff2afdf5b742569527b95758998b4d0c64e42324cf79541ab6a56e12bd83ad963b15598cd9fcf5f928e3b9c39561875cb6e5a159e97a274ddf7e
-  data.tar.gz: 5da842bfbcde57f40acd8bd2d72b0d780f667cc94900a0ca2c7517d9f1e6549049b09859550a76bc17d6ba0bb4fc34074efb81756ea69aaa74b9219a7930d5d4
+  metadata.gz: a1f22c27c463f286cada30d926683a4b318e989cc4d1f9aaeb1bb31b2ef9388952b2d02a09046d53a1f2471a001c48d7139c937c4bc0e4392b2567ce9f7343bb
+  data.tar.gz: e3173ba212eff79ee42fe75b1fcb77cb608dddf452e57faaf3ea834f97367d8694c3f0b852393c9afd2fa56e5f989aeafc113a6524d1da2d319e5a3ae8d27d8e

data/README.md

@@ -24,21 +24,20 @@ require 'speedtest'
 ```
 
 Configure a new test with whatever options you want—all are optional:
-* download_runs - The number of attempts to download each file
-* upload_runs - The number of attempts to upload each file
+* minimum_transfer_secs - The transfers will continue for at least that many seconds
+* num_threads - The number of threads to perform the transfers in parallel
 * ping_runs - The number of ping attempts to establish latency
-* download_sizes - an array of .jpg dimensions (must be one or more of `[350, 500, 750, 1000, 1500, 2000, 2500, 3000, 3500, 4000]`)
-* upload_sizes
+* download_size - jpg dimensions (must be one or more of `[350, 500, 750, 1000, 1500, 2000, 2500, 3000, 3500, 4000]`)
+* upload_size - Size of the randomly generated file in bytes
 * logger
 
 ```ruby
-test = Speedtest::Test.new(
-  download_runs: 4,
-    upload_runs: 4,
-    ping_runs: 4,
-    download_sizes: [750, 1500],
-    upload_sizes: [10000, 400000],
-    logger: Logger.new(STDOUT)
+speedtest = Speedtest::Test.new(min_transfer_secs: 5,
+                                download_size: 500,
+                                upload_size: 10_000,
+                                num_threads: 4,
+                                logger: Logger.new(STDOUT),
+                                skip_servers: "http://www.github.com")
  )
  => #<Speedtest::Test:0x007fac5ac9dca0 @download_runs=4, @upload_runs=4, @ping_runs=4, @download_sizes=[750, 1500], @upload_sizes=[10000, 400000], @debug=true>
 ```

data/lib/speedtest/logging.rb

@@ -0,0 +1,11 @@
+module Speedtest
+  module Logging
+    def log(msg)
+      @logger.debug msg if @logger
+    end
+
+    def error(msg)
+      @logger.error msg if @logger
+    end
+  end
+end

data/lib/speedtest/transfer_worker.rb

@@ -3,17 +3,13 @@ require 'celluloid/current'
 module Speedtest
   class TransferWorker
     include Celluloid
+    include Logging
 
     def initialize(url, logger)
       @url = url
       @logger = logger
     end
 
-    def log(msg)
-      return unless @logger
-      @logger.debug msg
-    end
-
     def download
       log "  downloading: #{@url}"
       status = ThreadStatus.new(false, 0)
@@ -32,7 +28,6 @@ module Speedtest
       status = ThreadStatus.new(false, 0)
 
       page = HTTParty.post(@url, :body => { "content" => content }, timeout: 10)
-      log "upload response body = [#{page.body}]"
       unless page.code / 100 == 2
         error "GET #{@url} failed with code #{page.code}"
         status.error = true

data/lib/speedtest/version.rb

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

data/lib/speedtest.rb

@@ -2,6 +2,7 @@ require 'httparty'
 
 require_relative 'speedtest/result'
 require_relative 'speedtest/geo_point'
+require_relative 'speedtest/logging'
 require_relative 'speedtest/transfer_worker'
 require_relative 'speedtest/ring'
 
@@ -9,6 +10,7 @@ module Speedtest
   ThreadStatus = Struct.new(:error, :size)
 
   class Test
+    include Logging
 
     class FailedTransfer < StandardError; end
 
@@ -21,11 +23,8 @@ module Speedtest
       @download_size = options[:download_size]         || 4000
       @upload_size = options[:upload_size]             || 1_000_000
       @logger = options[:logger]
-      @num_transfers_padding = options[:num_transfers_padding] || 5
+      @skip_servers = options[:skip_servers]           || []
 
-      if @num_transfers_padding > @num_threads
-        @num_transfers_padding = @num_threads
-      end
       @ping_runs = 2 if @ping_runs < 2
     end
 
@@ -59,14 +58,6 @@ module Speedtest
       "%.2f #{units[i]}" % speed
     end
 
-    def log(msg)
-      @logger.debug msg if @logger
-    end
-
-    def error(msg)
-      @logger.error msg if @logger
-    end
-
     def download_url(server_root)
       "#{server_root}/speedtest/random#{@download_size}x#{@download_size}.jpg"
     end
@@ -75,10 +66,11 @@ module Speedtest
       log "\nstarting download tests:"
 
       start_time = Time.now
-      futures_ring = Ring.new(@num_threads + @num_transfers_padding)
+      ring_size = @num_threads * 2
+      futures_ring = Ring.new(ring_size)
       download_url = download_url(@server_root)
       pool = TransferWorker.pool(size: @num_threads, args: [download_url, @logger])
-      1.upto(@num_threads + @num_transfers_padding).each do |i|
+      1.upto(ring_size).each do |i|
         futures_ring.append(pool.future.download)
       end
 
@@ -114,10 +106,11 @@ module Speedtest
 
       start_time = Time.now
 
-      futures_ring = Ring.new(@num_threads + @num_transfers_padding)
+      ring_size = @num_threads * 2
+      futures_ring = Ring.new(ring_size)
       upload_url = upload_url(@server_root)
       pool = TransferWorker.pool(size: @num_threads, args: [upload_url, @logger])
-      1.upto(@num_threads + @num_transfers_padding).each do |i|
+      1.upto(ring_size).each do |i|
         futures_ring.append(pool.future.upload(data))
       end
 
@@ -158,8 +151,15 @@ module Speedtest
         {
         :latency => ping(x[:url]),
         :url => x[:url]
-        }}.sort_by { |x| x[:latency] }
+        }
+      }.sort_by { |x| x[:latency] }
 
+      latency_sorted_servers.reject! do |s|
+        if @skip_servers.include?(s[:url])
+          log "Skipping #{s}"
+          true
+        end
+      end
 
       selected = latency_sorted_servers.detect { |s| validate_server_transfer(s[:url]) }
       log "Automatically selected server: #{selected[:url]} - #{selected[:latency]} ms"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plr-speedtest
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Pete Myron
@@ -113,6 +113,7 @@ files:
 - Rakefile
 - lib/speedtest.rb
 - lib/speedtest/geo_point.rb
+- lib/speedtest/logging.rb
 - lib/speedtest/result.rb
 - lib/speedtest/ring.rb
 - lib/speedtest/transfer_worker.rb