zold 0.14.2 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b465026197a0d5f1aa6d9821a7d56dfd8a47ff27
-  data.tar.gz: e135309f6d0eb7a08b3939002285cf8d5fba34ee
+  metadata.gz: 9a77da32d7c42f8614442e76efa0eb9560e645a8
+  data.tar.gz: 5840bb2844ef57929752da61d40158a2f2eba758
 SHA512:
-  metadata.gz: 3ed88e357053350010c898b4d90dddc32ab36e4cd7dc34155db296b539b36f4dbd9b3c680fcd95e491bb44887a73201c51f1a2897a5b9c8d59a1bbea7c2d3a24
-  data.tar.gz: 4999f7da3a1f05da20c7f4e2a78fd66ea407de1ad15368e51b79fd393ee98baf01b368596fdf454f42558bd311ac2c9552e3e08aa2996533d41cc246b5abb884
+  metadata.gz: ebf8e676c08b13bf103d7cf155191bbf05e95d09138a815d0357782a2e9fba499c1bb8499dfbdf39f6cf8541d181f3ad26bfd0d0399bba1912a0db28727cfb31
+  data.tar.gz: a8d9e92bfa9a5f4660bb089a6ea80862547f51b84f5fc454d5d22bd18f79a36858dbfc2949efffde70da25f6d90ba7bca68585f64062e5c58db27c8edc8b44cf

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

@@ -30,7 +30,7 @@ zold taxes debt 0000000000000000
 zold remote show
 zold push 0000000000000000
 sleep 2
-zold fetch 0000000000000000 --ignore-score-weakness
+zold fetch 0000000000000000 --ignore-score-weakness || echo 'Failed'
 zold diff 0000000000000000
 zold merge 0000000000000000
 zold clean 0000000000000000

data/lib/zold/id.rb

@@ -29,7 +29,7 @@ module Zold
       if id.nil?
         @id = rand(2**32..2**64 - 1)
       else
-        raise "Invalid wallet ID '#{id}'" unless id =~ /^[0-9a-fA-F]{16}$/
+        raise "Invalid wallet ID: #{id}" unless id =~ /^[0-9a-fA-F]{16}$/
         @id = Integer("0x#{id}", 16)
       end
     end

data/lib/zold/node/entrance.rb

@@ -78,7 +78,7 @@ module Zold
       end
       modified = Merge.new(
         wallets: @wallets, copies: copies.root, log: @log
-      ).run(['merge', id.to_s, '--no-baseline'])
+      ).run(['merge', id.to_s])
       Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(['clean', id.to_s])
       copies.remove(localhost, Remotes::PORT)
       sec = (Time.now - start).round(2)

data/lib/zold/upgrades.rb

@@ -37,21 +37,12 @@ module Zold
       # This is a workaround, remove it once this class works correctly
       require_relative '../../upgrades/2.rb'
       UpgradeTo2.new(Dir.pwd, @log).exec
+      require_relative '../../upgrades/protocol_up.rb'
+      ProtocolUp.new(Dir.pwd, @log).exec
 
-      scripts.each do |script|
+      Dir.glob("#{@directory}/*.rb").select { |f| f =~ /^(\d+)\.rb$/ }.sort.each do |script|
         @version.apply(script)
       end
     end
-
-    private
-
-    def scripts
-      Dir.glob("#{@directory}/*.rb").sort.map do |path|
-        basename = File.basename(path)
-        match = basename.match(/^(\d+)\.rb$/)
-        raise 'An upgrade script has to be named <number>.rb.' unless match
-        match[1]
-      end
-    end
   end
 end

data/lib/zold/version.rb

@@ -23,6 +23,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION  = '0.14.2'.freeze
+  VERSION  = '0.14.3'.freeze
   PROTOCOL = 2
 end

data/test/upgrades/test_protocol_up.rb

@@ -0,0 +1,39 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require_relative '../test__helper'
+require_relative '../../upgrades/protocol_up'
+require_relative '../fake_home'
+
+# Protocol up.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestProtocolUp < Minitest::Test
+  def test_upgrades_protocol_in_wallet
+    FakeHome.new.run do |home|
+      id = home.create_wallet.id
+      Zold::ProtocolUp.new(home.dir, test_log).exec
+      wallet = home.wallets.find(id)
+      assert_equal(Zold::PROTOCOL, wallet.protocol)
+    end
+  end
+end

data/upgrades/2.rb

@@ -1,3 +1,23 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
 # https://github.com/zold-io/zold/issues/358
 # rename all wallets from their current names into *.z
 

data/upgrades/protocol_up.rb

@@ -0,0 +1,44 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative '../lib/zold/version'
+require_relative '../lib/zold/wallet'
+
+module Zold
+  # Upgrade protocol in each wallet
+  class ProtocolUp
+    def initialize(home, log)
+      @home = home
+      @log = log
+    end
+
+    def exec
+      Dir.new(@home).each do |path|
+        next unless path =~ /^[a-f0-9]{16}#{Wallet::EXTENSION}$/
+        f = File.join(@home, path)
+        lines = File.read(f).split("\n")
+        next if lines[1].to_i == Zold::PROTOCOL
+        lines[1] = Zold::PROTOCOL
+        File.write(f, lines.join("\n"))
+        @log.info("Protocol set to #{Zold::PROTOCOL} in #{f}")
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.3
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -462,7 +462,9 @@ files:
 - test/test_wallet.rb
 - test/test_wallets.rb
 - test/test_zold.rb
+- test/upgrades/test_protocol_up.rb
 - upgrades/2.rb
+- upgrades/protocol_up.rb
 - zold.gemspec
 homepage: http://github.com/zold-io/zold
 licenses:
@@ -546,3 +548,4 @@ test_files:
 - test/test_wallet.rb
 - test/test_wallets.rb
 - test/test_zold.rb
+- test/upgrades/test_protocol_up.rb