zold 0.13.29 → 0.13.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5548665d483b173adbc56944626a2ae8f5a9b3c
-  data.tar.gz: 8599a6491f67845ef46da4fe915a5eabbc8fc9bf
+  metadata.gz: ee35d396502c3f5d87f9b65debca6c3e7bd498da
+  data.tar.gz: 5958504831a46a0a40d3cae2af06b26cc78e4c85
 SHA512:
-  metadata.gz: 2231e2653e8f83ea7adbf2322e3c70ee56884f8976f5e58cfafa3e2d6cf252f668211554231bc5302929fcf9f3cd05b38130c4ae595706d95ae5f1dd70ffa883
-  data.tar.gz: 17a0728fe33979c7670820e018806eb7000c820dab8b652f2569436841408ec746fd964e5ba0604d6d0ccaabd5dfe3cd6a71caf0f3de604fef952b0f818c0689
+  metadata.gz: 493b9c89a94e367e2b54fd441d3a7adb54e44db8b8110d7baee8f87cca5aa9027180c7140c331e7d78a195161f86db2ce6728a07a1f5af5dae86de7ada7be66b
+  data.tar.gz: 3dc8aff3511edd018766cc15e936f4c8ba9c416db82c27a031d760411b52a17cdff8cf2549d744230dfb6ba9238f3dad603788a8ad5647141d381ee2a7970c90

data/README.md

@@ -1,5 +1,7 @@
 <img src="http://www.zold.io/logo.svg" width="92px" height="92px"/>
 
+[![Donate via Zerocracy](https://www.0crat.com/contrib-badge/CAZPZR9FS.svg)](https://www.0crat.com/contrib/CAZPZR9FS)
+
 [![EO principles respected here](http://www.elegantobjects.org/badge.svg)](http://www.elegantobjects.org)
 [![Managed by Zerocracy](https://www.0crat.com/badge/CAZPZR9FS.svg)](https://www.0crat.com/p/CAZPZR9FS)
 [![DevOps By Rultor.com](http://www.rultor.com/b/yegor256/zold)](http://www.rultor.com/p/yegor256/zold)

data/lib/zold/remotes.rb

@@ -125,11 +125,17 @@ module Zold
 
     def exists?(host, port = Remotes::PORT)
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
+      raise 'Host can\'t be nil' if host.nil?
+      raise 'Port can\'t be nil' if port.nil?
       !load.find { |r| r[:host] == host.downcase && r[:port] == port }.nil?
     end
 
     def add(host, port = Remotes::PORT)
+      raise 'Host can\'t be nil' if host.nil?
+      raise 'Host can\'t be empty' if host.empty?
+      raise 'Port can\'t be nil' if port.nil?
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
+      raise 'Port can\'t be zero' if port.zero?
       raise 'Port can\'t be negative' if port < 0
       raise 'Port can\'t be over 65536' if port > 0xffff
       raise "#{host}:#{port} already exists" if exists?(host, port)
@@ -141,6 +147,8 @@ module Zold
 
     def remove(host, port = Remotes::PORT)
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
+      raise 'Host can\'t be nil' if host.nil?
+      raise 'Port can\'t be nil' if port.nil?
       raise "#{host}:#{port} is absent" unless exists?(host, port)
       list = load
       list.reject! { |r| r[:host] == host.downcase && r[:port] == port }
@@ -148,6 +156,8 @@ module Zold
     end
 
     def iterate(log, farm: Farm::Empty.new)
+      raise 'Log can\'t be nil' if log.nil?
+      raise 'Farm can\'t be nil' if farm.nil?
       best = farm.best[0]
       require_relative 'score'
       score = best.nil? ? Score::ZERO : best
@@ -165,6 +175,8 @@ module Zold
     end
 
     def errors(host, port = Remotes::PORT)
+      raise 'Host can\'t be nil' if host.nil?
+      raise 'Port can\'t be nil' if port.nil?
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       list = load
       raise "#{host}:#{port} is absent among #{list.count} remotes" unless exists?(host, port)
@@ -172,6 +184,8 @@ module Zold
     end
 
     def error(host, port = Remotes::PORT)
+      raise 'Host can\'t be nil' if host.nil?
+      raise 'Port can\'t be nil' if port.nil?
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       list = load
       raise "#{host}:#{port} is absent among #{list.count} remotes" unless exists?(host, port)
@@ -180,6 +194,9 @@ module Zold
     end
 
     def rescore(host, port, score)
+      raise 'Host can\'t be nil' if host.nil?
+      raise 'Port can\'t be nil' if port.nil?
+      raise 'Score can\'t be nil' if score.nil?
       raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       raise "#{host}:#{port} is absent" unless exists?(host, port)
       list = load
@@ -190,15 +207,18 @@ module Zold
     private
 
     def load
-      CSV.read(file).map do |r|
+      raw = CSV.read(file).map do |r|
         {
           host: r[0],
           port: r[1].to_i,
           score: r[2].to_i,
-          errors: r[3].to_i,
-          home: URI("http://#{r[0]}:#{r[1]}/")
+          errors: r[3].to_i
         }
       end
+      raw.reject { |r| !r[:host] || r[:port].zero? }.map do |r|
+        r[:home] = URI("http://#{r[0]}:#{r[1]}/")
+        r
+      end
     end
 
     def save(list)

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.13.29'.freeze
+  VERSION = '0.13.30'.freeze
 end

data/test/test_remotes.rb

@@ -39,6 +39,22 @@ class TestRemotes < Minitest::Test
     end
   end
 
+  def test_reads_broken_file
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'remotes')
+      [
+        ',0,0,0',
+        'some garbage',
+        '',
+        "\n\n\n\n"
+      ].each do |t|
+        File.write(file, t)
+        remotes = Zold::Remotes.new(file)
+        assert(remotes.all.empty?, remotes.all)
+      end
+    end
+  end
+
   def test_iterates_and_fails
     Dir.mktmpdir 'test' do |dir|
       file = File.join(dir, 'remotes')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.13.29
+  version: 0.13.30
 platform: ruby
 authors:
 - Yegor Bugayenko