zold 0.14.17 → 0.14.18

data/test/node/fake_node.rb

@@ -74,6 +74,7 @@ class FakeNode
           @log.debug("Waiting for #{uri}...")
           sleep 1
         end
+        raise 'The node is dead' unless node.alive?
         begin
           yield port
         ensure

data/test/node/test_farm.rb

@@ -38,7 +38,7 @@ class FarmTest < Minitest::Test
   end
 
   def test_renders_in_json
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
       farm.start('localhost', 80, threads: 4, strength: 2) do
         sleep 0.1 while farm.best.empty? || farm.best[0].value.zero?
@@ -50,7 +50,7 @@ class FarmTest < Minitest::Test
   end
 
   def test_renders_in_text
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
       farm.start('localhost', 80, threads: 2, strength: 1) do
         assert(!farm.to_text.nil?)
@@ -59,19 +59,19 @@ class FarmTest < Minitest::Test
   end
 
   def test_makes_best_score_in_background
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
-      farm.start('localhost', 80, threads: 4, strength: 2) do
-        sleep 0.1 while farm.best.empty? || farm.best[0].value.zero?
+      farm.start('localhost', 80, threads: 4, strength: 3) do
+        sleep 0.1 while farm.best.empty? || farm.best[0].value < 3
         score = farm.best[0]
         assert(!score.expired?)
-        assert(score.value.positive?)
+        assert(score.value >= 3)
       end
     end
   end
 
   def test_correct_score_from_empty_farm
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       farm = Zold::Farm.new('NOPREFIX@cccccccccccccccc', File.join(dir, 'f'), log: test_log)
       farm.start('example.com', 8080, threads: 0, strength: 1) do
         score = farm.best[0]
@@ -84,7 +84,7 @@ class FarmTest < Minitest::Test
   end
 
   def test_pre_loads_history
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       cache = File.join(dir, 'cache')
       farm = Zold::Farm.new('NOPREFIX@cccccccccccccccc', cache, log: test_log)
       farm.start('example.com', 8080, threads: 0, strength: 1) do
@@ -98,7 +98,7 @@ class FarmTest < Minitest::Test
   end
 
   def test_drops_expired_scores_from_history
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       cache = File.join(dir, 'cache')
       score = Zold::Score.new(
         time: Time.parse('2017-07-19T21:24:51Z'),
@@ -121,7 +121,7 @@ class FarmTest < Minitest::Test
 
   def test_garbage_farm_file
     log = SaveLastMessageLogger.new
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       file = File.join(dir, 'corrupted_farm')
       [
         '0/6: 2018-06-26ABCT00:32:43Z 178.128.165.12 4096 MIRhypo1@c13620484b46caa4',

data/test/test_atomic_file.rb

@@ -35,7 +35,7 @@ require_relative '../lib/zold/verbose_thread'
 # License:: MIT
 class TestAtomicFile < Minitest::Test
   def test_writes_and_reads
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       file = Zold::AtomicFile.new(File.join(dir, 'test.txt'))
       ['', 'hello, dude!'].each do |t|
         file.write(t)
@@ -45,7 +45,7 @@ class TestAtomicFile < Minitest::Test
   end
 
   def test_writes_from_many_threads
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       file = Zold::AtomicFile.new(File.join(dir, 'a.txt'))
       threads = 10
       pool = Concurrent::FixedThreadPool.new(threads)

data/test/test_copies.rb

@@ -35,7 +35,7 @@ require_relative '../lib/zold/wallet'
 # License:: MIT
 class TestCopies < Minitest::Test
   def test_adds_and_removes_copies
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(File.join(dir, 'my/a/copies'), log: test_log)
       copies.add(content('alpha'), '192.168.0.1', 80, 1)
       copies.add(content('beta'), '192.168.0.2', 80, 3)
@@ -50,14 +50,14 @@ class TestCopies < Minitest::Test
   end
 
   def test_lists_empty_dir
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(File.join(dir, 'xxx'), log: test_log)
       assert(copies.all.empty?, "#{copies.all.count} is not zero")
     end
   end
 
   def test_overwrites_host
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(File.join(dir, 'my/a/copies-2'), log: test_log)
       host = 'b1.zold.io'
       copies.add(content('z1'), host, 80, 5)
@@ -69,7 +69,7 @@ class TestCopies < Minitest::Test
   end
 
   def test_cleans_copies
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(dir, log: test_log)
       copies.add(content('h1'), 'zold.io', 4096, 10, Time.now - 25 * 60 * 60)
       copies.add(content('h1'), 'zold.io', 4097, 20, Time.now - 26 * 60 * 60)
@@ -81,7 +81,7 @@ class TestCopies < Minitest::Test
   end
 
   def test_cleans_broken_copies
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(dir, log: test_log)
       copies.add('broken wallet content', 'zold.io', 4096, 10, Time.now)
       copies.clean
@@ -90,7 +90,7 @@ class TestCopies < Minitest::Test
   end
 
   def test_ignores_garbage
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(dir, log: test_log)
       copies.add(content('h1'), 'zold.io', 50, 80, Time.now - 25 * 60 * 60)
       FileUtils.mkdir(File.join(dir, '55'))
@@ -99,7 +99,7 @@ class TestCopies < Minitest::Test
   end
 
   def test_sorts_them_by_score
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(dir, log: test_log)
       copies.add(content('content-1'), '1.zold.io', 80, 1)
       copies.add(content('content-2'), '2.zold.io', 80, 2)
@@ -110,7 +110,7 @@ class TestCopies < Minitest::Test
   end
 
   def test_ignores_too_old_scores
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(dir, log: test_log)
       copies.add(content('h1'), 'zold.io', 50, 80, Time.now - 1000 * 60 * 60)
       assert_equal(0, copies.all[0][:score])

data/test/test_key.rb

@@ -53,7 +53,7 @@ class TestKey < Minitest::Test
   end
 
   def test_signs_and_verifies_with_random_key
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       key = OpenSSL::PKey::RSA.new(2048)
       file = File.join(dir, 'temp')
       File.write(file, key.public_key.to_s)

data/test/test_remotes.rb

@@ -44,17 +44,17 @@ class TestRemotes < Minitest::Test
   end
 
   def test_adds_remotes
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       file = File.join(dir, 'remotes')
       FileUtils.touch(file)
-      remotes = Zold::Remotes.new(file)
+      remotes = Zold::Remotes.new(file: file)
       remotes.add('127.0.0.1')
       assert(1, remotes.all.count)
     end
   end
 
   def test_reads_broken_file
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       file = File.join(dir, 'remotes')
       [
         ',0,0,0',
@@ -63,17 +63,17 @@ class TestRemotes < Minitest::Test
         "\n\n\n\n"
       ].each do |t|
         File.write(file, t)
-        remotes = Zold::Remotes.new(file)
+        remotes = Zold::Remotes.new(file: file)
         assert(remotes.all.empty?, remotes.all)
       end
     end
   end
 
   def test_iterates_and_fails
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       file = File.join(dir, 'remotes')
       FileUtils.touch(file)
-      remotes = Zold::Remotes.new(file)
+      remotes = Zold::Remotes.new(file: file)
       ips = (0..50)
       ips.each { |i| remotes.add("0.0.0.#{i}", 9999) }
       remotes.iterate(Zold::Log::Quiet.new) { raise 'Intended' }
@@ -81,11 +81,22 @@ class TestRemotes < Minitest::Test
     end
   end
 
+  def test_iterates_them_all
+    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 }
+      assert_equal(5, total)
+    end
+  end
+
   def test_log_msg_of_iterates_when_fail
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       file = File.join(dir, 'remotes')
       FileUtils.touch(file)
-      remotes = Zold::Remotes.new(file)
+      remotes = Zold::Remotes.new(file: file)
       remotes.add('0.0.0.1', 9999)
       log = TestLogger.new
       remotes.iterate(log) { raise 'Intended' }
@@ -94,22 +105,22 @@ class TestRemotes < Minitest::Test
   end
 
   def test_log_msg_of_iterates_when_take_too_long
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       file = File.join(dir, 'remotes')
       FileUtils.touch(file)
-      remotes = Zold::Remotes.new(file)
+      remotes = Zold::Remotes.new(file: file, timeout: 1)
       remotes.add('127.0.0.1')
       log = TestLogger.new
-      remotes.iterate(log) { sleep(17) }
+      remotes.iterate(log) { sleep(2) }
       assert(log.msg.include?('Took too long to execute'))
     end
   end
 
   def test_removes_remotes
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       file = File.join(dir, 'remotes')
       FileUtils.touch(file)
-      remotes = Zold::Remotes.new(file)
+      remotes = Zold::Remotes.new(file: file)
       remotes.add('127.0.0.1')
       remotes.add('LOCALHOST', 433)
       remotes.remove('localhost', 433)
@@ -118,8 +129,8 @@ class TestRemotes < Minitest::Test
   end
 
   def test_resets_remotes
-    Dir.mktmpdir 'test' do |dir|
-      remotes = Zold::Remotes.new(File.join(dir, 'remotes'))
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'remotes'))
       remotes.clean
       remotes.reset
       remotes.reset
@@ -128,10 +139,10 @@ class TestRemotes < Minitest::Test
   end
 
   def test_modifies_score
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       file = File.join(dir, 'remotes')
       FileUtils.touch(file)
-      remotes = Zold::Remotes.new(file)
+      remotes = Zold::Remotes.new(file: file)
       remotes.add('127.0.0.1', 1024)
       remotes.rescore('127.0.0.1', 1024, 15)
       remotes.all.each do |r|
@@ -142,17 +153,17 @@ class TestRemotes < Minitest::Test
   end
 
   def test_tolerates_invalid_requests
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       file = File.join(dir, 'remotes')
-      remotes = Zold::Remotes.new(file)
+      remotes = Zold::Remotes.new(file: file)
       remotes.error('127.0.0.1', 1024)
       remotes.rescore('127.0.0.1', 1024, 15)
     end
   end
 
   def test_modifies_from_many_threads
-    Dir.mktmpdir 'test' do |dir|
-      remotes = Zold::Remotes.new(File.join(dir, 'a.csv'))
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'a.csv'))
       remotes.clean
       threads = 5
       pool = Concurrent::FixedThreadPool.new(threads)
@@ -180,4 +191,32 @@ class TestRemotes < Minitest::Test
       assert_equal(0, remotes.all.reject { |r| r[:host] == host }.size)
     end
   end
+
+  def test_adds_from_many_threads
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'xx.csv'))
+      remotes.clean
+      threads = 5
+      pool = Concurrent::FixedThreadPool.new(threads)
+      done = Concurrent::AtomicFixnum.new
+      latch = Concurrent::CountDownLatch.new(1)
+      threads.times do |i|
+        pool.post do
+          Zold::VerboseThread.new(test_log).run(true) do
+            latch.wait(10)
+            remotes.add('127.0.0.1', 8080 + i)
+            done.increment
+          end
+        end
+      end
+      latch.count_down
+      sleep 0.1 until done.value == threads
+      assert_equal(threads, remotes.all.count)
+    end
+  end
+
+  def test_empty_remotes
+    remotes = Zold::Remotes::Empty.new(file: '/tmp/empty')
+    assert(remotes.is_a?(Zold::Remotes))
+  end
 end

data/test/test_zold.rb

@@ -34,7 +34,8 @@ 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|
-      Dir.mktmpdir 'test' do |dir|
+      # next unless f == 'redeploy-on-upgrade.sh'
+      Dir.mktmpdir do |dir|
         FileUtils.cp('fixtures/id_rsa.pub', dir)
         FileUtils.cp('fixtures/id_rsa', dir)
         script = File.join(dir, f)
@@ -68,7 +69,7 @@ class TestZold < Minitest::Test
   end
 
   def test_create_new_wallet
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       FileUtils.cp('fixtures/id_rsa.pub', dir)
       FileUtils.cp('fixtures/id_rsa', dir)
       stdout = exec(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.17
+  version: 0.14.18
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -335,7 +335,6 @@ files:
 - ".rultor.yml"
 - ".simplecov"
 - ".travis.yml"
-- ".zoldata/remotes"
 - Gemfile
 - INSTALL.md
 - LICENSE.txt
@@ -346,7 +345,6 @@ files:
 - bin/zold
 - cucumber.yml
 - deploy.sh
-- farm
 - features/cli.feature
 - features/gem_package.feature
 - features/step_definitions/steps.rb
@@ -401,6 +399,7 @@ files:
 - lib/zold/commands/invoice.rb
 - lib/zold/commands/list.rb
 - lib/zold/commands/merge.rb
+- lib/zold/commands/next.rb
 - lib/zold/commands/node.rb
 - lib/zold/commands/pay.rb
 - lib/zold/commands/propagate.rb
@@ -457,6 +456,7 @@ files:
 - test/commands/test_node.rb
 - test/commands/test_pay.rb
 - test/commands/test_propagate.rb
+- test/commands/test_pull.rb
 - test/commands/test_push.rb
 - test/commands/test_remote.rb
 - test/commands/test_show.rb
@@ -544,6 +544,7 @@ test_files:
 - test/commands/test_node.rb
 - test/commands/test_pay.rb
 - test/commands/test_propagate.rb
+- test/commands/test_pull.rb
 - test/commands/test_push.rb
 - test/commands/test_remote.rb
 - test/commands/test_show.rb

data/.zoldata/remotes

@@ -1 +0,0 @@
-b1.zold.io,80,0,0

data/farm

@@ -1 +0,0 @@
-0/6: 2018-07-18T09:06:07Z b1.zold.io 80 ML5Ern7m@912ecc24b32dbe74