zold 0.14.7 → 0.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe5dfb0c10d55bd3baccfdeb9fcdf48fa2c71b5f
-  data.tar.gz: 72eb0acf988ec8e6e58eb7e9f341c286ab7c5732
+  metadata.gz: f2f9cbae830828107bb4b7aa19a24fa9d53620b4
+  data.tar.gz: 03f51730a5136f765985161d36b9454d59f19748
 SHA512:
-  metadata.gz: a0c43f1bbf63ac32f535b2d3f5b5bb84b851395ef9445ea311fa2eda9467f4aae101862ab326fd90f1bac7e7fcd90eafa23f324502efeffa12647a7ebe49d19c
-  data.tar.gz: 44fac93b3e27a4f3687d06fe4b2e6097503abbda9d280a392fd47c1b38a46d43a64ed505eab526ebb60cf36ddd1ae0333a7d1ef0c9666cc04bb3c697437e523a
+  metadata.gz: ed925085a934c77ffed65eb83bf9a8d0d97fb31dcb608ab20538445397a226241904fdf9ee41bb40f6078d0888d92d05e424c3cc7623cb581011b4cb0caaba1a
+  data.tar.gz: 1d0a2a7233ef74a7b1fb9e51584df480e06836b4efbbb67f71fc3c2238300a9f3409b98d4d2105f03d8905dc3a086066fafe601eda188309a4a8617c9b5a1e0a

data/.simplecov

@@ -35,6 +35,6 @@ else
   SimpleCov.start do
     add_filter "/test/"
     add_filter "/features/"
-#    minimum_coverage 30
+    minimum_coverage 30
   end
 end

data/bin/zold

@@ -138,6 +138,16 @@ Available options:"
 
   Zold::Upgrades.new(Zold::VersionFile.new('.zoldata/version'), 'upgrades').run
 
+  # @todo #384:30min This is a workaround, move this code into Upgrades, somehow.
+  #  We should find a way to run these arbitrary scripts and pass arguments
+  #  to them. Each of them may need its own set of arguments.
+  require_relative '../upgrades/2'
+  Zold::UpgradeTo2.new(Dir.pwd, log).exec
+  require_relative '../upgrades/protocol_up'
+  Zold::ProtocolUp.new(Dir.pwd, log).exec
+  require_relative '../upgrades/rename_foreign_wallets'
+  Zold::RenameForeignWallets.new(Dir.pwd, opts['network'], log).exec
+
   wallets = Zold::Wallets.new('.')
   remotes = Zold::Remotes.new('./.zoldata/remotes', network: opts['network'])
   copies = './.zoldata/copies'

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

@@ -47,7 +47,7 @@ module Zold
           @entrance.push(id, File.read(@wallets.find(id).path))
           pushed << id
         end
-        @log.info("Spread #{pushed.count} random wallets out of #{@wallets.all.count}: #{pushed.join}")
+        @log.info("Spread #{pushed.count} random wallets out of #{@wallets.all.count}: #{pushed.join(', ')}")
       end
     end
   end

data/lib/zold/upgrades.rb

@@ -34,12 +34,6 @@ module Zold
     #  - The upgrade scripts run when there is a version file and there are pending upgrade scripts.
     #  - Make sure *only* the correct upgrade scripts run.
     def run
-      # 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
-
       Dir.glob("#{@directory}/*.rb").select { |f| f =~ /^(\d+)\.rb$/ }.sort.each do |script|
         @version.apply(script)
       end

data/lib/zold/version.rb

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

data/upgrades/rename_foreign_wallets.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
+  # Rename wallets that belong to another network
+  class RenameForeignWallets
+    def initialize(home, network, log)
+      @home = home
+      @network = network
+      @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)
+        wallet = Wallet.new(f)
+        next if wallet.network == @network
+        @log.info("Wallet #{wallet.id} renamed, since it's in #{wallet.network}, while we are in #{@network} network")
+        File.rename(f, f + '-old')
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.7
+  version: 0.14.8
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -463,6 +463,7 @@ files:
 - test/upgrades/test_protocol_up.rb
 - upgrades/2.rb
 - upgrades/protocol_up.rb
+- upgrades/rename_foreign_wallets.rb
 - zold.gemspec
 homepage: http://github.com/zold-io/zold
 licenses: