zold 0.14.46 → 0.14.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c359aed6c4deb0d0a24de1ca8708f6cdb8fac8da481392df5e8a375c5c9edb1a
-  data.tar.gz: b967d7822af606bcd9f19d6601498d8b00693599512f3a008ece9336334e8f40
+  metadata.gz: f3e066098cbe84a5b065695c6fdc533a45bb9e5e077537eaedb0d36b8d98f5de
+  data.tar.gz: eab40577e1cdd5b6b7d08f210ebf2c98b1879c09d38760227b4d7bf670c61d47
 SHA512:
-  metadata.gz: 6f4c779de8bbcda39f648e7b3e8d062cf9d2462092b109ac23870eb397f23ad15950a1ef32cc461dca17c116a2893595ebd7dd801e798939b4b76b812d0ce433
-  data.tar.gz: 12c2f331075d390b253928200024b82cea9c78367f0a4155a0407ad0c0c077ddef8037004959cb7c1c41bb92d5e6ff5fb39244c8d23fe5e36fbe3338e841d6da
+  metadata.gz: db883f083ea6c65dc4f396e01566876f347202d80cef8ff3bc792df14c088f085cdd72a9b36ea2ee24e8a0162c1bb1d0ed8c39c418918b0062cfb965872352cd
+  data.tar.gz: 388beed99a60d17b4cc0a5fd2f4148379e0c91c4a1aa6fa62488574efb07ba137715c784f5c65151e68540bdafb73641fe35c2701ca85d699e2c04239d1b8649

data/lib/zold/commands/merge.rb

@@ -22,8 +22,8 @@
 
 require 'slop'
 require 'rainbow'
+require 'backtrace'
 require_relative 'args'
-require_relative '../backtrace'
 require_relative '../age'
 require_relative '../log'
 require_relative '../id'

data/lib/zold/commands/node.rb

@@ -22,10 +22,10 @@
 
 require 'open3'
 require 'slop'
+require 'backtrace'
 require_relative '../version'
 require_relative '../age'
 require_relative '../score'
-require_relative '../backtrace'
 require_relative '../metronome'
 require_relative '../wallet'
 require_relative '../wallets'

data/lib/zold/copies.rb

@@ -22,11 +22,11 @@
 
 require 'time'
 require 'csv'
+require 'backtrace'
 require_relative 'atomic_file'
 require_relative 'log'
 require_relative 'size'
 require_relative 'wallet'
-require_relative 'backtrace'
 
 # The list of copies.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/lib/zold/http.rb

@@ -24,7 +24,7 @@ require 'rainbow'
 require 'uri'
 require 'timeout'
 require 'net/http'
-require_relative 'backtrace'
+require 'backtrace'
 require_relative 'version'
 require_relative 'type'
 

data/lib/zold/metronome.rb

@@ -20,10 +20,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'backtrace'
 require_relative 'log'
 require_relative 'age'
 require_relative 'verbose_thread'
-require_relative 'backtrace'
 
 # Background routines.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -41,7 +41,12 @@ module Zold
 
     def to_text
       @threads.map do |t|
-        "#{t.name}: status=#{t.status}; alive=#{t.alive?};\n  #{t.backtrace.join("\n  ")}"
+        [
+          "#{t.name}:",
+          "status=#{t.status};",
+          "alive=#{t.alive?};\n",
+          t.backtrace.nil? ? '---' : "  #{t.backtrace.join("\n  ")}"
+        ].join(' ')
       end.join("\n") + "\n\n" + @failures.map { |r, f| "#{r}\n#{f}\n" }.join("\n")
     end
 

data/lib/zold/node/farm.rb

@@ -22,11 +22,11 @@
 
 require 'time'
 require 'open3'
+require 'backtrace'
 require_relative '../log'
 require_relative '../score'
 require_relative '../age'
 require_relative '../verbose_thread'
-require_relative '../backtrace'
 require_relative '../atomic_file'
 
 # The farm of scores.

data/lib/zold/node/front.rb

@@ -31,7 +31,7 @@ require 'get_process_mem'
 require 'diffy'
 require 'usagewatch_ext'
 require 'concurrent'
-require_relative '../backtrace'
+require 'backtrace'
 require_relative '../version'
 require_relative '../size'
 require_relative '../wallet'

data/lib/zold/remotes.rb

@@ -26,7 +26,7 @@ require 'uri'
 require 'net/http'
 require 'time'
 require 'fileutils'
-require_relative 'backtrace'
+require 'backtrace'
 require_relative 'age'
 require_relative 'score'
 require_relative 'http'
@@ -114,7 +114,7 @@ module Zold
       end
 
       def assert_score_value(score, min)
-        raise "Score is too small (<#{min}): #{score}" if score.value < min
+        raise "Score #{score.value} is too small (<#{min}): #{score}" if score.value < min
       end
     end
 

data/lib/zold/verbose_thread.rb

@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'backtrace'
 require_relative 'log'
-require_relative 'backtrace'
 
 # Verbose thread.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.14.46'
+  VERSION = '0.14.47'
   PROTOCOL = 2
 end

data/test/test_metronome.rb

@@ -46,6 +46,13 @@ class TestMetronome < Minitest::Test
     end
   end
 
+  def test_prints_empty_to_text
+    metronome = Zold::Metronome.new(test_log)
+    metronome.start do |m|
+      assert(!m.to_text.nil?)
+    end
+  end
+
   def test_continues_even_after_error
     metronome = Zold::Metronome.new(test_log)
     routine = BrokenRoutine.new

data/zold.gemspec

@@ -54,6 +54,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.test_files = s.files.grep(%r{^(test|features)/})
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
+  s.add_runtime_dependency 'backtrace', '0.1.0'
   s.add_runtime_dependency 'cachy', '0.4.2'
   s.add_runtime_dependency 'concurrent-ruby', '~>1.0'
   s.add_runtime_dependency 'cucumber', '~>3.1' # has to stay here for Heroku

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.46
+  version: 0.14.47
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: backtrace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: cachy
   requirement: !ruby/object:Gem::Requirement
@@ -475,7 +489,6 @@ files:
 - lib/zold/age.rb
 - lib/zold/amount.rb
 - lib/zold/atomic_file.rb
-- lib/zold/backtrace.rb
 - lib/zold/cached_wallets.rb
 - lib/zold/commands/alias.rb
 - lib/zold/commands/args.rb
@@ -575,7 +588,6 @@ files:
 - test/test_age.rb
 - test/test_amount.rb
 - test/test_atomic_file.rb
-- test/test_backtrace.rb
 - test/test_cached_wallets.rb
 - test/test_copies.rb
 - test/test_gem.rb
@@ -673,7 +685,6 @@ test_files:
 - test/test_age.rb
 - test/test_amount.rb
 - test/test_atomic_file.rb
-- test/test_backtrace.rb
 - test/test_cached_wallets.rb
 - test/test_copies.rb
 - test/test_gem.rb

data/lib/zold/backtrace.rb

@@ -1,44 +0,0 @@
-# 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.
-
-# Backtrace.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-module Zold
-  # Backtrace of an exception
-  class Backtrace
-    def initialize(error)
-      @error = error
-    end
-
-    def to_s
-      [
-        @error.class.name,
-        ': ',
-        @error.message,
-        "\n\t",
-        @error.backtrace.reverse.drop_while { |t| !t.include?('zold/') }.reverse.join("\n\t")
-      ].join
-    end
-  end
-end

data/test/test_backtrace.rb

@@ -1,42 +0,0 @@
-# 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.
-
-require 'minitest/autorun'
-require_relative '../lib/zold/backtrace'
-
-# Backtrace test.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-class TestBacktrace < Minitest::Test
-  def test_prints_backtrace
-    obj = Object.new
-    def obj.exec
-      raise 'Intended to be here'
-    end
-    obj.exec
-  rescue RuntimeError => e
-    text = Zold::Backtrace.new(e).to_s
-    assert(text.include?('Intended to be here'), text)
-    assert(!text.include?('lib/minitest'), text)
-  end
-end