zold 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c22d25b0575aa403b58457dc738b232a14e40c8
-  data.tar.gz: 40726c037b816bd370b41b2cd46c1dfd23d834d7
+  metadata.gz: d4b85a4409d351be25bfa99d529cb7805474c413
+  data.tar.gz: 17c7832d676da4213cccf791dc38a175d2a45667
 SHA512:
-  metadata.gz: cdbfb12a088dbfc45ea613d5274c7bf1baf64d1864f939264bdd832cceb0c41988ba003fd27b3819a55a71ed4a599c847f65b676cc8e1052a6e27431cd053aa7
-  data.tar.gz: 2ea2de44216e0ef5f69f27b1c065fd2ec4570c0488a76d567572403cb284a72e72a872cccc4906e2528fc211e400143c9e04e94d973882be4d7c30a4223c3c67
+  metadata.gz: 214f26718d2dcf269e355bb574edb51c4b2d15dc6b0679ef8a721e77595751b551d4e48c3fe83d65889b612453a2a7e7cea45be8a22f063629ffa33ab663d0dc
+  data.tar.gz: f488b84aa410a24cf9c73e3acfebe7943378889a183fa923937856bbdb8ee27ec11e8bdd3a00cc75bbf4ad5b5cbe431abeb3ea291581161a0bff63abb3b0a0f8

data/fixtures/scripts/push-and-pull.sh

@@ -23,6 +23,7 @@ done
 
 zold remote clean
 zold remote add localhost ${port}
+zold remote trim
 zold remote show
 
 zold --public-key=id_rsa.pub create 0000000000000000

data/lib/zold/commands/fetch.rb

@@ -77,7 +77,7 @@ Available options:"
     def fetch_one(id, r, cps, opts)
       start = Time.now
       if opts['ignore-node'].include?(r.to_s)
-        @log.info("#{r} ignored because of --ignore-node")
+        @log.debug("#{r} ignored because of --ignore-node")
         return false
       end
       res = r.http("/wallet/#{id}").get
@@ -92,7 +92,7 @@ Available options:"
         File.write(f, body)
         wallet = Wallet.new(f.path)
         cps.add(body, score.host, score.port, score.value)
-        @log.info("#{r} returned #{body.length}b/#{wallet.txns.count} \
+        @log.info("#{r} returned #{body.length}b/#{wallet.txns.count}t \
 of #{id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
       end
     end

data/lib/zold/commands/node.rb

@@ -119,11 +119,12 @@ module Zold
       )
       Front.set(:farm, farm)
       update = Thread.start do
-        VerboseThread.new(@log).run do
+        VerboseThread.new(@log).run(true) do
           loop do
             sleep(60)
             require_relative 'remote'
             Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote update --reboot])
+            Remote.new(remotes: remotes, log: @log).run(%w[remote trim])
             @log.debug('Regular update of remote nodes succeeded')
           end
         end

data/lib/zold/commands/push.rb

@@ -73,7 +73,7 @@ Available options:"
 
     def push_one(wallet, r, opts)
       if opts['ignore-node'].include?(r.to_s)
-        @log.info("#{r} ignored because of --ignore-node")
+        @log.debug("#{r} ignored because of --ignore-node")
         return 0
       end
       start = Time.now
@@ -84,11 +84,11 @@ Available options:"
         return 0
       end
       r.assert_code(200, response)
-      json = JSON.parse(response.body)['score']
-      score = Score.parse_json(json)
+      json = JSON.parse(response.body)
+      score = Score.parse_json(json['score'])
       r.assert_valid_score(score)
       raise "Score is too weak #{score}" if score.strength < Score::STRENGTH
-      @log.info("#{r} accepted #{content.length}b/#{wallet.txns.count}txns of #{wallet.id} \
+      @log.info("#{r} accepted #{content.length}b/#{wallet.txns.count}t of #{wallet.id} \
 in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
       score.value
     end

data/lib/zold/commands/remote.rb

@@ -58,6 +58,8 @@ Available commands:
       Add a new remote node
     #{Rainbow('remote remove').green} host [port]
       Remove the remote node
+    #{Rainbow('remote trim').green}
+      Remote the least reliable nodes
     #{Rainbow('remote update').green}
       Check each registered remote node for availability
 Available options:"
@@ -86,6 +88,8 @@ Available options:"
         add(mine[1], mine[2] ? mine[2].to_i : Remotes::PORT, opts)
       when 'remove'
         remove(mine[1], mine[2] ? mine[2].to_i : Remotes::PORT, opts)
+      when 'trim'
+        trim(opts)
       when 'update'
         update(opts)
         update(opts, false)
@@ -135,6 +139,12 @@ Available options:"
       @log.info("There are #{@remotes.all.count} remote nodes in the list")
     end
 
+    def trim(opts)
+      @remotes.all.each do |r|
+        remove(r[:host], r[:port], opts) if r[:errors] > 20
+      end
+    end
+
     def update(opts, deep = true)
       capacity = []
       @remotes.iterate(@log, farm: @farm) do |r|

data/lib/zold/http.rb

@@ -57,7 +57,7 @@ module Zold
 
     def put(body)
       http = Net::HTTP.new(@uri.host, @uri.port)
-      http.read_timeout = 60
+      http.read_timeout = 10
       path = @uri.path
       path += '?' + @uri.query if @uri.query
       http.request_put(

data/lib/zold/node/entrance.rb

@@ -44,7 +44,7 @@ module Zold
       @address = address
       @log = log
       @semaphores = Concurrent::Map.new
-      @pool = Concurrent::FixedThreadPool.new(16)
+      @pool = Concurrent::FixedThreadPool.new(16, max_queue: 64, fallback_policy: :abort)
     end
 
     def push(id, body, sync: true)
@@ -78,8 +78,9 @@ module Zold
     def push_sync(id, body)
       @semaphores.put_if_absent(id, Mutex.new)
       @semaphores.get(id).synchronize do
+        start = Time.now
         modified = push_unsafe(id, body)
-        @log.info("Accepted #{id} and modified: #{modified.join(', ')}")
+        @log.info("Accepted #{id} in #{(Time.now - start) / 60}s and modified #{modified.join(', ')}")
         modified
       end
     end

data/lib/zold/node/farm.rb

@@ -58,10 +58,11 @@ module Zold
 
     def start(host, port, strength: 8, threads: 8)
       @log.debug('Zero-threads farm won\'t score anything!') if threads.zero?
-      @best << Score.new(Time.now, host, port, @invoice, strength: strength)
       @scores = Queue.new
-      history.each { |s| @scores << s }
-      @log.debug("#{@scores.size} scores pre-loaded") unless @scores.size.zero?
+      h = history(threads)
+      h.each { |s| @scores << s }
+      @best << (h[0] || Score.new(Time.now, host, port, @invoice, strength: strength))
+      @log.info("#{@scores.size} scores pre-loaded, the best is: #{@best[0]}")
       @threads = (1..threads).map do |t|
         Thread.new do
           VerboseThread.new(@log).run do
@@ -107,9 +108,14 @@ module Zold
       File.write(@cache, (history + [score]).map(&:to_s).join("\n"))
     end
 
-    def history
+    def history(max = 16)
       if File.exist?(@cache)
-        File.readlines(@cache).map { |t| Score.parse(t) }.reject(&:expired?)
+        File.readlines(@cache)
+          .map { |t| Score.parse(t) }
+          .reject(&:expired?)
+          .sort_by(&:value)
+          .reverse
+          .take(max)
       else
         []
       end

data/lib/zold/node/front.rb

@@ -90,6 +90,10 @@ module Zold
       'User-agent: *'
     end
 
+    get '/v' do
+      VERSION
+    end
+
     get '/favicon.ico' do
       if score.value >= 16
         redirect 'https://www.zold.io/images/logo-green.png'
@@ -108,7 +112,7 @@ module Zold
         pid: Process.pid,
         cpus: Concurrent.processor_count,
         uptime: `uptime`.strip,
-        threads: Thread.list.select { |t| t.status == 'run' }.count,
+        threads: "#{Thread.list.select { |t| t.status == 'run' }.count}/#{Thread.list.count}",
         wallets: settings.wallets.all.count,
         remotes: settings.remotes.all.count,
         farm: settings.farm.to_json,

data/lib/zold/remotes.rb

@@ -64,9 +64,9 @@ module Zold
       end
 
       def assert_code(code, response)
-        @log.debug("#{response.code} \"#{response.message}\" at \"#{response.body}\"")
         msg = response.message
         return if response.code.to_i == code
+        @log.debug("#{response.code} \"#{response.message}\" at \"#{response.body}\"")
         raise "Unexpected HTTP code #{response.code}, instead of #{code}" if msg.empty?
         raise "#{msg} (HTTP code #{response.code}, instead of #{code})"
       end

data/lib/zold/verbose_thread.rb

@@ -31,11 +31,11 @@ module Zold
       @log = log
     end
 
-    def run
+    def run(safe = false)
       yield
     rescue StandardError => e
       @log.error("#{e.class.name}: #{e.message} #{e.backtrace.join("\n\t")}")
-      raise e
+      raise e unless safe
     end
   end
 end

data/lib/zold/version.rb

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

data/test/commands/test_calculate.rb

@@ -29,7 +29,7 @@ require_relative '../../lib/zold/commands/calculate'
 # License:: MIT
 class TestCalculate < Minitest::Test
   def test_calculates_score
-    score = Zold::Calculate.new(log: log).run(
+    score = Zold::Calculate.new(log: test_log).run(
       ['score', '--strength=2', '--max=8', '--invoice=NOSUFFIX@ffffffffffffffff']
     )
     assert(score.valid?)

data/test/commands/test_clean.rb

@@ -36,7 +36,7 @@ class TestClean < Minitest::Test
       copies = home.copies(wallet)
       copies.add('a1', 'host-1', 80, 1, Time.now - 26 * 60 * 60)
       copies.add('a2', 'host-2', 80, 2, Time.now - 26 * 60 * 60)
-      Zold::Clean.new(wallets: home.wallets, copies: copies.root, log: log).run(['clean', wallet.id.to_s])
+      Zold::Clean.new(wallets: home.wallets, copies: copies.root, log: test_log).run(['clean', wallet.id.to_s])
       assert(copies.all.empty?)
     end
   end

data/test/commands/test_create.rb

@@ -32,7 +32,7 @@ require_relative '../../lib/zold/commands/create'
 class TestCreate < Minitest::Test
   def test_creates_wallet
     Dir.mktmpdir 'test' do |dir|
-      wallet = Zold::Create.new(wallets: Zold::Wallets.new(dir), log: log).run(
+      wallet = Zold::Create.new(wallets: Zold::Wallets.new(dir), log: test_log).run(
         ['create', '--public-key=fixtures/id_rsa.pub']
       )
       assert wallet.balance.zero?

data/test/commands/test_diff.rb

@@ -44,13 +44,13 @@ class TestDiff < Minitest::Test
       File.write(first.path, File.read(wallet.path))
       second = home.create_wallet
       File.write(second.path, File.read(wallet.path))
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: log).run(
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
         ['pay', wallet.id.to_s, second.id.to_s, '14.95', '--force', '--private-key=fixtures/id_rsa']
       )
       copies = home.copies(wallet)
       copies.add(File.read(first.path), 'host-1', 80, 5)
       copies.add(File.read(second.path), 'host-2', 80, 5)
-      diff = Zold::Diff.new(wallets: home.wallets, copies: copies.root, log: log).run(
+      diff = Zold::Diff.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
         ['diff', wallet.id.to_s]
       )
       assert(diff.include?('-0001;'))

data/test/commands/test_fetch.rb

@@ -59,7 +59,7 @@ class TestFetch < Minitest::Test
       remotes.add('fake-1', 80)
       remotes.add('fake-2', 80)
       copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
-      Zold::Fetch.new(wallets: wallets, copies: copies.root, remotes: remotes, log: log).run(
+      Zold::Fetch.new(wallets: wallets, copies: copies.root, remotes: remotes, log: test_log).run(
         ['fetch', '--ignore-score-weakness', id.to_s]
       )
       assert_equal(copies.all[0][:name], '1')
@@ -83,7 +83,7 @@ class TestFetch < Minitest::Test
       remotes.add('fake-1', 80)
       copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
       Zold::Fetch.new(
-        wallets: wallets, copies: copies.root, remotes: remotes, log: log
+        wallets: wallets, copies: copies.root, remotes: remotes, log: test_log
       ).run(['fetch', id.to_s])
       assert_equal(copies.all[0][:name], '1')
       assert_equal(copies.all[0][:score], 0)

data/test/commands/test_invoice.rb

@@ -38,7 +38,7 @@ class TestInvoice < Minitest::Test
       wallets = Zold::Wallets.new(dir)
       source = wallets.find(id)
       source.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      invoice = Zold::Invoice.new(wallets: wallets, log: log).run(
+      invoice = Zold::Invoice.new(wallets: wallets, log: test_log).run(
         ['invoice', id.to_s, '--length=16']
       )
       assert_equal(33, invoice.length)

data/test/commands/test_list.rb

@@ -37,7 +37,7 @@ class TestList < Minitest::Test
       wallets = Zold::Wallets.new(dir)
       wallet = wallets.find(id)
       wallet.init(Zold::Id.new, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      Zold::List.new(wallets: wallets, log: log).run
+      Zold::List.new(wallets: wallets, log: test_log).run
     end
   end
 end

data/test/commands/test_merge.rb

@@ -45,13 +45,13 @@ class TestMerge < Minitest::Test
       File.write(first.path, File.read(wallet.path))
       second = home.create_wallet
       File.write(second.path, File.read(wallet.path))
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: log).run(
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
         ['pay', wallet.id.to_s, second.id.to_s, '14.95', '--force', '--private-key=fixtures/id_rsa']
       )
       copies = home.copies(wallet)
       copies.add(File.read(first.path), 'host-1', 80, 5)
       copies.add(File.read(second.path), 'host-2', 80, 5)
-      modified = Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: log).run(
+      modified = Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
         ['merge', wallet.id.to_s]
       )
       assert(1, modified.count)
@@ -66,13 +66,13 @@ class TestMerge < Minitest::Test
       File.write(first.path, File.read(wallet.path))
       second = home.create_wallet
       File.write(second.path, File.read(wallet.path))
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: log).run(
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
         ['pay', wallet.id.to_s, second.id.to_s, '14.95', '--force', '--private-key=fixtures/id_rsa']
       )
       copies = home.copies(wallet)
       copies.add(File.read(first.path), 'host-1', 80, 5)
       copies.add(File.read(second.path), 'host-2', 80, 5)
-      modified = Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: log).run(
+      modified = Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
         ['merge', wallet.id.to_s]
       )
       assert(1, modified.count)

data/test/commands/test_node.rb

@@ -38,7 +38,7 @@ require_relative '../node/fake_node'
 # License:: MIT
 class TestNode < Minitest::Test
   def test_push_and_fetch
-    FakeNode.new(log: log).run do |port|
+    FakeNode.new(log: test_log).run do |port|
       Dir.mktmpdir 'test' do |dir|
         id = Zold::Id.new
         wallets = Zold::Wallets.new(dir)
@@ -47,10 +47,10 @@ class TestNode < Minitest::Test
         remotes = Zold::Remotes.new(File.join(dir, 'remotes.csv'))
         remotes.clean
         remotes.add('localhost', port)
-        Zold::Push.new(wallets: wallets, remotes: remotes, log: log).run(['push', '--sync'])
+        Zold::Push.new(wallets: wallets, remotes: remotes, log: test_log).run(['push', '--sync'])
         Zold::Fetch.new(
           wallets: wallets, copies: File.join(dir, 'copies'),
-          remotes: remotes, log: log
+          remotes: remotes, log: test_log
         ).run(['fetch'])
         copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
         assert_equal(1, copies.all.count)

data/test/commands/test_pay.rb

@@ -37,7 +37,7 @@ class TestPay < Minitest::Test
       source = home.create_wallet
       target = home.create_wallet
       amount = Zold::Amount.new(zld: 14.95)
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: log).run(
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
         [
           'pay', '--force', '--private-key=fixtures/id_rsa',
           source.id.to_s, target.id.to_s, amount.to_zld, 'For the car'
@@ -52,7 +52,7 @@ class TestPay < Minitest::Test
       source = home.create_wallet(Zold::Id::ROOT)
       target = home.create_wallet
       amount = Zold::Amount.new(zld: 14.95)
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: log).run(
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
         [
           'pay', '--private-key=fixtures/id_rsa',
           source.id.to_s, target.id.to_s, amount.to_zld, 'For the car'
@@ -73,7 +73,7 @@ class TestPay < Minitest::Test
           'NOPREFIX', Zold::Id.new, '-'
         )
       )
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: log).run(
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
         [
           'pay', '--private-key=fixtures/id_rsa',
           source.id.to_s, target.id.to_s, amount.to_zld, 'here is the refund'

data/test/commands/test_push.rb

@@ -38,7 +38,7 @@ class TestPush < Minitest::Test
     FakeHome.new.run do |home|
       wallet = home.create_wallet
       stub_request(:put, "http://fake-1/wallet/#{wallet.id}").to_return(status: 304)
-      Zold::Push.new(wallets: home.wallets, remotes: home.remotes, log: log).run(
+      Zold::Push.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
         ['--ignore-this-stupid-option', 'push', wallet.id.to_s]
       )
     end

data/test/commands/test_remote.rb

@@ -59,7 +59,7 @@ class TestRemote < Minitest::Test
       stub_request(:get, 'http://localhost:999/remotes').to_return(
         status: 404
       )
-      cmd = Zold::Remote.new(remotes: remotes, log: log)
+      cmd = Zold::Remote.new(remotes: remotes, log: test_log)
       cmd.run(%w[remote clean])
       cmd.run(['remote', 'add', zero.host, zero.port.to_s])
       cmd.run(%w[remote add localhost 2])

data/test/commands/test_show.rb

@@ -38,7 +38,7 @@ class TestShow < Minitest::Test
       wallets = Zold::Wallets.new(dir)
       wallet = wallets.find(id)
       wallet.init(Zold::Id.new, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      balance = Zold::Show.new(wallets: wallets, log: log).run(['show', id.to_s])
+      balance = Zold::Show.new(wallets: wallets, log: test_log).run(['show', id.to_s])
       assert_equal(Zold::Amount::ZERO, balance)
     end
   end

data/test/commands/test_taxes.rb

@@ -59,7 +59,7 @@ class TestTaxes < Minitest::Test
         }.to_json
       )
       Zold::Taxes.new(
-        wallets: wallets, remotes: remotes, log: log
+        wallets: wallets, remotes: remotes, log: test_log
       ).run(['taxes', '--private-key=fixtures/id_rsa', id.to_s])
       assert_equal(Zold::Amount.new(coins: 85_856_396_247), wallet.balance)
     end

data/test/node/test_emission.rb

@@ -36,7 +36,7 @@ class EmissionTest < Minitest::Test
             'NOPREFIX', Zold::Id::ROOT, '-'
           )
         )
-        log.info("Year: #{year}, Quota: #{(Zold::Emission.new(wallet).quota * 100).round(2)}%, \
+        test_log.info("Year: #{year}, Quota: #{(Zold::Emission.new(wallet).quota * 100).round(2)}%, \
 Limit: #{Zold::Emission.new(wallet).limit}")
       end
     end

data/test/node/test_entrance.rb

@@ -40,7 +40,7 @@ class TestEntrance < Minitest::Test
     body = FakeHome.new.run do |home|
       source = home.create_wallet(sid)
       target = home.create_wallet(tid)
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: log).run(
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
         [
           'pay', '--force', '--private-key=fixtures/id_rsa',
           source.id.to_s, target.id.to_s, '19.99', 'testing'
@@ -51,7 +51,7 @@ class TestEntrance < Minitest::Test
     FakeHome.new.run do |home|
       source = home.create_wallet(sid)
       home.create_wallet(tid)
-      modified = Zold::Entrance.new(home.wallets, home.remotes, home.copies(source).root, 'x', log: log).push(
+      modified = Zold::Entrance.new(home.wallets, home.remotes, home.copies(source).root, 'x', log: test_log).push(
         source.id, body
       )
       assert_equal(2, modified.count)

data/test/node/test_farm.rb

@@ -28,7 +28,7 @@ require_relative '../../lib/zold/node/farm'
 class FarmTest < Minitest::Test
   def test_makes_best_score_in_background
     Dir.mktmpdir 'test' do |dir|
-      farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: log)
+      farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
       farm.start('localhost', 80, threads: 4, strength: 2)
       sleep 0.1 while farm.best.empty? || farm.best[0].value.zero?
       assert(farm.best[0].value > 0)
@@ -38,7 +38,20 @@ class FarmTest < Minitest::Test
 
   def test_correct_score_from_empty_farm
     Dir.mktmpdir 'test' do |dir|
-      farm = Zold::Farm.new('NOPREFIX@cccccccccccccccc', File.join(dir, 'f'), log: log)
+      farm = Zold::Farm.new('NOPREFIX@cccccccccccccccc', File.join(dir, 'f'), log: test_log)
+      farm.start('example.com', 8080, threads: 0, strength: 1)
+      score = farm.best[0]
+      assert_equal(0, score.value)
+      assert_equal('example.com', score.host)
+      assert_equal(8080, score.port)
+      farm.stop
+    end
+  end
+
+  def test_pre_loads_history
+    Dir.mktmpdir 'test' do |dir|
+      cache = File.join(dir, 'cache')
+      farm = Zold::Farm.new('NOPREFIX@cccccccccccccccc', cache, log: test_log)
       farm.start('example.com', 8080, threads: 0, strength: 1)
       score = farm.best[0]
       assert_equal(0, score.value)

data/test/node/test_front.rb

@@ -27,12 +27,13 @@ require_relative '../../lib/zold/score'
 
 class FrontTest < Minitest::Test
   def test_renders_public_pages
-    FakeNode.new(log: log).run(['--ignore-score-weakness']) do |port|
+    FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
       {
         '200' => [
           '/robots.txt',
           '/',
-          '/remotes'
+          '/remotes',
+          '/v'
         ],
         '404' => [
           '/this-is-absent',
@@ -65,7 +66,7 @@ class FrontTest < Minitest::Test
       '4' => 'https://www.zold.io/images/logo-orange.png',
       '16' => 'https://www.zold.io/images/logo-green.png'
     }.each do |num, path|
-      log.info("Calculating score #{num}...")
+      test_log.info("Calculating score #{num}...")
       score = Zold::Score.new(
         Time.now, 'localhost', 999,
         'NOPREFIX@ffffffffffffffff',
@@ -74,7 +75,7 @@ class FrontTest < Minitest::Test
       num.to_i.times do
         score = score.next
       end
-      log.info("Score #{num} calculated.")
+      test_log.info("Score #{num} calculated.")
       if score.value >= 16
         assert_equal(
           path, 'https://www.zold.io/images/logo-green.png',

data/test/test__helper.rb

@@ -29,18 +29,18 @@ if ENV['CI'] == 'true'
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
 
-require_relative '../lib/zold/log'
-
 require 'minitest/autorun'
 require_relative '../lib/zold'
 
 gem 'openssl'
 require 'openssl'
 
-require_relative 'support/logs'
-
 module Minitest
   class Test
-    include Logs
+    def test_log
+      require_relative '../lib/zold/log'
+      # @test_log = Zold::Log::Quiet.new
+      @test_log ||= Zold::Log::Verbose.new
+    end
   end
 end

data/test/test_zold.rb

@@ -38,7 +38,7 @@ class TestZold < Minitest::Test
         bin = File.join(Dir.pwd, 'bin/zold')
         Dir.chdir(dir) do
           stdout = `/bin/bash #{f} #{bin} 2>&1`
-          log.info(stdout)
+          test_log.info(stdout)
           assert_equal(0, $CHILD_STATUS.exitstatus)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -379,7 +379,6 @@ files:
 - test/node/test_entrance.rb
 - test/node/test_farm.rb
 - test/node/test_front.rb
-- test/support/logs.rb
 - test/test__helper.rb
 - test/test_amount.rb
 - test/test_copies.rb
@@ -449,7 +448,6 @@ test_files:
 - test/node/test_entrance.rb
 - test/node/test_farm.rb
 - test/node/test_front.rb
-- test/support/logs.rb
 - test/test__helper.rb
 - test/test_amount.rb
 - test/test_copies.rb

data/test/support/logs.rb

@@ -1,6 +0,0 @@
-module Logs
-  def log
-    # $log = Zold::Log::Quiet.new
-    @log ||= Zold::Log::Verbose.new
-  end
-end