zold 0.14.39 → 0.14.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13cff3999d82e0c3230da3fe717537fdef3337e4
-  data.tar.gz: 307f20cb6d1cf11c963f94cae910540dac9f473a
+  metadata.gz: d7b45f4c26031db16e0648325a3bb697fd815f30
+  data.tar.gz: 4ef739093a92027005789d04be4b70e2607eed47
 SHA512:
-  metadata.gz: bdcbe7adf732ea4aea112322a56420a1197aad5640dcd5f330ce3b0315be4021832aac1d5ed4e2d07642f141748b6e08ac7e52b1ad5085da2f5b12fabd7b0e56
-  data.tar.gz: 379b7ec0f166019354cd3ea276edbd455baff582ea8ca3f024eb0b307d3a6e5485021a7cc3beea3eb6a59d13a0aa62bb6a4fd22e084bb654758f8bb1759b05fc
+  metadata.gz: aee52e4cd446e7c235f3edf8fbd4a0116772c02e0983e33f010424f286daa7fe6cfeae243d7d7d8cbef471c7a734bfb58464e9dc1a1a1d60196279885e891056
+  data.tar.gz: ad64f721708ac64e46ab64c3e3276cce4e429f6d98cf52b6d9d213f30f916060af9af49f85ffb000ec8c91797c34d731f4e78d8f29c23461c2ae7ba102ed3b6d

data/.rultor.yml

@@ -3,6 +3,8 @@ assets:
   id_rsa: zerocracy/home#assets/heroku-key
   id_rsa.pub: zerocracy/home#assets/heroku-key.pub
 install: |
+  export GEM_HOME=~/.ruby
+  export GEM_PATH=$GEM_HOME:$GEM_PATH
   sudo apt-get -y update
   sudo gem install pdd
 release:
@@ -11,8 +13,8 @@ release:
     [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1
     rm -rf *.gem
     sed -i "s/0\.0\.0/${tag}/g" lib/zold/version.rb
-    bundle install
-    rake --quiet
+    bundle install --no-color
+    rake
     git add lib/zold/version.rb
     git commit -m "version set to ${tag}"
     gem build zold.gemspec

data/bin/zold

@@ -176,6 +176,8 @@ Available options:"
   remotes = Zold::Remotes.new(file: File.join(zoldata, 'remotes'), network: opts['network'])
   copies = File.join(zoldata, 'copies')
 
+  log.debug("Network: #{opts['network']}")
+
   case command
   when 'node'
     require_relative '../lib/zold/commands/node'

data/lib/zold/commands/fetch.rb

@@ -104,10 +104,11 @@ Available options:"
         @log.debug("#{r} ignored because of --ignore-node")
         return 0
       end
-      res = r.http("/wallet/#{id}").get
+      uri = "/wallet/#{id}"
+      res = r.http(uri).get
       raise "Wallet #{id} not found" if res.code == '404'
       r.assert_code(200, res)
-      json = JsonPage.new(res.body).to_hash
+      json = JsonPage.new(res.body, uri).to_hash
       score = Score.parse_json(json['score'])
       r.assert_valid_score(score)
       r.assert_score_ownership(score)

data/lib/zold/commands/pay.rb

@@ -78,7 +78,7 @@ Available options:"
       raise 'Amount is required (in ZLD) as the third argument' if mine[2].nil?
       amount = Amount.new(zld: mine[2].to_f)
       details = mine[3] || '-'
-      taxes(id)
+      taxes(id, opts)
       @wallets.find(id) do |from|
         pay(from, invoice, amount, details, opts)
       end
@@ -89,7 +89,7 @@ Available options:"
 
     private
 
-    def taxes(id)
+    def taxes(id, opts)
       debt = @wallets.find(id) do |wallet|
         raise "Wallet #{id} doesn't exist, do 'zold pull' first" unless wallet.exists?
         Tax.new(wallet).in_debt? && !opts['dont-pay-taxes']

data/lib/zold/commands/push.rb

@@ -91,7 +91,8 @@ total score for #{id} is #{total}")
         raise "The wallet #{id} is absent" unless wallet.exists?
         AtomicFile.new(wallet.path).read
       end
-      response = r.http("/wallet/#{id}#{opts['sync'] ? '?sync=true' : ''}").put(content)
+      uri = "/wallet/#{id}"
+      response = r.http(uri).put(content)
       @wallets.find(id) do |wallet|
         if response.code == '304'
           @log.info("#{r}: same version #{content.length}b/#{wallet.txns.count}t \
@@ -99,7 +100,7 @@ of #{wallet.id} there, in #{(Time.now - start).round(2)}s")
           return 0
         end
         r.assert_code(200, response)
-        json = JsonPage.new(response.body).to_hash
+        json = JsonPage.new(response.body, uri).to_hash
         score = Score.parse_json(json['score'])
         r.assert_valid_score(score)
         r.assert_score_ownership(score)

data/lib/zold/commands/remote.rb

@@ -183,9 +183,10 @@ Available options:"
     def elect(opts)
       scores = []
       @remotes.iterate(@log, farm: @farm) do |r|
-        res = r.http('/').get
+        uri = '/'
+        res = r.http(uri).get
         r.assert_code(200, res)
-        json = JsonPage.new(res.body).to_hash
+        json = JsonPage.new(res.body, uri).to_hash
         score = Score.parse_json(json['score'])
         r.assert_valid_score(score)
         r.assert_score_ownership(score)
@@ -216,9 +217,10 @@ Available options:"
       capacity = []
       @remotes.iterate(@log, farm: @farm) do |r|
         start = Time.now
-        res = r.http('/remotes').get
+        uri = '/remotes'
+        res = r.http(uri).get
         r.assert_code(200, res)
-        json = JsonPage.new(res.body).to_hash
+        json = JsonPage.new(res.body, uri).to_hash
         score = Score.parse_json(json['score'])
         r.assert_valid_score(score)
         r.assert_score_ownership(score)

data/lib/zold/commands/taxes.rb

@@ -139,9 +139,10 @@ Available options:"
     def top_scores
       best = []
       @remotes.iterate(@log) do |r|
-        res = r.http.get
+        uri = '/'
+        res = r.http(uri).get
         r.assert_code(200, res)
-        json = JsonPage.new(res.body).to_hash
+        json = JsonPage.new(res.body, uri).to_hash
         score = Score.parse_json(json['score'])
         r.assert_valid_score(score)
         r.assert_score_strength(score)

data/lib/zold/gem.rb

@@ -21,8 +21,9 @@
 # SOFTWARE.
 
 require 'uri'
-require 'net/http'
 require_relative 'json_page'
+require_relative 'http'
+require_relative 'score'
 
 # Class representing the Zold gem on Rubygems
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -31,16 +32,10 @@ require_relative 'json_page'
 module Zold
   # Gem
   class Gem
-    BASE_URI = 'rubygems.org'
-    API_VERSION = '/api/v1/'
-
     def last_version
-      uri = URI(API_VERSION + 'versions/zold/latest.json')
-      http = Net::HTTP.new(BASE_URI)
-      path = uri.path
-      path += '?' + uri.query if uri.query
-      res = http.request_get(path)
-      JsonPage.new(res.body).to_hash['version']
+      JsonPage.new(
+        Http.new(uri: 'https://rubygems.org/api/v1/versions/zold/latest.json', score: Score::ZERO).get.body
+      ).to_hash['version']
     end
   end
 end

data/lib/zold/http.rb

@@ -25,7 +25,6 @@ require 'uri'
 require 'net/http'
 require_relative 'backtrace'
 require_relative 'version'
-require_relative 'score'
 require_relative 'type'
 
 # HTTP page.
@@ -72,6 +71,7 @@ module Zold
 
     def get
       http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme == 'https'
       http.read_timeout = Http::READ_TIMEOUT
       http.open_timeout = Http::CONNECT_TIMEOUT
       path = uri.path
@@ -83,6 +83,7 @@ module Zold
 
     def put(body)
       http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme == 'https'
       http.read_timeout = Http::READ_TIMEOUT
       http.open_timeout = Http::CONNECT_TIMEOUT
       path = uri.path
@@ -106,6 +107,10 @@ module Zold
         @ex = ex
       end
 
+      def to_s
+        "#{code}: #{message}\n#{body}"
+      end
+
       def body
         Backtrace.new(@ex).to_s
       end

data/lib/zold/json_page.rb

@@ -29,17 +29,18 @@ require 'json'
 module Zold
   # JSON page
   class JsonPage
-    def initialize(text)
+    def initialize(text, uri = '')
       raise 'JSON text can\'t be nil' if text.nil?
       raise 'JSON must be of type String' unless text.is_a?(String)
       @text = text
+      @uri = uri
     end
 
     def to_hash
-      raise 'JSON is empty, can\'t parse' if @text.empty?
+      raise 'JSON is empty, can\'t parse' + (@uri.empty? ? '' : " at #{@uri}") if @text.empty?
       JSON.parse(@text)
     rescue JSON::ParserError => e
-      raise "Failed to parse JSON (#{e.message}): #{@text}"
+      raise "Failed to parse JSON #{@uri.empty? ? '' : "at #{@uri}"} (#{e.message}): #{@text}"
     end
   end
 end

data/lib/zold/node/front.rb

@@ -193,7 +193,7 @@ while #{settings.address} is in '#{settings.network}'"
       settings.wallets.find(id) do |wallet|
         error 404 unless wallet.exists?
         content_type 'application/json'
-        {
+        JSON.pretty_generate(
           version: settings.version,
           alias: settings.node_alias,
           protocol: settings.protocol,
@@ -206,7 +206,7 @@ while #{settings.address} is in '#{settings.network}'"
           copies: Copies.new(File.join(settings.copies, id)).all.count,
           balance: wallet.balance.to_i,
           body: AtomicFile.new(wallet.path).read
-        }.to_json
+        )
       end
     end
 
@@ -215,7 +215,7 @@ while #{settings.address} is in '#{settings.network}'"
       settings.wallets.find(id) do |wallet|
         error 404 unless wallet.exists?
         content_type 'application/json'
-        {
+        JSON.pretty_generate(
           version: settings.version,
           alias: settings.node_alias,
           protocol: settings.protocol,
@@ -227,7 +227,7 @@ while #{settings.address} is in '#{settings.network}'"
           digest: wallet.digest,
           balance: wallet.balance.to_i,
           txns: wallet.txns.count
-        }.to_json
+        )
       end
     end
 
@@ -350,7 +350,8 @@ while #{settings.address} is in '#{settings.network}'"
         version: settings.version,
         alias: settings.node_alias,
         score: score.to_h,
-        all: settings.remotes.all
+        all: settings.remotes.all,
+        mtime: settings.remotes.mtime.utc.iso8601
       )
     end
 

data/lib/zold/remotes.rb

@@ -39,7 +39,7 @@ require_relative 'type'
 # License:: MIT
 module Zold
   # All remotes
-  class Remotes
+  class Remotes < Dry::Struct
     # The default TCP port all nodes are supposed to use.
     PORT = 4096
 
@@ -49,6 +49,13 @@ module Zold
     # Default number of nodes to fetch.
     MAX_NODES = 16
 
+    # Mutex object
+    MUTEX = Mutex.new
+
+    attribute :file, Types::Strict::String
+    attribute :network, Types::Strict::String.optional.default('test')
+    attribute :timeout, Types::Strict::Integer.optional.default(16)
+
     # Empty, for standalone mode
     class Empty < Remotes
       def all
@@ -58,13 +65,17 @@ module Zold
       def iterate(_)
         # Nothing to do here
       end
+
+      def mtime
+        Time.now
+      end
     end
 
     # One remote.
     class Remote < Dry::Struct
       attribute :host, Types::Strict::String
       attribute :port, Types::Strict::Integer.constrained(gteq: 0, lt: 65_535)
-      attribute :score, Object
+      attribute :score, Score
       attribute :idx, Types::Strict::Integer
       attribute :network, Types::Strict::String.optional.default('test')
       attribute :log, (Types::Class.constructor do |value|
@@ -106,24 +117,15 @@ module Zold
       end
     end
 
-    def initialize(file:, network: 'test', mutex: Mutex.new, timeout: 16)
-      @file = file
-      @network = network
-      @mutex = mutex
-      @timeout = timeout
-    end
-
     def all
-      @mutex.synchronize do
-        list = load
-        max_score = list.map { |r| r[:score] }.max || 0
-        max_score = 1 if max_score.zero?
-        max_errors = list.map { |r| r[:errors] }.max || 0
-        max_errors = 1 if max_errors.zero?
-        list.sort_by do |r|
-          (1 - r[:errors] / max_errors) * 5 + (r[:score] / max_score)
-        end.reverse
-      end
+      list = load
+      max_score = list.map { |r| r[:score] }.max || 0
+      max_score = 1 if max_score.zero?
+      max_errors = list.map { |r| r[:errors] }.max || 0
+      max_errors = 1 if max_errors.zero?
+      list.sort_by do |r|
+        (1 - r[:errors] / max_errors) * 5 + (r[:score] / max_score)
+      end.reverse
     end
 
     def clean
@@ -131,10 +133,10 @@ module Zold
     end
 
     def reset
-      FileUtils.mkdir_p(File.dirname(@file))
+      FileUtils.mkdir_p(File.dirname(file))
       FileUtils.copy(
         File.join(File.dirname(__FILE__), '../../resources/remotes'),
-        @file
+        file
       )
     end
 
@@ -154,7 +156,7 @@ module Zold
       raise 'Port can\'t be negative' if port.negative?
       raise 'Port can\'t be over 65536' if port > 0xffff
       modify do |list|
-        list + [{ host: host.downcase, port: port, score: 0 }]
+        list + [{ host: host.downcase, port: port, score: 0, errors: 0 }]
       end
     end
 
@@ -189,10 +191,10 @@ module Zold
               score: score,
               idx: idx,
               log: log,
-              network: @network
+              network: network
             )
             idx += 1
-            raise 'Took too long to execute' if (Time.now - start).round > @timeout
+            raise 'Took too long to execute' if (Time.now - start).round > timeout
           rescue StandardError => e
             error(r[:host], r[:port])
             log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message} \
@@ -221,10 +223,14 @@ in #{(Time.now - start).round}s")
       if_present(host, port) { |r| r[:score] = score }
     end
 
+    def mtime
+      File.mtime(file)
+    end
+
     private
 
     def modify
-      @mutex.synchronize do
+      Remotes::MUTEX.synchronize do
         save(yield(load))
       end
     end
@@ -239,13 +245,13 @@ in #{(Time.now - start).round}s")
     end
 
     def load
-      reset unless File.exist?(@file)
-      raw = CSV.read(@file).map do |r|
+      reset unless File.exist?(file)
+      raw = CSV.read(file).map do |row|
         {
-          host: r[0],
-          port: r[1].to_i,
-          score: r[2].to_i,
-          errors: r[3].to_i
+          host: row[0],
+          port: row[1].to_i,
+          score: row[2].to_i,
+          errors: row[3].to_i
         }
       end
       raw.reject { |r| !r[:host] || r[:port].zero? }.map do |r|
@@ -255,7 +261,7 @@ in #{(Time.now - start).round}s")
     end
 
     def save(list)
-      AtomicFile.new(@file).write(
+      AtomicFile.new(file).write(
         list.uniq { |r| "#{r[:host]}:#{r[:port]}" }.map do |r|
           [
             r[:host],

data/lib/zold/score.rb

@@ -22,7 +22,6 @@
 
 require 'openssl'
 require 'time'
-require_relative 'remotes'
 require_relative 'type'
 
 # The score.

data/lib/zold/version.rb

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

data/test/commands/test_remote.rb

@@ -61,7 +61,7 @@ class TestRemote < Minitest::Test
       stub_request(:get, 'http://localhost:999/remotes').to_return(
         status: 404
       )
-      stub_request(:get, 'http://rubygems.org/api/v1/versions/zold/latest.json').to_return(
+      stub_request(:get, 'https://rubygems.org/api/v1/versions/zold/latest.json').to_return(
         status: 200,
         body: '{"version": "0.0.0"}'
       )
@@ -90,7 +90,7 @@ class TestRemote < Minitest::Test
           ]
         }.to_json
       )
-      stub_request(:get, 'http://rubygems.org/api/v1/versions/zold/latest.json').to_return(
+      stub_request(:get, 'https://rubygems.org/api/v1/versions/zold/latest.json').to_return(
         status: 200,
         body: '{"version": "9.9.9"}'
       )
@@ -101,7 +101,7 @@ class TestRemote < Minitest::Test
       cmd.run(['remote', 'update', '--ignore-score-weakness', '--skip-ping', '--reboot'])
       assert(log.msg.to_s.include?(', reboot!'))
       log.msg = []
-      stub_request(:get, 'http://rubygems.org/api/v1/versions/zold/latest.json').to_return(
+      stub_request(:get, 'https://rubygems.org/api/v1/versions/zold/latest.json').to_return(
         status: 200,
         body: "{\"version\": \"#{Zold::VERSION}\"}"
       )
@@ -149,7 +149,7 @@ class TestRemote < Minitest::Test
           ]
         }.to_json
       )
-      stub_request(:get, 'http://rubygems.org/api/v1/versions/zold/latest.json').to_return(
+      stub_request(:get, 'https://rubygems.org/api/v1/versions/zold/latest.json').to_return(
         status: 200,
         body: '{"version": "0.0.0"}'
       )

data/test/node/test_front.rb

@@ -87,6 +87,11 @@ class FrontTest < Minitest::Test
       response = Zold::Http.new(uri: "http://localhost:#{port}/remotes", score: score).get
       assert_equal('200', response.code, response.body)
       assert_equal(1, Zold::JsonPage.new(response.body).to_hash['all'].count, response.body)
+      assert_match(
+        /(\d{4})-(\d{2})-(\d{2})T(\d{2})\:(\d{2})\:(\d{2})Z/,
+        Zold::JsonPage.new(response.body).to_hash['mtime'].to_s,
+        response.body
+      )
     end
   end
 

data/test/test_gem.rb

@@ -6,12 +6,16 @@ require 'minitest/autorun'
 
 class TestGem < Minitest::Test
   def test_last_version
-    gem = Zold::Gem.new
     version = (1..3).map { rand(9).to_s } .join('.')
-    stub_request(:get, 'http://rubygems.org/api/v1/versions/zold/latest.json').to_return(
+    stub_request(:get, 'https://rubygems.org/api/v1/versions/zold/latest.json').to_return(
       status: 200,
       body: "{\"version\": \"#{version}\"}"
     )
-    assert_equal(version, gem.last_version)
+    assert_equal(version, Zold::Gem.new.last_version)
+  end
+
+  def test_last_version_live
+    WebMock.allow_net_connect!
+    assert(!Zold::Gem.new.last_version.nil?)
   end
 end

data/test/test_remotes.rb

@@ -173,6 +173,27 @@ class TestRemotes < Minitest::Test
     end
   end
 
+  def test_mtime
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'remotes')
+      FileUtils.touch(file)
+      File.stub :mtime, Time.mktime(2018, 1, 1) do
+        remotes = Zold::Remotes.new(file: file)
+        remotes.add('127.0.0.1')
+        assert_equal(Time.mktime(2018, 1, 1), remotes.mtime)
+      end
+    end
+  end
+
+  def test_read_mtime_from_file
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'remotes')
+      remotes = Zold::Remotes.new(file: file)
+      remotes.all
+      assert_equal(File.mtime(file).to_i, remotes.mtime.to_i)
+    end
+  end
+
   def test_adds_from_many_threads
     Dir.mktmpdir do |dir|
       remotes = Zold::Remotes.new(file: File.join(dir, 'xx.csv'))
@@ -202,8 +223,11 @@ class TestRemotes < Minitest::Test
   end
 
   def test_empty_remotes
-    remotes = Zold::Remotes::Empty.new(file: '/tmp/empty')
-    assert(remotes.is_a?(Zold::Remotes))
+    Time.stub :now, Time.mktime(2018, 1, 1) do
+      remotes = Zold::Remotes::Empty.new(file: '/tmp/empty')
+      assert_equal(Time.mktime(2018, 1, 1), remotes.mtime)
+      assert(remotes.is_a?(Zold::Remotes))
+    end
   end
 
   def test_reports_zold_error_header
@@ -222,4 +246,17 @@ class TestRemotes < Minitest::Test
       end
     end
   end
+
+  def test_manifests_correct_network_name
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'uu-083.csv'), network: 'x13')
+      remotes.clean
+      remotes.add('r5-example.org', 8080)
+      stub_request(:get, 'http://r5-example.org:8080/').to_return(status: 200)
+      remotes.iterate(test_log) do |r|
+        r.http.get
+      end
+      assert_requested(:get, 'http://r5-example.org:8080/', headers: { 'X-Zold-Network' => 'x13' })
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.39
+  version: 0.14.40
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cachy
@@ -606,7 +606,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 2
 summary: A fast cryptocurrency for micro payments