zold 0.14.40 → 0.14.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7b45f4c26031db16e0648325a3bb697fd815f30
-  data.tar.gz: 4ef739093a92027005789d04be4b70e2607eed47
+  metadata.gz: 6b4683993fc4c2115b2cf6cf69ea4bc157eb05c2
+  data.tar.gz: 83a3040d404d3b71c2af331bf4085950bfa17fd3
 SHA512:
-  metadata.gz: aee52e4cd446e7c235f3edf8fbd4a0116772c02e0983e33f010424f286daa7fe6cfeae243d7d7d8cbef471c7a734bfb58464e9dc1a1a1d60196279885e891056
-  data.tar.gz: ad64f721708ac64e46ab64c3e3276cce4e429f6d98cf52b6d9d213f30f916060af9af49f85ffb000ec8c91797c34d731f4e78d8f29c23461c2ae7ba102ed3b6d
+  metadata.gz: d28d9c5c4170478c60793e1f7bcab3a50af9cc5fd06b33f78500bd0c8c862010c738a2ca2c00bcf42a20a35512a8955f0e99c8ecb6b55cc6d2016f091ee5997b
+  data.tar.gz: d078e2ec1833d55e2087926e5eac1ac50fc2c199e93f8326a3e8b410f1ba969381d89416d5ca2b09cfd46d2a99ffe527a628e1aa0e1a985aa0702ffb8cba3de1

data/bin/zold

@@ -31,8 +31,6 @@ end
 
 require 'slop'
 require 'rainbow'
-require 'cachy'
-require 'moneta'
 require_relative '../lib/zold'
 require_relative '../lib/zold/version'
 require_relative '../lib/zold/wallet'
@@ -49,8 +47,6 @@ require_relative '../lib/zold/version_file'
 
 Thread.current.name = 'main'
 
-Cachy.cache_store = Moneta.new(:Memory)
-
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 

data/lib/zold/commands/node.rb

@@ -127,6 +127,9 @@ module Zold
           'Maximum amount of nohup re-starts (-1 by default, which means forever)',
           require: true,
           default: -1
+        o.string '--home',
+          "Home directory (default: #{Dir.pwd})",
+          default: Dir.pwd
         o.bool '--no-metronome',
           'Don\'t run the metronome',
           required: true,
@@ -156,9 +159,9 @@ module Zold
       Front.set(:protocol, Zold::PROTOCOL)
       Front.set(:logging, @log.debug?)
       Front.set(:halt, opts['halt-code'])
-      Front.set(:home, Dir.pwd)
+      Front.set(:home, opts['home'])
       @log.info("Time: #{Time.now.utc.iso8601}")
-      @log.info("Home directory: #{Dir.pwd}")
+      @log.info("Home directory: #{opts['home']}")
       @log.info("Ruby version: #{RUBY_VERSION}")
       @log.info("Zold gem version: #{Zold::VERSION}")
       @log.info("Zold protocol version: #{Zold::PROTOCOL}")
@@ -189,7 +192,7 @@ module Zold
       Front.set(:remotes, @remotes)
       Front.set(:copies, @copies)
       Front.set(:address, address)
-      Front.set(:root, Dir.pwd)
+      Front.set(:root, opts['home'])
       Front.set(:dump_errors, opts['dump-errors'])
       Front.set(:port, opts['bind-port'])
       Front.set(:reboot, !opts['never-reboot'])
@@ -215,21 +218,21 @@ module Zold
                   @remotes, @copies, address,
                   log: @log, network: opts['network']
                 ),
-                File.join(Dir.pwd, '.zoldata/entrance'),
+                File.join(opts['home'], '.zoldata/entrance'),
                 log: @log
               ),
               @wallets, @remotes, address,
               log: @log,
               ignore_score_weakeness: opts['ignore-score-weakness']
             ),
-            File.join(Dir.pwd, '.zoldata/entrance'), log: @log
+            File.join(opts['home'], '.zoldata/entrance'), log: @log
           ),
           @wallets
         ),
         network: opts['network']
       ).start do |entrance|
         Front.set(:entrance, entrance)
-        Farm.new(invoice, File.join(Dir.pwd, 'farm'), log: @log)
+        Farm.new(invoice, File.join(opts['home'], 'farm'), log: @log)
           .start(host, opts[:port], threads: opts[:threads], strength: opts[:strength]) do |farm|
           Front.set(:farm, farm)
           metronome(farm, opts).start do |metronome|

data/lib/zold/node/async_entrance.rb

@@ -38,10 +38,6 @@ module Zold
     # Queue length
     MAX_QUEUE = Concurrent.processor_count * 64
 
-    # Max items in the queue. If there will be more, push() requests
-    # will be rejected.
-    MAX_QUEUE = 128
-
     def initialize(entrance, dir, log: Log::Quiet.new)
       raise 'Entrance can\'t be nil' if entrance.nil?
       @entrance = entrance

data/lib/zold/node/front.rb

@@ -26,6 +26,7 @@ require 'json'
 require 'sinatra/base'
 require 'webrick'
 require 'cachy'
+require 'moneta'
 require 'get_process_mem'
 require 'diffy'
 require 'usagewatch_ext'
@@ -48,6 +49,7 @@ module Zold
   class Front < Sinatra::Base
     configure do
       Thread.current.name = 'sinatra'
+      Cachy.cache_store = Moneta.new(:Memory)
       set :bind, '0.0.0.0'
       set :suppress_messages, true
       set :start, Time.now

data/lib/zold/version.rb

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

data/test/node/fake_node.rb

@@ -22,6 +22,7 @@
 
 require 'tmpdir'
 require 'webmock/minitest'
+require 'random-port'
 require_relative '../fake_home'
 require_relative '../../lib/zold/log'
 require_relative '../../lib/zold/http'
@@ -33,27 +34,21 @@ require_relative '../../lib/zold/node/front'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 class FakeNode
-  # rubocop:disable Style/ClassVars
-  @@ports = Set.new
-  # rubocop:enable Style/ClassVars
-
   def initialize(log: Zold::Log::Quiet.new)
     @log = log
   end
 
   def run(args = ['--standalone'])
     WebMock.allow_net_connect!
-    start = Dir.pwd
-    begin
-      FakeHome.new.run do |home|
-        port = FakeNode.random_port
+    FakeHome.new.run do |home|
+      RandomPort::Pool::SINGLETON.acquire do |port|
         node = Thread.new do
           Zold::VerboseThread.new(@log).run do
             Thread.current.abort_on_exception = true
-            Dir.chdir(home.dir)
             require_relative '../../lib/zold/commands/node'
             Zold::Node.new(wallets: home.wallets, remotes: home.remotes, copies: home.copies.root, log: @log).run(
               [
+                '--home', home.dir,
                 '--network=test',
                 '--port', port.to_s,
                 '--host=localhost',
@@ -82,19 +77,6 @@ class FakeNode
           node.join
         end
       end
-    ensure
-      Dir.chdir(start)
-    end
-  end
-
-  def self.random_port
-    loop do
-      server = TCPServer.new('127.0.0.1', 0)
-      port = server.addr[1]
-      server.close
-      next if @@ports.include?(port)
-      @@ports << port
-      return port
     end
   end
 end

data/test/test__helper.rb

@@ -24,7 +24,6 @@ gem 'openssl'
 require 'openssl'
 require 'minitest/autorun'
 require 'concurrent'
-require 'cachy'
 require 'moneta'
 
 STDOUT.sync = true
@@ -38,8 +37,6 @@ if ENV['CI'] == 'true'
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
 
-Cachy.cache_store = Moneta.new(:Memory)
-
 module Minitest
   class Test
     def assert_wait(max: 30)

data/zold.gemspec

@@ -77,6 +77,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'xcop', '~>0.5'
   s.add_development_dependency 'codecov', '0.1.10'
   s.add_development_dependency 'minitest', '5.11.3'
+  s.add_development_dependency 'random-port', '~>0.1'
   s.add_development_dependency 'rdoc', '4.2.0'
   s.add_development_dependency 'rspec-rails', '3.1.0'
   s.add_development_dependency 'webmock', '3.4.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.40
+  version: 0.14.41
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cachy
@@ -332,6 +332,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 5.11.3
+- !ruby/object:Gem::Dependency
+  name: random-port
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement