zold 0.11.12 → 0.11.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90832b265cac310c342302076196ba278cb95a61
-  data.tar.gz: 6dfa38e0c58cf822e932e02f6069d320bb27ea3c
+  metadata.gz: 734d97457d4cc18d8b84d6371904086aef0c7019
+  data.tar.gz: df98902e71751e659730fd4cee9dcff8e8ddaba4
 SHA512:
-  metadata.gz: b9bad4cfcf2359824214fceb42944f835864fd6beac8603f63862d9a0311b0a9a64cc4dc016bfe96db5043416a51e29cce4d449a6090e968aa301ad80b5a4e8c
-  data.tar.gz: be26c9b2ff2d1afaafbfb96d3074b32fe31633d28430e9d9d62d46c8a089e6a77c0aee107bd7404b17904fa8d2d62d41cbfbf4222ff365a8c218968d3c9b03cf
+  metadata.gz: 4c2a79df0c7e6df4b31787fb4a726e7a56cc91f32227c83ac2d78fbf91f651ef3f17f82a5be6c64d6d590d2a72c00cf20cba203817d758418c6ac601caf8be85
+  data.tar.gz: 150bbcb1df2950d67628c6452cb84ae5d5ba15c175f25ef97b8f4493cacbb6c95541216796a507220006f9546b0a2ef38d3286819965e2f403296fec8e8e401f

data/lib/zold/commands/invoice.rb

@@ -50,7 +50,7 @@ Available options:"
       raise 'Receiver wallet ID is required' if mine[0].nil?
       id = Zold::Id.new(mine[0])
       wallet = @wallets.find(id)
-      raise "Wallet #{id} doesn\'t exist in #{@wallets}, do 'pull' first" unless wallet.exists?
+      raise "Wallet #{id} doesn\'t exist in #{@wallets}, do 'zold pull' first" unless wallet.exists?
       invoice(wallet, opts)
     end
 

data/lib/zold/commands/merge.rb

@@ -61,7 +61,10 @@ Available options:"
     private
 
     def merge(id, cps, _)
-      raise "There are no remote copies of #{id}, try FETCH first" if cps.all.empty?
+      if cps.all.empty?
+        @log.error("There are no remote copies of #{id}, try 'zold fetch' first")
+        return
+      end
       wallet = @wallets.find(id)
       cps = cps.all.sort_by { |c| c[:score] }.reverse
       patch = Patch.new

data/lib/zold/commands/pay.rb

@@ -61,7 +61,7 @@ Available options:"
       raise 'Payer wallet ID is required as the first argument' if mine[0].nil?
       id = Id.new(mine[0])
       from = @wallets.find(id)
-      raise "Wallet #{id} doesn't exist, do 'pull' first" unless from.exists?
+      raise "Wallet #{id} doesn't exist, do 'zold pull' first" unless from.exists?
       raise 'Recepient\'s invoice or wallet ID is required as the second argument' if mine[1].nil?
       invoice = mine[1]
       unless invoice.include?('@')

data/lib/zold/version.rb

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

metadata

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