zold 0.16.27 → 0.16.28

data/lib/zold/commands/push.rb

@@ -24,6 +24,7 @@ require 'rainbow'
 require 'slop'
 require 'json'
 require 'net/http'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../age'
 require_relative '../size'
@@ -39,7 +40,9 @@ require_relative '../json_page'
 module Zold
   # Wallet pushing command
   class Push
-    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/remote.rb

@@ -27,6 +27,7 @@ require 'net/http'
 require 'json'
 require 'time'
 require 'zold/score'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../node/farm'
 require_relative '../log'
@@ -44,7 +45,9 @@ require_relative '../gem'
 module Zold
   # Remote command
   class Remote
-    def initialize(remotes:, farm: Farm::Empty.new, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(remotes:, farm: Farm::Empty.new, log: Log::NULL)
       @remotes = remotes
       @farm = farm
       @log = log
@@ -103,9 +106,9 @@ Available options:"
           'The amount of update cycles to run, in order to fetch as many nodes as possible (default: 2)',
           default: 2
         o.string '--network',
-          "The name of the network we work in (default: #{Wallet::MAIN_NETWORK}",
+          "The name of the network we work in (default: #{Wallet::MAINET}",
           required: true,
-          default: Wallet::MAIN_NETWORK
+          default: Wallet::MAINET
         o.bool '--reboot',
           'Exit if any node reports version higher than we have',
           default: false

data/lib/zold/commands/remove.rb

@@ -22,6 +22,7 @@
 
 require 'slop'
 require 'rainbow'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../log'
 
@@ -32,7 +33,9 @@ require_relative '../log'
 module Zold
   # REMOVE command
   class Remove
-    def initialize(wallets:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, log: Log::NULL)
       @wallets = wallets
       @log = log
     end

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

@@ -32,7 +32,7 @@ module Zold
   module Routines
     # Reconnect to the network
     class Reconnect
-      def initialize(opts, remotes, farm = Farm::Empty.new, network: 'test', log: Log::Quiet.new)
+      def initialize(opts, remotes, farm = Farm::Empty.new, network: 'test', log: Log::NULL)
         @opts = opts
         @remotes = remotes
         @farm = farm

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

@@ -33,7 +33,7 @@ module Zold
   module Routines
     # Spread them
     class Spread
-      def initialize(opts, wallets, remotes, log: Log::Quiet.new)
+      def initialize(opts, wallets, remotes, log: Log::NULL)
         @opts = opts
         @wallets = wallets
         @remotes = remotes

data/lib/zold/commands/show.rb

@@ -22,6 +22,7 @@
 
 require 'slop'
 require 'rainbow'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative '../log'
 require_relative '../id'
@@ -35,8 +36,11 @@ require_relative '../wallet'
 module Zold
   # Show command
   class Show
-    def initialize(wallets:, log: Log::Quiet.new)
+    prepend ThreadBadge
+
+    def initialize(wallets:, copies:, log: Log::NULL)
       @wallets = wallets
+      @copies = copies
       @log = log
     end
 
@@ -49,7 +53,7 @@ Available options:"
       mine = Args.new(opts, @log).take || return
       if mine.empty?
         require_relative 'list'
-        List.new(wallets: @wallets, log: @log).run(args)
+        List.new(wallets: @wallets, copies: @copies, log: @log).run(args)
       else
         total = Amount::ZERO
         mine.map { |i| Id.new(i) }.each do |id|
@@ -69,7 +73,7 @@ Available options:"
         @log.info(t.to_text)
       end
       msg = "The balance of #{wallet}: #{balance}"
-      msg += " (net:#{wallet.network})" if wallet.network != Wallet::MAIN_NETWORK
+      msg += " (net:#{wallet.network})" if wallet.network != Wallet::MAINET
       @log.info(msg)
       balance
     end

data/lib/zold/commands/taxes.rb

@@ -24,6 +24,7 @@ require 'slop'
 require 'json'
 require 'rainbow'
 require 'zold/score'
+require_relative 'thread_badge'
 require_relative 'args'
 require_relative 'pay'
 require_relative '../log'
@@ -51,7 +52,9 @@ module Zold
   # just selects the most suitable wallet to transfer taxes to and sends
   # the payment. More details you can find in the White Paper.
   class Taxes
-    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/thread_badge.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# 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.
+
+# Thread badge.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # This module should be included in each command, in order to label
+  # the current Thread correctly, when the command is running. This is mostly
+  # useful for debugging/testing purposes - want to be able to see what's
+  # going on in the thread when it gets stuck with a Futex.
+  #
+  # Since all commands have exactly the same external interface and implement
+  # the method "run," we catch all calls to this method and label the
+  # current thread properly. We label it back when it's over.
+  module ThreadBadge
+    def run(args = [])
+      before = Thread.current.name || ''
+      Thread.current.name = "#{before}:#{self.class.name.gsub(/^Zold::/, '')}"
+      begin
+        super(args)
+      ensure
+        Thread.current.name = before
+      end
+    end
+  end
+end

data/lib/zold/copies.rb

@@ -39,7 +39,7 @@ module Zold
     # Extension for copy files
     EXT = '.zc'
 
-    def initialize(dir, log: Log::Quiet.new)
+    def initialize(dir, log: Log::NULL)
       @dir = dir
       @log = log
     end

data/lib/zold/endless.rb

@@ -31,7 +31,7 @@ require_relative 'age'
 module Zold
   # Endless loop
   class Endless
-    def initialize(title, log: Log::Quiet.new)
+    def initialize(title, log: Log::NULL)
       @title = title
       @log = log
     end

data/lib/zold/http.rb

@@ -67,7 +67,7 @@ module Zold
       @network = network
     end
 
-    def get(timeout: READ_TIMEOUT + CONNECT_TIMEOUT)
+    def get(timeout: READ_TIMEOUT)
       base_url = "#{@uri.scheme}://#{@uri.host}:#{@uri.port}"
       session = Patron::Session.new(
         timeout: timeout,
@@ -82,7 +82,7 @@ module Zold
       Error.new(e)
     end
 
-    def put(body, timeout: READ_TIMEOUT + CONNECT_TIMEOUT)
+    def put(body, timeout: READ_TIMEOUT)
       base_url = "#{@uri.scheme}://#{@uri.host}:#{@uri.port}"
       session = Patron::Session.new(
         timeout: timeout,
@@ -109,7 +109,7 @@ module Zold
       end
 
       def to_s
-        "#{code}: #{message}\n#{body}"
+        "#{status}: #{status_line}\n#{body}"
       end
 
       def body

data/lib/zold/key.rb

@@ -51,6 +51,9 @@ module Zold
       end
     end
 
+    # Public key of the root wallet
+    ROOT = Key.new(file: File.expand_path(File.join(File.dirname(__FILE__), '../../resources/root.pub')))
+
     def ==(other)
       to_s == other.to_s
     end

data/lib/zold/log.rb

@@ -20,10 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'logger'
 require 'rainbow'
-require 'monitor'
-
-STDOUT.sync = true
 
 # Zold module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -47,121 +45,64 @@ module Zold
   # messages. The user turns this mode by using --verbose command line argument.
   #
   module Log
-    # Synchronized
-    class Sync
-      def initialize(log)
-        @log = log
-        @monitor = Monitor.new
-      end
-
-      def debug(msg)
-        return unless debug?
-        @monitor.synchronize do
-          @log.debug(msg)
-        end
-      end
-
-      def debug?
-        @log.debug?
-      end
-
-      def info(msg)
-        return unless info?
-        @monitor.synchronize do
-          @log.info(msg)
-        end
-      end
-
-      def info?
-        @log.info?
-      end
-
-      def error(msg)
-        @monitor.synchronize do
-          @log.error(msg)
-        end
-      end
+    def self.colored(text, severity)
+      case severity
+      when 'ERROR', 'FATAL'
+        return Rainbow(text).red
+      when 'DEBUG'
+        return Rainbow(text).yellow
+      end
+      text
     end
 
-    # Extra verbose log
-    class Verbose
-      def debug(msg)
-        print(msg)
-      end
-
-      def debug?
-        true
-      end
-
-      def info(msg)
-        print(msg)
-      end
-
-      def info?
-        true
-      end
-
-      def error(msg)
-        print("#{Rainbow('ERROR').red}: #{msg}")
-      end
-
-      private
-
-      def print(text)
-        puts(text)
+    # Compact formatter
+    COMPACT = proc do |severity, _time, _target, msg|
+      prefix = ''
+      case severity
+      when 'ERROR', 'FATAL'
+        prefix = 'E: '
+      when 'DEBUG'
+        prefix = 'D: '
       end
+      colored(prefix, severity) + msg.to_s.rstrip.gsub(/\n/, "\n" + (' ' * prefix.length)) + "\n"
     end
 
-    # Regular log
-    class Regular
-      def debug(msg)
-        # nothing
-      end
-
-      def debug?
-        false
-      end
-
-      def info(msg)
-        print(msg)
-      end
-
-      def info?
-        true
-      end
-
-      def error(msg)
-        print("#{Rainbow('ERROR').red}: #{msg}")
-      end
-
-      private
-
-      def print(text)
-        puts(text)
-      end
+    # Short formatter
+    SHORT = proc do |_severity, _time, _target, msg|
+      msg.to_s.rstrip + "\n"
     end
 
-    # Log that doesn't log anything
-    class Quiet
-      def debug(msg)
-        # nothing to do here
-      end
-
-      def debug?
-        false
-      end
-
-      def info(msg)
-        # nothing to do here
-      end
-
-      def info?
-        false
-      end
-
-      def error(msg)
-        # nothing to do here
-      end
+    # Full formatter
+    FULL = proc do |severity, time, _target, msg|
+      format(
+        "%<time>s %<severity>5s %<msg>s\n",
+        time: time.utc.iso8601,
+        severity: colored(severity, severity),
+        msg: msg.to_s.rstrip
+      )
     end
+
+    # No logging at all
+    NULL = Logger.new(STDOUT)
+    NULL.level = Logger::UNKNOWN
+    NULL.freeze
+
+    # Everything, including debug
+    VERBOSE = Logger.new(STDOUT)
+    VERBOSE.level = Logger::DEBUG
+    VERBOSE.formatter = COMPACT
+    VERBOSE.freeze
+
+    # Info and errors, no debug info
+    REGULAR = Logger.new(STDOUT)
+    REGULAR.level = Logger::INFO
+    REGULAR.formatter = COMPACT
+    REGULAR.freeze
+
+    # Errors only
+    ERRORS = Logger.new(STDOUT)
+    ERRORS.level = Logger::ERROR
+    ERRORS.formatter = COMPACT
+    ERRORS.freeze
   end
 end

data/lib/zold/metronome.rb

@@ -32,7 +32,7 @@ require_relative 'verbose_thread'
 module Zold
   # Metronome
   class Metronome
-    def initialize(log = Log::Quiet.new)
+    def initialize(log = Log::NULL)
       @log = log
       @routines = []
       @threads = []
@@ -86,16 +86,18 @@ module Zold
       begin
         yield(self)
       ensure
-        alive = false
-        @log.info("Stopping the metronome with #{@threads.count} threads: #{@threads.map(&:name).join(', ')}")
         start = Time.now
-        @threads.each do |t|
-          tstart = Time.now
-          if t.join(60)
-            @log.info("Thread #{t.name} finished in #{Age.new(tstart)}")
-          else
-            t.exit
-            @log.info("Thread #{t.name} killed in #{Age.new(tstart)}")
+        unless @threads.empty?
+          alive = false
+          @log.info("Stopping the metronome with #{@threads.count} threads: #{@threads.map(&:name).join(', ')}")
+          @threads.each do |t|
+            tstart = Time.now
+            if t.join(60)
+              @log.info("Thread #{t.name} finished in #{Age.new(tstart)}")
+            else
+              t.exit
+              @log.info("Thread #{t.name} killed in #{Age.new(tstart)}")
+            end
           end
         end
         @log.info("Metronome stopped in #{Age.new(start)}, #{@failures.count} failures")