zold 0.18.6 → 0.18.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cef493a42202430232e9c904a25258bdf6c59336c3f6732687b1412713f93d1
-  data.tar.gz: 8ff76340ba5810cf0ccb241c61505fcc1c8f9b0c7efa49b40f49fb312ff0370f
+  metadata.gz: e805665d05301f84e70c8e280530b3a9b7cd195b63165a1a3eefda7eb72f509f
+  data.tar.gz: 42113e608d1c76f7b3ed5ace35ff36456566b708a9779e6c52e866a6c189416d
 SHA512:
-  metadata.gz: 5ffcaa34424091b2f97ce0f3a12cca71b983c32332a7ddeef69d6cdfd89ed507a8539f4baa2cf909ec30675721aea4b7add652fba881192113df3b97b6fd1cd2
-  data.tar.gz: b1e80e8a217ba00c6a1c6b15a8efc48c1687f7295607c529a2d322b763fd001d019bb87411e3815532f7a9117f7e41f88a137e3e666c74c20fb42db401e14986
+  metadata.gz: d7e2b7606454ca38aac815c9c43a280d753845ab8301ac4e0055894a640e6f7c81185c8c23445d776875c215b7d614c8abcaa118133eaab41dc81778f0d44bb4
+  data.tar.gz: 1223bc3bee736ccc949ae1f663f25286498b07f1595370a870c65a65ca036477e6800b021caca6b44bf118f3424a3b611d7560c3bf8858c2e034be11f964e5d8

data/lib/zold/cached_wallets.rb

@@ -22,6 +22,7 @@
 
 require 'zache'
 require_relative 'endless'
+require_relative 'thread_pool'
 
 # Cached collection of wallets.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -33,7 +34,8 @@ module Zold
     def initialize(wallets)
       @wallets = wallets
       @zache = Zache.new
-      @clean = Thread.start do
+      @clean = ThreadPool.new('cached-wallets')
+      @clean.add do
         Endless.new('cached_wallets').run do
           sleep 60
           @zache.clean

data/lib/zold/commands/fetch.rb

@@ -32,6 +32,7 @@ require 'concurrent'
 require 'parallel'
 require_relative 'thread_badge'
 require_relative 'args'
+require_relative '../thread_pool'
 require_relative '../log'
 require_relative '../age'
 require_relative '../http'
@@ -77,9 +78,9 @@ Available options:"
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
-      Parallel.map((mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }), in_threads: opts[:threads]) do |id|
+      list = mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }
+      ThreadPool.new('fetch', log: @log).run(opts['threads'], list) do |id|
         fetch(id, Copies.new(File.join(@copies, id)), opts)
-        @log.debug("Worker: #{Parallel.worker_number} has fetched wallet #{id}")
       end
     end
 

data/lib/zold/commands/push.rb

@@ -28,6 +28,7 @@ require 'concurrent'
 require 'parallel'
 require_relative 'thread_badge'
 require_relative 'args'
+require_relative '../thread_pool'
 require_relative '../age'
 require_relative '../size'
 require_relative '../log'
@@ -66,9 +67,9 @@ Available options:"
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
-      Parallel.map((mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }), in_threads: opts[:threads]) do |id|
+      list = mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }
+      ThreadPool.new('push', log: @log).run(opts['threads'], list) do |id|
         push(id, opts)
-        @log.debug("Worker: #{Parallel.worker_number} has pushed wallet #{id}")
       end
     end
 

data/lib/zold/commands/remote.rb

@@ -229,7 +229,7 @@ Available options:"
       else
         scores.each { |s| @log.info("Elected: #{s.reduced(4)}") }
       end
-      scores
+      scores.sort_by(&:value).reverse
     end
 
     def trim(opts)
@@ -257,15 +257,22 @@ Available options:"
           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 Semantic::Version.new(VERSION) < Semantic::Version.new(json['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
+          if Semantic::Version.new(VERSION) < Semantic::Version.new(Zold::Gem.new.last_version)
+            if opts['reboot']
+              @log.info("#{r}: the version of the gem is higher than mine #{VERSION}, reboot! \
+(use --never-reboot to avoid this from happening)")
+              terminate
+            end
+            @log.debug("#{r}: gem version is higher than mine #{VERSION}, \
 it's recommended to reboot, but I don't do it because of --never-reboot")
           end
           if cycle.positive?

data/lib/zold/commands/routines/gc.rb

@@ -51,7 +51,7 @@ module Zold
           cmd.run(args + [id.to_s])
           removed += 1
         end
-        @log.info("Removed #{removed} empty+old wallets out of #{seen} total")
+        @log.info("Removed #{removed} empty+old wallets out of #{seen} total") unless removed.zero?
       end
     end
   end

data/lib/zold/endless.rb

@@ -39,7 +39,6 @@ module Zold
     def run
       start = Time.now
       Thread.current.name = @title
-      Thread.current.abort_on_exception = true
       begin
         loop do
           VerboseThread.new(@log).run(true) do

data/lib/zold/http.rb

@@ -98,7 +98,7 @@ module Zold
 
     private
 
-    # Some clients waits for status method in respons
+    # Some clients waits for status method in response
     class Response < SimpleDelegator
       def status
         code.zero? ? 599 : code

data/lib/zold/metronome.rb

@@ -24,6 +24,7 @@ require 'backtrace'
 require_relative 'log'
 require_relative 'age'
 require_relative 'verbose_thread'
+require_relative 'thread_pool'
 
 # Background routines.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -35,8 +36,7 @@ module Zold
     def initialize(log = Log::NULL)
       @log = log
       @routines = []
-      @threads = []
-      @starts = {}
+      @threads = ThreadPool.new('metronome', log: log)
       @failures = {}
     end
 
@@ -44,13 +44,7 @@ module Zold
       [
         Time.now.utc.iso8601,
         'Current threads:',
-        @threads.map do |t|
-          [
-            "#{t.name}: status=#{t.status}; alive=#{t.alive?}",
-            "Most recent start: #{Age.new(@starts[t])} ago",
-            t.backtrace.nil? ? 'NO BACKTRACE' : "  #{t.backtrace.join("\n  ")}"
-          ].join("\n")
-        end,
+        @threads.to_s,
         'Failures:',
         @failures.map { |r, f| "#{r}\n#{f}\n" }
       ].flatten.join("\n\n")
@@ -63,18 +57,19 @@ module Zold
 
     def start
       @routines.each_with_index do |r, idx|
-        @threads << Thread.start do
-          Thread.current.abort_on_exception = true
+        @threads.add do
           Thread.current.name = "#{r.class.name}-#{idx}"
           step = 0
           loop do
-            @starts[Thread.current] = Time.now
+            Thread.current.thread_variable_set(:start, Time.now)
             begin
               r.exec(step)
-              @log.debug("Routine #{r.class.name} ##{step} done in #{Age.new(@starts[Thread.current])}")
+              @log.debug("Routine #{r.class.name} ##{step} done \
+in #{Age.new(Thread.current.thread_variable_get(:start))}")
             rescue StandardError => e
               @failures[r.class.name] = Time.now.utc.iso8601 + "\n" + Backtrace.new(e).to_s
-              @log.error("Routine #{r.class.name} ##{step} failed in #{Age.new(@starts[Thread.current])}")
+              @log.error("Routine #{r.class.name} ##{step} failed \
+in #{Age.new(Thread.current.thread_variable_get(:start))}")
               @log.error(Backtrace.new(e).to_s)
             end
             step += 1
@@ -85,14 +80,7 @@ module Zold
       begin
         yield(self)
       ensure
-        start = Time.now
-        unless @threads.empty?
-          @log.info("Stopping the metronome with #{@threads.count} threads...")
-          @threads.each(&:kill)
-          @threads.each(&:join)
-          @log.info("Metronome #{@threads.count} threads killed")
-        end
-        @log.info("Metronome stopped in #{Age.new(start)}, #{@failures.count} failures")
+        @threads.kill
       end
     end
   end

data/lib/zold/node/async_entrance.rb

@@ -27,6 +27,7 @@ require_relative '../age'
 require_relative '../size'
 require_relative '../id'
 require_relative '../endless'
+require_relative '../thread_pool'
 require_relative '../dir_items'
 require_relative 'soft_error'
 
@@ -42,7 +43,8 @@ module Zold
       @entrance = entrance
       @dir = File.expand_path(dir)
       @log = log
-      @total = threads
+      @threads = threads
+      @pool = ThreadPool.new('async-entrance', log: log)
       @queue = Queue.new
       @queue_limit = queue_limit
     end
@@ -50,7 +52,7 @@ module Zold
     def to_json
       @entrance.to_json.merge(
         'queue': @queue.size,
-        'threads': @threads.count,
+        'threads': @pool.count,
         'queue_limit': @queue_limit
       )
     end
@@ -65,8 +67,8 @@ module Zold
       end
       @log.info("#{@queue.size} wallets pre-loaded into async_entrace from #{@dir}") unless @queue.size.zero?
       @entrance.start do
-        @threads = (0..@total - 1).map do |i|
-          Thread.start do
+        (0..@threads).map do |i|
+          @pool.add do
             Endless.new("async-e##{i}", log: @log).run do
               take
             end
@@ -75,10 +77,7 @@ module Zold
         begin
           yield(self)
         ensure
-          @log.info("AsyncEntrance stopping and killing #{@threads.count} threads...")
-          @threads.each(&:kill)
-          @threads.each(&:join)
-          @log.info("AsyncEntrance stopped, #{@threads.count} threads killed")
+          @pool.kill
         end
       end
     end

data/lib/zold/node/farm.rb

@@ -28,6 +28,7 @@ require 'concurrent'
 require 'json'
 require 'zold/score'
 require_relative '../log'
+require_relative '../thread_pool'
 require_relative '../age'
 require_relative '../endless'
 require_relative 'farmers'
@@ -64,7 +65,7 @@ module Zold
       @invoice = invoice
       @pipeline = Queue.new
       @farmer = farmer
-      @threads = []
+      @threads = ThreadPool.new('farm')
       @lifetime = lifetime
       @strength = strength
     end
@@ -82,21 +83,14 @@ module Zold
         "Current time: #{Time.now.utc.iso8601}",
         "Ruby processes: #{`ps ax | grep zold | wc -l`}",
         JSON.pretty_generate(to_json),
-        @threads.map do |t|
-          trace = t.backtrace || []
-          [
-            "#{t.name}: status=#{t.status}; alive=#{t.alive?}",
-            'Vars: ' + t.thread_variables.map { |v| "#{v}=\"#{t.thread_variable_get(v)}\"" }.join('; '),
-            "  #{trace.join("\n  ")}"
-          ].join("\n")
-        end
+        @threads.to_s
       ].flatten.join("\n\n")
     end
 
     # Renders the Farm into JSON to show for the end-user in front.rb.
     def to_json
       {
-        threads: @threads.map { |t| "#{t.name}/#{t.status}/#{t.alive? ? 'alive' : 'dead'}" }.join(', '),
+        threads: @threads.to_json,
         pipeline: @pipeline.size,
         best: best.map(&:to_mnemo).join(', '),
         farmer: @farmer.class.name
@@ -121,8 +115,8 @@ module Zold
       else
         @log.info("#{best.size} scores pre-loaded from #{@cache}, the best is: #{best[0]}")
       end
-      @threads = (1..threads).map do |t|
-        Thread.start do
+      (1..threads).map do |t|
+        @threads.add do
           Thread.current.thread_variable_set(:tid, t.to_s)
           Endless.new("f#{t}", log: @log).run do
             cycle(host, port, threads)
@@ -131,7 +125,7 @@ module Zold
       end
       unless threads.zero?
         ready = false
-        @threads << Thread.start do
+        @threads.add do
           Endless.new('cleanup', log: @log).run do
             cleanup(host, port, threads)
             ready = true
@@ -140,7 +134,7 @@ module Zold
         end
         loop { break if ready }
       end
-      if @threads.empty?
+      if threads.zero?
         cleanup(host, port, threads)
         @log.info("Farm started with no threads (there will be no score) at #{host}:#{port}")
       else
@@ -150,10 +144,7 @@ at #{host}:#{port}, strength is #{@strength}")
       begin
         yield(self)
       ensure
-        @log.info("Farm stopping with #{threads} threads...")
-        @threads.each(&:kill)
-        @threads.each(&:join)
-        @log.info("Farm stopped, #{threads} threads killed")
+        @threads.kill
       end
     end
 
@@ -164,11 +155,11 @@ at #{host}:#{port}, strength is #{@strength}")
       before = scores.map(&:value).max.to_i
       save(threads, [Score.new(host: host, port: port, invoice: @invoice, strength: @strength)])
       scores = load
-      free = scores.reject { |s| @threads.find { |t| t.name == s.to_mnemo } }
+      free = scores.reject { |s| @threads.exists?(s.to_mnemo) }
       @pipeline << free[0] if @pipeline.size.zero? && !free.empty?
       after = scores.map(&:value).max.to_i
       return unless before != after && !after.zero?
-      @log.debug("#{Thread.current.name}: best score of #{scores.count} is #{scores[0]}")
+      @log.debug("#{Thread.current.name}: best score of #{scores.count} is #{scores[0].reduced(4)}")
     end
 
     def cycle(host, port, threads)

data/lib/zold/node/spread_entrance.rb

@@ -28,6 +28,7 @@ require_relative '../remotes'
 require_relative '../copies'
 require_relative '../endless'
 require_relative '../tax'
+require_relative '../thread_pool'
 require_relative '../commands/merge'
 require_relative '../commands/fetch'
 require_relative '../commands/push'
@@ -48,12 +49,13 @@ module Zold
       @log = log
       @ignore_score_weakeness = ignore_score_weakeness
       @mutex = Mutex.new
+      @push = ThreadPool.new('spread-entrance')
     end
 
     def to_json
       @entrance.to_json.merge(
         'modified': @modified.size,
-        'push': @push.status
+        'push': @push.to_json
       )
     end
 
@@ -62,7 +64,7 @@ module Zold
       @entrance.start do
         @seen = Set.new
         @modified = Queue.new
-        @push = Thread.start do
+        @push.add do
           Endless.new('push', log: @log).run do
             id = @modified.pop
             if @remotes.all.empty?
@@ -82,11 +84,8 @@ module Zold
         begin
           yield(self)
         ensure
-          @log.info('Waiting for spread entrance to finish...')
           @modified.clear
           @push.kill
-          @push.join
-          @log.info('Spread entrance finished, thread killed')
         end
       end
     end

data/lib/zold/remotes.rb

@@ -31,6 +31,7 @@ require 'backtrace'
 require 'zold/score'
 require_relative 'age'
 require_relative 'http'
+require_relative 'thread_pool'
 require_relative 'node/farm'
 
 # The list of remotes.
@@ -94,7 +95,7 @@ module Zold
       def assert_code(code, response)
         msg = response.status_line.strip
         return if response.status.to_i == code
-        if response.headers['X-Zold-Error']
+        if response.headers && response.headers['X-Zold-Error']
           raise "Error ##{response.status} \"#{response.headers['X-Zold-Error']}\"
             at #{response.headers['X-Zold-Path']}"
         end
@@ -182,40 +183,32 @@ module Zold
       end
     end
 
+    # Go through the list of remotes and call a provided block for each
+    # of them. See how it's used, for example, in fetch.rb.
     def iterate(log, farm: Farm::Empty.new)
       raise 'Log can\'t be nil' if log.nil?
       raise 'Farm can\'t be nil' if farm.nil?
-      list = all
-      return if list.empty?
-      best = farm.best[0]
-      score = best.nil? ? Score::ZERO : best
-      idx = Concurrent::AtomicFixnum.new
-      pool = Concurrent::FixedThreadPool.new([list.count, Concurrent.processor_count * 4].min, max_queue: 0)
-      list.each do |r|
-        pool.post do
-          Thread.current.abort_on_exception = true
-          Thread.current.name = "remotes-#{idx.value}@#{r[:host]}:#{r[:port]}"
-          start = Time.now
-          begin
-            yield Remotes::Remote.new(
-              host: r[:host],
-              port: r[:port],
-              score: score,
-              idx: idx.increment - 1,
-              log: log,
-              network: @network
-            )
-            raise 'Took too long to execute' if (Time.now - start).round > @timeout
-          rescue StandardError => e
-            error(r[:host], r[:port])
-            log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message} in #{Age.new(start)}")
-            log.debug(Backtrace.new(e).to_s)
-            remove(r[:host], r[:port]) if errors > TOLERANCE
-          end
+      ThreadPool.new('remotes', log: log).run(Concurrent.processor_count * 4, all) do |r, idx|
+        Thread.current.name = "remotes-#{idx}@#{r[:host]}:#{r[:port]}"
+        start = Time.now
+        best = farm.best[0]
+        begin
+          yield Remotes::Remote.new(
+            host: r[:host],
+            port: r[:port],
+            score: best.nil? ? Score::ZERO : best,
+            idx: idx,
+            log: log,
+            network: @network
+          )
+          raise 'Took too long to execute' if (Time.now - start).round > @timeout
+        rescue StandardError => e
+          error(r[:host], r[:port])
+          log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message} in #{Age.new(start)}")
+          log.debug(Backtrace.new(e).to_s)
+          remove(r[:host], r[:port]) if r[:errors] > TOLERANCE
         end
       end
-      pool.shutdown
-      pool.kill unless pool.wait_for_termination(5 * 60)
     end
 
     def error(host, port = PORT)

data/lib/zold/thread_pool.rb

@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+# 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 NONINFINGEMENT. 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.
+
+require 'concurrent'
+require_relative 'age'
+require_relative 'verbose_thread'
+
+# Thread pool.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Thread pool
+  class ThreadPool
+    def initialize(title, log: Log::NULL)
+      @title = title
+      @log = log
+      @threads = []
+      @start = Time.now
+    end
+
+    # Run this code in many threads
+    def run(threads, set = (0..threads - 1).to_a)
+      raise "Number of threads #{threads} has to be positive" unless threads.positive?
+      raise 'Set of data can\'t be empty' if set.empty?
+      idx = Concurrent::AtomicFixnum.new
+      mutex = Mutex.new
+      list = set.dup
+      [threads, set.count].min.times do
+        add do
+          loop do
+            r = mutex.synchronize { list.pop }
+            break if r.nil?
+            yield(r, idx.increment - 1)
+          end
+        end
+      end
+      @threads.each(&:join)
+      @threads.clear
+    end
+
+    # Add a new thread
+    def add
+      raise 'Block must be given to start()' unless block_given?
+      latch = Concurrent::CountDownLatch.new(1)
+      thread = Thread.start do
+        VerboseThread.new(@log).run do
+          latch.count_down
+          yield
+        end
+      end
+      latch.wait
+      Thread.current.thread_variable_set(
+        :kids,
+        (Thread.current.thread_variable_get(:kids) || []) + [thread]
+      )
+      @threads << thread
+    end
+
+    # Kill them all immediately and close the pool
+    def kill
+      if @threads.empty?
+        @log.debug("Thread pool \"#{@title}\" terminated with no threads")
+        return
+      end
+      @log.info("Stopping \"#{@title}\" thread pool with #{@threads.count} threads: \
+#{@threads.map { |t| "#{t.name}/#{t.status}" }.join(', ')}...")
+      start = Time.new
+      @threads.each do |t|
+        (t.thread_variable_get(:kids) || []).each(&:kill)
+        t.kill
+        raise "Failed to join the thread \"#{t.name}\" in \"#{@title}\" pool" unless t.join(0.1)
+        (Thread.current.thread_variable_get(:kids) || []).delete(t)
+      end
+      @log.info("Thread pool \"#{@title}\" terminated all threads in #{Age.new(start)}, \
+it was alive for #{Age.new(@start)}: #{@threads.map { |t| "#{t.name}/#{t.status}" }.join(', ')}")
+      @threads.clear
+    end
+
+    # How many threads are in there
+    def count
+      @threads.count
+    end
+
+    # A thread with this name exists?
+    def exists?(name)
+      !@threads.find { |t| t.name == name }.nil?
+    end
+
+    # As a hash map
+    def to_json
+      @threads.map do |t|
+        {
+          name: t.name,
+          status: t.status,
+          alive: t.alive?,
+          vars: t.thread_variables.map { |v| { k: v, v: t.thread_variable_get(v) } }
+        }
+      end
+    end
+
+    # As a text
+    def to_s
+      @threads.map do |t|
+        [
+          "#{t.name}: status=#{t.status}; alive=#{t.alive?}",
+          'Vars: ' + t.thread_variables.map { |v| "#{v}=\"#{t.thread_variable_get(v)}\"" }.join('; '),
+          t.backtrace.nil? ? 'NO BACKTRACE' : "  #{t.backtrace.join("\n  ")}"
+        ].join("\n")
+      end
+    end
+  end
+end

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.18.6'
+  VERSION = '0.18.7'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

data/test/commands/test_remote.rb

@@ -43,6 +43,7 @@ class TestRemote < Zold::Test
       zero = Zold::Score::ZERO
       stub_request(:get, "http://#{zero.host}:#{zero.port}/remotes").to_return(
         status: 200,
+        headers: {},
         body: {
           version: Zold::VERSION,
           score: zero.to_h,
@@ -63,6 +64,7 @@ class TestRemote < Zold::Test
       )
       stub_request(:get, 'https://rubygems.org/api/v1/versions/zold/latest.json').to_return(
         status: 200,
+        headers: {},
         body: '{"version": "0.0.0"}'
       )
       cmd = Zold::Remote.new(remotes: remotes, log: test_log)

data/test/test__helper.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 gem 'openssl'
+require 'eventmachine'
 require 'openssl'
 require 'minitest/autorun'
 require 'minitest/hooks/test'

data/test/test_remotes.rb

@@ -82,13 +82,46 @@ class TestRemotes < Zold::Test
     end
   end
 
-  def test_iterates_them_all
+  def test_iterates_all_failures
+    Dir.mktmpdir do |dir|
+      file = File.join(dir, 'remotes')
+      FileUtils.touch(file)
+      remotes = Zold::Remotes.new(file: file)
+      5.times { |i| remotes.add("0.0.0.#{i}", 9999) }
+      total = 0
+      remotes.iterate(Zold::Log::NULL) do
+        total += 1
+        raise 'Intended'
+      end
+      assert_equal(5, total)
+    end
+  end
+
+  def test_closes_threads_carefully
+    Dir.mktmpdir do |dir|
+      file = File.join(dir, 'remotes')
+      FileUtils.touch(file)
+      remotes = Zold::Remotes.new(file: file)
+      5.times { |i| remotes.add("0.0.0.#{i}", 9999) }
+      total = 0
+      remotes.iterate(Zold::Log::NULL) do
+        sleep 0.25
+        total += 1
+      end
+      assert_equal(5, total)
+    end
+  end
+
+  def test_iterates_them_all_even_with_delays
     Dir.mktmpdir do |dir|
       remotes = Zold::Remotes.new(file: File.join(dir, 'rrr.csv'))
       remotes.clean
       5.times { |i| remotes.add("0.0.0.#{i}", 8080) }
       total = 0
-      remotes.iterate(test_log) { total += 1 }
+      remotes.iterate(test_log) do
+        sleep 0.25
+        total += 1
+      end
       assert_equal(5, total)
     end
   end

data/test/test_thread_pool.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+# 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 NONINFINGEMENT. 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.
+
+require 'minitest/autorun'
+require 'concurrent'
+require_relative 'test__helper'
+require_relative '../lib/zold/thread_pool'
+
+# ThreadPool test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestThreadPool < Zold::Test
+  def test_closes_all_threads_right
+    pool = Zold::ThreadPool.new('test', log: test_log)
+    idx = Concurrent::AtomicFixnum.new
+    threads = 50
+    threads.times do
+      pool.add do
+        idx.increment
+      end
+    end
+    pool.kill
+    assert_equal(threads, idx.value)
+  end
+
+  def test_runs_in_many_threads
+    idx = Concurrent::AtomicFixnum.new
+    threads = 50
+    Zold::ThreadPool.new('test', log: test_log).run(threads) do
+      idx.increment
+    end
+    assert_equal(threads, idx.value)
+  end
+
+  def test_runs_with_index
+    idx = Concurrent::AtomicFixnum.new
+    indexes = Set.new
+    Zold::ThreadPool.new('test', log: test_log).run(10, %w[a b c]) do |_, i|
+      idx.increment
+      indexes << i
+    end
+    assert_equal(3, idx.value)
+    assert_equal('0 1 2', indexes.to_a.sort.join(' '))
+  end
+
+  def test_adds_and_stops
+    pool = Zold::ThreadPool.new('test', log: test_log)
+    pool.add do
+      sleep 60 * 60
+    end
+    pool.kill
+  end
+
+  def test_stops_stuck_threads
+    pool = Zold::ThreadPool.new('test', log: test_log)
+    pool.add do
+      loop do
+        # forever
+      end
+    end
+    pool.kill
+  end
+
+  def test_stops_empty_pool
+    pool = Zold::ThreadPool.new('test', log: test_log)
+    pool.kill
+  end
+
+  def test_prints_to_json
+    pool = Zold::ThreadPool.new('test', log: test_log)
+    assert(pool.to_json.is_a?(Array))
+  end
+
+  def test_prints_to_text
+    pool = Zold::ThreadPool.new('test', log: test_log)
+    assert(!pool.to_s.nil?)
+  end
+end

data/zold.gemspec

@@ -70,7 +70,6 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'json', '2.1.0'
   s.add_runtime_dependency 'memory_profiler', '0.9.12'
   s.add_runtime_dependency 'openssl', '2.1.2'
-  s.add_runtime_dependency 'parallel', '1.12.1'
   s.add_runtime_dependency 'rainbow', '3.0.0'
   s.add_runtime_dependency 'rake', '12.3.1' # has to stay here for Heroku
   s.add_runtime_dependency 'rubocop', '0.60.0' # has to stay here for Heroku

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.18.6
+  version: 0.18.7
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -136,20 +136,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.1.2
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.12.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -614,6 +600,7 @@ files:
 - lib/zold/size.rb
 - lib/zold/sync_wallets.rb
 - lib/zold/tax.rb
+- lib/zold/thread_pool.rb
 - lib/zold/tree_wallets.rb
 - lib/zold/txn.rb
 - lib/zold/txns.rb
@@ -681,6 +668,7 @@ files:
 - test/test_size.rb
 - test/test_sync_wallets.rb
 - test/test_tax.rb
+- test/test_thread_pool.rb
 - test/test_tree_wallets.rb
 - test/test_txn.rb
 - test/test_upgrades.rb
@@ -701,7 +689,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.18.6!
+  Thanks for installing Zold 0.18.7!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try online wallet at: https://wts.zold.io
@@ -789,6 +777,7 @@ test_files:
 - test/test_size.rb
 - test/test_sync_wallets.rb
 - test/test_tax.rb
+- test/test_thread_pool.rb
 - test/test_tree_wallets.rb
 - test/test_txn.rb
 - test/test_upgrades.rb