zold 0.14.52 → 0.14.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f2a2f29076ab430c597f9d07c7a72b7f10a378e3c69b9ff755b04f644accdb9
-  data.tar.gz: 5bab77f75e6b20cf1e80cb1f8bea44353ec0060e523c0c2c08614334d728c22b
+  metadata.gz: 12bf3dea4ff2630f3530269b7c5db959ad30cec8ab6346ba3336570c4a61822d
+  data.tar.gz: 1cb07c0e0ce665ededffc57a221ead9a235d99ba9eb391a8a75b1af6434bf093
 SHA512:
-  metadata.gz: 7aec846b0b6443e195e989a414254fe80bca5e810b19000e60e574ba4721b64cb3ac820f85811c96b2a23db45c1c64291d0ae63e1eb619a30d5f27406354a432
-  data.tar.gz: 41d673a22f703fc01bdc857f61a7c82d3fa34059e1a05c2cd759532d65606df723e2810bff55ab44d6f2ef9f2c0914ec9c713ea557924b1244b1f6575c17ad3f
+  metadata.gz: 4788bfa23317ab20259ef9fae9266556d402caf07de529d8358d9541f61dca9f42b2921b6d15535e8b11583c4f79c130aae3fa82cda5cd8fd494aeb645f8fd8d
+  data.tar.gz: 2a929f263c3a0a2fa91e6cddc9436b273781c58f121753ad28191f4fa140b5df7b9f07bda75e84dcc448e6d30633695895906fac47089be453246b83f3665e83

data/lib/zold/commands/diff.rb

@@ -28,7 +28,6 @@ require_relative 'args'
 require_relative '../log'
 require_relative '../patch'
 require_relative '../wallet'
-require_relative '../atomic_file'
 
 # DIFF command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -68,7 +67,7 @@ Available options:"
         patch.join(Wallet.new(c[:path]))
       end
       before = @wallets.find(id) do |wallet|
-        AtomicFile.new(wallet.path).read
+        File.read(wallet.path)
       end
       after = ''
       Tempfile.open(['', Wallet::EXTENSION]) do |f|

data/lib/zold/commands/node.rb

@@ -135,6 +135,12 @@ module Zold
           'Don\'t run the metronome',
           required: true,
           default: false
+        o.bool '--disable-push',
+          'Prohibit all PUSH requests',
+          default: false
+        o.bool '--disable-fetch',
+          'Prohibit all FETCH requests',
+          default: false
         o.string '--alias',
           'The alias of the node (default: host:port)',
           require: false
@@ -160,6 +166,8 @@ module Zold
       Front.set(:protocol, Zold::PROTOCOL)
       Front.set(:logging, @log.debug?)
       Front.set(:halt, opts['halt-code'])
+      Front.set(:disable_push, opts['disable-push'])
+      Front.set(:disable_fetch, opts['disable-fetch'])
       Front.set(:home, opts['home'])
       @log.info("Time: #{Time.now.utc.iso8601}")
       @log.info("Home directory: #{opts['home']}")
@@ -198,7 +206,7 @@ module Zold
       Front.set(:port, opts['bind-port'])
       Front.set(:reboot, !opts['never-reboot'])
       node_alias = opts[:alias] || address
-      unless node_alias.eql?(address) || node_alias =~ /^[a-z0-9]{4,16}$/
+      unless node_alias.eql?(address) || node_alias =~ /^[A-Za-z0-9]{4,16}$/
         raise "Alias should be a 4 to 16 char long alphanumeric string: #{node_alias}"
       end
       Front.set(:node_alias, node_alias)
@@ -375,7 +383,7 @@ module Zold
       end
 
       def info(msg)
-        @log.debug(msg)
+        @log.debug('WEBRICK ' + msg)
       end
 
       def debug(msg)
@@ -383,11 +391,11 @@ module Zold
       end
 
       def error(msg)
-        @log.error(msg)
+        @log.error('WEBRICK ' + msg)
       end
 
       def fatal(msg)
-        @log.error(msg)
+        @log.error('WEBRICK ' + msg)
       end
 
       def debug?

data/lib/zold/commands/push.rb

@@ -31,7 +31,6 @@ require_relative '../log'
 require_relative '../id'
 require_relative '../http'
 require_relative '../json_page'
-require_relative '../atomic_file'
 
 # PUSH command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -91,7 +90,7 @@ total score for #{id} is #{total}")
       start = Time.now
       content = @wallets.find(id) do |wallet|
         raise "The wallet #{id} is absent" unless wallet.exists?
-        AtomicFile.new(wallet.path).read
+        File.read(wallet.path)
       end
       uri = "/wallet/#{id}"
       response = r.http(uri).put(content)

data/lib/zold/copies.rb

@@ -23,7 +23,6 @@
 require 'time'
 require 'csv'
 require 'backtrace'
-require_relative 'atomic_file'
 require_relative 'log'
 require_relative 'size'
 require_relative 'wallet'
@@ -104,7 +103,7 @@ module Zold
         list = load
         target = list.find do |s|
           f = File.join(@dir, "#{s[:name]}#{Copies::EXT}")
-          File.exist?(f) && AtomicFile.new(f).read == content
+          File.exist?(f) && File.read(f) == content
         end
         if target.nil?
           max = Dir.new(@dir)
@@ -113,7 +112,7 @@ module Zold
             .max
           max = 0 if max.nil?
           name = (max + 1).to_s
-          AtomicFile.new(File.join(@dir, "#{name}#{Copies::EXT}")).write(content)
+          File.write(File.join(@dir, "#{name}#{Copies::EXT}"), content)
         else
           name = target[:name]
         end
@@ -161,7 +160,8 @@ module Zold
     private
 
     def save(list)
-      AtomicFile.new(file).write(
+      File.write(
+        file,
         list.map do |r|
           [
             r[:name], r[:host],

data/lib/zold/head.rb

@@ -39,7 +39,7 @@ module Zold
 
     def fetch
       raise "Wallet file '#{@file}' is absent" unless File.exist?(@file)
-      lines = AtomicFile.new(@file).read.split(/\n/)
+      lines = File.read(@file).split(/\n/)
       raise "Not enough lines in #{@file}, just #{lines.count}" if lines.count < 4
       lines.take(4)
     end

data/lib/zold/key.rb

@@ -24,7 +24,6 @@ gem 'openssl'
 require 'openssl'
 require 'base64'
 require 'tempfile'
-require_relative 'atomic_file'
 
 # The RSA key (either private or public).
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -38,7 +37,7 @@ module Zold
         unless file.nil?
           path = File.expand_path(file)
           raise "Can't find RSA key at #{file} (#{path})" unless File.exist?(path)
-          return AtomicFile.new(path).read
+          return File.read(path)
         end
         unless text.nil?
           return text if text.start_with?('-----')

data/lib/zold/node/async_entrance.rb

@@ -97,7 +97,7 @@ module Zold
     def push(id, body)
       raise "Queue is too long (#{queue.count} wallets), try again later" if queue.count > AsyncEntrance::MAX_QUEUE
       @mutex.synchronize do
-        AtomicFile.new(File.join(@dir, id.to_s)).write(body)
+        File.write(File.join(@dir, id.to_s), body)
       end
       [id]
     end

data/lib/zold/node/farm.rb

@@ -27,7 +27,6 @@ require_relative '../log'
 require_relative '../score'
 require_relative '../age'
 require_relative '../verbose_thread'
-require_relative '../atomic_file'
 
 # The farm of scores.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -222,7 +221,8 @@ module Zold
       scores = load + list
       period = 24 * 60 * 60 / [threads, 1].max
       @mutex.synchronize do
-        AtomicFile.new(@cache).write(
+        File.write(
+          @cache,
           scores.select(&:valid?)
             .reject(&:expired?)
             .sort_by(&:value)
@@ -239,7 +239,7 @@ module Zold
     def load
       @mutex.synchronize do
         if File.exist?(@cache)
-          AtomicFile.new(@cache).read.split(/\n/)
+          File.read(@cache).split(/\n/)
             .map { |t| parse_score_line(t) }
             .reject(&:zero?)
         else

data/lib/zold/node/front.rb

@@ -35,11 +35,11 @@ require 'backtrace'
 require_relative '../version'
 require_relative '../size'
 require_relative '../wallet'
+require_relative '../age'
 require_relative '../copies'
 require_relative '../log'
 require_relative '../id'
 require_relative '../http'
-require_relative '../atomic_file'
 
 # The web front of the node.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -56,7 +56,7 @@ module Zold
       set :start, Time.now
       set :lock, false
       set :show_exceptions, false
-      set :server, 'webrick'
+      set :server, :puma
       set :log, nil? # to be injected at node.rb
       set :trace, nil? # to be injected at node.rb
       set :halt, '' # to be injected at node.rb
@@ -110,17 +110,19 @@ while #{settings.address} is in '#{settings.network}'"
         cmd = Remote.new(remotes: settings.remotes, log: settings.log)
         cmd.run(['remote', 'add', s.host, s.port.to_s, "--network=#{settings.network}"])
       end
+      @start = Time.now
     end
 
     # @todo #357:30min Test that the headers are being set correctly.
     #  Currently there are no tests at all that would verify the headers.
     after do
       headers['Cache-Control'] = 'no-cache'
-      headers['Connection'] = 'close'
       headers['X-Zold-Version'] = settings.version
       headers[Http::PROTOCOL_HEADER] = settings.protocol.to_s
       headers['Access-Control-Allow-Origin'] = '*'
       headers[Http::SCORE_HEADER] = score.reduced(16).to_s
+      headers['X-Zold-Thread'] = Thread.current.name
+      headers['X-Zold-Milliseconds'] = ((Time.now - @start) * 1000).round.to_s
     end
 
     get '/robots.txt' do
@@ -192,6 +194,7 @@ while #{settings.address} is in '#{settings.network}'"
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})} do
+      error 404 if settings.disable_fetch
       id = Id.new(params[:id])
       settings.wallets.find(id) do |wallet|
         error 404 unless wallet.exists?
@@ -208,12 +211,13 @@ while #{settings.address} is in '#{settings.network}'"
           digest: wallet.digest,
           copies: Copies.new(File.join(settings.copies, id)).all.count,
           balance: wallet.balance.to_i,
-          body: AtomicFile.new(wallet.path).read
+          body: File.new(wallet.path).read
         )
       end
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16}).json} do
+      error 404 if settings.disable_fetch
       id = Id.new(params[:id])
       settings.wallets.find(id) do |wallet|
         error 404 unless wallet.exists?
@@ -235,6 +239,7 @@ while #{settings.address} is in '#{settings.network}'"
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/balance} do
+      error 404 if settings.disable_fetch
       id = Id.new(params[:id])
       settings.wallets.find(id) do |wallet|
         error 404 unless wallet.exists?
@@ -244,6 +249,7 @@ while #{settings.address} is in '#{settings.network}'"
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/key} do
+      error 404 if settings.disable_fetch
       id = Id.new(params[:id])
       settings.wallets.find(id) do |wallet|
         error 404 unless wallet.exists?
@@ -253,6 +259,7 @@ while #{settings.address} is in '#{settings.network}'"
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/mtime} do
+      error 404 if settings.disable_fetch
       id = Id.new(params[:id])
       settings.wallets.find(id) do |wallet|
         error 404 unless wallet.exists?
@@ -262,6 +269,7 @@ while #{settings.address} is in '#{settings.network}'"
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/digest} do
+      error 404 if settings.disable_fetch
       id = Id.new(params[:id])
       settings.wallets.find(id) do |wallet|
         error 404 unless wallet.exists?
@@ -271,6 +279,7 @@ while #{settings.address} is in '#{settings.network}'"
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.txt} do
+      error 404 if settings.disable_fetch
       id = Id.new(params[:id])
       settings.wallets.find(id) do |wallet|
         error 404 unless wallet.exists?
@@ -284,25 +293,27 @@ while #{settings.address} is in '#{settings.network}'"
           wallet.txns.map(&:to_text).join("\n"),
           '',
           '--',
-          "Balance: #{wallet.balance.to_zld} ZLD (#{wallet.balance.to_i} zents)",
+          "Balance: #{wallet.balance.to_zld(8)} ZLD (#{wallet.balance.to_i} zents)",
           "Transactions: #{wallet.txns.count}",
           "File size: #{File.size(wallet.path)} bytes (#{Copies.new(File.join(settings.copies, id)).all.count} copies)",
-          "Modified: #{wallet.mtime.utc.iso8601}",
+          "Modified: #{wallet.mtime.utc.iso8601} (#{Age.new(wallet.mtime.utc.iso8601)} ago)",
           "Digest: #{wallet.digest}"
         ].join("\n")
       end
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.bin} do
+      error 404 if settings.disable_fetch
       id = Id.new(params[:id])
       settings.wallets.find(id) do |wallet|
         error 404 unless wallet.exists?
         content_type 'text/plain'
-        AtomicFile.new(wallet.path).read
+        File.read(wallet.path)
       end
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/copies} do
+      error 404 if settings.disable_fetch
       id = Id.new(params[:id])
       settings.wallets.find(id) do |wallet|
         error 404 unless wallet.exists?
@@ -321,6 +332,7 @@ while #{settings.address} is in '#{settings.network}'"
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/copy/(?<name>[0-9]+)} do
+      error 404 if settings.disable_fetch
       id = Id.new(params[:id])
       name = params[:name]
       settings.wallets.find(id) do |wallet|
@@ -333,6 +345,7 @@ while #{settings.address} is in '#{settings.network}'"
     end
 
     put %r{/wallet/(?<id>[A-Fa-f0-9]{16})/?} do
+      error 404 if settings.disable_push
       request.body.rewind
       modified = settings.entrance.push(Id.new(params[:id]), request.body.read.to_s)
       if modified.empty?
@@ -368,6 +381,16 @@ while #{settings.address} is in '#{settings.network}'"
       settings.metronome.to_text
     end
 
+    get '/threads' do
+      content_type 'text/plain'
+      Thread.list.map do |t|
+        [
+          "#{t.name}: status=#{t.status}; alive=#{t.alive?}",
+          t.backtrace.nil? ? 'NO BACKTRACE' : "  #{t.backtrace.join("\n  ")}"
+        ].join("\n")
+      end.join("\n\n")
+    end
+
     not_found do
       status 404
       content_type 'text/plain'

data/lib/zold/node/nodup_entrance.rb

@@ -24,7 +24,6 @@ require 'tempfile'
 require_relative '../log'
 require_relative '../size'
 require_relative '../wallet'
-require_relative '../atomic_file'
 
 # The entrance that ignores duplicates.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -61,7 +60,7 @@ module Zold
         wallet.refurbish
         after = File.read(wallet.path)
         before = @wallets.find(id) do |w|
-          w.exists? ? AtomicFile.new(w.path).read.to_s : ''
+          w.exists? ? File.read(w.path).to_s : ''
         end
         if before == after
           @log.info(

data/lib/zold/patch.rb

@@ -23,7 +23,6 @@
 require_relative 'log'
 require_relative 'wallet'
 require_relative 'signature'
-require_relative 'atomic_file'
 
 # Patch.
 #
@@ -120,7 +119,7 @@ among #{payer.txns.count} transactions: #{txn.to_text}")
     def save(file, overwrite: false)
       raise 'You have to join at least one wallet in' if @id.nil?
       before = ''
-      before = AtomicFile.new(file).read if File.exist?(file)
+      before = File.read(file) if File.exist?(file)
       wallet = Wallet.new(file)
       wallet.init(@id, @key, overwrite: overwrite, network: @network)
       File.open(file, 'a') do |f|
@@ -129,7 +128,7 @@ among #{payer.txns.count} transactions: #{txn.to_text}")
         end
       end
       wallet.refurbish
-      after = AtomicFile.new(file).read
+      after = File.read(file)
       before != after
     end
   end

data/lib/zold/remotes.rb

@@ -31,7 +31,6 @@ require_relative 'age'
 require_relative 'score'
 require_relative 'http'
 require_relative 'node/farm'
-require_relative 'atomic_file'
 require_relative 'type'
 
 # The list of remotes.
@@ -50,12 +49,10 @@ module Zold
     # Default number of nodes to fetch.
     MAX_NODES = 16
 
-    # Mutex object
-    MUTEX = Mutex.new
-
     attribute :file, Types::Strict::String
     attribute :network, Types::Strict::String.optional.default('test')
     attribute :timeout, Types::Strict::Integer.optional.default(16)
+    attribute :mutex, Types::Object.optional.default(Mutex.new)
 
     # Empty, for standalone mode
     class Empty < Remotes
@@ -183,7 +180,7 @@ module Zold
       list.each do |r|
         pool.post do
           Thread.current.abort_on_exception = true
-          Thread.current.name = "remotes@#{r[:host]}:#{r[:port]}"
+          Thread.current.name = "remotes-#{idx}@#{r[:host]}:#{r[:port]}"
           start = Time.now
           begin
             yield Remotes::Remote.new(
@@ -194,7 +191,6 @@ module Zold
               log: log,
               network: network
             )
-            idx += 1
             raise 'Took too long to execute' if (Time.now - start).round > timeout
           rescue StandardError => e
             error(r[:host], r[:port])
@@ -203,6 +199,7 @@ module Zold
             remove(r[:host], r[:port]) if errors > Remotes::TOLERANCE
           end
         end
+        idx += 1
       end
       pool.shutdown
       pool.kill unless pool.wait_for_termination(5 * 60)
@@ -230,7 +227,7 @@ module Zold
     private
 
     def modify
-      Remotes::MUTEX.synchronize do
+      mutex.synchronize do
         save(yield(load))
       end
     end
@@ -261,7 +258,8 @@ module Zold
     end
 
     def save(list)
-      AtomicFile.new(file).write(
+      File.write(
+        file,
         list.uniq { |r| "#{r[:host]}:#{r[:port]}" }.map do |r|
           [
             r[:host],

data/lib/zold/txns.rb

@@ -21,7 +21,6 @@
 # SOFTWARE.
 
 require_relative 'txn'
-require_relative 'atomic_file'
 
 # Transactions in a wallet.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -40,7 +39,7 @@ module Zold
 
     def fetch
       raise "Wallet file '#{@file}' is absent" unless File.exist?(@file)
-      lines = AtomicFile.new(@file).read.split(/\n/)
+      lines = File.read(@file).split(/\n/)
       raise "Not enough lines in #{@file}, just #{lines.count}" if lines.count < 4
       lines.drop(5)
         .each_with_index

data/lib/zold/version.rb

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

data/lib/zold/wallet.rb

@@ -30,7 +30,6 @@ require_relative 'tax'
 require_relative 'amount'
 require_relative 'hexnum'
 require_relative 'signature'
-require_relative 'atomic_file'
 require_relative 'txns'
 require_relative 'head'
 
@@ -90,7 +89,8 @@ module Zold
     def init(id, pubkey, overwrite: false, network: 'test')
       raise "File '#{@file}' already exists" if File.exist?(@file) && !overwrite
       raise "Invalid network name '#{network}'" unless network =~ /^[a-z]{4,16}$/
-      AtomicFile.new(@file).write("#{network}\n#{PROTOCOL}\n#{id}\n#{pubkey.to_pub}\n\n")
+      FileUtils.mkdir_p(File.dirname(@file))
+      File.write(@file, "#{network}\n#{PROTOCOL}\n#{id}\n#{pubkey.to_pub}\n\n")
       @txns.flush
       @head.flush
     end
@@ -187,7 +187,8 @@ module Zold
     end
 
     def refurbish
-      AtomicFile.new(@file).write(
+      File.write(
+        @file,
         "#{network}\n#{protocol}\n#{id}\n#{key.to_pub}\n\n#{txns.map { |t| t.to_s + "\n" }.join}"
       )
       @txns.flush

data/test/fake_home.rb

@@ -28,7 +28,6 @@ require_relative '../lib/zold/sync_wallets'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/version'
 require_relative '../lib/zold/remotes'
-require_relative '../lib/zold/atomic_file'
 
 # Fake home dir.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -74,7 +73,7 @@ class FakeHome
         mtime: wallet.mtime.utc.iso8601,
         digest: wallet.digest,
         balance: wallet.balance.to_i,
-        body: Zold::AtomicFile.new(wallet.path).read
+        body: File.read(wallet.path)
       }.to_json
     end
   end

data/test/node/test_front.rb

@@ -61,7 +61,8 @@ class FrontTest < Minitest::Test
           '/farm',
           '/metronome',
           '/score',
-          '/trace'
+          '/trace',
+          '/threads'
         ],
         '404' => [
           '/this-is-absent',
@@ -121,6 +122,27 @@ class FrontTest < Minitest::Test
     end
   end
 
+  def test_fetch_in_multiple_threads
+    FakeNode.new(log: test_log).run(['--no-metronome']) do |port|
+      FakeHome.new.run do |home|
+        wallet = home.create_wallet
+        base = "http://localhost:#{port}"
+        Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).put(File.read(wallet.path))
+        assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get.code }
+        threads = []
+        mutex = Mutex.new
+        assert_in_threads(loops: 100) do
+          assert_equal_wait('200') do
+            res = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get
+            mutex.synchronize { threads << res.header['X-Zold-Thread'] }
+            res.code
+          end
+        end
+        assert(threads.uniq.count > 1)
+      end
+    end
+  end
+
   def test_pushes_twice
     FakeNode.new(log: test_log).run do |port|
       FakeHome.new.run do |home|
@@ -221,26 +243,12 @@ class FrontTest < Minitest::Test
     Time.stub :now, Time.at(0) do
       FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
         response = Zold::Http.new(uri: URI("http://localhost:#{port}/"), score: nil).get
-        assert_equal(
-          'no-cache',
-          response.header['Cache-Control']
-        )
-        assert_equal(
-          'close',
-          response.header['Connection']
-        )
-        assert_equal(
-          app.settings.version,
-          response.header['X-Zold-Version']
-        )
-        assert_equal(
-          app.settings.protocol.to_s,
-          response.header[Zold::Http::PROTOCOL_HEADER]
-        )
-        assert_equal(
-          '*',
-          response.header['Access-Control-Allow-Origin']
-        )
+        assert_equal('no-cache', response.header['Cache-Control'])
+        assert_equal('close', response.header['Connection'])
+        assert_equal(app.settings.version, response.header['X-Zold-Version'])
+        assert_equal(app.settings.protocol.to_s, response.header[Zold::Http::PROTOCOL_HEADER])
+        assert_equal('*', response.header['Access-Control-Allow-Origin'])
+        assert(response.header['X-Zold-Milliseconds'])
         assert(!response.header[Zold::Http::SCORE_HEADER].nil?)
       end
     end

data/test/test_zold.rb

@@ -34,7 +34,7 @@ require_relative '../lib/zold/version'
 class TestZold < Minitest::Test
   def test_all_scripts
     Dir.new('fixtures/scripts').select { |f| f =~ /\.sh$/ && !f.start_with?('_') }.each do |f|
-      # next unless f == 'redeploy-on-upgrade.sh'
+      # next unless f == 'deadlocks.sh'
       Dir.mktmpdir do |dir|
         FileUtils.cp('fixtures/id_rsa.pub', dir)
         FileUtils.cp('fixtures/id_rsa', dir)

data/zold.gemspec

@@ -65,6 +65,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'json', '~>1.8'
   s.add_runtime_dependency 'moneta', '~>1.0'
   s.add_runtime_dependency 'openssl', '~>2.1'
+  s.add_runtime_dependency 'puma'
   s.add_runtime_dependency 'rainbow', '~>3.0'
   s.add_runtime_dependency 'rake', '~>12.3' # has to stay here for Heroku
   s.add_runtime_dependency 'rubocop', '0.58.1' # has to stay here for Heroku

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.52
+  version: 0.14.53
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -488,7 +502,6 @@ files:
 - lib/zold.rb
 - lib/zold/age.rb
 - lib/zold/amount.rb
-- lib/zold/atomic_file.rb
 - lib/zold/cached_wallets.rb
 - lib/zold/commands/alias.rb
 - lib/zold/commands/args.rb
@@ -587,7 +600,6 @@ files:
 - test/test__helper.rb
 - test/test_age.rb
 - test/test_amount.rb
-- test/test_atomic_file.rb
 - test/test_cached_wallets.rb
 - test/test_copies.rb
 - test/test_gem.rb
@@ -684,7 +696,6 @@ test_files:
 - test/test__helper.rb
 - test/test_age.rb
 - test/test_amount.rb
-- test/test_atomic_file.rb
 - test/test_cached_wallets.rb
 - test/test_copies.rb
 - test/test_gem.rb

data/lib/zold/atomic_file.rb

@@ -1,52 +0,0 @@
-# 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.
-
-# Atomic file.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-module Zold
-  # Atomic file
-  class AtomicFile
-    def initialize(file)
-      raise 'File can\'t be nil' if file.nil?
-      @file = file
-      @mutex = Mutex.new
-    end
-
-    def read
-      @mutex.synchronize do
-        File.open(@file, 'rb', &:read)
-      end
-    end
-
-    def write(content)
-      raise 'Content can\'t be nil' if content.nil?
-      FileUtils.mkdir_p(File.dirname(@file))
-      @mutex.synchronize do
-        File.open(@file, 'wb') do |f|
-          f.write(content)
-        end
-      end
-    end
-  end
-end

data/test/test_atomic_file.rb

@@ -1,55 +0,0 @@
-# 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 'tmpdir'
-require 'securerandom'
-require_relative 'test__helper'
-require_relative '../lib/zold/atomic_file'
-require_relative '../lib/zold/verbose_thread'
-
-# AtomicFile test.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-class TestAtomicFile < Minitest::Test
-  def test_writes_and_reads
-    Dir.mktmpdir do |dir|
-      file = Zold::AtomicFile.new(File.join(dir, 'test.txt'))
-      ['', 'hello, dude!'].each do |t|
-        file.write(t)
-        assert_equal(t, file.read)
-      end
-    end
-  end
-
-  def test_writes_from_many_threads
-    Dir.mktmpdir do |dir|
-      file = Zold::AtomicFile.new(File.join(dir, 'a.txt'))
-      content = SecureRandom.hex(1000)
-      assert_in_threads(loops: 1000) do
-        file.write(content)
-        assert_equal(content, file.read, 'Invalid content')
-      end
-    end
-  end
-end