zold 0.10.19 → 0.10.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7ae7c852c6d1190d4a6a440700465fa92854527
-  data.tar.gz: 67b159887e8c11ed5ce1a0df30230e1451859ad5
+  metadata.gz: c87fbfc264dd92de42cde13930a908289aacf563
+  data.tar.gz: 8e6f525f6b0018704d1e716aa5e47bb3c8914862
 SHA512:
-  metadata.gz: 499abe446491bbc1cfa140422338778c6af96adf5e4c597d7f65427711bd591f961c167c27c0cc0b103f3091c483bddb5b504d465f4d7143f961fca45e3f19fa
-  data.tar.gz: 39aa0b1199ad377d638c59c221adf257f194a52a87a3d32ae3ee2a96a277f1f401a65cbf3954ba985a8df0d1d839479b93688737c0b0ce5ef98a721474e3b90c
+  metadata.gz: c4b2c011d7a787548881a49e89178fd03615eaaddeb50caf682ea66cf9e561c826a13610a40cc2af14568d989a56ce63e14b9a07abcb91db54dfc9cca65eaeec
+  data.tar.gz: 47b372309318e42bef1dbc69ad53ce7d8a33e1166c433e11e06c1a99fef524e97e3e1c008a9e4a0f9557a8eb14b5032392b22164e23b30b3b5076c9f71c55e1d

data/.rubocop.yml

@@ -31,10 +31,3 @@ Style/MultilineBlockChain:
   Enabled: false
 Layout/MultilineOperationIndentation:
   Enabled: false
-
-# @todo #64:30min Let's get rid of this and find a way to pass that
-#  $log global variable to all tests. Now it's defined inside test__helper.rb,
-#  but there should be a better solution. I posted a question about it:
-#  https://stackoverflow.com/questions/50418822
-Style/GlobalVars:
-  Enabled: false

data/.rultor.yml

@@ -37,7 +37,7 @@ merge:
   script: |-
     bundle install
     rake
-    pdd
+    pdd -f /dev/null -v
 deploy:
   script: |-
     echo "There is nothing to deploy"

data/lib/zold.rb

@@ -18,7 +18,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'rainbow'
 require_relative 'zold/version'
 
 # Zold main module.

data/lib/zold/http.rb

@@ -98,7 +98,7 @@ module Zold
         'Connection': 'close'
       }
       headers[Http::VERSION_HEADER] = VERSION
-      headers[Http::SCORE_HEADER] = @score.reduced(4).to_text if @score.valid? && !@score.expired?
+      headers[Http::SCORE_HEADER] = @score.reduced(4).to_text if @score.valid? && !@score.expired? && @score.value > 3
       headers
     end
   end

data/lib/zold/node/farm.rb

@@ -61,6 +61,7 @@ module Zold
       @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?
       @threads = (1..threads).map do |t|
         Thread.new do
           VerboseThread.new(@log).run do
@@ -103,12 +104,12 @@ module Zold
     private
 
     def save(score)
-      File.write(@cache, (history.reject(&:expired?) + [score]).map(&:to_s).join("\n"))
+      File.write(@cache, (history + [score]).map(&:to_s).join("\n"))
     end
 
     def history
       if File.exist?(@cache)
-        File.readlines(@cache).map { |t| Score.parse(t) }
+        File.readlines(@cache).map { |t| Score.parse(t) }.reject(&:expired?)
       else
         []
       end

data/lib/zold/node/front.rb

@@ -61,10 +61,7 @@ module Zold
     before do
       name = "HTTP-#{Http::SCORE_HEADER}".upcase.tr('-', '_')
       header = request.env[name]
-      unless header
-        settings.log.debug("#{request.url}: HTTP header #{Http::SCORE_HEADER} is absent (#{name})")
-        return
-      end
+      return unless header
       if settings.remotes.all.empty?
         settings.log.debug("#{request.url}: we are in standalone mode, won't update remotes")
       end
@@ -94,7 +91,13 @@ module Zold
     end
 
     get '/favicon.ico' do
-      redirect 'https://www.zold.io/logo.png'
+      if score.value >= 16
+        redirect 'https://www.zold.io/images/logo-green.png'
+      elsif score.value >= 4
+        redirect 'https://www.zold.io/images/logo-orange.png'
+      else
+        redirect 'https://www.zold.io/images/logo-red.png'
+      end
     end
 
     get '/' do
@@ -151,11 +154,6 @@ module Zold
       )
     end
 
-    get %r{/(?<page>.+\.html)} do
-      content_type 'text/html'
-      File.read(File.join(settings.root, "html/#{params[:page]}"))
-    end
-
     not_found do
       status 404
       content_type 'text/plain'

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.10.19'.freeze
+  VERSION = '0.10.20'.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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: log).run(['push', '--sync'])
         Zold::Fetch.new(
           wallets: wallets, copies: File.join(dir, 'copies'),
-          remotes: remotes, log: $log
+          remotes: remotes, log: 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: 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: 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: 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: 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: 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: 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: 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)}%, \
+        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: 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: 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: 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,7 @@ 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: 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,11 @@ 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: log).run(['--ignore-score-weakness']) do |port|
       {
         '200' => [
           '/robots.txt',
           '/',
-          '/map.html',
           '/remotes'
         ],
         '404' => [
@@ -59,4 +58,39 @@ class FrontTest < Minitest::Test
       assert(json['all'].find { |r| r['host'] == 'localhost' })
     end
   end
+
+  def test_different_logos
+    {
+      '0' => 'https://www.zold.io/images/logo-red.png',
+      '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}...")
+      score = Zold::Score.new(
+        Time.now, 'localhost', 999,
+        'NOPREFIX@ffffffffffffffff',
+        strength: 1
+      )
+      num.to_i.times do
+        score = score.next
+      end
+      log.info("Score #{num} calculated.")
+      if score.value >= 16
+        assert_equal(
+          path, 'https://www.zold.io/images/logo-green.png',
+          "Expected #{path} for score #{score.value}"
+        )
+      elsif score.value >= 4
+        assert_equal(
+          path, 'https://www.zold.io/images/logo-orange.png',
+          "Expected #{path} for score #{score.value}"
+        )
+      else
+        assert_equal(
+          path, 'https://www.zold.io/images/logo-red.png',
+          "Expected #{path} for score #{score.value}"
+        )
+      end
+    end
+  end
 end

data/test/support/logs.rb

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

data/test/test__helper.rb

@@ -30,11 +30,17 @@ if ENV['CI'] == 'true'
 end
 
 require_relative '../lib/zold/log'
-# $log = Zold::Log::Quiet.new
-$log = Zold::Log::Verbose.new
 
 require 'minitest/autorun'
 require_relative '../lib/zold'
 
 gem 'openssl'
 require 'openssl'
+
+require_relative 'support/logs'
+
+module Minitest
+  class Test
+    include Logs
+  end
+end

data/test/test_remotes.rb

@@ -54,6 +54,7 @@ class TestRemotes < Minitest::Test
       remotes = Zold::Remotes.new(File.join(dir, 'remotes'))
       remotes.clean
       remotes.reset
+      remotes.reset
       assert(!remotes.all.empty?)
     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)
+          log.info(stdout)
           assert_equal(0, $CHILD_STATUS.exitstatus)
         end
       end

data/zold.gemspec

@@ -42,21 +42,22 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features|wp)/})
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_runtime_dependency 'concurrent-ruby', '1.0.5'
-  s.add_runtime_dependency 'cucumber', '1.3.17'
-  s.add_runtime_dependency 'diffy', '3.2.0'
-  s.add_runtime_dependency 'openssl', '2.0.1'
+  s.add_runtime_dependency 'concurrent-ruby', '~>1.0.5'
+  s.add_runtime_dependency 'diffy', '~>3.2.0'
+  s.add_runtime_dependency 'json', '~>1.8.6'
+  s.add_runtime_dependency 'openssl', '~>2.1.1'
   s.add_runtime_dependency 'rainbow', '~>3.0'
-  s.add_runtime_dependency 'rake', '12.0.0'
-  s.add_runtime_dependency 'rubocop', '~>0.52.0'
-  s.add_runtime_dependency 'rubocop-rspec', '1.5.1'
-  s.add_runtime_dependency 'semantic', '~>1.5.0'
+  s.add_runtime_dependency 'semantic', '~>1.6.1'
   s.add_runtime_dependency 'sinatra', '~>2.0.1'
   s.add_runtime_dependency 'slop', '~>4.4'
   s.add_runtime_dependency 'xcop', '~>0.5'
   s.add_development_dependency 'codecov', '0.1.10'
-  s.add_development_dependency 'minitest', '5.5.0'
+  s.add_development_dependency 'cucumber', '3.1.1'
+  s.add_development_dependency 'minitest', '5.11.3'
+  s.add_development_dependency 'rake', '12.3.1'
   s.add_development_dependency 'rdoc', '4.2.0'
   s.add_development_dependency 'rspec-rails', '3.1.0'
-  s.add_development_dependency 'webmock', '3.4.1'
+  s.add_development_dependency 'rubocop', '0.52.0'
+  s.add_development_dependency 'rubocop-rspec'
+  s.add_development_dependency 'webmock', '3.4.2'
 end

metadata

@@ -1,141 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.10.19
+  version: 0.10.20
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.17
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.17
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: openssl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: rainbow
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.8.6
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 12.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 12.0.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
+  name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +150,48 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.10
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: 5.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.11.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 12.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: 12.3.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +220,48 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.52.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.52.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.4.2
 description: Non-blockchain cryptocurrency
 email: yegor256@gmail.com
 executables:
@@ -291,7 +305,6 @@ files:
 - fixtures/scripts/calculate-scores.sh
 - fixtures/scripts/print-helps.sh
 - fixtures/scripts/push-and-pull.sh
-- html/map.html
 - lib/zold.rb
 - lib/zold/amount.rb
 - lib/zold/commands/args.rb
@@ -353,6 +366,7 @@ 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
@@ -422,6 +436,7 @@ 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/html/map.html

@@ -1,139 +0,0 @@
-<?xml version="1.0"?>
-<!--
-(The MIT License)
-
-Copyright (c) 2018 Yegor Bugayenko
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the 'Software'), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--->
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>Zold nodes map</title>
-    <meta name="description" content="Full map of visible Zold nodes"/>
-    <meta name="keywords" content="zerocracy, management, robotocracy, meritocracy"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="shortcut icon" href="https://www.zold.io/logo.png"/>
-    <script src="https://maps.google.com/maps/api/js?key=AIzaSyArj6RePmR3DAAF7Tx9nK9UvO5exPStHu8">
-      // Should be empty
-    </script>
-    <script src="https://code.jquery.com/jquery-3.3.1.min.js">
-      // Should be empty
-    </script>
-    <style>
-      * { box-sizing: border-box; margin: 0; padding: 0; font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; }
-      html { height: 100% }
-      body { height: 100%; }
-      #container { width: 100%; height: 100% }
-      #map { width: 80%; height: 100%; display: inline-block; }
-      #nodes { width: 20%; height: 100%; background-color: #f5f5f5; float: right; padding: 1em; }
-      #logo { position: absolute; bottom: 1em; right: 1em; width: 48px; height: 48px; }
-      #remotes { margin-top: 1em; }
-      #remotes li { list-style: none; }
-    </style>
-    <script>
-      function put_marker_by_ip(map, coords, ip, port) {
-        $.getJSON('http://www.geoplugin.net/json.gp?ip=' + ip, function(json) {
-          var lat = parseFloat(json['geoplugin_latitude']), lon = parseFloat(json['geoplugin_longitude']);
-          console.log(ip + ' located at ' + lat + '/' + lon);
-          new google.maps.Marker({
-            position: { lat: lat, lng: lon },
-            map: map,
-            title: coords
-          });
-          console.log('Marker set for ' + coords + ' at ' + lat + '/' + lon);
-        }).fail(function() { console.log('Failed to find geo-location for ' + ip) });
-      }
-      function put_marker_by_host(map, coords, host, port) {
-        $.getJSON('https://api.exana.io/dns/' + host + '/a', function(json) {
-          ip = $.grep(json['answer'], function (a, i) { return a['type'] == 'A'; })[0]['rdata'];
-          console.log('Host ' + host + ' resolved to ' + ip);
-          put_marker_by_ip(map, coords, ip, port);
-        }).fail(function() { console.log('Failed to find IP for ' + host) });
-      }
-      function put_markers(map, remotes) {
-        $.each(remotes, function (i, r) {
-          var host = r['host'], port = r['port'];
-          var coords = host + ':' + port;
-          var items = $('#remotes li[data-coords="' + coords + '"]');
-          if (items.length) {
-            var li = items.first();
-            $.getJSON('http://' + coords + '/', function(json) {
-              li.html(coords + ': ' + json['score']['value'] + '/' + json['wallets'] + ' (' + json['version'] + ')');
-              if (host.match(/^[0-9\.]+$/)) {
-                put_marker_by_ip(map, host + ':' + port, host, port);
-              } else {
-                put_marker_by_host(map, host + ':' + port, host, port);
-              }
-            }).done(function() { li.css('color', 'darkgreen'); }).fail(function() { li.css('color', 'red'); });
-          } else {
-            $('#remotes').append('<li data-coords="' + coords + '">' + coords + '</li>')
-          }
-        });
-      }
-      function refresh_list(map) {
-        $.getJSON('http://b1.zold.io/remotes', function(data) {
-          var remotes = data['all'];
-          console.log(remotes.length + ' remote nodes found');
-          put_markers(map, remotes);
-        });
-      }
-      function refresh(map) {
-        $.getJSON('http://b1.zold.io/', function(data) {
-          $('#header').html(
-            'Version: ' + data['version'] + '<br/>' +
-            'Host: ' + data['score']['host'] + ':' + data['score']['port'] + '<br/>' +
-            'Score: ' + data['score']['value'] + '<br/>' +
-            'Wallets: ' + data['wallets']
-          );
-          refresh_list(map);
-          window.setTimeout(refresh, 10000);
-        });
-      }
-      function init() {
-        var map = new google.maps.Map(
-          document.getElementById("map"),
-          {
-            center: new google.maps.LatLng(55.751244, 37.618423),
-            mapTypeId: google.maps.MapTypeId.ROADMAP,
-            zoom: 3
-          }
-        );
-        refresh(map);
-      };
-    </script>
-  </head>
-  <body onload="init();">
-    <div id="container">
-      <div id="map">
-        <!-- Empty on start -->
-      </div>
-      <div id="nodes">
-        <div id="header">
-          <!-- Empty on start -->
-        </div>
-        <ul id="remotes">
-          <!-- Empty on start -->
-        </ul>
-      </div>
-      <img id="logo" src="https://www.zold.io/logo.svg"/>
-    </div>
-  </body>
-</html>