zold 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42d45258927844c4cc2c07418af8b5077787731b
-  data.tar.gz: 508255ebe906bd0c4dd9fcb88ed12dee32a1973a
+  metadata.gz: c34164f9da323f0a19a831a982d4904b2c3eaffd
+  data.tar.gz: 77d4935724eab082b127abdc5505be79d02fe6e8
 SHA512:
-  metadata.gz: 4783b3ade202e80fb6b252ed58cab12176a0bcb70cc4584e67e3e6fe49f1ec9fcd2fdb1df0020f7a2d13b20e865e99c591a14604e402b8725acc9168a6365b2b
-  data.tar.gz: c8c189ee8908b4479b3b9e71f73776995ddcfc407cb2bdb6e32b15339c63bbdfc86a6f5a49845ad064bbd92cc1f50c2da557be6ae9d3a2673dbe478f4c80c0cc
+  metadata.gz: fa900d58a11e33b2f8855b62a7bd8503a39c68d1cdd3a270ad85defac1529fb120c38b3be8437513120911a0ec6725d8d23749503c92bd0ac8809dd8aa1767ac
+  data.tar.gz: 9d73f149efa4a79c9acf55edec7caeb5c12613ec115310a5023ec962fd7786e6975b54c1070965bb21bc7484ff4ad01cb1a1e63ac79bd2a8c2895a4a29331e38

data/Procfile

@@ -1 +1 @@
-web: LC_ALL=UTF-8 ./bin/zold --no-colors --verbose --trace node --bind-port=$PORT --port=80 --host=b1.zold.io --threads=0 --standalone
+web: LC_ALL=UTF-8 ./bin/zold node --no-colors --verbose --trace --bind-port=$PORT --port=80 --host=b1.zold.io --threads=0 --standalone --invoice=JKFq17yipfjLtX@0000000000000000

data/lib/zold/commands/fetch.rb

@@ -66,7 +66,12 @@ Available options:"
     def fetch(id, cps, opts)
       total = 0
       @remotes.all.each do |r|
-        total += 1 if fetch_one(id, r, cps, opts)
+        done = fetch_one(id, r, cps, opts)
+        if done
+          total += 1
+        else
+          @remotes.error(r[:host], r[:port])
+        end
       end
       @log.debug("#{total} copies fetched, there are #{cps.all.count} available locally")
     end

data/lib/zold/commands/remote.rb

@@ -121,35 +121,35 @@ Available options:"
         uri = URI("#{r[:home]}remotes")
         res = Http.new(uri).get
         unless res.code == '200'
-          @remotes.remove(r[:host], r[:port])
+          @remotes.error(r[:host], r[:port])
           @log.info("#{Rainbow(r[:host]).red} #{res.code} \"#{res.message}\" #{uri}")
           next
         end
         begin
           json = JSON.parse(res.body)
         rescue JSON::ParserError => e
-          remove(r[:host], r[:port])
+          error(r[:host], r[:port])
           @log.info("#{Rainbow(r[:host]).red} \"#{e.message}\": #{res.body}")
           next
         end
         score = Score.parse_json(json['score'])
         unless score.valid?
-          remove(r[:host], r[:port])
+          error(r[:host], r[:port])
           @log.info("#{Rainbow(r[:host]).red} invalid score")
           next
         end
         if score.expired?
-          remove(r[:host], r[:port])
+          error(r[:host], r[:port])
           @log.info("#{Rainbow(r[:host]).red} expired score")
           next
         end
         if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
-          remove(r[:host], r[:port])
+          error(r[:host], r[:port])
           @log.info("#{Rainbow(r[:host]).red} score too weak: #{score.strength}")
           next
         end
         if r[:host] != score.host || r[:port] != score.port
-          @remotes.remove(r[:host], r[:port])
+          @remotes.error(r[:host], r[:port])
           @remotes.add(score.host, score.port)
           @log.info("#{r[:host]}:#{r[:port]} renamed to #{score.host}:#{score.port}")
         end

data/lib/zold/remotes.rb

@@ -43,7 +43,14 @@ module Zold
     end
 
     def all
-      load.sort_by { |r| r[:score] }.reverse
+      list = load
+      max_score = list.map { |r| r[:score] }.max
+      max_score = 1 if max_score.zero?
+      max_errors = list.map { |r| r[:errors] }.max
+      max_errors = 1 if max_errors.zero?
+      list.sort_by do |r|
+        (1 - r[:errors] / max_errors) * 5 + (r[:score] / max_score)
+      end.reverse
     end
 
     def clean
@@ -88,6 +95,22 @@ module Zold
       load.find { |r| r[:host] == host.downcase && r[:port] == port }[:score]
     end
 
+    def errors(host, port = Remotes::PORT)
+      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
+      raise "#{host}:#{port} is absent" unless exists?(host, port)
+      load.find { |r| r[:host] == host.downcase && r[:port] == port }[:errors]
+    end
+
+    def error(host, port = Remotes::PORT)
+      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
+      raise "#{host}:#{port} is absent" unless exists?(host, port)
+      list = load
+      list.find do |r|
+        r[:host] == host.downcase && r[:port] == port
+      end[:errors] += 1
+      save(list)
+    end
+
     def rescore(host, port, score)
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       raise "#{host}:#{port} is absent" unless exists?(host, port)
@@ -106,6 +129,7 @@ module Zold
           host: r[0],
           port: r[1].to_i,
           score: r[2].to_i,
+          errors: r[3].to_i,
           home: URI("http://#{r[0]}:#{r[1]}/")
         }
       end
@@ -114,7 +138,14 @@ module Zold
     def save(list)
       File.write(
         file,
-        list.map { |r| "#{r[:host]},#{r[:port]},#{r[:score]}" }.join("\n")
+        list.map do |r|
+          [
+            r[:host],
+            r[:port],
+            r[:score],
+            r[:errors]
+          ].join(',')
+        end.join("\n")
       )
     end
 

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.6.2'.freeze
 end

data/resources/remotes

@@ -1,2 +1,2 @@
-b1.zold.io,80,0
-b2.zold.io,4096,0
+b1.zold.io,80,0,0
+b2.zold.io,4096,0,0

data/test/commands/test_remote.rb

@@ -62,7 +62,7 @@ class TestRemote < Minitest::Test
       cmd.run(%w[remote add localhost 2])
       assert_equal(2, remotes.all.count)
       cmd.run(['remote', 'update', '--ignore-score-weakness'])
-      assert_equal(1, remotes.all.count)
+      assert_equal(4, remotes.all.count)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Yegor Bugayenko