judges 0.15.6 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d43bd3ebf5cea4ae2ca7c8d5deb723e01730ea24a2b849e5a7601049b354a3f
-  data.tar.gz: 5b7e845e02b248d8d3eb6c877ee29e7fa92a423eb472aada3112d4efa772feb4
+  metadata.gz: 6fde2252d089419bf5cb20dabc6368db3b70b7a7e6fb116624b3ec2f04811544
+  data.tar.gz: 80accd532717b42f176b2bcfc9510610e1dc43d9396ed670196782b923ef2c70
 SHA512:
-  metadata.gz: 2e263f81a023f86ac28fd69d122120e29c74adc91ba141d65ec9bfb76266c89b9d072f5134b858c089f43d136ca53fee5fff0c93cf40d453970c8fc8f25a84d0
-  data.tar.gz: d36e3c2b7e80a15d2194645e8756adfdd6077e1895e6d9e6035c421842be38f04e2ce6188a3672ea3d8c0ef590ff1d5362adc547d31d55c88709ad1dc6dc77cd
+  metadata.gz: 3bbdd338bea78fe3d8890b7f581d80081828e3391b738fdbf7a507751f5fab1897764e13dea952ecb5fa2c210c2baa577fb72b1b4d5b6e3994aec49d78eea1b4
+  data.tar.gz: 1e514af2b34b531fbdc70337d3183aeb54d47f8127cda4145ce735724dc7a029e237e09b3c445876c413c1e3c0c660015c648bceef20661fb8b430e00d739692

data/Gemfile

@@ -31,7 +31,7 @@ gem 'random-port', '~>0.0', require: false
 gem 'rspec-rails', '6.1.3', require: false
 gem 'rubocop', '1.65.0', require: false
 gem 'rubocop-performance', '1.21.1', require: false
-gem 'rubocop-rspec', '3.0.2', require: false
+gem 'rubocop-rspec', '3.0.3', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false
 gem 'webmock', '3.23.1', require: false

data/Gemfile.lock

@@ -2,17 +2,17 @@ PATH
   remote: .
   specs:
     judges (0.0.0)
-      backtrace
+      backtrace (~> 0)
       concurrent-ruby (~> 1.2)
-      factbase
+      factbase (~> 0)
       gli (~> 2.21)
-      iri
-      loog
+      iri (~> 0)
+      loog (~> 0)
       moments (~> 0.3)
       nokogiri (~> 1.10)
-      others
-      retries
-      tago
+      others (~> 0)
+      retries (~> 0)
+      tago (~> 0)
       typhoeus (~> 1.3)
 
 GEM
@@ -216,7 +216,7 @@ GEM
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.2)
+    rubocop-rspec (3.0.3)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
@@ -267,7 +267,7 @@ DEPENDENCIES
   rspec-rails (= 6.1.3)
   rubocop (= 1.65.0)
   rubocop-performance (= 1.21.1)
-  rubocop-rspec (= 3.0.2)
+  rubocop-rspec (= 3.0.3)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)
   webmock (= 3.23.1)

data/bin/judges

@@ -177,6 +177,10 @@ class App
     c.switch([:ssl], default_value: true)
     c.desc 'A unique name to use for a lock/unlock'
     c.flag([:owner], default_value: 'default', type: String)
+    c.desc 'Supplementary meta information about the upload (key:value)'
+    c.flag([:meta], type: String, multiple: true)
+    c.desc 'How many times to retry'
+    c.flag([:retries], type: Integer, default_value: 3)
     c.action do |global, options, args|
       require_relative '../lib/judges/commands/push'
       Judges::Push.new(loog).run(options, args)
@@ -199,6 +203,8 @@ class App
     c.switch([:ssl], default_value: true)
     c.desc 'A unique name to use for a lock/unlock'
     c.flag([:owner], default_value: 'default', type: String)
+    c.desc 'How many times to retry'
+    c.flag([:retries], type: Integer, default_value: 3)
     c.action do |global, options, args|
       require_relative '../lib/judges/commands/pull'
       Judges::Pull.new(loog).run(options, args)

data/features/push.feature

@@ -6,7 +6,6 @@ Feature: Push
     Given I make a temp directory
     Then I run bin/judges with "--verbose eval simple.fb '(0..1000).each { $fb.insert.foo = 42 }'"
     And Exit code is zero
-    Then I run bin/judges with "push --token 00000000-0000-0000-0000-000000000000 simple simple.fb"
+    Then I run bin/judges with "push --token 00000000-0000-0000-0000-000000000000 --meta a:b --meta foo:bar --meta=pages_url:https://zerocracy.github.io/zerocracy.html --meta=duration:1055  simple simple.fb"
     Then Stdout contains "Pushed"
     And Exit code is zero
-

data/judges.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=3.2'
   s.name = 'judges'
-  s.version = '0.15.6'
+  s.version = '0.17.0'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =
@@ -42,17 +42,17 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_dependency 'backtrace'
+  s.add_dependency 'backtrace', '~>0'
   s.add_dependency 'concurrent-ruby', '~>1.2'
-  s.add_dependency 'factbase'
+  s.add_dependency 'factbase', '~>0'
   s.add_dependency 'gli', '~>2.21'
-  s.add_dependency 'iri'
-  s.add_dependency 'loog'
+  s.add_dependency 'iri', '~>0'
+  s.add_dependency 'loog', '~>0'
   s.add_dependency 'moments', '~>0.3'
   s.add_dependency 'nokogiri', '~>1.10'
-  s.add_dependency 'others'
-  s.add_dependency 'retries'
-  s.add_dependency 'tago'
+  s.add_dependency 'others', '~>0'
+  s.add_dependency 'retries', '~>0'
+  s.add_dependency 'tago', '~>0'
   s.add_dependency 'typhoeus', '~>1.3'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/judges/baza.rb

@@ -24,6 +24,7 @@ require 'typhoeus'
 require 'retries'
 require 'iri'
 require 'loog'
+require 'base64'
 require_relative '../judges'
 require_relative '../judges/elapsed'
 
@@ -33,7 +34,7 @@ require_relative '../judges/elapsed'
 # License:: MIT
 class Judges::Baza
   # rubocop:disable Metrics/ParameterLists
-  def initialize(host, port, token, ssl: true, timeout: 30, loog: Loog::NULL)
+  def initialize(host, port, token, ssl: true, timeout: 30, retries: 3, loog: Loog::NULL)
     # rubocop:enable Metrics/ParameterLists
     @host = host
     @port = port
@@ -41,20 +42,25 @@ class Judges::Baza
     @token = token
     @timeout = timeout
     @loog = loog
+    @retries = retries
   end
 
-  def push(name, data)
+  def push(name, data, meta)
     id = 0
+    hdrs = headers.merge(
+      'Content-Type' => 'application/octet-stream',
+      'Content-Length' => data.size
+    )
+    unless meta.empty?
+      hdrs = hdrs.merge('X-Zerocracy-Meta' => meta.map { |v| Base64.encode64(v).gsub("\n", '') }.join(' '))
+    end
     elapsed(@loog) do
-      ret = with_retries do
+      ret = with_retries(max_tries: @retries) do
         checked(
           Typhoeus::Request.put(
             home.append('push').append(name).to_s,
             body: data,
-            headers: headers.merge(
-              'Content-Type' => 'application/octet-stream',
-              'Content-Length' => data.size
-            ),
+            headers: hdrs,
             connecttimeout: @timeout,
             timeout: @timeout
           )
@@ -82,7 +88,9 @@ class Judges::Baza
           request.on_body do |chunk|
             f.write(chunk)
           end
-          request.run
+          with_retries(max_tries: @retries) do
+            request.run
+          end
           checked(request.response)
         end
         data = File.binread(file)
@@ -96,7 +104,7 @@ class Judges::Baza
   def finished?(id)
     finished = false
     elapsed(@loog) do
-      ret = with_retries do
+      ret = with_retries(max_tries: @retries) do
         checked(
           Typhoeus::Request.get(
             home.append('finished').append(id).to_s,
@@ -113,7 +121,7 @@ class Judges::Baza
   # Lock the name.
   def lock(name, owner)
     elapsed(@loog) do
-      with_retries do
+      with_retries(max_tries: @retries) do
         checked(
           Typhoeus::Request.get(
             home.append('lock').append(name).add(owner:).to_s,
@@ -128,7 +136,7 @@ class Judges::Baza
   # Unlock the name.
   def unlock(name, owner)
     elapsed(@loog) do
-      with_retries do
+      with_retries(max_tries: @retries) do
         checked(
           Typhoeus::Request.get(
             home.append('unlock').append(name).add(owner:).to_s,
@@ -143,7 +151,7 @@ class Judges::Baza
   def recent(name)
     job = 0
     elapsed(@loog) do
-      ret = with_retries do
+      ret = with_retries(max_tries: @retries) do
         checked(
           Typhoeus::Request.get(
             home.append('recent').append("#{name}.txt").to_s,
@@ -160,7 +168,7 @@ class Judges::Baza
   def name_exists?(name)
     exists = 0
     elapsed(@loog) do
-      ret = with_retries do
+      ret = with_retries(max_tries: @retries) do
         checked(
           Typhoeus::Request.get(
             home.append('exists').append(name).to_s,
@@ -203,12 +211,17 @@ class Judges::Baza
     @loog.debug("#{log}\n  #{(ret.headers || {}).map { |k, v| "#{k}: #{v}" }.join("\n  ")}")
     msg =
       "Invalid response code ##{ret.code} " \
-      "at #{mtd} #{url} (#{ret.headers['X-Zerocracy-Flash']})"
-    if ret.code == 503
+      "at #{mtd} #{url} (#{ret.headers['X-Zerocracy-Flash'].inspect})"
+    case ret.code
+    when 500
       msg +=
         ', most probably it\'s an internal error on the server, ' \
+        'please report this to https://github.com/zerocracy/baza'
+    when 503
+      msg +=
+        ", most probably it's an internal error on the server (#{ret.headers['X-Zerocracy-Failure'].inspect}), " \
         'please report this to https://github.com/yegor256/judges'
-    elsif ret.code == 404
+    when 404
       msg +=
         ', most probably you are trying to reach a wrong server, which doesn\'t ' \
         'have the URL that it is expected to have'

data/lib/judges/commands/pull.rb

@@ -42,7 +42,8 @@ class Judges::Pull
       opts['host'], opts['port'].to_i, opts['token'],
       ssl: opts['ssl'],
       timeout: (opts['timeout'] || 30).to_i,
-      loog: @loog
+      loog: @loog,
+      retries: (opts['retries'] || 3).to_i
     )
     name = args[0]
     elapsed(@loog) do

data/lib/judges/commands/push.rb

@@ -43,11 +43,12 @@ class Judges::Push
       opts['host'], opts['port'].to_i, opts['token'],
       ssl: opts['ssl'],
       timeout: (opts['timeout'] || 30).to_i,
-      loog: @loog
+      loog: @loog,
+      retries: (opts['retries'] || 3).to_i
     )
     elapsed(@loog) do
       baza.lock(name, opts['owner'])
-      id = baza.push(name, fb.export)
+      id = baza.push(name, fb.export, opts['meta'] || [])
       baza.unlock(name, opts['owner'])
       throw :"Pushed #{fb.size} facts, job ID is #{id}"
     end

data/lib/judges.rb

@@ -25,5 +25,5 @@
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 module Judges
-  VERSION = '0.15.6'
+  VERSION = '0.17.0'
 end

data/test/test_baza.rb

@@ -40,7 +40,7 @@ class TestBaza < Minitest::Test
     )
     assert_equal(
       42,
-      Judges::Baza.new('example.org', 443, '000').push('simple', 'hello, world!')
+      Judges::Baza.new('example.org', 443, '000').push('simple', 'hello, world!', [])
     )
   end
 
@@ -76,6 +76,37 @@ class TestBaza < Minitest::Test
   end
 
   def test_real_http
+    req = with_http_server(200, 'yes') do |baza|
+      baza.name_exists?('simple')
+    end
+    assert(req.include?("User-Agent: judges #{Judges::VERSION}\r\n"))
+  end
+
+  def test_push_with_meta
+    req = with_http_server(200, 'yes') do |baza|
+      baza.push('simple', 'hello, world!', ['boom!', 'хей!'])
+    end
+    assert(req.include?("X-Zerocracy-Meta: Ym9vbSE= 0YXQtdC5IQ==\r\n"))
+  end
+
+  def test_push_with_big_meta
+    req = with_http_server(200, 'yes') do |baza|
+      baza.push(
+        'simple',
+        'hello, world!',
+        [
+          'pages_url:https://zerocracy.github.io/zerocracy.html',
+          'others:https://zerocracy.github.io/zerocracy.html',
+          'duration:59595'
+        ]
+      )
+    end
+    assert(req.join.include?('X-Zerocracy-Meta: '))
+  end
+
+  private
+
+  def with_http_server(code, response)
     WebMock.enable_net_connect!
     req = []
     host = '127.0.0.1'
@@ -88,12 +119,12 @@ class TestBaza < Minitest::Test
           break if line == "\r\n"
           req << line
         end
-        socket.puts "HTTP/1.1 200 OK\r\nContent-Length: 3\r\n\r\nyes"
+        socket.puts "HTTP/1.1 #{code} OK\r\nContent-Length: #{response.length}\r\n\r\n#{response}"
         socket.close
       end
-      Judges::Baza.new(host, port, '0000', ssl: false, timeout: 1).name_exists?('simple')
+      yield Judges::Baza.new(host, port, '0000', ssl: false, timeout: 1)
       t.join
     end
-    assert(req.include?("User-Agent: judges #{Judges::VERSION}\r\n"))
+    req
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.15.6
+  version: 0.17.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-11 00:00:00.000000000 Z
+date: 2024-07-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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -42,14 +42,14 @@ dependencies:
   name: factbase
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -70,28 +70,28 @@ dependencies:
   name: iri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: loog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -126,42 +126,42 @@ dependencies:
   name: others
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: retries
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tago
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency