speedtest_net 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed21ac6a96ef110554941966993ee911a4062090216400207534c59afcc5b383
-  data.tar.gz: 466c522ae2b60cd187a5d7b98b023db50bfa8f9834e55a01979879de154a3e34
+  metadata.gz: 35f79907495fb46041e545a27bf81429cbeb7d4ac8281cc5b3e0dc58cd329b66
+  data.tar.gz: 0750ba31b2672dc5c9b3b3707dbf80d7a4bdcc3095971f54aa9ea45477f7e39e
 SHA512:
-  metadata.gz: 838e4b7eb05e59234e650c6d807c985a236467bf89af5a440df795febe66e6c211026b54f5ecd6019e41bed08e6b50e61ea9de1fc5f4b2ad6f4ade54ec6f55e9
-  data.tar.gz: 51d43777a2d506eb2092e1b77fd1de923881e4ba0fabe727a09b7da8dea1a0112bdd78ea3af2cd89f4072de352a0667b6ff4799e19110923ce34afd05c4270dd
+  metadata.gz: f8801cfc3a1dd4ce6ad90c8d76ed3ffe0196d9d74996f05e624f6c948f71a65c496d73140ca230c2cd84e64ecb191ab6d4d2818fd68f8520ef7133bb1d5d55ea
+  data.tar.gz: 6e15ea46406b725c5b290312a81230a8caed487118c87fe46a0ff03cd86eb7ad6fca04500d5ac9029af3bd66455c141cdb23feb6ab47bb8fbbc20b770fd93dd9

data/Gemfile

@@ -4,3 +4,13 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in speedtest_net.gemspec
 gemspec
+
+gem 'codacy-coverage', '>= 2.1'
+gem 'factory_bot', '>= 6.0'
+gem 'rake', '>= 13.0'
+gem 'rspec', '>= 3.0'
+gem 'rubocop', '>= 0.76'
+gem 'rubocop-rspec', '>= 1.36'
+gem 'simplecov', '>= 0.17'
+gem 'vcr', '>= 6.0'
+gem 'webmock', '>= 3.7'

data/README.md

@@ -2,8 +2,8 @@
 
 [![Gem Version](https://badge.fury.io/rb/speedtest_net.svg)](https://badge.fury.io/rb/speedtest_net)
 [![Actions Status](https://github.com/ryonkn/speedtest_net/workflows/GitHub%20Actions/badge.svg)](https://github.com/ryonkn/speedtest_net/actions)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/18f112dae19a48938bdf2b225d3a76bb)](https://www.codacy.com/manual/ryonkn/speedtest_net?utm_source=github.com&utm_medium=referral&utm_content=ryonkn/speedtest_net&utm_campaign=Badge_Grade)
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/18f112dae19a48938bdf2b225d3a76bb)](https://www.codacy.com/manual/ryonkn/speedtest_net?utm_source=github.com&utm_medium=referral&utm_content=ryonkn/speedtest_net&utm_campaign=Badge_Coverage)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/fa55809b2789403489d9d5063249c238)](https://www.codacy.com/manual/ryonkn/speedtest_net/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ryonkn/speedtest_net&utm_campaign=Badge_Grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/fa55809b2789403489d9d5063249c238)](https://www.codacy.com/manual/ryonkn/speedtest_net/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ryonkn/speedtest_net&utm_campaign=Badge_Coverage)
 
 A Ruby library for testing internet bandwidth using speedtest.net
 

data/lib/speedtest_net.rb

@@ -6,13 +6,14 @@ require 'speedtest_net/server'
 require 'speedtest_net/download'
 require 'speedtest_net/upload'
 require 'speedtest_net/result'
+require 'speedtest_net/http_timeout'
 
 module SpeedtestNet
-  def self.run(id = nil, exclude_server_ids: [])
+  def self.run(id = nil, exclude_server_ids: [], timeout: HTTP_TIMEOUT)
     config = Config.fetch
     server = Server.select_server(id, exclude_server_ids)
-    download_results = Download.measure(server)
-    upload_results = Upload.measure(server)
+    download_results = Download.measure(server, timeout: timeout)
+    upload_results = Upload.measure(server, timeout: timeout)
 
     Config.clear_cache
     Result.new(config.client, server, download_results, upload_results)

data/lib/speedtest_net/download.rb

@@ -3,6 +3,8 @@
 require 'curb'
 require 'securerandom'
 require 'pathname'
+require 'speedtest_net/calculate_speed'
+require 'speedtest_net/http_timeout'
 
 module SpeedtestNet
   class Download
@@ -10,16 +12,30 @@ module SpeedtestNet
                random1500x1500.jpg random2000x2000.jpg random3000x3000.jpg
                random3500x3500.jpg random4000x4000.jpg].freeze
 
+    def initialize(results)
+      @results = results
+    end
+
+    def calculate
+      CalculateSpeed.call(@results)
+    end
+
     class << self
-      def measure(server)
+      def measure(server, timeout: HTTP_TIMEOUT) # rubocop:disable Metrics/MethodLength
         config = Config.fetch
         concurrent_number = config.download[:threadsperurl]
 
-        results = FILES.map do |file|
-          urls = create_urls(server, file, concurrent_number)
-          multi_downloader(urls)
+        results = []
+        begin
+          Timeout.timeout(timeout) do
+            FILES.each do |file|
+              urls = create_urls(server, file, concurrent_number)
+              results << multi_downloader(urls)
+            end
+          end
+        rescue Timeout::Error # rubocop:disable Lint/SuppressedException
         end
-        results
+        new(results)
       end
 
       private

data/lib/speedtest_net/formatter/distance.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  module Formatter
+    class Distance
+      class << self
+        def call(distance)
+          format('%<distance>.3f kilometre', distance: (distance / 1_000).round(3))
+        end
+      end
+    end
+  end
+end

data/lib/speedtest_net/formatter/latency.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  module Formatter
+    class Latency
+      class << self
+        def call(latency)
+          format('%<latency>f millisecond', latency: latency * 1_000)
+        end
+      end
+    end
+  end
+end

data/lib/speedtest_net/formatter/speed.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  module Formatter
+    class Speed
+      UNITS = %w[bps Kbps Mbps Gbps Tbps].freeze
+
+      class << self
+        def call(speed)
+          i = 0
+          while speed >= 1000
+            speed /= 1000
+            i += 1
+          end
+          format('%<speed>.2f %<unit>s', speed: speed, unit: UNITS[i])
+        end
+      end
+    end
+  end
+end

data/lib/speedtest_net/http_timeout.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  HTTP_TIMEOUT = 180
+end

data/lib/speedtest_net/result.rb

@@ -1,34 +1,34 @@
 # frozen_string_literal: true
 
-require 'speedtest_net/calculate_speed'
+require 'speedtest_net/formatter/distance'
+require 'speedtest_net/formatter/latency'
+require 'speedtest_net/formatter/speed'
 
 module SpeedtestNet
   class Result
-    UNITS = %w[bps Kbps Mbps Gbps Tbps].freeze
+    attr_reader :client, :server
 
-    attr_reader :client, :server, :download_results, :upload_results
-
-    def initialize(client, server, download_results, upload_results)
+    def initialize(client, server, download, upload)
       @client = client
       @server = server
-      @download_results = download_results
-      @upload_results = upload_results
+      @download = download
+      @upload = upload
     end
 
     def download
-      CalculateSpeed.call(@download_results)
+      @download.calculate
     end
 
     def pretty_download
-      pretty_format(download)
+      Formatter::Speed.call(download)
     end
 
     def upload
-      CalculateSpeed.call(@upload_results)
+      @upload.calculate
     end
 
     def pretty_upload
-      pretty_format(upload)
+      Formatter::Speed.call(upload)
     end
 
     def latency
@@ -36,7 +36,7 @@ module SpeedtestNet
     end
 
     def pretty_latency
-      format('%<latency>f millisecond', latency: latency * 1_000)
+      Formatter::Latency.call(latency)
     end
 
     def distance
@@ -44,18 +44,7 @@ module SpeedtestNet
     end
 
     def pretty_distance
-      format('%<distance>.3f kilometre', distance: (distance / 1_000).round(3))
-    end
-
-    private
-
-    def pretty_format(speed)
-      i = 0
-      while speed > 1000
-        speed /= 1000
-        i += 1
-      end
-      format('%<speed>.2f %<unit>s', speed: speed, unit: UNITS[i])
+      Formatter::Distance.call(distance)
     end
   end
 end

data/lib/speedtest_net/upload.rb

@@ -2,22 +2,38 @@
 
 require 'curb'
 require 'securerandom'
+require 'speedtest_net/calculate_speed'
+require 'speedtest_net/http_timeout'
 
 module SpeedtestNet
   class Upload
     SIZE = [250_000, 500_000, 1_000_000, 2_000_000, 4_000_000, 8_000_000,
             12_000_000, 17_000_000, 24_000_000, 32_000_000].freeze
 
+    def initialize(results)
+      @results = results
+    end
+
+    def calculate
+      CalculateSpeed.call(@results)
+    end
+
     class << self
-      def measure(server)
+      def measure(server, timeout: HTTP_TIMEOUT) # rubocop:disable Metrics/MethodLength
         config = Config.fetch
         concurrent_number = config.upload[:threadsperurl]
 
-        results = SIZE.map do |size|
-          urls = create_urls(server, concurrent_number)
-          multi_uploader(urls, size)
+        results = []
+        begin
+          Timeout.timeout(timeout) do
+            SIZE.each do |size|
+              urls = create_urls(server, concurrent_number)
+              results << multi_uploader(urls, size)
+            end
+          end
+        rescue Timeout::Error # rubocop:disable Lint/SuppressedException
         end
-        results
+        new(results)
       end
 
       private

data/lib/speedtest_net/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SpeedtestNet
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/speedtest_net.gemspec

@@ -30,17 +30,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.5.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'codacy-coverage', '~> 2.1'
-  spec.add_development_dependency 'factory_bot', '~> 6.0'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.76'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.36'
-  spec.add_development_dependency 'simplecov', '~> 0.17'
-  spec.add_development_dependency 'vcr', '~> 6.0'
-  spec.add_development_dependency 'webmock', '~> 3.7'
-
   spec.add_dependency 'curb', '~> 0.9'
   spec.add_dependency 'rexml', '~> 3.2'
   spec.add_dependency 'typhoeus', '~> 1.3'

metadata

@@ -1,155 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: speedtest_net
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ryo Nakano
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: codacy-coverage
-  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
-  name: factory_bot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.76'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.76'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.36'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.36'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +78,10 @@ files:
 - lib/speedtest_net/config.rb
 - lib/speedtest_net/download.rb
 - lib/speedtest_net/error.rb
+- lib/speedtest_net/formatter/distance.rb
+- lib/speedtest_net/formatter/latency.rb
+- lib/speedtest_net/formatter/speed.rb
+- lib/speedtest_net/http_timeout.rb
 - lib/speedtest_net/latency.rb
 - lib/speedtest_net/result.rb
 - lib/speedtest_net/server.rb