judges 0.15.6 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d43bd3ebf5cea4ae2ca7c8d5deb723e01730ea24a2b849e5a7601049b354a3f
-  data.tar.gz: 5b7e845e02b248d8d3eb6c877ee29e7fa92a423eb472aada3112d4efa772feb4
+  metadata.gz: db0130833063b43aab8a1dacec3106566da9c398fe539eea33eb8e76529d9d09
+  data.tar.gz: 2ced92ba9c8896742ad493dc75be234864cef5690d0313a6a581ee7e12cb427a
 SHA512:
-  metadata.gz: 2e263f81a023f86ac28fd69d122120e29c74adc91ba141d65ec9bfb76266c89b9d072f5134b858c089f43d136ca53fee5fff0c93cf40d453970c8fc8f25a84d0
-  data.tar.gz: d36e3c2b7e80a15d2194645e8756adfdd6077e1895e6d9e6035c421842be38f04e2ce6188a3672ea3d8c0ef590ff1d5362adc547d31d55c88709ad1dc6dc77cd
+  metadata.gz: d4393433a51dfdbabec4e6b8c09d9a02255fc18f76022f571a9633abf73c9f4bc9783ef1b4175dca14f35a939f5cc043f6052f928c5798206d40bda22667e6d7
+  data.tar.gz: b4e7653eb03bec4c3ec08a4060c594d1ded0bbe63e24357bce24bab52e4dee1d74615ac7199bbbf09b485c51072c997f513d71011c3fef4147a46c378bf786cd

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

data/bin/judges

@@ -177,6 +177,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 'Supplementary meta information about the upload (key:value)'
+    c.flag([:meta], type: String, multiple: true)
     c.action do |global, options, args|
       require_relative '../lib/judges/commands/push'
       Judges::Push.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 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.16.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'
 
@@ -43,18 +44,20 @@ class Judges::Baza
     @loog = loog
   end
 
-  def push(name, data)
+  def push(name, data, meta)
     id = 0
+    hdrs = headers.merge(
+      '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?
     elapsed(@loog) do
       ret = with_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
           )
@@ -203,12 +206,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/push.rb

@@ -47,7 +47,7 @@ class Judges::Push
     )
     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.16.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,22 @@ 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
+
+  private
+
+  def with_http_server(code, response)
     WebMock.enable_net_connect!
     req = []
     host = '127.0.0.1'
@@ -88,12 +104,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.16.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