q3_servers 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f82fbeb9b327a11aedb51d1ad6f3dd98d20ff7863d5d1c108e70680cfc4f3ffb
-  data.tar.gz: 45fa2991f473f0714823d3574a1965dc56b249fc2a7a63c1a753e15bd752bcd9
+  metadata.gz: 9fb8f8effc44482edebea0de3ba0a458ef03d7ebe44dabec1ecee2b2acfaa0d0
+  data.tar.gz: 68567822f194a905695e814fe158be591b1a2d852eff6d69b9f885eb959896e6
 SHA512:
-  metadata.gz: 96f27480478d3f3443cd5451cd2876f036949037d2cc22731dc8c39734ec561d6f005430489fb133bdd286153b76289bf7d317f6d7330464ab40a0ded0d0d16b
-  data.tar.gz: '01168eac86e3c2bfa307c5c323b204b154e1bab4242387660504300553f9598ee19c732c9d67365c7cda751d74dca55d447c5451c2655fba6ba18b3e1eab3fd0'
+  metadata.gz: f157543e7674b674c0f6bcfd98b01ceaf43a54552c2de5e03b8b116142bc8056715827ab394b41f4676f08f2f2e378af6aea268aeecac1f38bcc9167f01e9622
+  data.tar.gz: 59dd575a839a181cca3101a020c7e3214b9e6c6be6d98a3da47f5f9ef54340b01ecb167e6eafdbc87580ac7dfc4c5fad2ecd214500f51b42cf95b3bd525c594f

data/Gemfile.lock

@@ -1,42 +1,22 @@
 PATH
   remote: .
   specs:
-    q3_servers (0.1.0)
+    q3_servers (1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
     minitest (5.14.4)
-    parallel (1.20.1)
-    parser (3.0.1.1)
-      ast (~> 2.4.1)
-    rainbow (3.0.0)
     rake (12.3.3)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rubocop (1.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
-    ruby-progressbar (1.11.0)
-    unicode-display_width (2.0.0)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
   minitest (~> 5.0)
   q3_servers!
   rake (~> 12.0)
-  rubocop
 
 BUNDLED WITH
    2.2.17

data/README.md

@@ -38,16 +38,16 @@ Or install it yourself as:
     servers = q3_urt_list.fetch_servers({})
 ```
 ##### Threads
-  You can use use_threads keyword, for multi-threaded fetching (one for each server found!)
+  You can use the second argument as true, for multi-threaded fetching (one for each server found!)
    ```ruby
-   q3_urt_list.fetch_servers({}, use_threads: true)
+   q3_urt_list.fetch_servers({}, true)
    ```
 
 ##### Filter
   Filter by keys from "info" attribute in Q3Servers::Server
   example:
   ```ruby
-   q3_urt_list.fetch_servers({hostname: "Arg"})
+   q3_urt_list.fetch_servers({hostname: "Arg"}, false)
    ```
 
 #### And now read information from each server

data/lib/q3_servers/list.rb

@@ -2,6 +2,7 @@
 
 require 'socket'
 require 'date'
+require 'logger'
 
 module Q3Servers
   class List
@@ -9,7 +10,7 @@ module Q3Servers
     MAX_LENGTH = 65_536
 
     attr_reader :master_socket, :threads, :servers, :favorites
-    attr_accessor :cache, :timeout, :master_updated_at, :debug, :master_cache_secs, :info_cache_secs, :only_favorites,
+    attr_accessor :cache, :timeout, :master_updated_at, :debug, :logger, :master_cache_secs, :info_cache_secs, :only_favorites,
                   :master_address, :master_port
     alias only_favorites? only_favorites
     alias cache? cache
@@ -27,9 +28,10 @@ module Q3Servers
       @master_port = 27_900
       @master_address = 'master.urbanterror.info' # 51.75.224.242
       @threads = []
+      @logger = Logger.new(STDOUT)
     end
 
-    def fetch_servers(filter = {}, use_threads: false)
+    def fetch_servers(filter = {}, use_threads = false)
       servers_list_from_master if master_server_outdated? && !only_favorites?
       fetch_info_servers(filter, use_threads)
     end
@@ -44,11 +46,11 @@ module Q3Servers
     end
 
     def cached_info?(server)
-      cache? && server_info?(server) && !server_info_outdated?(server)
+      cache? && server.info? && !server_info_outdated?(server)
     end
 
     def cached_status?(server)
-      cache? && server_status?(server) && !server_status_outdated?(server)
+      cache? && server.info_status? && !server_status_outdated?(server)
     end
 
     def add_server(server)
@@ -78,14 +80,6 @@ module Q3Servers
       server.info
     end
 
-    def server_info?(server)
-      !server.info.empty?
-    end
-
-    def server_status?(server)
-      server_info?(server) && !server.info_status.empty?
-    end
-
     def fill_list_favorites
       favorites.each do |fav|
         add_server(fav)
@@ -142,7 +136,7 @@ module Q3Servers
     end
 
     def print_debug(info)
-      p info if @debug
+      logger.info(info) if @debug
     end
 
     def to_ip(decimal)
@@ -154,15 +148,16 @@ module Q3Servers
     end
 
     def server_info_outdated?(server)
-      (!server_info?(server) or (DateTime.now > (server.updated_at + Rational(info_cache_secs, 86_400))))
+      (!server.info? or (DateTime.now > (server.updated_at + Rational(info_cache_secs, 86_400))))
     end
 
     def server_status_outdated?(server)
-      (!server_status?(server) or (DateTime.now > (server.status_updated_at + Rational(info_cache_secs, 86_400))))
+      (!server.info_status? or (DateTime.now > (server.status_updated_at + Rational(info_cache_secs, 86_400))))
     end
 
     def massive_read_info_status(servers, filter)
-      massive_helper = MassiveHelper.new(servers.select(&:request_status?), self)
+      logger_object = debug ? logger : nil
+      massive_helper = MassiveHelper.new(servers.select(&:request_status?), logger_object)
       alive_servers = massive_helper.read_info_servers(2, timeout) do |server|
         server.read_info unless cached_info?(server)
       end

data/lib/q3_servers/massive_helper.rb

@@ -4,20 +4,20 @@ module Q3Servers
   class MassiveHelper
     attr_accessor :sockets, :servers
 
-    def initialize(servers, context)
-      @context = context
+    def initialize(servers, logger)
+      @logger = logger
       @servers = servers.each_with_object({}) do |server, hsh|
         hsh[server.unique_index] = server
       end
     end
   
     def read_info_servers(max_retries, timeout, &block)
-      puts '======== Read Info servers ========'
+      @logger.info '======== Read Info servers ========' if @logger
       read_info(servers.map { |_unique_index, server| server.socket }, max_retries, timeout, &Proc.new)
     end
   
     def read_status_servers(servers, max_retries, timeout)
-      puts '======== Read Status servers ========'
+      @logger.info '======== Read Status servers ========' if @logger
       read_info(servers.map(&:socket), max_retries, timeout, &Proc.new)
     end
   
@@ -39,7 +39,7 @@ module Q3Servers
           end
         else
           retries += 1
-          puts "Retry n #{retries}"
+          @logger.info "Retry n #{retries}" if @logger
         end
       end
       servers_with_info

data/lib/q3_servers/server.rb

@@ -95,6 +95,14 @@ module Q3Servers
       define_method("#{status}_status?") { self.status == status }
     end
 
+    def info?
+      !info.empty?
+    end
+
+    def info_status?
+      info? && !info_status.empty?
+    end
+    
     private
 
     def touch!

data/lib/q3_servers/version.rb

@@ -1,3 +1,3 @@
 module Q3Servers
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: q3_servers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Juan Pablo Garritano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: