zold 0.11.6 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4b85a4409d351be25bfa99d529cb7805474c413
-  data.tar.gz: 17c7832d676da4213cccf791dc38a175d2a45667
+  metadata.gz: 12b394868e7a954a6a72411f2326339ca57cd6c2
+  data.tar.gz: e39cfab10878262a6431c4bd2bd5a06a3939a973
 SHA512:
-  metadata.gz: 214f26718d2dcf269e355bb574edb51c4b2d15dc6b0679ef8a721e77595751b551d4e48c3fe83d65889b612453a2a7e7cea45be8a22f063629ffa33ab663d0dc
-  data.tar.gz: f488b84aa410a24cf9c73e3acfebe7943378889a183fa923937856bbdb8ee27ec11e8bdd3a00cc75bbf4ad5b5cbe431abeb3ea291581161a0bff63abb3b0a0f8
+  metadata.gz: b414866acdc3a4a099e293c5ec6358d9ad0ffbd223306469e38477736430818d84b5bc7eda44e120f69af5c9aa202e5ebae1989a8b5257f7e8a7ff8e5e701977
+  data.tar.gz: 6edc6beb6b837bf7f9151cb3f9e652bd737c2c8362d558d0c039a6edc6806f2344bec791bda91fb3544966bd78a8508ebcd0fe7e31b85feccfaabcd2a4633097

data/lib/zold/atomic_file.rb

@@ -0,0 +1,48 @@
+# 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
+    end
+
+    def read
+      File.open(@file, 'r') do |f|
+        f.flock(File::LOCK_SH)
+        f.read
+      end
+    end
+
+    def write(content)
+      raise 'Content can\'t be nil' if content.nil?
+      File.open(@file, 'w+') do |f|
+        f.flock(File::LOCK_EX)
+        f.write(content)
+      end
+    end
+  end
+end

data/lib/zold/commands/merge.rb

@@ -70,7 +70,7 @@ Available options:"
       cps[1..-1].each do |c|
         extra = Wallet.new(c[:path])
         if extra.network != main.network
-          @log.error("The wallet is from a different network '#{wallet.version}', ours is '#{@network}'")
+          @log.error("The wallet is from a different network '#{extra.network}', ours is '#{main.network}'")
           next
         end
         if extra.key != main.key

data/lib/zold/commands/remote.rb

@@ -114,7 +114,7 @@ Available options:"
 
     def reset
       @remotes.reset
-      @log.debug('Remote nodes set back to default')
+      @log.debug("Remote nodes set back to default, #{@remotes.all.count} total")
     end
 
     def add(host, port, opts)
@@ -123,7 +123,7 @@ Available options:"
         @log.info("#{host}:#{port} already exists in the list")
       else
         @remotes.add(host, port)
-        @log.info("#{host}:#{port} added to the list")
+        @log.info("#{host}:#{port} added to the list, #{@remotes.all.count} total")
       end
       @log.info("There are #{@remotes.all.count} remote nodes in the list")
     end
@@ -143,6 +143,7 @@ Available options:"
       @remotes.all.each do |r|
         remove(r[:host], r[:port], opts) if r[:errors] > 20
       end
+      @log.info("The list of remotes trimmed, #{@remotes.all.count} nodes left there")
     end
 
     def update(opts, deep = true)

data/lib/zold/copies.rb

@@ -20,6 +20,7 @@
 
 require 'time'
 require 'csv'
+require_relative 'atomic_file'
 
 # The list of copies.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -74,7 +75,7 @@ module Zold
           .max
         max = 0 if max.nil?
         name = (max + 1).to_s
-        File.write(File.join(@dir, name), content)
+        AtomicFile.new(File.join(@dir, name)).write(content)
       else
         name = target[:name]
       end
@@ -118,8 +119,7 @@ module Zold
     end
 
     def save(list)
-      File.write(
-        file,
+      AtomicFile.new(file).write(
         list.map do |r|
           [
             r[:name], r[:host],

data/lib/zold/node/farm.rb

@@ -22,6 +22,7 @@ require 'time'
 require_relative '../log'
 require_relative '../score'
 require_relative '../verbose_thread'
+require_relative '../atomic_file'
 
 # The farm of scores.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -105,7 +106,7 @@ module Zold
     private
 
     def save(score)
-      File.write(@cache, (history + [score]).map(&:to_s).join("\n"))
+      AtomicFile.new(@cache).write((history + [score]).map(&:to_s).join("\n"))
     end
 
     def history(max = 16)

data/lib/zold/node/front.rb

@@ -87,13 +87,20 @@ module Zold
     end
 
     get '/robots.txt' do
+      content_type 'text/plain'
       'User-agent: *'
     end
 
-    get '/v' do
+    get '/version' do
+      content_type 'text/plain'
       VERSION
     end
 
+    get '/score' do
+      content_type 'text/plain'
+      score.to_s
+    end
+
     get '/favicon.ico' do
       if score.value >= 16
         redirect 'https://www.zold.io/images/logo-green.png'

data/lib/zold/remotes.rb

@@ -22,6 +22,7 @@ require 'csv'
 require 'uri'
 require 'fileutils'
 require_relative 'node/farm'
+require_relative 'atomic_file'
 
 # The list of remotes.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -64,7 +65,7 @@ module Zold
       end
 
       def assert_code(code, response)
-        msg = response.message
+        msg = response.message.strip
         return if response.code.to_i == code
         @log.debug("#{response.code} \"#{response.message}\" at \"#{response.body}\"")
         raise "Unexpected HTTP code #{response.code}, instead of #{code}" if msg.empty?
@@ -113,7 +114,7 @@ module Zold
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       raise 'Port can\'t be negative' if port < 0
       raise 'Port can\'t be over 65536' if port > 0xffff
-      raise "#{host}:#{port} alread exists" if exists?(host, port)
+      raise "#{host}:#{port} already exists" if exists?(host, port)
       list = load
       list << { host: host.downcase, port: port, score: 0 }
       list.uniq! { |r| "#{r[:host]}:#{r[:port]}" }
@@ -145,11 +146,9 @@ module Zold
 
     def error(host, port = Remotes::PORT)
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
-      raise "#{host}:#{port} is absent" unless exists?(host, port)
       list = load
-      list.find do |r|
-        r[:host] == host.downcase && r[:port] == port
-      end[:errors] += 1
+      raise "#{host}:#{port} is absent among #{list.count} remotes" unless exists?(host, port)
+      list.find { |r| r[:host] == host.downcase && r[:port] == port }[:errors] += 1
       save(list)
     end
 
@@ -157,9 +156,7 @@ module Zold
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       raise "#{host}:#{port} is absent" unless exists?(host, port)
       list = load
-      list.find do |r|
-        r[:host] == host.downcase && r[:port] == port
-      end[:score] = score
+      list.find { |r| r[:host] == host.downcase && r[:port] == port }[:score] = score
       save(list)
     end
 
@@ -178,8 +175,7 @@ module Zold
     end
 
     def save(list)
-      File.write(
-        file,
+      AtomicFile.new(file).write(
         list.map do |r|
           [
             r[:host],

data/lib/zold/verbose_thread.rb

@@ -34,7 +34,8 @@ module Zold
     def run(safe = false)
       yield
     rescue StandardError => e
-      @log.error("#{e.class.name}: #{e.message} #{e.backtrace.join("\n\t")}")
+      @log.error("#{e.class.name}: #{e.message}")
+      @log.debug(e.backtrace.join("\n\t"))
       raise e unless safe
     end
   end

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.11.6'.freeze
+  VERSION = '0.11.7'.freeze
 end

data/lib/zold/wallet.rb

@@ -26,6 +26,7 @@ require_relative 'txn'
 require_relative 'tax'
 require_relative 'amount'
 require_relative 'signature'
+require_relative 'atomic_file'
 
 # The wallet.
 #
@@ -78,7 +79,7 @@ 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}$/
-      File.write(@file, "#{network}\n#{VERSION}\n#{id}\n#{pubkey.to_pub}\n\n")
+      AtomicFile.new(@file).write("#{network}\n#{VERSION}\n#{id}\n#{pubkey.to_pub}\n\n")
     end
 
     def root?

data/test/commands/test_remote.rb

@@ -61,6 +61,7 @@ class TestRemote < Minitest::Test
       )
       cmd = Zold::Remote.new(remotes: remotes, log: test_log)
       cmd.run(%w[remote clean])
+      assert(remotes.all.empty?)
       cmd.run(['remote', 'add', zero.host, zero.port.to_s])
       cmd.run(%w[remote add localhost 2])
       assert_equal(2, remotes.all.count)

data/test/node/test_front.rb

@@ -33,7 +33,8 @@ class FrontTest < Minitest::Test
           '/robots.txt',
           '/',
           '/remotes',
-          '/v'
+          '/version',
+          '/score'
         ],
         '404' => [
           '/this-is-absent',

data/test/test_atomic_file.rb

@@ -0,0 +1,39 @@
+# 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_relative '../lib/zold/atomic_file'
+
+# 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 'test' 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
+end

data/test/test_copies.rb

@@ -37,7 +37,7 @@ class TestCopies < Minitest::Test
       copies.add('hello 1', '192.168.0.4', 80, 10)
       copies.add('hello-to-delete', '192.168.0.5', 80, 10)
       copies.remove('192.168.0.5', 80)
-      assert(copies.all.count == 2, "#{copies.all.count} is not equal to 2")
+      assert(2, copies.all.count)
       assert(copies.all.find { |c| c[:name] == '1' }[:score] == 11)
     end
   end

data/test/test_remotes.rb

@@ -20,6 +20,8 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
+require_relative 'test__helper'
+require_relative '../lib/zold/log'
 require_relative '../lib/zold/remotes'
 
 # Remotes test.
@@ -37,6 +39,18 @@ class TestRemotes < Minitest::Test
     end
   end
 
+  def test_iterates_and_fails
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'remotes')
+      FileUtils.touch(file)
+      remotes = Zold::Remotes.new(file)
+      ips = (0..50)
+      ips.each { |i| remotes.add("0.0.0.#{i}", 9999) }
+      remotes.iterate(Zold::Log::Quiet.new) { raise 'Intended' }
+      ips.each { |i| assert(1, remotes.all[i][:errors]) }
+    end
+  end
+
   def test_removes_remotes
     Dir.mktmpdir 'test' do |dir|
       file = File.join(dir, 'remotes')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.7
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -320,6 +320,7 @@ files:
 - fixtures/scripts/push-and-pull.sh
 - lib/zold.rb
 - lib/zold/amount.rb
+- lib/zold/atomic_file.rb
 - lib/zold/commands/args.rb
 - lib/zold/commands/calculate.rb
 - lib/zold/commands/clean.rb
@@ -381,6 +382,7 @@ files:
 - test/node/test_front.rb
 - test/test__helper.rb
 - test/test_amount.rb
+- test/test_atomic_file.rb
 - test/test_copies.rb
 - test/test_hexnum.rb
 - test/test_http.rb
@@ -450,6 +452,7 @@ test_files:
 - test/node/test_front.rb
 - test/test__helper.rb
 - test/test_amount.rb
+- test/test_atomic_file.rb
 - test/test_copies.rb
 - test/test_hexnum.rb
 - test/test_http.rb