zold 0.14.8 → 0.14.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2f9cbae830828107bb4b7aa19a24fa9d53620b4
-  data.tar.gz: 03f51730a5136f765985161d36b9454d59f19748
+  metadata.gz: 3f87074edd8e64584ac6834ed6646922c903c4f7
+  data.tar.gz: 3e35c4e458186d16a9f5ebf2f635b7757525de74
 SHA512:
-  metadata.gz: ed925085a934c77ffed65eb83bf9a8d0d97fb31dcb608ab20538445397a226241904fdf9ee41bb40f6078d0888d92d05e424c3cc7623cb581011b4cb0caaba1a
-  data.tar.gz: 1d0a2a7233ef74a7b1fb9e51584df480e06836b4efbbb67f71fc3c2238300a9f3409b98d4d2105f03d8905dc3a086066fafe601eda188309a4a8617c9b5a1e0a
+  metadata.gz: 05ff08a140bf66931a794d110ef12951389140836c2b0554ffb2e2abf738316d2c193a146decd7a71718e009e4ea9b839e5a7c6ac7778fffa8bab183788e17bc
+  data.tar.gz: 5a30ccf3cdfccec6007140021160d197cb5e95728a83aeeb2bb8dc293e4f65d17be997b14396a6b86746e679f0d13d1e6787be56c3a3dd333209eb13ed8cd3d2

data/.rubocop.yml

@@ -3,7 +3,7 @@ AllCops:
     - 'bin/**/*'
     - 'assets/**/*'
   DisplayCopNames: true
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3.3
 
 Metrics/CyclomaticComplexity:
   Max: 25

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/appveyor.yml

@@ -7,15 +7,20 @@ branches:
   except:
     - gh-pages
 os: Windows Server 2012
+environment:
+  matrix:
+    - RUBY_VERSION: 23
+    - RUBY_VERSION: 24
+    - RUBY_VERSION: 25
 install:
-  - cmd: SET PATH=C:\Ruby23-x64\bin;%PATH%
+  - cmd: set PATH=C:\Ruby%RUBY_VERSION%-X64\bin;%PATH%
   - cmd: ruby --version
   - cmd: git --version
+  - cmd: bundle config --local path vendor/bundle
 build_script:
   - bundle update
   - bundle install
 test_script:
   - rake
 cache:
-  - C:\Ruby200\bin -> zold.gemspec
-  - C:\Ruby200\lib\ruby\gems\2.0.0 -> zold.gemspec
+  - vendor/bundle

data/features/step_definitions/steps.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/features/support/env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/fixtures/merge/asserts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/fixtures/merge/into-no-wallet/assert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/fixtures/merge/random-expenses/assert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/fixtures/merge/simple-case/assert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/fixtures/scripts/_head.sh

@@ -3,12 +3,25 @@ set -e
 set -x
 shopt -s expand_aliases
 
+export RUBYOPT="-W0"
+
 alias zold="$1 --ignore-this-stupid-option --ignore-global-config --trace --network=test --no-colors"
 
 function reserve_port {
   python -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'
 }
 
+function wait_for_url {
+  while ! curl --silent --fail $1 > /dev/null; do
+    ((p++)) || sleep 1
+    if ((p==30)); then
+      echo URL $1 is not available after $p seconds of waiting
+      exit -1
+    fi
+    sleep 1
+  done
+}
+
 function wait_for_port {
   while ! nc -z localhost $1; do
     ((p++)) || sleep 1

data/fixtures/scripts/distribute-wallet.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+function start_node {
+  port=$(reserve_port)
+  mkdir ${port}
+  cd ${port}
+  zold node --trace --invoice=NOPREFIX@ffffffffffffffff \
+    --host=localhost --port=${port} --bind-port=${port} \
+    --threads=0 --routine-immediately > log.txt &
+  pid=$!
+  echo ${pid} > pid
+  cd ..
+  wait_for_url http://localhost:${port}/
+  echo ${port}
+}
+
+# We start two nodes and kill them both at the end of the script. If we
+# don't do the TRAP for killing, the test will never end.
+first=$(start_node)
+second=$(start_node)
+trap "kill -9 $(cat ${first}/pid) $(cat ${second}/pid)" EXIT
+
+# The first node is linked to the second one and the second one
+# is linked to the first one. The --home argument specifies their
+# locations.
+zold --home=${first} remote clean
+zold --home=${first} remote add localhost ${second}
+zold --home=${second} remote clean
+zold --home=${second} remote add localhost ${first}
+
+# Locally we create a new root wallet (to avoid negative balance checking)
+# and connect our local Zold home to the first remote node. Then, we push
+# the wallet to the remote, expecting it to distribute it to the second
+# wallet automatically.
+zold --public-key=id_rsa.pub create 0000000000000000
+zold pay --private-key=id_rsa 0000000000000000 NOPREFIX@aaaabbbbccccdddd 4.95 'To help you, dude!'
+zold remote add localhost ${first}
+zold push 0000000000000000
+zold remote clean
+zold remote add localhost ${second}
+
+# Here we fetch the wallet from the second remote node. The wallet has
+# to be visible there. We are doing a number of attempts with a small
+# delay between them, in order to give the first node a chance to distribute
+# the wallet.
+until zold fetch 0000000000000000 --ignore-score-weakness; do
+  echo 'Failed to fetch, let us try again'
+  ((i++)) || sleep 1
+  if ((i==5)); then
+    cat ${first}/log.txt
+    echo "The wallet has not been distributed, after ${i} attempts"
+    exit -1
+  fi
+  sleep 1
+done
+
+# Here we check the JSON of the first node to make sure all status
+# indicators are clean.
+json=$(curl --silent --show-error http://localhost:${first})
+if [ ! $(echo ${json} | jq -r '.entrance.queue') == "0" ]; then
+  echo "The queue is not empty after PUSH, it's a bug"
+  exit -1
+fi
+if [ $(echo ${json} | jq -r '.entrance.history_size') == "0" ]; then
+  echo "The history doesn't have a wallet, it's a bug"
+  exit -1
+fi
+if [ ! $(echo ${json} | jq -r '.wallets') == "1" ]; then
+  echo "The wallet is not there for some reason, it's a bug"
+  exit -1
+fi
+
+# Now, we remove the wallet from the second node and expect the first
+# one to "spread" it again, almost immediately.
+rm ${second}/0000000000000000.z
+until zold fetch 0000000000000000 --ignore-score-weakness; do
+  echo 'Failed to fetch, let us try again'
+  ((i++)) || sleep 1
+  if ((i==5)); then
+    cat ${first}/log.txt
+    echo "The wallet has not been spread, after ${i} attempts"
+    exit -1
+  fi
+  sleep 1
+done
+

data/fixtures/scripts/spread-wallets.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+function start_node {
+  port=$(reserve_port)
+  mkdir ${port}
+  cd ${port}
+  zold node --trace --invoice=NOPREFIX@ffffffffffffffff \
+    --host=localhost --port=${port} --bind-port=${port} \
+    --threads=0 > log.txt &
+  pid=$!
+  echo ${pid} > pid
+  cd ..
+  wait_for_url http://localhost:${port}/
+  echo ${port}
+}
+
+first=$(start_node)
+second=$(start_node)
+trap "kill -9 $(cat ${first}/pid) $(cat ${second}/pid)" EXIT
+
+zold --home=${first} remote clean
+zold --home=${first} remote add localhost ${second}
+zold --home=${second} remote clean
+zold --home=${second} remote add localhost ${first}
+
+zold --public-key=id_rsa.pub create 0000000000000000
+zold pay --private-key=id_rsa 0000000000000000 NOPREFIX@aaaabbbbccccdddd 4.95 'To help you, dude!'
+zold remote add localhost ${first}
+zold push 0000000000000000
+zold remote clean
+zold remote add localhost ${second}
+
+until zold fetch 0000000000000000 --ignore-score-weakness; do
+  echo 'Failed to fetch, let us try again'
+  ((i++)) || sleep 2
+  if ((i==5)); then
+    cat ${first}/log.txt
+    echo "The wallet has not been distributed, after ${i} attempts"
+    exit -1
+  fi
+  sleep 2
+done
+
+json=$(curl --silent --show-error http://localhost:${first})
+if [ ! $(echo ${json} | jq -r '.entrance.queue') == "0" ]; then
+  echo "The queue is not empty after PUSH, it's a bug"
+  exit -1
+fi
+if [ ! $(echo ${json} | jq -r '.entrance.history_size') == "1" ]; then
+  echo "The history doesn't have a wallet, it's a bug"
+  exit -1
+fi
+if [ ! $(echo ${json} | jq -r '.wallets') == "1" ]; then
+  echo "The wallet is not there for some reason, it's a bug"
+  exit -1
+fi

data/lib/zold.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/amount.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -106,7 +108,7 @@ module Zold
     end
 
     def negative?
-      @coins < 0
+      @coins.negative?
     end
 
     def *(other)

data/lib/zold/atomic_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/backtrace.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/alias.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'slop'
 require 'rainbow'
 require_relative 'args'

data/lib/zold/commands/args.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/calculate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -74,12 +76,12 @@ Available options:"
       strength = opts[:strength]
       raise "Invalid strength: #{strength}" if strength <= 0 || strength > 8
       score = Zold::Score.new(
-        Time.parse(opts[:time]), opts[:host], opts[:port].to_i,
-        opts[:invoice], strength: strength
+        time: Time.parse(opts[:time]), host: opts[:host], port: opts[:port].to_i,
+        invoice: opts[:invoice], strength: strength
       )
       loop do
         msg = score.to_s
-        msg += (score.value > 0 ? ' ' + score.hash : '') unless opts['hide-hash']
+        msg += (score.value.positive? ? ' ' + score.hash : '') unless opts['hide-hash']
         msg += " #{(Time.now - mstart).round(2)}s" unless opts['hide-time']
         @log.info(msg)
         break if score.value >= opts[:max].to_i

data/lib/zold/commands/clean.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/create.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/diff.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/fetch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -55,6 +57,9 @@ Available options:"
         o.array '--ignore-node',
           'Ignore this node and don\'t fetch from it',
           default: []
+        o.bool '--quiet-if-absent',
+          'Don\'t fail if the wallet is absent in all remote nodes',
+          default: false
         o.string '--network',
           'The name of the network we work in',
           default: 'test'
@@ -79,8 +84,8 @@ Available options:"
         done += 1
       end
       raise "There are no remote nodes, run 'zold remote reset'" if nodes.zero?
-      raise "No nodes out of #{nodes} have the wallet #{id}" if done.zero?
-      @log.info("#{nodes} copies of #{id} fetched for the total score of #{total}")
+      raise "No nodes out of #{nodes} have the wallet #{id}" if done.zero? && !opts['quiet-if-absent']
+      @log.info("#{done} copies of #{id} fetched for the total score of #{total} from #{nodes} nodes")
       @log.debug("#{cps.all.count} local copies:\n  #{cps.all.map { |c| "#{c[:name]}: #{c[:score]}" }.join("\n  ")}")
     end
 

data/lib/zold/commands/invoice.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/merge.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/pay.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/propagate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/pull.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/commands/push.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy