zold 0.16.27 → 0.16.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6099001404773f73201ba9d4120098b1e096a14132874aaee47ffea89d0bb4d4
-  data.tar.gz: 004e0c2475ba063f08f8a685e6f9b592769a593fb4b17d765e9316f487481506
+  metadata.gz: 0a58595f5d647efa9b0ff2f58a2d975d299f9dda59ddd938f8f5c2ff4f917f37
+  data.tar.gz: 86d0ddf04dcbe3301ce6906900f0d02687c3b893702e374dcab7008e99f7fa45
 SHA512:
-  metadata.gz: cc98c08e0f2c2c6c3e5f0a94b434d05a5a0301c213fb2ad45401e1f4b733fe3e7f0806ac060e2f414a937a935effaaad5f39c8a7d07c26b2fc2251c42d16d536
-  data.tar.gz: 486ba67e95ad7c4d2f92a9e1dd8d8fe854f701a39737b3664de943482370bba1859052fcd09372e2905e484b3f5a857e55abde9e8d89b8bea0114fda28bf6e57
+  metadata.gz: '09ca8a13aca6b85dd4d1efb6dcfdeeea39b5c9bdf685e0c0d87a2b29c6de081c59e24d59d838ec2d57a20fcb1259fc1fde104aba107c3c33927a0de25638e098'
+  data.tar.gz: 18bfc9cf728d6d22d9e50287d1031e7340cb8b623ef3249523161e84fa711dba364bed0cbec34950108b4c4c5753719b59f1997813e0548a37c0d576c6d1cf70

data/README.md

@@ -311,7 +311,7 @@ For example, `Zold::Log::Verbose` will print a lot of information to the console
 
 ```ruby
 require 'zold/commands/push'
-Zold::Push.new(wallets: wallets, remotes: remotes, log: Zold::Log::Verbose.new).run(['push'])
+Zold::Push.new(wallets: wallets, remotes: remotes, log: Zold::Log::VERBOSE).run(['push'])
 ```
 
 Also, all commands by default assume that you are working in a `test` network.

data/bin/zold

@@ -50,7 +50,7 @@ Thread.current.name = 'main'
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
-log = Zold::Log::Regular.new
+log = Zold::Log::REGULAR.dup
 
 args = []
 unless ENV['RACK_ENV'] == 'test' || ARGV.find { |a| a == '--ignore-global-config' }
@@ -105,9 +105,13 @@ Available options:"
     "Home directory (default: #{Dir.pwd})",
     default: Dir.pwd
   o.string '--network',
-    "The name of the network we work in (default: #{Zold::Wallet::MAIN_NETWORK})",
+    "The name of the network we work in (default: #{Zold::Wallet::MAINET})",
     required: true,
-    default: Zold::Wallet::MAIN_NETWORK
+    default: Zold::Wallet::MAINET
+  o.string '--pretty',
+    'Logging format, e.g. short, full, compact (default: short)',
+    required: true,
+    default: 'short'
   o.bool '-h', '--help', 'Show these instructions'
   o.bool '--trace', 'Show full stack trace in case of a problem'
   o.bool '--memory-dump', 'Dump memory snapshot afterwards, to the console', default: false
@@ -117,7 +121,7 @@ Available options:"
     Rainbow.enabled = false
   end
   o.on '--verbose', 'Enable extra logging information' do
-    log = Zold::Log::Verbose.new
+    log = Zold::Log::VERBOSE.dup
   end
   o.on '-v', '--version', 'Show current version' do
     log.info(Zold::VERSION)
@@ -125,7 +129,14 @@ Available options:"
   end
 end
 
-log = Zold::Log::Sync.new(log)
+case opts['pretty'].downcase.strip
+when 'short'
+  log.formatter = Zold::Log::SHORT
+when 'compact'
+  log.formatter = Zold::Log::COMPACT
+when 'full'
+  log.formatter = Zold::Log::FULL
+end
 
 log.debug("Gem location: #{File.dirname(File.dirname(__FILE__))}")
 
@@ -182,7 +193,7 @@ else
 end
 copies = File.join(zoldata, 'copies')
 
-log.debug("Network: #{opts['network']} (#{opts['network'] == Zold::Wallet::MAIN_NETWORK ? 'main' : 'test'} net)")
+log.debug("Network: #{opts['network']} (#{opts['network'] == Zold::Wallet::MAINET ? 'main' : 'test'} net)")
 
 cmd = lambda do
   begin
@@ -204,10 +215,10 @@ cmd = lambda do
       Zold::Pay.new(wallets: wallets, remotes: remotes, log: log).run(args)
     when 'show'
       require_relative '../lib/zold/commands/show'
-      Zold::Show.new(wallets: wallets, log: log).run(args)
+      Zold::Show.new(wallets: wallets, copies: copies, log: log).run(args)
     when 'list'
       require_relative '../lib/zold/commands/list'
-      Zold::List.new(wallets: wallets, log: log).run(args)
+      Zold::List.new(wallets: wallets, copies: copies, log: log).run(args)
     when 'fetch'
       require_relative '../lib/zold/commands/fetch'
       Zold::Fetch.new(wallets: wallets, remotes: remotes, copies: copies, log: log).run(args)

data/fixtures/scripts/distribute-wallet.sh

@@ -6,7 +6,7 @@ function start_node {
   cd ${port}
   zold node --trace --invoice=DISTRWALLET@ffffffffffffffff \
     --host=127.0.0.1 --port=${port} --bind-port=${port} \
-    --threads=0 --routine-immediately --never-reboot > log.txt &
+    --threads=0 --routine-immediately --never-reboot > log.txt 2>&1 &
   pid=$!
   echo ${pid} > pid
   cd ..

data/fixtures/scripts/pull-on-start.sh

@@ -5,7 +5,7 @@ mkdir server
 cd server
 zold node --trace --invoice=PULLONSTART@ffffffffffffffff --no-metronome \
   --host=127.0.0.1 --port=${port} --bind-port=${port} \
-  --threads=0 --standalone &
+  --threads=0 --standalone --pretty=full 2>&1 &
 cd ..
 
 wait_for_port ${port}

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

@@ -6,7 +6,7 @@ mkdir server
 cd server
 zold node --trace --invoice=PUSHNPULL@ffffffffffffffff \
   --host=127.0.0.1 --port=${port} --bind-port=${port} \
-  --threads=0 --standalone &
+  --threads=0 --standalone 2>&1 &
 pid=$!
 trap "halt_nodes ${port}" EXIT
 cd ..

data/fixtures/scripts/spread-wallets.sh

@@ -6,7 +6,7 @@ function start_node {
   cd ${port}
   zold node --trace --invoice=SPREADWALLETS@ffffffffffffffff \
     --host=127.0.0.1 --port=${port} --bind-port=${port} \
-    --threads=0 > log.txt &
+    --threads=0 > log.txt 2>&1 &
   pid=$!
   echo ${pid} > pid
   cd ..

data/lib/zold/commands/alias.rb

@@ -2,13 +2,16 @@
 
 require 'slop'
 require 'rainbow'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../log'
 
 module Zold
   # Command to set an alias for wallet ID
   class Alias
-    def initialize(wallets:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, log: Log::NULL)
       @wallets = wallets
       @log = log
     end

data/lib/zold/commands/calculate.rb

@@ -22,6 +22,7 @@
 
 require 'slop'
 require 'zold/score'
+require_relative 'thread_badge'
 require_relative '../log'
 
 # SCORE command.
@@ -31,7 +32,9 @@ require_relative '../log'
 module Zold
   # Calculate score
   class Calculate
-    def initialize(log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(log: Log::NULL)
       @log = log
     end
 

data/lib/zold/commands/clean.rb

@@ -41,7 +41,7 @@ require_relative '../copies'
 module Zold
   # CLEAN command
   class Clean
-    def initialize(wallets:, copies:, log: Log::Quiet.new)
+    def initialize(wallets:, copies:, log: Log::NULL)
       @wallets = wallets
       @copies = copies
       @log = log

data/lib/zold/commands/create.rb

@@ -22,6 +22,7 @@
 
 require 'slop'
 require 'rainbow'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../wallet'
 require_relative '../log'
@@ -34,7 +35,9 @@ require_relative '../id'
 module Zold
   # Create command
   class Create
-    def initialize(wallets:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, log: Log::NULL)
       @wallets = wallets
       @log = log
     end
@@ -48,9 +51,9 @@ Available options:"
           require: true,
           default: File.expand_path('~/.ssh/id_rsa.pub')
         o.string '--network',
-          "The name of the network (default: #{Wallet::MAIN_NETWORK}",
+          "The name of the network (default: #{Wallet::MAINET}",
           require: true,
-          default: Wallet::MAIN_NETWORK
+          default: Wallet::MAINET
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return

data/lib/zold/commands/diff.rb

@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require_relative 'thread_badge'
 require 'tempfile'
 require 'slop'
 require 'diffy'
@@ -36,7 +37,9 @@ require_relative '../wallet'
 module Zold
   # DIFF pulling command
   class Diff
-    def initialize(wallets:, copies:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, copies:, log: Log::NULL)
       @wallets = wallets
       @copies = copies
       @log = log

data/lib/zold/commands/fetch.rb

@@ -28,6 +28,7 @@ require 'slop'
 require 'rainbow'
 require 'concurrent/atomics'
 require 'zold/score'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../log'
 require_relative '../age'
@@ -43,7 +44,9 @@ require_relative '../copies'
 module Zold
   # FETCH pulling command
   class Fetch
-    def initialize(wallets:, remotes:, copies:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, remotes:, copies:, log: Log::NULL)
       @wallets = wallets
       @remotes = remotes
       @copies = copies

data/lib/zold/commands/invoice.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'slop'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../log'
 require_relative '../prefixes'
@@ -32,7 +33,9 @@ require_relative '../prefixes'
 module Zold
   # Generate invoice
   class Invoice
-    def initialize(wallets:, remotes:, copies:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, remotes:, copies:, log: Log::NULL)
       @wallets = wallets
       @remotes = remotes
       @copies = copies

data/lib/zold/commands/list.rb

@@ -20,9 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require_relative 'thread_badge'
 require_relative '../log'
 require_relative '../amount'
 require_relative '../wallet'
+require_relative '../size'
 
 # LIST command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -31,26 +33,32 @@ require_relative '../wallet'
 module Zold
   # LIST command
   class List
-    def initialize(wallets:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, copies:, log: Log::NULL)
       @wallets = wallets
+      @copies = copies
       @log = log
     end
 
     def run(_ = [])
       total = 0
       txns = 0
+      size = 0
       balance = Amount::ZERO
       @wallets.all.sort.each do |id|
         total += 1
+        cps = Copies.new(File.join(@copies, id))
         @wallets.acq(id) do |wallet|
-          msg = wallet.mnemo
-          msg += " (net:#{wallet.network})" if wallet.network != Wallet::MAIN_NETWORK
+          msg = "#{wallet.mnemo} #{cps.all.count}c"
+          msg += " (net:#{wallet.network})" if wallet.network != Wallet::MAINET
           txns += wallet.txns.count
           balance += wallet.balance
+          size += wallet.size
           @log.info(msg)
         end
       end
-      @log.info("#{total} wallets, #{txns} transactions, #{balance} in total")
+      @log.info("#{total} wallets, #{txns} transactions, #{Size.new(size)}, #{balance} in total")
     end
   end
 end

data/lib/zold/commands/merge.rb

@@ -23,6 +23,7 @@
 require 'slop'
 require 'rainbow'
 require 'backtrace'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../age'
 require_relative '../log'
@@ -37,7 +38,9 @@ require_relative '../patch'
 module Zold
   # MERGE pulling command
   class Merge
-    def initialize(wallets:, copies:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, copies:, log: Log::NULL)
       @wallets = wallets
       @copies = copies
       @log = log
@@ -51,6 +54,9 @@ Available options:"
         o.bool '--no-baseline',
           'Don\'t trust any remote copies and re-validate all incoming payments against their wallets',
           default: false
+        o.bool '--skip-propagate',
+          'Don\'t propagate after merge',
+          default: false
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
@@ -58,6 +64,7 @@ Available options:"
       (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
+        next if opts['skip-propagate']
         require_relative 'propagate'
         modified += Propagate.new(wallets: @wallets, log: @log).run(args)
       end

data/lib/zold/commands/next.rb

@@ -22,6 +22,7 @@
 
 require 'slop'
 require 'zold/score'
+require_relative 'thread_badge'
 require_relative '../log'
 
 # NEXT command.
@@ -31,7 +32,9 @@ require_relative '../log'
 module Zold
   # Calculate next score
   class Next
-    def initialize(log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(log: Log::NULL)
       @log = log
     end
 

data/lib/zold/commands/node.rb

@@ -25,6 +25,7 @@ require 'slop'
 require 'backtrace'
 require 'concurrent'
 require 'zold/score'
+require_relative 'thread_badge'
 require_relative '../version'
 require_relative '../age'
 require_relative '../metronome'
@@ -54,7 +55,9 @@ require_relative 'remote'
 module Zold
   # NODE command
   class Node
-    def initialize(wallets:, remotes:, copies:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, remotes:, copies:, log: Log::NULL)
       @remotes = remotes
       @copies = copies
       @log = log
@@ -123,8 +126,8 @@ module Zold
           'The location of RSA private key (default: ~/.ssh/id_rsa)',
           default: '~/.ssh/id_rsa'
         o.string '--network',
-          "The name of the network (default: #{Wallet::MAIN_NETWORK})",
-          default: Wallet::MAIN_NETWORK
+          "The name of the network (default: #{Wallet::MAINET})",
+          default: Wallet::MAINET
         o.integer '--nohup-max-cycles',
           'Maximum amount of nohup re-starts (-1 by default, which means forever)',
           default: -1

data/lib/zold/commands/pay.rb

@@ -22,6 +22,7 @@
 
 require 'slop'
 require 'rainbow'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../id'
 require_relative '../amount'
@@ -34,7 +35,9 @@ require_relative '../log'
 module Zold
   # Money sending command
   class Pay
-    def initialize(wallets:, remotes:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, remotes:, log: Log::NULL)
       @wallets = wallets
       @remotes = remotes
       @log = log

data/lib/zold/commands/propagate.rb

@@ -22,6 +22,7 @@
 
 require 'slop'
 require 'rainbow'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../log'
 require_relative '../age'
@@ -36,7 +37,9 @@ require_relative '../prefixes'
 module Zold
   # PROPAGATE pulling command
   class Propagate
-    def initialize(wallets:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, log: Log::NULL)
       @wallets = wallets
       @log = log
     end

data/lib/zold/commands/pull.rb

@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require_relative 'thread_badge'
 require_relative '../log'
 require_relative 'fetch'
 require_relative 'merge'
@@ -32,7 +33,9 @@ require_relative 'clean'
 module Zold
   # PULL command
   class Pull
-    def initialize(wallets:, remotes:, copies:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, remotes:, copies:, log: Log::NULL)
       @wallets = wallets
       @remotes = remotes
       @copies = copies