zold 0.14.53 → 0.15.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/fixtures/scripts/push-and-pull.sh +6 -0
- data/lib/zold/commands/clean.rb +1 -2
- data/lib/zold/commands/fetch.rb +1 -2
- data/lib/zold/commands/merge.rb +1 -2
- data/lib/zold/commands/propagate.rb +1 -2
- data/lib/zold/commands/push.rb +1 -2
- data/lib/zold/commands/remote.rb +11 -2
- data/lib/zold/commands/remove.rb +1 -2
- data/lib/zold/commands/routines/reconnect.rb +1 -1
- data/lib/zold/remotes.rb +21 -18
- data/lib/zold/version.rb +1 -1
- data/test/commands/test_remote.rb +1 -0
- data/test/test_remotes.rb +4 -4
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e42d8de2d004ce5a9bfe7eaee7728dc0988a08482e5cc7d138de0c7bf8552fd4
|
4
|
+
data.tar.gz: 2e82e4cc5f59db84b8647396c902dbd6b86ec3769a4eb6cfd0ca922e6020c3d5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4f194dab4b5c826ce407effcc2374e77ba82c969adb3ff0780796702addb3db807b9f6d1bbf6ec15bd10f48a274561774414d913847429053980039f30d0dc3c
|
7
|
+
data.tar.gz: 255583b83271342d7895cff40965bb71bc13bc8608755a279c65e437a55858958b00e06d1bd88f46470f353fe06846f270e89a77018bc91acfd5f6efff43958e
|
@@ -22,17 +22,23 @@ zold --public-key=id_rsa.pub create 0000000000000000
|
|
22
22
|
target=$(zold create --public-key=id_rsa.pub)
|
23
23
|
invoice=$(zold invoice ${target})
|
24
24
|
zold pay --private-key=id_rsa 0000000000000000 ${invoice} 14.99 'To save the world!'
|
25
|
+
zold propagate
|
25
26
|
zold propagate 0000000000000000
|
26
27
|
zold show
|
27
28
|
zold show 0000000000000000
|
28
29
|
zold taxes debt 0000000000000000
|
29
30
|
|
30
31
|
zold remote show
|
32
|
+
zold push
|
31
33
|
zold push 0000000000000000
|
32
34
|
until zold fetch 0000000000000000 --ignore-score-weakness; do
|
33
35
|
echo 'Failed to fetch, let us try again'
|
34
36
|
sleep 1
|
35
37
|
done
|
38
|
+
zold fetch
|
36
39
|
zold diff 0000000000000000
|
40
|
+
zold merge
|
37
41
|
zold merge 0000000000000000
|
42
|
+
zold clean
|
38
43
|
zold clean 0000000000000000
|
44
|
+
zold remove
|
data/lib/zold/commands/clean.rb
CHANGED
@@ -53,8 +53,7 @@ Available options:"
|
|
53
53
|
o.bool '--help', 'Print instructions'
|
54
54
|
end
|
55
55
|
mine = Args.new(opts, @log).take || return
|
56
|
-
mine
|
57
|
-
mine.map { |i| Id.new(i) }.each do |id|
|
56
|
+
(mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
|
58
57
|
clean(Copies.new(File.join(@copies, id), log: @log), opts)
|
59
58
|
end
|
60
59
|
end
|
data/lib/zold/commands/fetch.rb
CHANGED
@@ -69,8 +69,7 @@ Available options:"
|
|
69
69
|
o.bool '--help', 'Print instructions'
|
70
70
|
end
|
71
71
|
mine = Args.new(opts, @log).take || return
|
72
|
-
mine
|
73
|
-
mine.map { |i| Id.new(i) }.each do |id|
|
72
|
+
(mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
|
74
73
|
fetch(id, Copies.new(File.join(@copies, id)), opts)
|
75
74
|
end
|
76
75
|
end
|
data/lib/zold/commands/merge.rb
CHANGED
@@ -54,9 +54,8 @@ Available options:"
|
|
54
54
|
o.bool '--help', 'Print instructions'
|
55
55
|
end
|
56
56
|
mine = Args.new(opts, @log).take || return
|
57
|
-
mine = @wallets.all if mine.empty?
|
58
57
|
modified = []
|
59
|
-
mine.map { |i| Id.new(i) }.each do |id|
|
58
|
+
(mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
|
60
59
|
next unless merge(id, Copies.new(File.join(@copies, id)), opts)
|
61
60
|
modified << id
|
62
61
|
require_relative 'propagate'
|
@@ -49,9 +49,8 @@ Available options:"
|
|
49
49
|
o.bool '--help', 'Print instructions'
|
50
50
|
end
|
51
51
|
mine = Args.new(opts, @log).take || return
|
52
|
-
mine = @wallets.all if mine.empty?
|
53
52
|
modified = []
|
54
|
-
mine.map { |i| Id.new(i) }.each do |id|
|
53
|
+
(mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
|
55
54
|
modified += propagate(id, opts)
|
56
55
|
end
|
57
56
|
modified
|
data/lib/zold/commands/push.rb
CHANGED
@@ -58,8 +58,7 @@ Available options:"
|
|
58
58
|
o.bool '--help', 'Print instructions'
|
59
59
|
end
|
60
60
|
mine = Args.new(opts, @log).take || return
|
61
|
-
mine
|
62
|
-
mine.map { |i| Id.new(i) }.each do |id|
|
61
|
+
(mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
|
63
62
|
push(id, opts)
|
64
63
|
end
|
65
64
|
end
|
data/lib/zold/commands/remote.rb
CHANGED
@@ -60,6 +60,8 @@ Available commands:
|
|
60
60
|
Remove all registered remote nodes
|
61
61
|
#{Rainbow('remote reset').green}
|
62
62
|
Restore it back to the default list of nodes
|
63
|
+
#{Rainbow('remote defaults').green}
|
64
|
+
Add all default nodes to the list
|
63
65
|
#{Rainbow('remote add').green} host [port]
|
64
66
|
Add a new remote node
|
65
67
|
#{Rainbow('remote remove').green} host [port]
|
@@ -125,6 +127,8 @@ Available options:"
|
|
125
127
|
clean
|
126
128
|
when 'reset'
|
127
129
|
reset
|
130
|
+
when 'defaults'
|
131
|
+
defaults
|
128
132
|
when 'add'
|
129
133
|
add(mine[1], mine[2] ? mine[2].to_i : Remotes::PORT, opts)
|
130
134
|
when 'remove'
|
@@ -158,8 +162,13 @@ Available options:"
|
|
158
162
|
end
|
159
163
|
|
160
164
|
def reset
|
161
|
-
|
162
|
-
|
165
|
+
clean
|
166
|
+
defaults
|
167
|
+
end
|
168
|
+
|
169
|
+
def defaults
|
170
|
+
@remotes.defaults
|
171
|
+
@log.debug("Default remote nodes were added to the list, #{@remotes.all.count} total")
|
163
172
|
end
|
164
173
|
|
165
174
|
def add(host, port, opts)
|
data/lib/zold/commands/remove.rb
CHANGED
@@ -44,8 +44,7 @@ Available options:"
|
|
44
44
|
o.bool '--help', 'Print instructions'
|
45
45
|
end
|
46
46
|
mine = Args.new(opts, @log).take || return
|
47
|
-
mine
|
48
|
-
mine.map { |i| Id.new(i) }.each do |id|
|
47
|
+
(mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }).each do |id|
|
49
48
|
remove(id, opts)
|
50
49
|
end
|
51
50
|
end
|
@@ -46,7 +46,7 @@ module Zold
|
|
46
46
|
args = ['remote', "--network=#{@opts['network']}"]
|
47
47
|
score = @farm.best[0]
|
48
48
|
args << "--ignore-node=#{score.host}:#{score.port}" if score
|
49
|
-
cmd.run(args + ['
|
49
|
+
cmd.run(args + ['defaults']) unless @opts['routine-immediately']
|
50
50
|
cmd.run(args + ['trim'])
|
51
51
|
cmd.run(args + ['select'])
|
52
52
|
cmd.run(args + ['update'] + (@opts['never-reboot'] ? [] : ['--reboot']))
|
data/lib/zold/remotes.rb
CHANGED
@@ -130,12 +130,11 @@ module Zold
|
|
130
130
|
modify { [] }
|
131
131
|
end
|
132
132
|
|
133
|
-
def
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
)
|
133
|
+
def defaults
|
134
|
+
other = Remotes.new(file: File.join(File.dirname(__FILE__), '../../resources/remotes'))
|
135
|
+
other.all.each do |r|
|
136
|
+
add(r[:host], r[:port])
|
137
|
+
end
|
139
138
|
end
|
140
139
|
|
141
140
|
def exists?(host, port = Remotes::PORT)
|
@@ -242,22 +241,26 @@ module Zold
|
|
242
241
|
end
|
243
242
|
|
244
243
|
def load
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
244
|
+
if File.exist?(file)
|
245
|
+
raw = CSV.read(file).map do |row|
|
246
|
+
{
|
247
|
+
host: row[0],
|
248
|
+
port: row[1].to_i,
|
249
|
+
score: row[2].to_i,
|
250
|
+
errors: row[3].to_i
|
251
|
+
}
|
252
|
+
end
|
253
|
+
raw.reject { |r| !r[:host] || r[:port].zero? }.map do |r|
|
254
|
+
r[:home] = URI("http://#{r[:host]}:#{r[:port]}/")
|
255
|
+
r
|
256
|
+
end
|
257
|
+
else
|
258
|
+
[]
|
257
259
|
end
|
258
260
|
end
|
259
261
|
|
260
262
|
def save(list)
|
263
|
+
FileUtils.mkdir_p(File.dirname(file))
|
261
264
|
File.write(
|
262
265
|
file,
|
263
266
|
list.uniq { |r| "#{r[:host]}:#{r[:port]}" }.map do |r|
|
data/lib/zold/version.rb
CHANGED
@@ -176,6 +176,7 @@ class TestRemote < Minitest::Test
|
|
176
176
|
def test_select_respects_max_nodes_option
|
177
177
|
Dir.mktmpdir do |dir|
|
178
178
|
remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.txt'))
|
179
|
+
remotes.defaults
|
179
180
|
zero = Zold::Score::ZERO
|
180
181
|
cmd = Zold::Remote.new(remotes: remotes, log: test_log)
|
181
182
|
(5000..5010).each do |port|
|
data/test/test_remotes.rb
CHANGED
@@ -132,8 +132,8 @@ class TestRemotes < Minitest::Test
|
|
132
132
|
Dir.mktmpdir do |dir|
|
133
133
|
remotes = Zold::Remotes.new(file: File.join(dir, 'remotes'))
|
134
134
|
remotes.clean
|
135
|
-
remotes.
|
136
|
-
remotes.
|
135
|
+
remotes.defaults
|
136
|
+
remotes.defaults
|
137
137
|
assert(!remotes.all.empty?)
|
138
138
|
end
|
139
139
|
end
|
@@ -188,9 +188,9 @@ class TestRemotes < Minitest::Test
|
|
188
188
|
|
189
189
|
def test_read_mtime_from_file
|
190
190
|
Dir.mktmpdir 'test' do |dir|
|
191
|
-
file = File.join(dir, 'remotes')
|
191
|
+
file = File.join(dir, 'a/b/c/remotes')
|
192
192
|
remotes = Zold::Remotes.new(file: file)
|
193
|
-
remotes.
|
193
|
+
remotes.clean
|
194
194
|
assert_equal(File.mtime(file).to_i, remotes.mtime.to_i)
|
195
195
|
end
|
196
196
|
end
|