zold 0.22.8 → 0.22.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42ca9062c455774b1da44e1cec93e5bfaffd9e56669f0c74322a14b96e2c6818
-  data.tar.gz: 442934756ba12ed8c947c0331f4852c18529f2afdaf4512e40c6e406a7eb638c
+  metadata.gz: 42d10a8522bef20fb7b2c55c247ecc7e5880ff8b54f3de789757a66f93ae5473
+  data.tar.gz: 36961cafd7fb37eb88790efca940a8181b9ec57c42808bbb8b6a3d6766b70c44
 SHA512:
-  metadata.gz: 328d923df8f83833584ccc83c17e4c589f4830aba44c899e00ca6b47aeeba6e76f834efd7e4a5f7c58589f719805fa6e62763a4938f5872a6468aad312533898
-  data.tar.gz: 07ee1516be6327e02b018db91cbc8ad3c1b7fbb0800e4d282e3ad5c98d53e1aaabeb0969fcfe605dfe18d5b7955c2dc88da7d993d0c3ef04016a5ba65d67c5c6
+  metadata.gz: 44792c5bec30388fd5cbaf793ab5a7ac6254aaf6e52ff2ee0574fb2d158144fc832e63bcd1c91bc349b3403e0931dc6b8db717570e4fd6ebd61be324e2574750
+  data.tar.gz: c87eabcbd062862ef4538a50c1e4eb3da11e82bcbacb703e935e76ef3647934156f6e3d53f08171b1a753b2f953eb19ee243293d15b0cd44bdd9930714e37209

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.0

data/lib/zold/age.rb

@@ -54,7 +54,13 @@ module Zold
       return "#{(sec * 1000).round}ms" if sec < 1
       return "#{sec.round(2)}s" if sec < 60
       return "#{(sec / 60).round}m" if sec < 60 * 60
-      "#{(sec / 3600).round}h"
+      hours = (sec / 3600).round
+      return "#{hours}h" if hours < 24
+      days = (hours / 24).round
+      return "#{days}d" if days < 14
+      return "#{(days / 7).round}w" if days < 40
+      return "#{(days / 30).round}mo" if days < 365
+      "#{(days / 365).round}y"
     end
   end
 end

data/lib/zold/commands/pay.rb

@@ -57,6 +57,9 @@ Available options:"
           'The location of RSA private key (default: ~/.ssh/id_rsa)',
           require: true,
           default: File.expand_path('~/.ssh/id_rsa')
+        o.string '--network',
+          'The name of the network we work in',
+          default: 'test'
         o.bool '--force',
           'Ignore all validations',
           default: false
@@ -85,7 +88,7 @@ Available options:"
       unless invoice.include?('@')
         require_relative 'invoice'
         invoice = Invoice.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
-          ['invoice', invoice, "--tolerate-quorum=#{opts['tolerate-quorum']}"] +
+          ['invoice', invoice, "--tolerate-quorum=#{opts['tolerate-quorum']}", "--network=#{opts['network']}"] +
           (opts['tolerate-edges'] ? ['--tolerate-edges'] : [])
         )
       end

data/lib/zold/commands/push.rb

@@ -153,7 +153,7 @@ out of #{nodes.value} in #{Age.new(start)}, total score for #{id} is #{total.val
           r.http(uri).put(f)
         end
         if response.status == 304
-          @log.info("#{r}: same version of #{@wallets.acq(id, &:mnemo)} there, didn't push
+          @log.info("#{r}: same version of #{@wallets.acq(id, &:mnemo)} there, didn't push \
 in #{Age.new(start, limit: 0.5)}")
           return 0
         end

data/lib/zold/txn.rb

@@ -81,14 +81,14 @@ module Zold
       raise 'The bnf has to be of type Id' unless bnf.is_a?(Id)
       @bnf = bnf
       raise 'Prefix can\'t be NIL' if prefix.nil?
-      raise "Prefix is too short: \"#{prefix}\"" if prefix.length < 8
-      raise "Prefix is too long: \"#{prefix}\"" if prefix.length > 32
-      raise "Prefix is wrong: \"#{prefix}\" (#{RE_PREFIX})" unless REGEX_PREFIX.match?(prefix)
+      raise "Prefix is too short: #{prefix.inspect}" if prefix.length < 8
+      raise "Prefix is too long: #{prefix.inspect}" if prefix.length > 32
+      raise "Prefix is wrong: #{prefix.inspect} (#{RE_PREFIX})" unless REGEX_PREFIX.match?(prefix)
       @prefix = prefix
       raise 'Details can\'t be NIL' if details.nil?
       raise 'Details can\'t be empty' if details.empty?
-      raise "Details are too long: \"#{details}\"" if details.length > 512
-      raise "Wrong details \"#{details}\" (#{RE_DETAILS})" unless REGEX_DETAILS.match?(details)
+      raise "Details are too long: #{details.inspect}" if details.length > 512
+      raise "Wrong details #{details.inspect} (#{RE_DETAILS})" unless REGEX_DETAILS.match?(details)
       @details = details
     end
 

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.22.8'
+  VERSION = '0.22.9'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

data/test/test_age.rb

@@ -35,4 +35,21 @@ class TestAge < Zold::Test
     assert_equal('?', Zold::Age.new(nil).to_s)
     assert(!Zold::Age.new(Time.now.utc.iso8601).to_s.nil?)
   end
+
+  def test_prints_all_ages
+    [
+      0,
+      1,
+      63,
+      63 * 60,
+      27 * 60 * 60,
+      13 * 24 * 60 * 60,
+      30 * 24 * 60 * 60,
+      5 * 30 * 24 * 60 * 60,
+      15 * 30 * 24 * 60 * 60,
+      8 * 12 * 30 * 24 * 60 * 60
+    ].each do |s|
+      assert(!Zold::Age.new(Time.now - s).to_s.nil?)
+    end
+  end
 end

data/test/test_txn.rb

@@ -63,15 +63,20 @@ class TestTxn < Zold::Test
   end
 
   def test_accepts_text_as_details
-    details = 'How are you, dude?! I\'m @yegor256: *_hello_'
-    txn = Zold::Txn.parse(
-      Zold::Txn.new(
-        123, Time.now, Zold::Amount.new(zld: -99.95),
-        'NOPREFIX', Zold::Id.new,
-        details
-      ).to_s
-    )
-    assert_equal(details, txn.details)
+    [
+      'How are you, dude?! I\'m @yegor256: *_hello_',
+      'For a pizza to my friend: John! Good? Works.',
+      'ZLD exchange to 0.00104 BTC at 3NimQKG2kuseH3cz3hdbdEHbqai9kj, rate is 0.00026, fee is 0.08'
+    ].each do |details|
+      txn = Zold::Txn.parse(
+        Zold::Txn.new(
+          123, Time.now, Zold::Amount.new(zld: -99.95),
+          'NOPREFIX', Zold::Id.new,
+          details
+        ).to_s
+      )
+      assert_equal(details, txn.details)
+    end
   end
 
   def test_prints_and_parses_time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.22.8
+  version: 0.22.9
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -751,7 +751,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.22.8!
+  Thanks for installing Zold 0.22.9!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try ZLD online wallet at: https://wts.zold.io