judges 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db0130833063b43aab8a1dacec3106566da9c398fe539eea33eb8e76529d9d09
-  data.tar.gz: 2ced92ba9c8896742ad493dc75be234864cef5690d0313a6a581ee7e12cb427a
+  metadata.gz: 6fde2252d089419bf5cb20dabc6368db3b70b7a7e6fb116624b3ec2f04811544
+  data.tar.gz: 80accd532717b42f176b2bcfc9510610e1dc43d9396ed670196782b923ef2c70
 SHA512:
-  metadata.gz: d4393433a51dfdbabec4e6b8c09d9a02255fc18f76022f571a9633abf73c9f4bc9783ef1b4175dca14f35a939f5cc043f6052f928c5798206d40bda22667e6d7
-  data.tar.gz: b4e7653eb03bec4c3ec08a4060c594d1ded0bbe63e24357bce24bab52e4dee1d74615ac7199bbbf09b485c51072c997f513d71011c3fef4147a46c378bf786cd
+  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

@@ -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

@@ -179,6 +179,8 @@ class App
     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)
@@ -201,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,6 +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 --meta a:b --meta foo:bar 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.16.0'
+  s.version = '0.17.0'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =

data/lib/judges/baza.rb

@@ -34,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
@@ -42,6 +42,7 @@ class Judges::Baza
     @token = token
     @timeout = timeout
     @loog = loog
+    @retries = retries
   end
 
   def push(name, data, meta)
@@ -50,9 +51,11 @@ class Judges::Baza
       'Content-Type' => 'application/octet-stream',
       'Content-Length' => data.size
     )
-    hdrs = hdrs.merge('X-Zerocracy-Meta' => meta.map { |v| Base64.encode64(v).strip }.join(' ')) unless meta.empty?
+    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,
@@ -85,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)
@@ -99,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,
@@ -116,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,
@@ -131,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,
@@ -146,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,
@@ -163,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,

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,7 +43,8 @@ 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'])

data/lib/judges.rb

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

data/test/test_baza.rb

@@ -89,6 +89,21 @@ class TestBaza < Minitest::Test
     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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Yegor Bugayenko