zold 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f2635ac65d327c6ef19ec965976a6de7961fce5
-  data.tar.gz: 9a5cb6ef5aab7e9217a0131eac7fa422a95fb559
+  metadata.gz: 73513e03f0456f1f174a5fbda8880d05ad26b4e6
+  data.tar.gz: 0c5fa14573661f65ddba4dbfa65afdc1e010c60d
 SHA512:
-  metadata.gz: 3c6f1a464e2b81427cecb31ee26ed73ce8413635bc42156566b3927b214664ec3d862786880892102ecee5a94c10ce5e3c65d54d2ad85882d914dca603d0f58d
-  data.tar.gz: 57d24db630188ab12d0d23b3ec6aae112f94f79895b5092653f17d41f3352528d895cbe7ec227e7d014259a328f1aeb18cf978afbc8b9eb66cd39df6d477ddbb
+  metadata.gz: 181d60dd63b4fdc24d88f5af921f76dcd8e0b39f9f8b49103dc36d10d7f7c0da4d44ac52ac19206b5811ebb77e6eddae88509be19c62cd781928532f68c981bc
+  data.tar.gz: 1e06c4d01f5dc12a52b6ebe9c475de20555ee376aa9395d991b57f17b8f466553dab66142b99b38128cf04d33cb27514deaadb25faf771af9604437dbc84b40c

data/lib/zold/commands/push.rb

@@ -44,6 +44,9 @@ module Zold
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold push [ID...] [options]
 Available options:"
+        o.array '--ignore-node',
+          'Ignore this node and don\'t push to it',
+          default: []
         o.bool '--sync',
           'Wait until the server confirms merge and pushes all wallets further (default: false)',
           default: false
@@ -63,23 +66,31 @@ Available options:"
     def push(wallet, opts)
       total = 0
       @remotes.iterate(@log) do |r|
-        start = Time.now
-        response = r.http(
-          "/wallet/#{wallet.id}#{opts['sync'] ? '?sync=true' : ''}"
-        ).put(File.read(wallet.path))
-        if response.code == '304'
-          @log.info("#{r}: same version of #{wallet.id} there")
-          next
-        end
-        r.assert_code(200, response)
-        json = JSON.parse(response.body)['score']
-        score = Score.parse_json(json)
-        r.assert_valid_score(score)
-        raise "Score is too weak #{score}" if score.strength < Score::STRENGTH
-        @log.info("#{r} accepted #{wallet.id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green}")
-        total += score.value
+        total += push_one(wallet, r, opts)
       end
       @log.info("Total score for #{wallet.id} is #{total}")
     end
+
+    def push_one(wallet, r, opts)
+      if opts['ignore-node'].include?(r.to_s)
+        @log.info("#{r} ignored because of --ignore-node")
+        return 0
+      end
+      start = Time.now
+      response = r.http(
+        "/wallet/#{wallet.id}#{opts['sync'] ? '?sync=true' : ''}"
+      ).put(File.read(wallet.path))
+      if response.code == '304'
+        @log.info("#{r}: same version of #{wallet.id} there")
+        return 0
+      end
+      r.assert_code(200, response)
+      json = JSON.parse(response.body)['score']
+      score = Score.parse_json(json)
+      r.assert_valid_score(score)
+      raise "Score is too weak #{score}" if score.strength < Score::STRENGTH
+      @log.info("#{r} accepted #{wallet.id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green}")
+      score.value
+    end
   end
 end

data/lib/zold/node/entrance.rb

@@ -86,7 +86,7 @@ module Zold
 
     def push_unsafe(id, body)
       copies = Copies.new(File.join(@copies, id.to_s))
-      copies.add(body, 'remote', Remotes::PORT, 0)
+      copies.add(body, '0.0.0.0', Remotes::PORT, 0)
       Fetch.new(
         wallets: @wallets, remotes: @remotes, copies: copies.root, log: @log
       ).run(['fetch', id.to_s, "--ignore-node=#{@address}"])
@@ -97,7 +97,7 @@ module Zold
       copies.remove('remote', Remotes::PORT)
       Push.new(
         wallets: @wallets, remotes: @remotes, log: @log
-      ).run(['push'] + modified.map(&:to_s))
+      ).run(['push', "--ignore-node=#{@address}"] + modified.map(&:to_s))
       modified
     end
   end

data/lib/zold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby