speedtest_net 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e96f1e3dfc288c7a9203f575420bc6b25d5077c8dbde6e3822851f54296fff5f
-  data.tar.gz: 8019fba56eae4047eab3ae84b6afbaa4979262e3ed59395a6394c1ad466e013c
+  metadata.gz: ed21ac6a96ef110554941966993ee911a4062090216400207534c59afcc5b383
+  data.tar.gz: 466c522ae2b60cd187a5d7b98b023db50bfa8f9834e55a01979879de154a3e34
 SHA512:
-  metadata.gz: 6bcfdd411e38e6e6a602ce61a41f32ed5f27ee1723269502e8d80cedc08a8d5ccad1bcd61874f3621287024463bce1d6466b92834a999f639f04ebae529b856a
-  data.tar.gz: d535e32474576a614709b33b67bc836cc32bf32021ee8d1a38eaf202817cacfd0e223c1f8c4d9efd7a3ce17ef3ad605fbb37832100bfcff3ae6b87905f27b9df
+  metadata.gz: 838e4b7eb05e59234e650c6d807c985a236467bf89af5a440df795febe66e6c211026b54f5ecd6019e41bed08e6b50e61ea9de1fc5f4b2ad6f4ade54ec6f55e9
+  data.tar.gz: 51d43777a2d506eb2092e1b77fd1de923881e4ba0fabe727a09b7da8dea1a0112bdd78ea3af2cd89f4072de352a0667b6ff4799e19110923ce34afd05c4270dd

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: '20:00'
+  open-pull-requests-limit: 10
+  assignees:
+  - ryonkn

data/.github/workflows/ruby.yml

@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
-    - name: Setup Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - name: Setup Ruby 2.7
+      uses: ruby/setup-ruby@master
       with:
-        ruby-version: 2.6.x
+        ruby-version: 2.7
     - name: Run rubocop
       run: |
         gem install rubocop rubocop-rspec
@@ -32,14 +32,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.5.x', '2.6.x' ]
+        ruby: [ 2.5, 2.6, 2.7, 'ruby-head' ]
     steps:
     - uses: actions/checkout@master
     - name: Setup Ruby 
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@master
       with:
         ruby-version: ${{ matrix.ruby }}
-        architecture: 'x64'
     - name: Run apt-get
       run: |
         sudo apt-get update

data/bin/console

@@ -8,8 +8,8 @@ require 'speedtest_net'
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-require 'pry'
-Pry.start
+# require 'pry'
+# Pry.start
 
-# require "irb"
-# IRB.start(__FILE__)
+require 'irb'
+IRB.start(__FILE__)

data/lib/speedtest_net.rb

@@ -1,24 +1,24 @@
 # frozen_string_literal: true
 
 require 'speedtest_net/version'
+require 'speedtest_net/user_agent'
 require 'speedtest_net/server'
 require 'speedtest_net/download'
 require 'speedtest_net/upload'
 require 'speedtest_net/result'
 
 module SpeedtestNet
-  def self.run
-    config = SpeedtestNet::Config.fetch
-    server = SpeedtestNet::Server.best_server
-    download_results = SpeedtestNet::Download.measure(server)
-    upload_results = SpeedtestNet::Upload.measure(server)
+  def self.run(id = nil, exclude_server_ids: [])
+    config = Config.fetch
+    server = Server.select_server(id, exclude_server_ids)
+    download_results = Download.measure(server)
+    upload_results = Upload.measure(server)
 
-    SpeedtestNet::Config.clear_cache
-    SpeedtestNet::Result.new(config.client, server, download_results,
-                             upload_results)
+    Config.clear_cache
+    Result.new(config.client, server, download_results, upload_results)
   end
 
   def self.list_server
-    SpeedtestNet::Server.list
+    Server.list
   end
 end

data/lib/speedtest_net/config.rb

@@ -48,9 +48,7 @@ module SpeedtestNet
         client.follow_location = true
         client.perform
 
-        if client.response_code != 200
-          raise HTTPDownloadError, 'Config download error'
-        end
+        raise HTTPDownloadError, 'Config download error' if client.response_code != 200
 
         xml = REXML::Document.new(client.body, ignore_whitespace_nodes: :all)
         xml.elements

data/lib/speedtest_net/download.rb

@@ -12,7 +12,7 @@ module SpeedtestNet
 
     class << self
       def measure(server)
-        config = SpeedtestNet::Config.fetch
+        config = Config.fetch
         concurrent_number = config.download[:threadsperurl]
 
         results = FILES.map do |file|
@@ -37,6 +37,7 @@ module SpeedtestNet
         multi = Curl::Multi.new
         urls.each do |url|
           client = Curl::Easy.new(url)
+          client.headers['User-Agent'] = USER_AGENT
           client.on_complete { |data| responses << data }
           multi.add(client)
         end

data/lib/speedtest_net/error.rb

@@ -3,4 +3,5 @@
 module SpeedtestNet
   class Error < StandardError; end
   class HTTPDownloadError < Error; end
+  class InvalidServerIdError < Error; end
 end

data/lib/speedtest_net/latency.rb

@@ -11,7 +11,7 @@ module SpeedtestNet
 
     class << self
       def measure(server)
-        config = SpeedtestNet::Config.fetch
+        config = Config.fetch
         test_length = test_length(config)
         timeout = config.latency[:timeout]
 
@@ -35,6 +35,7 @@ module SpeedtestNet
       end
 
       def measure_latency(url, timeout)
+        Typhoeus::Config.user_agent = SpeedtestNet::USER_AGENT
         client = Typhoeus::Request.new(url, followlocation: true,
                                             timeout: timeout)
         client.run

data/lib/speedtest_net/result.rb

@@ -16,7 +16,7 @@ module SpeedtestNet
     end
 
     def download
-      SpeedtestNet::CalculateSpeed.call(@download_results)
+      CalculateSpeed.call(@download_results)
     end
 
     def pretty_download
@@ -24,7 +24,7 @@ module SpeedtestNet
     end
 
     def upload
-      SpeedtestNet::CalculateSpeed.call(@upload_results)
+      CalculateSpeed.call(@upload_results)
     end
 
     def pretty_upload

data/lib/speedtest_net/server.rb

@@ -26,7 +26,7 @@ module SpeedtestNet
     end
 
     def measure_latency
-      @latency = SpeedtestNet::Latency.measure(self)
+      @latency = Latency.measure(self)
     end
 
     class << self
@@ -38,9 +38,16 @@ module SpeedtestNet
         servers.sort_by { |s| [s.distance, s.id] }
       end
 
-      def best_server
+      def select_server(id = nil, exclude_server_ids = [])
+        id.nil? ? best_server(exclude_server_ids) : pick_server(id)
+      end
+
+      private
+
+      def best_server(exclude_server_ids)
         servers = list
-        closest_servers = servers.first(10)
+        excluded_servers = servers.reject { |server| exclude_server_ids.include?(server.id) }
+        closest_servers = excluded_servers.first(10)
         closest_servers.each(&:measure_latency)
         sorted_servers = closest_servers.sort_by do |s|
           [s.latency, s.distance, s.id]
@@ -48,10 +55,17 @@ module SpeedtestNet
         sorted_servers.first
       end
 
-      private
+      def pick_server(id)
+        servers = list
+        server = servers.find { |s| s.id == id }
+        raise InvalidServerIdError if server.nil?
+
+        server.measure_latency
+        server
+      end
 
       def create_instance(server)
-        config = SpeedtestNet::Config.fetch
+        config = Config.fetch
         url = server['url2'] || server['url']
 
         geo = Geo.new(server['lat'].to_f, server['lon'].to_f)
@@ -65,9 +79,7 @@ module SpeedtestNet
         client.follow_location = true
         client.perform
 
-        if client.response_code != 200
-          raise HTTPDownloadError, 'Server lists download error'
-        end
+        raise HTTPDownloadError, 'Server lists download error' if client.response_code != 200
 
         xml = REXML::Document.new(client.body, ignore_whitespace_nodes: :all)
         xml.elements['settings/servers']

data/lib/speedtest_net/upload.rb

@@ -10,7 +10,7 @@ module SpeedtestNet
 
     class << self
       def measure(server)
-        config = SpeedtestNet::Config.fetch
+        config = Config.fetch
         concurrent_number = config.upload[:threadsperurl]
 
         results = SIZE.map do |size|
@@ -29,15 +29,18 @@ module SpeedtestNet
         end
       end
 
-      def multi_uploader(urls, size)
+      def multi_uploader(urls, size) # rubocop:disable Metrics/MethodLength
         responses = []
         content = 'A' * size
-        url_fields = urls.map do |url|
-          { url: url, post_fields: { 'content1' => content } }
-        end
-        Curl::Multi.post(url_fields) do |curl|
-          responses << curl
+        multi = Curl::Multi.new
+        urls.each do |url|
+          client = Curl::Easy.new(url)
+          client.headers['User-Agent'] = USER_AGENT
+          client.http_post(Curl::PostField.content('content1', content))
+          client.on_complete { |data| responses << data }
+          multi.add(client)
         end
+        multi.perform
         responses.map(&:upload_speed).sum * 8
       end
     end

data/lib/speedtest_net/user_agent.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module SpeedtestNet
+  USER_AGENT = "SpeedtestNet/#{VERSION}"
+end

data/lib/speedtest_net/version.rb

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

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

data/speedtest_net.gemspec

@@ -32,16 +32,16 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'codacy-coverage', '~> 2.1'
-  spec.add_development_dependency 'factory_bot', '~> 5.1'
-  spec.add_development_dependency 'pry', '~> 0.12'
+  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', '~> 5.0'
+  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'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedtest_net
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ryo Nakano
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +199,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
@@ -221,7 +222,9 @@ files:
 - lib/speedtest_net/result.rb
 - lib/speedtest_net/server.rb
 - lib/speedtest_net/upload.rb
+- lib/speedtest_net/user_agent.rb
 - lib/speedtest_net/version.rb
+- renovate.json
 - speedtest_net.gemspec
 homepage: https://github.com/ryonkn/speedtest_net
 licenses:
@@ -230,7 +233,7 @@ metadata:
   homepage_uri: https://github.com/ryonkn/speedtest_net
   source_code_uri: https://github.com/ryonkn/speedtest_net
   changelog_uri: https://github.com/ryonkn/speedtest_net
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -245,8 +248,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Library for testing internet bandwidth using speedtest.net
 test_files: []