zold 0.11.21 → 0.11.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c624d076515e55c78c91bbe5724d85ec5a7451ae
-  data.tar.gz: 2076bb04386f2502fc74984ad6f04ff703a75994
+  metadata.gz: bc7e111fc1e96f2796c64c793edd9714972680d8
+  data.tar.gz: 5149c712d5e30dd6e92f7e3ead90d0329d904399
 SHA512:
-  metadata.gz: 6d6311dfacdf2772f7050ce8cc6e69c7f6c67164249ef6a5f5e6ea51dc37b0c019d9558da00a7855c3ae70a3048546f4dc2ca60d53dd6ac76a807f54e3ed0fa0
-  data.tar.gz: 4d7d7c7e6f5565c6ddfceafb325040a66e567439c16e580f81d96506f7bf6b4f5e7e2dd4e17aa66ff3998d929aad944feaf8fad066af8fb543de18a4c0636a2b
+  metadata.gz: 29bf131b899ac382814b6ffcefa8b472167387b081269b9224b972ec4d3229bf40aad759c4cd39298e11af193a0d27f49b448679138c434d0c46d0d91f29b700
+  data.tar.gz: f676f48ea7719ccf1552220381e0df2e0a732791686d0b8128a5c57c2d3ca2711318910c70a24f2141d31dad3d835ebc78ca766e817ef963917b89a6aa023c88

data/bin/zold-nohup

@@ -57,12 +57,15 @@ def exec(cmd)
   Open3.popen2e(cmd) do |stdin, stdout, thr|
     log("Started: #{cmd}\n")
     stdin.close
-    loop do
-      line = stdout.gets
-      break if line.nil?
-      log(line)
+    until stdout.eof?
+      begin
+        data = stdout.read_nonblock(1024) unless stdout.eof?
+      rescue EOFError => _
+        break
+      end
+      log(data)
     end
-    code = thr.value.exitstatus
+    code = thr.value.to_i
     log("Exit code is #{code}: #{cmd}\n")
     raise "Exit code #{code} (non zero)" unless code.zero?
   end
@@ -72,15 +75,20 @@ File.delete($opts['log-file']) if File.exist?($opts['log-file']) && !$opts['skip
 
 $pid = fork do
   Signal.trap('HUP') do
-    log('Received HUP, ignoring...')
+    log("Received HUP, ignoring...\n")
   end
   Signal.trap('TERM') do
-    log('Received TERM, terminating...')
+    log("Received TERM, terminating...\n")
     exit(-1)
   end
   loop do
-    exec("zold #{$opts.arguments.join(' ')}")
-    exec(($opts['sudo-install'] ? 'sudo ' : '') + 'gem install zold') unless $opts['skip-install']
+    begin
+      exec("zold #{$opts.arguments.join(' ')}")
+      exec(($opts['sudo-install'] ? 'sudo ' : '') + 'gem install zold') unless $opts['skip-install']
+    rescue StandardError => e
+      log("#{e.class.name}: #{e.message}\n#{e.backtrace.join("\n\t")}\n")
+      raise e
+    end
   end
 end
 Process.detach($pid)

data/lib/zold/commands/diff.rb

@@ -65,14 +65,9 @@ Available options:"
     def diff(wallet, cps, _)
       raise "There are no remote copies, try 'zold fetch' first" if cps.all.empty?
       cps = cps.all.sort_by { |c| c[:score] }.reverse
-      patch = Patch.new
+      patch = Patch.new(log: @log)
       cps.each do |c|
-        begin
-          patch.join(Wallet.new(c[:path]))
-        rescue StandardError => e
-          @log.error("Can't use a copy of #{wallet.id} from #{c[:host]}:#{c[:port]}; #{e.class.name}: #{e.message}")
-          @log.debug(e.backtrace.join("\n\t"))
-        end
+        patch.join(Wallet.new(c[:path]))
       end
       before = AtomicFile.new(wallet.path).read
       after = ''

data/lib/zold/commands/merge.rb

@@ -66,7 +66,7 @@ Available options:"
         return
       end
       cps = cps.all.sort_by { |c| c[:score] }.reverse
-      patch = Patch.new
+      patch = Patch.new(log: @log)
       cps.each do |c|
         merge_one(patch, Wallet.new(c[:path]), "#{c[:host]}:#{c[:port]}")
         @log.debug("#{c[:host]}:#{c[:port]} merged: #{patch}")

data/lib/zold/patch.rb

@@ -18,6 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require_relative 'log'
 require_relative 'wallet'
 require_relative 'signature'
 require_relative 'atomic_file'
@@ -30,6 +31,10 @@ require_relative 'atomic_file'
 module Zold
   # A patch
   class Patch
+    def initialize(log: Log::Quiet.new)
+      @log = log
+    end
+
     def to_s
       return 'empty' if @id.nil?
       "#{@txns.count} txns"
@@ -40,6 +45,7 @@ module Zold
         @id = wallet.id
         @key = wallet.key
         @txns = wallet.txns
+        @log.debug("The baseline: #{@txns.count} transactions, the balance is #{wallet.balance}")
         @network = wallet.network
       end
       if wallet.network != @network
@@ -51,17 +57,28 @@ module Zold
       max = negative.empty? ? 0 : negative.max_by(&:id).id
       wallet.txns.each do |txn|
         next if @txns.find { |t| t == txn }
-        next if
-          txn.amount.negative? && !@txns.empty? &&
-          (txn.id <= max ||
-          @txns.find { |t| t.id == txn.id } ||
-          @txns.map(&:amount).inject(&:+) < txn.amount)
-        if !txn.amount.negative? && !txn.sign.empty?
-          raise "RSA signature is redundant at ##{txn.id} of #{wallet.id}: #{txn.to_text}"
-        end
-        if txn.amount.negative? && !Signature.new.valid?(@key, wallet.id, txn)
-          raise "Invalid RSA signature at transaction ##{txn.id} of #{wallet.id}: #{txn.to_text}"
+        if txn.amount.negative?
+          if txn.id <= max
+            @log.debug("Transaction ID is less than max #{max}: #{txn.to_text}")
+            next
+          end
+          if @txns.find { |t| t.id == txn.id }
+            @log.debug("Transaction ##{txn.id} already exists: #{txn.to_text}")
+            next
+          end
+          if !@txns.empty? && @txns.map(&:amount).inject(&:+) < txn.amount
+            @log.debug("Transaction ##{txn.id} attempts to make the balance negative: #{txn.to_text}")
+            next
+          end
+          unless Signature.new.valid?(@key, wallet.id, txn)
+            @log.debug("Invalid RSA signature at transaction ##{txn.id} of #{wallet.id}: #{txn.to_text}")
+            next
+          end
+        elsif !txn.sign.nil? && !txn.sign.empty?
+          @log.debug("RSA signature is redundant at ##{txn.id} of #{wallet.id}: #{txn.to_text}")
+          next
         end
+        @log.debug("Merged on top: #{txn.to_text}")
         @txns << txn
       end
     end

data/lib/zold/version.rb

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

data/test/commands/test_diff.rb

@@ -53,7 +53,7 @@ class TestDiff < Minitest::Test
       diff = Zold::Diff.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
         ['diff', wallet.id.to_s]
       )
-      assert(diff.include?('-0001;'))
+      assert(diff.include?('-0001;'), diff)
     end
   end
 end

data/test/test_patch.rb

@@ -20,6 +20,7 @@
 
 require 'minitest/autorun'
 require_relative 'fake_home'
+require_relative 'test__helper'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/id'
 require_relative '../lib/zold/wallet'
@@ -45,17 +46,13 @@ class TestPatch < Minitest::Test
       File.write(third.path, File.read(first.path))
       t = third.sub(Zold::Amount.new(zld: 10.0), "NOPREFIX@#{Zold::Id.new}", key)
       third.add(t.inverse(first.id))
-      patch = Zold::Patch.new
-      begin
-        patch.join(first)
-        patch.join(second)
-        patch.join(third)
-      rescue StandardError => e
-        test_log.info("Ignore it: #{e.message}")
-      end
+      patch = Zold::Patch.new(log: test_log)
+      patch.join(first)
+      patch.join(second)
+      patch.join(third)
       FileUtils.rm(first.path)
       assert_equal(true, patch.save(first.path))
-      assert_equal(Zold::Amount.new(zld: -53.0), first.balance)
+      assert_equal(Zold::Amount.new(zld: -43.0), first.balance)
     end
   end
 end

metadata

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