zold 0.10.7 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0008825f612b15bbca2f63f1a20229bce08e28c9'
-  data.tar.gz: 42d23123921ba6347cc2b234195d6cce30c7f471
+  metadata.gz: c2d0bc52f647f22b12dfb70543a113e7d4a0393a
+  data.tar.gz: f883780a0b2b0d5d4db0c261899ca4df7a357e15
 SHA512:
-  metadata.gz: 8012e04638c964ced09998754700490f7e24175b066bf11ecc9240e0274654fa686b1157bf4c31995dce9ddca842b8f4bb51e7a32ca6c48b2de411f8016d0f42
-  data.tar.gz: ab611b5530d5fea3362a67cd21cfd89855f9ce7bafcd320ac2a2a87bee3eff684f31a16996709bf9947d203ed8b68d21d9489c94d61689374570c37d4b47e51b
+  metadata.gz: e6657086782bfbd32fe8867a292ed7bc45e1e63d6640ff3bb148f1e7a322daa59c47a95278e276851693a223a4b88ecddd69dcc22591f43d1289dbde54e14f94
+  data.tar.gz: 17d58f71dc6a3a83334ab656cdd9c6a391da37ae544df9dac0a5a20f8ace8bec14fcaf294f7191bd4f81df80db6e93847676144feb9ac67e8f1d99685634dce9

data/.rultor.yml

@@ -10,7 +10,7 @@ release:
     bundle install
     rake
     rm -rf *.gem
-    sed -i "s/1\.0\.snapshot/${tag}/g" lib/zold/version.rb
+    sed -i "s/0\.0\.0/${tag}/g" lib/zold/version.rb
     git add lib/zold/version.rb
     git commit -m "version set to ${tag}"
     gem build zold.gemspec

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

@@ -34,7 +34,7 @@ zold show
 zold show 0000000000000000
 
 zold remote show
-zold push 0000000000000000
+zold push 0000000000000000 --sync
 zold fetch 0000000000000000 --ignore-score-weakness
 zold diff 0000000000000000
 zold merge 0000000000000000

data/lib/zold/commands/fetch.rb

@@ -85,8 +85,8 @@ Available options:"
       r.assert_valid_score(score)
       raise "Score is too weak #{score.strength}" if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
       cps.add(json['body'], score.host, score.port, score.value)
-      @log.info("#{r} #{json['body'].length}b/#{Rainbow(score.value).green} (#{json['version']}) \
-in #{(Time.now - start).round(2)}s")
+      @log.info("#{r} returned #{json['body'].length}b/#{Rainbow(score.value).green} \
+of #{id} (#{json['version']}) in #{(Time.now - start).round(2)}s")
     end
   end
 end

data/lib/zold/commands/node.rb

@@ -114,7 +114,7 @@ module Zold
       )
       Zold::Front.set(:farm, farm)
       Thread.start do
-        Zold::Remote.new(remotes: remotes, farm: farm, log: @log).run(%w[remote update]) unless best.nil?
+        Zold::Remote.new(remotes: remotes, farm: farm, log: @log).run(%w[remote update --reboot]) unless best.nil?
       end
       @log.debug('Starting up the web front...')
       begin

data/lib/zold/commands/push.rb

@@ -44,6 +44,9 @@ module Zold
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold push [ID...] [options]
 Available options:"
+        o.bool '--sync',
+          'Wait until the server confirms merge and pushes all wallets further (default: false)',
+          default: false
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
@@ -55,13 +58,15 @@ Available options:"
       end
     end
 
-    def push(wallet, _)
+    def push(wallet, opts)
       total = 0
       @remotes.iterate(@log) do |r|
         start = Time.now
-        response = r.http("/wallet/#{wallet.id}").put(File.read(wallet.path))
+        response = r.http(
+          "/wallet/#{wallet.id}#{opts['sync'] ? '?sync=true' : ''}"
+        ).put(File.read(wallet.path))
         if response.code == '304'
-          @log.info("#{r}: same version there")
+          @log.info("#{r}: same version of #{wallet.id} there")
           next
         end
         r.assert_code(200, response)
@@ -69,10 +74,10 @@ Available options:"
         score = Score.parse_json(json)
         r.assert_valid_score(score)
         raise "Score is too weak #{score}" if score.strength < Score::STRENGTH
-        @log.info("#{r} accepted in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green}")
+        @log.info("#{r} accepted #{wallet.id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green}")
         total += score.value
       end
-      @log.info("Total score is #{total}")
+      @log.info("Total score for #{wallet.id} is #{total}")
     end
   end
 end

data/lib/zold/commands/remote.rb

@@ -19,6 +19,7 @@
 # SOFTWARE.
 
 require 'slop'
+require 'semantic'
 require 'rainbow'
 require 'net/http'
 require 'json'
@@ -61,6 +62,9 @@ Available options:"
         o.bool '--ignore-score-weakness',
           'Don\'t complain when their score is too weak',
           default: false
+        o.bool '--reboot',
+          'Exit if any node reports version higher than we have',
+          default: false
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
@@ -125,6 +129,10 @@ Available options:"
         raise "Score too weak: #{score.strength}" if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
         raise "Masqueraded as #{score.host}:#{score.port}" if r.host != score.host || r.port != score.port
         @remotes.rescore(score.host, score.port, score.value)
+        if opts['reboot'] && Semantic::Version.new(VERSION) < Semantic::Version.new(json['version'])
+          @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot!")
+          exit(0)
+        end
         if deep
           json['all'].each do |s|
             add(s['host'], s['port']) unless @remotes.exists?(s['host'], s['port'])

data/lib/zold/http.rb

@@ -48,7 +48,9 @@ module Zold
     def get
       http = Net::HTTP.new(@uri.host, @uri.port)
       http.read_timeout = 5
-      return http.request_get(@uri.path, headers)
+      path = @uri.path
+      path += '?' + @uri.query if @uri.query
+      return http.request_get(path, headers)
     rescue StandardError => e
       Error.new(e)
     end
@@ -56,8 +58,10 @@ module Zold
     def put(body)
       http = Net::HTTP.new(@uri.host, @uri.port)
       http.read_timeout = 60
+      path = @uri.path
+      path += '?' + @uri.query if @uri.query
       return http.request_put(
-        @uri.path, body,
+        path, body,
         headers.merge(
           'Content-Type': 'text/plain',
           'Content-Length': body.length.to_s

data/lib/zold/node/entrance.rb

@@ -46,11 +46,14 @@ module Zold
       @semaphores = Concurrent::Map.new
     end
 
-    def push(id, body)
+    def push(id, body, sync: true)
       check(body)
-      @semaphores.put_if_absent(id, Mutex.new)
-      @semaphores.get(id).synchronize do
-        push_unsafe(id, body)
+      if sync
+        push_sync(id, body)
+      else
+        Thread.new do
+          push_sync(id, body)
+        end
       end
     end
 
@@ -60,7 +63,9 @@ module Zold
         wallet = Wallet.new(f)
         break unless wallet.network == Wallet::MAIN_NETWORK
         balance = wallet.balance
-        raise "The balance #{balance} is negative and it's not a root wallet" if balance.negative? && !wallet.root?
+        if balance.negative? && !wallet.root?
+          raise "The balance #{balance} of #{wallet.id} is negative and it's not a root wallet"
+        end
         Emission.new(wallet).check
         tax = Tax.new(wallet)
         if tax.in_debt?
@@ -69,6 +74,15 @@ module Zold
       end
     end
 
+    def push_sync(id, body)
+      @semaphores.put_if_absent(id, Mutex.new)
+      @semaphores.get(id).synchronize do
+        modified = push_unsafe(id, body)
+        @log.info("Accepted #{id} and modified: #{modified.join(', ')}")
+        modified
+      end
+    end
+
     def push_unsafe(id, body)
       copies = Copies.new(File.join(@copies, id.to_s))
       copies.add(body, 'remote', Remotes::PORT, 0)

data/lib/zold/node/front.rb

@@ -23,7 +23,6 @@ STDOUT.sync = true
 require 'json'
 require 'sinatra/base'
 require 'webrick'
-require 'semantic'
 require_relative '../version'
 require_relative '../wallet'
 require_relative '../log'
@@ -58,11 +57,6 @@ module Zold
     end
 
     before do
-      if request.env[Http::VERSION_HEADER] &&
-        Semantic::Version.new(VERSION) < Semantic::Version.new(request.env[Http::VERSION_HEADER]) &&
-        !settings.remotes.empty? && settings.reboot
-        exit(0)
-      end
       return unless request.env[Http::SCORE_HEADER]
       return unless settings.remotes.empty?
       s = Score.parse(request.env[Http::SCORE_HEADER])
@@ -121,12 +115,10 @@ module Zold
         status 304
         return
       end
-      modified = settings.entrance.push(id, body)
+      settings.entrance.push(id, body, sync: !params[:sync].nil?)
       JSON.pretty_generate(
         version: VERSION,
-        score: score.to_h,
-        balance: wallet.balance,
-        modified: modified.count
+        score: score.to_h
       )
     end
 

data/lib/zold/version.rb

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

data/test/commands/test_node.rb

@@ -47,7 +47,7 @@ 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'])
+        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

data/test/commands/test_remote.rb

@@ -22,6 +22,7 @@ require 'minitest/autorun'
 require 'tmpdir'
 require 'webmock/minitest'
 require_relative '../test__helper'
+require_relative '../../lib/zold/version'
 require_relative '../../lib/zold/wallets'
 require_relative '../../lib/zold/remotes'
 require_relative '../../lib/zold/key'
@@ -41,6 +42,7 @@ class TestRemote < Minitest::Test
       stub_request(:get, "http://#{zero.host}:#{zero.port}/remotes").to_return(
         status: 200,
         body: {
+          version: Zold::VERSION,
           score: zero.to_h,
           all: [
             { host: 'localhost', port: 888 },

data/test/test_zold.rb

@@ -52,7 +52,7 @@ class TestZold < Minitest::Test
 
   def test_show_version
     stdout = exec('--version')
-    assert(stdout.include?('1.0.snapshot'))
+    assert(stdout.include?('0.0.0'))
   end
 
   def test_create_new_wallet

metadata

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