zold 0.16.16 → 0.16.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6df1ca2906e963f7d5b796c1a4137dfe1acfb0257024f4959a6b388b16efbc66
-  data.tar.gz: 7b18acb15ec0cda28d4fd6bbe180fe637ae90406986f8b4504d62c96499e379d
+  metadata.gz: 294ae5c8edd1bfd6c8f8567f5e19161356d656d87a04050e29c82bcf5a5303cf
+  data.tar.gz: 63646cc0ed79fcb7de5c1c9498db578248aa6ff3e22a840138ccede01eed468e
 SHA512:
-  metadata.gz: 1f6b06a21a062f19147dc06fd58468864e38690c990bd3336a62a0cdf5adfa551cfa28566138a78cd46fbc593c62d1b1cfaf3c7d616df267f9101edf3550a4ba
-  data.tar.gz: 1397f88d2069a418da2b3c33f35589aa02b16685a4b14f8f9a45929ec5f53614248a4dd73e45ef5a04c6a87f0eb32d6eb49eedb1441e4f5ae919a56e0c595351
+  metadata.gz: 31dc5ac7025b04c949c0ee1329bcdc773fa159322437c665b48722b3e21a2295f37ba465f5bc7df13cf5d7654a3e234bfaf999399b9c0fc9bbe42881995226d5
+  data.tar.gz: 7e79554604ca13438cd05c467ce6f46274a8bbbb7bbedfee84e3d28ea8989f4707d7ad924e6c896108e6a282baee7c02cee76533f75ec78353eb070f9f823383

data/README.md

@@ -13,6 +13,7 @@
 [![Gem Version](https://badge.fury.io/rb/zold.svg)](http://badge.fury.io/rb/zold)
 [![Test Coverage](https://img.shields.io/codecov/c/github/zold-io/zold.svg)](https://codecov.io/github/zold-io/zold?branch=master)
 
+[![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/github/zold-io/zold/master/frames)
 [![Maintainability](https://api.codeclimate.com/v1/badges/2861728929db934eb376/maintainability)](https://codeclimate.com/github/zold-io/zold/maintainability)
 
 **NOTICE**: It's an experiment and a very early draft! Please, feel free to

data/lib/zold/cached_wallets.rb

@@ -19,9 +19,9 @@
 # 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.
-require 'pathname'
-require_relative 'id'
-require_relative 'wallet'
+
+require 'zache'
+require_relative 'endless'
 
 # Cached collection of wallets.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -32,8 +32,13 @@ module Zold
   class CachedWallets
     def initialize(wallets)
       @wallets = wallets
-      @cache = {}
-      @mutex = Mutex.new
+      @zache = Zache.new
+      @clean = Thread.start do
+        Endless.new('cached_wallets').run do
+          sleep 60
+          @zache.clean
+        end
+      end
     end
 
     def to_s
@@ -50,11 +55,7 @@ module Zold
 
     def find(id)
       @wallets.find(id) do |wallet|
-        w = @mutex.synchronize do
-          @cache[id] = wallet unless @cache[id]
-          @cache[id]
-        end
-        yield w
+        yield @zache.get(id.to_s, lifetime: 5 * 60) { wallet }
       end
     end
   end

data/lib/zold/commands/clean.rb

@@ -55,24 +55,23 @@ Available options:"
       end
       mine = Args.new(opts, @log).take || return
       (mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
-        clean(id, Copies.new(File.join(@copies, id), log: @log), opts)
+        clean(Copies.new(File.join(@copies, id), log: @log), opts)
       end
     end
 
-    def clean(id, cps, _)
-      Futex.new(File.join(@copies, "#{id}-clean"), log: @log).open do
-        start = Time.now
-        deleted = cps.clean
-        @log.debug(
-          "#{deleted} expired local copies removed for #{cps} \
-in #{Age.new(start, limit: 0.01)}, #{cps.all.count} left:\n" +
-          cps.all.map do |c|
-            wallet = Wallet.new(c[:path])
-            "  #{c[:name]}: #{c[:score]} #{wallet.mnemo} \
+    def clean(cps, _)
+      start = Time.now
+      deleted = cps.clean
+      list = cps.all.map do |c|
+        wallet = Wallet.new(c[:path])
+        "  #{c[:name]}: #{c[:score]} #{wallet.mnemo} \
 #{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}"
-          end.join("\n")
-        )
       end
+      @log.debug(
+        "#{deleted} expired local copies removed for #{cps} \
+in #{Age.new(start, limit: 0.01)}, \
+#{list.empty? ? 'nothing left' : "#{list.count} left:\n#{list.join("\n")}"}"
+      )
     end
   end
 end

data/lib/zold/commands/fetch.rb

@@ -90,12 +90,11 @@ Available options:"
       raise "No nodes out of #{nodes.value} have the wallet #{id}" if done.value.zero? && !opts['quiet-if-absent']
       @log.info("#{done.value} copies of #{id} fetched in #{Age.new(start)} with the total score of \
 #{total.value} from #{nodes.value} nodes")
-      @log.debug("#{cps.all.count} local copies:")
-      cps.all.each do |c|
-        wallet = Wallet.new(c[:path])
-        @log.debug("  #{c[:name]}: #{c[:score]} #{wallet.mnemo} \
-#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}")
+      list = cps.all.map do |c|
+        "  ##{c[:name]}: #{c[:score]} #{Wallet.new(c[:path]).mnemo} \
+#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}"
       end
+      @log.debug("#{cps.all.count} local copies of #{id}:\n#{list.join("\n")}")
     end
 
     def fetch_one(id, r, cps, opts)
@@ -105,7 +104,7 @@ Available options:"
         return 0
       end
       uri = "/wallet/#{id}"
-      res = r.http(uri).get
+      res = r.http(uri).get(timeout: 60)
       raise "Wallet #{id} not found" if res.code == '404'
       r.assert_code(200, res)
       json = JsonPage.new(res.body, uri).to_hash

data/lib/zold/commands/list.rb

@@ -38,7 +38,7 @@ module Zold
     def run(_ = [])
       @wallets.all.each do |id|
         @wallets.find(id) do |wallet|
-          msg = "#{id}: #{wallet.mnemo}"
+          msg = wallet.mnemo
           msg += " (net:#{wallet.network})" if wallet.network != Wallet::MAIN_NETWORK
           @log.info(msg)
         end

data/lib/zold/commands/propagate.rb

@@ -63,31 +63,30 @@ Available options:"
       start = Time.now
       modified = []
       total = 0
-      @wallets.find(id) do |wallet|
-        wallet.txns.select { |t| t.amount.negative? }.each do |t|
-          total += 1
-          if t.bnf == id
-            @log.error("Paying itself in #{id}? #{t}")
+      network = @wallets.find(id, &:network)
+      @wallets.find(id, &:txns).select { |t| t.amount.negative? }.each do |t|
+        total += 1
+        if t.bnf == id
+          @log.error("Paying itself in #{id}? #{t}")
+          next
+        end
+        @wallets.find(t.bnf) do |target|
+          unless target.exists?
+            @log.debug("#{t.amount * -1} to #{t.bnf}: wallet is absent")
+            next
+          end
+          unless target.network == network
+            @log.error("#{t.amount * -1} to #{t.bnf}: network mismatch, '#{target.network}'!='#{network}'")
             next
           end
-          @wallets.find(t.bnf) do |target|
-            unless target.exists?
-              @log.debug("#{t.amount * -1} to #{t.bnf}: wallet is absent")
-              next
-            end
-            unless target.network == wallet.network
-              @log.error("#{t.amount * -1} to #{t.bnf}: network mismatch, '#{target.network}'!='#{wallet.network}'")
-              next
-            end
-            next if target.includes_positive?(t.id, id)
-            unless target.prefix?(t.prefix)
-              @log.error("#{t.amount * -1} to #{t.bnf}: wrong prefix")
-              next
-            end
-            target.add(t.inverse(id))
-            @log.info("#{t.amount * -1} arrived to #{t.bnf}: #{t.details}")
-            modified << t.bnf
+          next if target.includes_positive?(t.id, id)
+          unless target.prefix?(t.prefix)
+            @log.error("#{t.amount * -1} to #{t.bnf}: wrong prefix")
+            next
           end
+          target.add(t.inverse(id))
+          @log.info("#{t.amount * -1} arrived to #{t.bnf}: #{t.details}")
+          modified << t.bnf
         end
       end
       modified.uniq!

data/lib/zold/commands/push.rb

@@ -92,7 +92,7 @@ total score for #{id} is #{total}")
         IO.read(wallet.path)
       end
       uri = "/wallet/#{id}"
-      response = r.http(uri).put(content)
+      response = r.http(uri).put(content, timeout: 60)
       @wallets.find(id) do |wallet|
         if response.code == '304'
           @log.info("#{r}: same version of #{wallet.mnemo} there, in #{Age.new(start, limit: 0.5)}")

data/lib/zold/commands/remote.rb

@@ -96,6 +96,9 @@ Available options:"
         o.bool '--skip-ping',
           'Don\'t ping back the node when adding it (not recommended)',
           default: false
+        o.integer '--depth',
+          'The amount of update cycles to run, in order to fetch as many nodes as possible (default: 2)',
+          default: 2
         o.string '--network',
           "The name of the network we work in (default: #{Wallet::MAIN_NETWORK}",
           required: true,
@@ -139,7 +142,6 @@ Available options:"
         trim(opts)
       when 'update'
         update(opts)
-        update(opts, false)
       when 'select'
         select(opts)
       else
@@ -157,8 +159,9 @@ Available options:"
     end
 
     def clean
+      before = @remotes.all.count
       @remotes.clean
-      @log.debug('All remote nodes deleted')
+      @log.debug("All #{before} remote nodes deleted")
     end
 
     def reset
@@ -217,44 +220,53 @@ Available options:"
       all = @remotes.all
       all.each do |r|
         next if r[:errors] <= opts['tolerate']
-        remove(r[:host], r[:port], opts)
+        @remotes.remove(r[:host], r[:port])
         @log.info("#{r[:host]}:#{r[:port]} removed because of #{r[:errors]} errors (over #{opts['tolerate']})")
       end
       @log.info("The list of #{all.count} remotes trimmed, #{@remotes.all.count} nodes left there")
     end
 
-    def update(opts, deep = true)
+    def update(opts)
+      st = Time.now
       capacity = []
-      @remotes.iterate(@log, farm: @farm) do |r|
-        start = Time.now
-        uri = '/remotes'
-        res = r.http(uri).get
-        r.assert_code(200, res)
-        json = JsonPage.new(res.body, uri).to_hash
-        score = Score.parse_json(json['score'])
-        r.assert_valid_score(score)
-        r.assert_score_ownership(score)
-        r.assert_score_strength(score) unless opts['ignore-score-weakness']
-        @remotes.rescore(score.host, score.port, score.value)
-        gem = Zold::Gem.new
-        if Semantic::Version.new(VERSION) < Semantic::Version.new(json['version']) ||
-           Semantic::Version.new(VERSION) < Semantic::Version.new(gem.last_version)
-          if opts['reboot']
-            @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot! \
-(use --never-reboot to avoid this from happening)")
-            terminate
+      opts['depth'].times do |cycle|
+        @remotes.iterate(@log, farm: @farm) do |r|
+          start = Time.now
+          uri = '/remotes'
+          res = r.http(uri).get
+          r.assert_code(200, res)
+          json = JsonPage.new(res.body, uri).to_hash
+          score = Score.parse_json(json['score'])
+          r.assert_valid_score(score)
+          r.assert_score_ownership(score)
+          r.assert_score_strength(score) unless opts['ignore-score-weakness']
+          @remotes.rescore(score.host, score.port, score.value)
+          gem = Zold::Gem.new
+          if Semantic::Version.new(VERSION) < Semantic::Version.new(json['version']) ||
+             Semantic::Version.new(VERSION) < Semantic::Version.new(gem.last_version)
+            if opts['reboot']
+              @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot! \
+  (use --never-reboot to avoid this from happening)")
+              terminate
+            end
+            @log.debug("#{r}: their version #{json['version']} is higher than mine #{VERSION}, \
+  it's recommended to reboot, but I don't do it because of --never-reboot")
           end
-          @log.debug("#{r}: their version #{json['version']} is higher than mine #{VERSION}, \
-it's recommended to reboot, but I don't do it because of --never-reboot")
-        end
-        if deep
-          json['all'].each do |s|
-            add(s['host'], s['port'], opts)
-            @log.info("#{s['host']}:#{s['port']} found at #{r} and added")
+          if cycle.positive?
+            json['all'].each do |s|
+              if opts['ignore-node'].include?("#{s['host']}:#{s['port']}")
+                @log.debug("#{s['host']}:#{s['port']}, which is found at #{r} \
+  won't be added since it's in the --ignore-node list")
+                next
+              end
+              next if @remotes.exists?(s['host'], s['port'])
+              @remotes.add(s['host'], s['port'])
+              @log.info("#{s['host']}:#{s['port']} found at #{r} and added to the list of #{@remotes.all.count}")
+            end
           end
+          capacity << { host: score.host, port: score.port, count: json['all'].count }
+          @log.info("#{r}: the score is #{Rainbow(score.value).green} (#{json['version']}) in #{Age.new(start)}")
         end
-        capacity << { host: score.host, port: score.port, count: json['all'].count }
-        @log.info("#{r}: the score is #{Rainbow(score.value).green} (#{json['version']}) in #{Age.new(start)}")
       end
       max_capacity = capacity.map { |c| c[:count] }.max || 0
       capacity.each do |c|
@@ -264,7 +276,7 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
       if total.zero?
         @log.info("The list of remotes is #{Rainbow('empty').red}, run 'zold remote reset'!")
       else
-        @log.info("There are #{total} known remotes")
+        @log.info("There are #{total} known remotes after update in #{Age.new(st)}")
       end
     end
 

data/lib/zold/copies.rb

@@ -67,13 +67,13 @@ module Zold
           deleted += 1
         end
         files.each do |f|
-          file = File.join(@dir, f)
-          wallet = Wallet.new(file)
+          cp = File.join(@dir, f)
+          wallet = Wallet.new(cp)
           begin
             wallet.refurbish
-            raise "Invalid protocol #{wallet.protocol} in #{file}" unless wallet.protocol == Zold::PROTOCOL
+            raise "Invalid protocol #{wallet.protocol} in #{cp}" unless wallet.protocol == Zold::PROTOCOL
           rescue StandardError => e
-            FileUtils.rm_rf(file)
+            FileUtils.rm_rf(cp)
             @log.debug("Copy at #{f} deleted: #{Backtrace.new(e)}")
             deleted += 1
           end

data/lib/zold/http.rb

@@ -55,10 +55,10 @@ module Zold
     PROTOCOL_HEADER = 'X-Zold-Protocol'
 
     # Read timeout in seconds
-    READ_TIMEOUT = 32
+    READ_TIMEOUT = 0.4
 
     # Connect timeout in seconds
-    CONNECT_TIMEOUT = 4
+    CONNECT_TIMEOUT = 0.2
 
     def initialize(uri:, score: Score::ZERO, network: 'test')
       @uri = uri.is_a?(URI) ? uri : URI(uri)
@@ -66,28 +66,28 @@ module Zold
       @network = network
     end
 
-    def get
+    def get(timeout: Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT)
       http = Net::HTTP.new(@uri.host, @uri.port)
       http.use_ssl = @uri.scheme == 'https'
       http.read_timeout = Http::READ_TIMEOUT
       http.open_timeout = Http::CONNECT_TIMEOUT
       path = @uri.path
       path += '?' + @uri.query if @uri.query
-      Timeout.timeout(Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT) do
+      Timeout.timeout(timeout) do
         http.request_get(path, headers)
       end
     rescue StandardError => e
       Error.new(e)
     end
 
-    def put(body)
+    def put(body, timeout: Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT)
       http = Net::HTTP.new(@uri.host, @uri.port)
       http.use_ssl = @uri.scheme == 'https'
       http.read_timeout = Http::READ_TIMEOUT
       http.open_timeout = Http::CONNECT_TIMEOUT
       path = @uri.path
       path += '?' + @uri.query if @uri.query
-      Timeout.timeout(Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT) do
+      Timeout.timeout(timeout) do
         http.request_put(
           path, body,
           headers.merge(

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.16.16'
+  VERSION = '0.16.17'
   PROTOCOL = 2
 end

data/test/test_cached_wallets.rb

@@ -22,6 +22,7 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
+require_relative 'test__helper'
 require_relative 'fake_home'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/id'

data/zold.gemspec

@@ -75,7 +75,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'threads', '0.3.0'
   s.add_runtime_dependency 'usagewatch_ext', '0.2.1'
   s.add_runtime_dependency 'xcop', '0.6'
-  s.add_runtime_dependency 'zache', '0.2.0'
+  s.add_runtime_dependency 'zache', '0.3.0'
   s.add_runtime_dependency 'zold-score', '0.2.0'
   s.add_development_dependency 'codecov', '0.1.13'
   s.add_development_dependency 'minitest', '5.11.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.16
+  version: 0.16.17
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: zold-score
   requirement: !ruby/object:Gem::Requirement