zold 0.13.38 → 0.13.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c4b9fec37b2f1f351188890814381b2abbaa48
-  data.tar.gz: c3d35c7bcf49845a0f95a0a24fee896bf4fbef3f
+  metadata.gz: 47d9dcf9ec8a2a32dffe47e6e2c9d5edc94d3d09
+  data.tar.gz: 1ed5c3c3dd87b804bd7cdfff3e489d37ef39faee
 SHA512:
-  metadata.gz: c3d5840ae8b755c85ceffbc5d0bfab5c778bc42d8a6f9883f1c178d7d86136206d07707425a33ecc55f2f823f850edc834fb8c9175eccab2ba8400c177acadb8
-  data.tar.gz: bebb092830df7d63e311b861804ab2013b6e43341a77e0ed9d96b5ee2438bc405797e30d06dbe831a46c52ae8a7f14e454040094e6d74c927ee667d5418eeaae
+  metadata.gz: 8d457fc55f2647038d922b1d047d952b75282650fc6744ce70d6a476ddcc1d744f54ea861d59fc70e289b9e8cf4ad8f283ea17d19cbd710b12db195527a165ab
+  data.tar.gz: 2fc54011ff8fe3b23b05839f73ee4b7ec1f5281424a6c5d5f9b785a8319b328a3f6acde934cd703dd6e441a1e0e80628189f4d8113117452f4505fc48160aecb

data/fixtures/scripts/redeploy-on-upgrade.sh

@@ -18,7 +18,7 @@ primary=$(start_node ${high} 9.9.9 --standalone)
 
 low=$(reserve_port)
 secondary=$(start_node ${low} 1.1.1)
-zold remote add localhost ${high} --home=${low}
+zold remote add localhost ${high} --home=${low} --skip-ping
 
 trap "kill -9 ${primary} ${secondary}" EXIT
 

data/lib/zold/commands/node.rb

@@ -246,7 +246,7 @@ module Zold
       metronome = Metronome.new(@log)
       require_relative 'routines/spread'
       metronome.add(Routines::Spread.new(opts, @wallets, entrance, log: @log))
-      unless opts[:standalone]
+      unless opts['standalone']
         require_relative 'routines/reconnect'
         metronome.add(Routines::Reconnect.new(opts, @remotes, farm, log: @log))
       end

data/lib/zold/commands/remote.rb

@@ -75,6 +75,9 @@ Available options:"
         o.bool '--force',
           'Add/remove if if this operation is not possible',
           default: false
+        o.bool '--skip-ping',
+          'Don\'t ping back the node when adding it (not recommended)',
+          default: false
         o.bool '--reboot',
           'Exit if any node reports version higher than we have',
           default: false
@@ -126,6 +129,10 @@ Available options:"
     end
 
     def add(host, port, opts)
+      unless opts['skip-ping']
+        res = Http.new("http://#{host}:#{port}/version").get
+        raise "The node #{host}:#{port} is not responding" unless res.code == '200'
+      end
       if @remotes.exists?(host, port)
         raise "#{host}:#{port} already exists in the list" unless opts['force']
         @log.debug("#{host}:#{port} already exists in the list")
@@ -213,7 +220,7 @@ in #{(Time.now - start).round(2)}s")
       end
       total = @remotes.all.size
       if total.zero?
-        @log.debug("The list of remotes is #{Rainbow('empty').red}, run 'zold reset'!")
+        @log.debug("The list of remotes is #{Rainbow('empty').red}, run 'zold remote reset'!")
       else
         @log.debug("There are #{total} known remotes")
       end

data/lib/zold/version.rb

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

data/test/commands/test_remote.rb

@@ -62,10 +62,10 @@ 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])
+      cmd.run(['remote', 'add', zero.host, zero.port.to_s, '--skip-ping'])
+      cmd.run(%w[remote add localhost 2 --skip-ping])
       assert_equal(2, remotes.all.count)
-      cmd.run(['remote', 'update', '--ignore-score-weakness'])
+      cmd.run(['remote', 'update', '--ignore-score-weakness', '--skip-ping'])
       assert_equal(4, remotes.all.count)
     end
   end

data/test/node/test_front.rb

@@ -61,13 +61,11 @@ class FrontTest < Minitest::Test
   def test_updates_list_of_remotes
     FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
       score = Zold::Score.new(
-        Time.now, 'a.example.com',
-        999, 'NOPREFIX@ffffffffffffffff',
-        strength: 1
+        Time.now, 'localhost', port, 'NOPREFIX@ffffffffffffffff', strength: 1
       ).next.next.next.next
       response = Zold::Http.new("http://localhost:#{port}/remotes", score).get
-      body = response.body
-      assert_equal(1, Zold::JsonPage.new(body).to_hash['all'].count, body)
+      assert_equal('200', response.code, response.body)
+      assert_equal(1, Zold::JsonPage.new(response.body).to_hash['all'].count, response.body)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.13.38
+  version: 0.13.39
 platform: ruby
 authors:
 - Yegor Bugayenko