zold 0.14.53 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12bf3dea4ff2630f3530269b7c5db959ad30cec8ab6346ba3336570c4a61822d
-  data.tar.gz: 1cb07c0e0ce665ededffc57a221ead9a235d99ba9eb391a8a75b1af6434bf093
+  metadata.gz: e42d8de2d004ce5a9bfe7eaee7728dc0988a08482e5cc7d138de0c7bf8552fd4
+  data.tar.gz: 2e82e4cc5f59db84b8647396c902dbd6b86ec3769a4eb6cfd0ca922e6020c3d5
 SHA512:
-  metadata.gz: 4788bfa23317ab20259ef9fae9266556d402caf07de529d8358d9541f61dca9f42b2921b6d15535e8b11583c4f79c130aae3fa82cda5cd8fd494aeb645f8fd8d
-  data.tar.gz: 2a929f263c3a0a2fa91e6cddc9436b273781c58f121753ad28191f4fa140b5df7b9f07bda75e84dcc448e6d30633695895906fac47089be453246b83f3665e83
+  metadata.gz: 4f194dab4b5c826ce407effcc2374e77ba82c969adb3ff0780796702addb3db807b9f6d1bbf6ec15bd10f48a274561774414d913847429053980039f30d0dc3c
+  data.tar.gz: 255583b83271342d7895cff40965bb71bc13bc8608755a279c65e437a55858958b00e06d1bd88f46470f353fe06846f270e89a77018bc91acfd5f6efff43958e

data/fixtures/scripts/push-and-pull.sh

@@ -22,17 +22,23 @@ zold --public-key=id_rsa.pub create 0000000000000000
 target=$(zold create --public-key=id_rsa.pub)
 invoice=$(zold invoice ${target})
 zold pay --private-key=id_rsa 0000000000000000 ${invoice} 14.99 'To save the world!'
+zold propagate
 zold propagate 0000000000000000
 zold show
 zold show 0000000000000000
 zold taxes debt 0000000000000000
 
 zold remote show
+zold push
 zold push 0000000000000000
 until zold fetch 0000000000000000 --ignore-score-weakness; do
   echo 'Failed to fetch, let us try again'
   sleep 1
 done
+zold fetch
 zold diff 0000000000000000
+zold merge
 zold merge 0000000000000000
+zold clean
 zold clean 0000000000000000
+zold remove

data/lib/zold/commands/clean.rb

@@ -53,8 +53,7 @@ Available options:"
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
-      mine = @wallets.all if mine.empty?
-      mine.map { |i| Id.new(i) }.each do |id|
+      (mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
         clean(Copies.new(File.join(@copies, id), log: @log), opts)
       end
     end

data/lib/zold/commands/fetch.rb

@@ -69,8 +69,7 @@ Available options:"
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
-      mine = @wallets.all if mine.empty?
-      mine.map { |i| Id.new(i) }.each do |id|
+      (mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
         fetch(id, Copies.new(File.join(@copies, id)), opts)
       end
     end

data/lib/zold/commands/merge.rb

@@ -54,9 +54,8 @@ Available options:"
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
-      mine = @wallets.all if mine.empty?
       modified = []
-      mine.map { |i| Id.new(i) }.each do |id|
+      (mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
         next unless merge(id, Copies.new(File.join(@copies, id)), opts)
         modified << id
         require_relative 'propagate'

data/lib/zold/commands/propagate.rb

@@ -49,9 +49,8 @@ Available options:"
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
-      mine = @wallets.all if mine.empty?
       modified = []
-      mine.map { |i| Id.new(i) }.each do |id|
+      (mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
         modified += propagate(id, opts)
       end
       modified

data/lib/zold/commands/push.rb

@@ -58,8 +58,7 @@ Available options:"
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
-      mine = @wallets.all if mine.empty?
-      mine.map { |i| Id.new(i) }.each do |id|
+      (mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
         push(id, opts)
       end
     end

data/lib/zold/commands/remote.rb

@@ -60,6 +60,8 @@ Available commands:
       Remove all registered remote nodes
     #{Rainbow('remote reset').green}
       Restore it back to the default list of nodes
+    #{Rainbow('remote defaults').green}
+      Add all default nodes to the list
     #{Rainbow('remote add').green} host [port]
       Add a new remote node
     #{Rainbow('remote remove').green} host [port]
@@ -125,6 +127,8 @@ Available options:"
         clean
       when 'reset'
         reset
+      when 'defaults'
+        defaults
       when 'add'
         add(mine[1], mine[2] ? mine[2].to_i : Remotes::PORT, opts)
       when 'remove'
@@ -158,8 +162,13 @@ Available options:"
     end
 
     def reset
-      @remotes.reset
-      @log.debug("Remote nodes set back to default, #{@remotes.all.count} total")
+      clean
+      defaults
+    end
+
+    def defaults
+      @remotes.defaults
+      @log.debug("Default remote nodes were added to the list, #{@remotes.all.count} total")
     end
 
     def add(host, port, opts)

data/lib/zold/commands/remove.rb

@@ -44,8 +44,7 @@ Available options:"
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
-      mine = @wallets.all if mine.empty?
-      mine.map { |i| Id.new(i) }.each do |id|
+      (mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
         remove(id, opts)
       end
     end

data/lib/zold/commands/routines/reconnect.rb

@@ -46,7 +46,7 @@ module Zold
         args = ['remote', "--network=#{@opts['network']}"]
         score = @farm.best[0]
         args << "--ignore-node=#{score.host}:#{score.port}" if score
-        cmd.run(args + ['add', 'b1.zold.io', '80']) unless @opts['routine-immediately']
+        cmd.run(args + ['defaults']) unless @opts['routine-immediately']
         cmd.run(args + ['trim'])
         cmd.run(args + ['select'])
         cmd.run(args + ['update'] + (@opts['never-reboot'] ? [] : ['--reboot']))

data/lib/zold/remotes.rb

@@ -130,12 +130,11 @@ module Zold
       modify { [] }
     end
 
-    def reset
-      FileUtils.mkdir_p(File.dirname(file))
-      FileUtils.copy(
-        File.join(File.dirname(__FILE__), '../../resources/remotes'),
-        file
-      )
+    def defaults
+      other = Remotes.new(file: File.join(File.dirname(__FILE__), '../../resources/remotes'))
+      other.all.each do |r|
+        add(r[:host], r[:port])
+      end
     end
 
     def exists?(host, port = Remotes::PORT)
@@ -242,22 +241,26 @@ module Zold
     end
 
     def load
-      reset unless File.exist?(file)
-      raw = CSV.read(file).map do |row|
-        {
-          host: row[0],
-          port: row[1].to_i,
-          score: row[2].to_i,
-          errors: row[3].to_i
-        }
-      end
-      raw.reject { |r| !r[:host] || r[:port].zero? }.map do |r|
-        r[:home] = URI("http://#{r[:host]}:#{r[:port]}/")
-        r
+      if File.exist?(file)
+        raw = CSV.read(file).map do |row|
+          {
+            host: row[0],
+            port: row[1].to_i,
+            score: row[2].to_i,
+            errors: row[3].to_i
+          }
+        end
+        raw.reject { |r| !r[:host] || r[:port].zero? }.map do |r|
+          r[:home] = URI("http://#{r[:host]}:#{r[:port]}/")
+          r
+        end
+      else
+        []
       end
     end
 
     def save(list)
+      FileUtils.mkdir_p(File.dirname(file))
       File.write(
         file,
         list.uniq { |r| "#{r[:host]}:#{r[:port]}" }.map do |r|

data/lib/zold/version.rb

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

data/test/commands/test_remote.rb

@@ -176,6 +176,7 @@ class TestRemote < Minitest::Test
   def test_select_respects_max_nodes_option
     Dir.mktmpdir do |dir|
       remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.txt'))
+      remotes.defaults
       zero = Zold::Score::ZERO
       cmd = Zold::Remote.new(remotes: remotes, log: test_log)
       (5000..5010).each do |port|

data/test/test_remotes.rb

@@ -132,8 +132,8 @@ class TestRemotes < Minitest::Test
     Dir.mktmpdir do |dir|
       remotes = Zold::Remotes.new(file: File.join(dir, 'remotes'))
       remotes.clean
-      remotes.reset
-      remotes.reset
+      remotes.defaults
+      remotes.defaults
       assert(!remotes.all.empty?)
     end
   end
@@ -188,9 +188,9 @@ class TestRemotes < Minitest::Test
 
   def test_read_mtime_from_file
     Dir.mktmpdir 'test' do |dir|
-      file = File.join(dir, 'remotes')
+      file = File.join(dir, 'a/b/c/remotes')
       remotes = Zold::Remotes.new(file: file)
-      remotes.all
+      remotes.clean
       assert_equal(File.mtime(file).to_i, remotes.mtime.to_i)
     end
   end

metadata

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