judges 0.11.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ef24207b8d6248eb98283c45d490b6d8b74fd8c00a6ef8f81dffa546dd6d270
-  data.tar.gz: 856eeb0c1f19d4d28055880514aca057cb0ec7b8584898bb44c30e9382e5e139
+  metadata.gz: '098f6126af6c35b9ee74dca41bbfb5b8e6b1357aee5dcec215a2819929e859d5'
+  data.tar.gz: 139a4b55ea82a090e385c4f54be682dd74d0922c66d77824c8d33cecaa799a84
 SHA512:
-  metadata.gz: ca5c1ef2e4cd29c60a1b0c3eba7c9578f5ef7d835c70bfaa994f5a3adbb2b6d98a5dd1b96847a06ec9ab281991b7933db860b651f6f0c7df06aa1dceccc34092
-  data.tar.gz: f884e4007e22b4be4efb7513eb7101c4913071bfc916b80041109d62fa655ed48424aea3af351ce1976dfad198f6e5cd1495c3e13e2c0fcf574aa6ba225fae2e
+  metadata.gz: 0e173739bc5341c55f869375fef959ff9e6ca57c1e0b814a29d4920700f640fc788a948932221c9fbf6f9e7d9d90501e274645f3de213b7f9b3211549652ad1c
+  data.tar.gz: 52f4c44351e5f3c9efb873913f26c8a7c2c5c08dbf490434145cc691968eec240ef95bb5007568b623c043f48ab658624a573664598df587282cb1cfb43ef94b

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     judges (0.0.0)
       backtrace (~> 0.3)
-      concurrent-ruby (= 1.2.3)
+      concurrent-ruby (~> 1.2)
       factbase (~> 0.0)
       gli (~> 2.21)
       iri (~> 0.8)
@@ -51,7 +51,7 @@ GEM
     base64 (0.2.0)
     bigdecimal (3.1.8)
     builder (3.3.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crack (1.0.0)
       bigdecimal
@@ -180,7 +180,7 @@ GEM
     reline (0.5.9)
       io-console (~> 0.5)
     retries (0.0.5)
-    rexml (3.3.0)
+    rexml (3.3.1)
       strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)

data/bin/judges

@@ -65,6 +65,8 @@ class App
     c.flag([:'max-cycles'], default_value: 8, type: Integer)
     c.desc 'Stay quiet even if some judges fail'
     c.switch([:q, :quiet], default_value: false)
+    c.desc 'Place a summarization fact into the factbase'
+    c.switch([:summary], default_value: false)
     c.desc 'Use default logging facility'
     c.switch([:log], default_value: true)
     c.action do |global, options, args|
@@ -167,6 +169,8 @@ class App
     c.flag([:timeout], default_value: 30, type: Integer)
     c.desc 'Shall SSL be used?'
     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.action do |global, options, args|
       require_relative '../lib/judges/commands/push'
       Judges::Push.new(loog).run(options, args)
@@ -187,6 +191,8 @@ class App
     c.flag([:timeout], default_value: 30, type: Integer)
     c.desc 'Shall SSL be used?'
     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.action do |global, options, args|
       require_relative '../lib/judges/commands/pull'
       Judges::Pull.new(loog).run(options, args)

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.11.0'
+  s.version = '0.13.0'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'backtrace', '~>0.3'
-  s.add_runtime_dependency 'concurrent-ruby', '1.2.3'
+  s.add_runtime_dependency 'concurrent-ruby', '~>1.2'
   s.add_runtime_dependency 'factbase', '~>0.0'
   s.add_runtime_dependency 'gli', '~>2.21'
   s.add_runtime_dependency 'iri', '~>0.8'

data/lib/judges/baza.rb

@@ -110,6 +110,36 @@ class Judges::Baza
     finished
   end
 
+  # Lock the name.
+  def lock(name, owner)
+    elapsed(@loog) do
+      with_retries do
+        checked(
+          Typhoeus::Request.get(
+            home.append('lock').append(name).add(owner:).to_s,
+            headers:
+          ),
+          302
+        )
+      end
+    end
+  end
+
+  # Unlock the name.
+  def unlock(name, owner)
+    elapsed(@loog) do
+      with_retries do
+        checked(
+          Typhoeus::Request.get(
+            home.append('unlock').append(name).add(owner:).to_s,
+            headers:
+          ),
+          302
+        )
+      end
+    end
+  end
+
   def recent(name)
     job = 0
     elapsed(@loog) do

data/lib/judges/churn.rb

@@ -27,34 +27,40 @@ require_relative '../judges'
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 class Judges::Churn
-  attr_reader :added, :removed
+  attr_reader :added, :removed, :errors
 
-  def initialize(added, removed)
+  def initialize(added, removed, errors = [])
     @added = added
     @removed = removed
+    @errors = errors
   end
 
   def to_s
-    "#{@added}/#{@removed}"
+    "#{@added}/#{@removed}#{@errors.empty? ? '' : "/#{@errors.size}"}"
   end
 
   def zero?
-    @added.zero? && @removed.zero?
+    @added.zero? && @removed.zero? && @errors.empty?
+  end
+
+  def <<(error)
+    @errors << error
+    nil
   end
 
   def +(other)
     if other.is_a?(Judges::Churn)
-      Judges::Churn.new(@added + other.added, @removed + other.removed)
+      Judges::Churn.new(@added + other.added, @removed + other.removed, @errors + other.errors)
     else
-      Judges::Churn.new(@added + other, @removed)
+      Judges::Churn.new(@added + other, @removed, @errors)
     end
   end
 
   def -(other)
     if other.is_a?(Judges::Churn)
-      Judges::Churn.new(@added - other.added, @removed - other.removed)
+      Judges::Churn.new(@added - other.added, @removed - other.removed, @errors + other.errors)
     else
-      Judges::Churn.new(@added, @removed + other)
+      Judges::Churn.new(@added, @removed + other, @errors)
     end
   end
 end

data/lib/judges/commands/pull.rb

@@ -47,6 +47,7 @@ class Judges::Pull
     name = args[0]
     elapsed(@loog) do
       if baza.name_exists?(name)
+        baza.lock(name, opts['owner'])
         fb.import(baza.pull(wait(baza, baza.recent(name), opts['wait'])))
         Judges::Impex.new(@loog, args[1]).export(fb)
         throw :"Pulled #{fb.size} facts by the name '#{name}'"

data/lib/judges/commands/push.rb

@@ -46,7 +46,9 @@ class Judges::Push
       loog: @loog
     )
     elapsed(@loog) do
+      baza.lock(name, opts['owner'])
       id = baza.push(name, fb.export)
+      baza.unlock(name, opts['owner'])
       throw :"Pushed #{fb.size} facts, job ID is #{id}"
     end
   end

data/lib/judges/commands/update.rb

@@ -72,6 +72,17 @@ class Judges::Update
       end
       throw :"Update finished in #{c} cycle(s), modified #{churn} fact(s)"
     end
+    return if churn.zero? || !opts['summary']
+    fb.query('(eq what "judges-summary")').delete!
+    f = fb.insert
+    f.what = 'judges-summary'
+    f.when = Time.now
+    f.version = Judges::VERSION
+    f.cycles = c
+    f.added = churn.added.size
+    f.removed = churn.removed.size
+    churn.errors.each { |e| f.error = e }
+    impex.export(fb)
   end
 
   private
@@ -79,12 +90,11 @@ class Judges::Update
   # Run all judges in a full cycle, one by one.
   # @return [Churn] How many modifications have been made
   def cycle(opts, judges, fb, options)
-    errors = []
     churn = Judges::Churn.new(0, 0)
     global = {}
     elapsed(@loog) do
       done = judges.each_with_index do |p, i|
-        @loog.info("\n\n👉 Running #{p.name} (##{i}) at #{p.dir.to_rel}...")
+        @loog.info("\n👉 Running #{p.name} (##{i}) at #{p.dir.to_rel}...")
         elapsed(@loog) do
           c = one_judge(fb, p, global, options)
           churn += c
@@ -92,13 +102,13 @@ class Judges::Update
         end
       rescue StandardError, SyntaxError => e
         @loog.warn(Backtrace.new(e))
-        errors << p.script
+        churn << e.message
       end
-      throw :"👍 #{done} judge(s) processed" if errors.empty?
-      throw :"❌ #{done} judge(s) processed with #{errors.size} errors"
+      throw :"👍 #{done} judge(s) processed" if churn.errors.empty?
+      throw :"❌ #{done} judge(s) processed with #{churn.errors.size} errors"
     end
-    unless errors.empty?
-      raise "Failed to update correctly (#{errors.size} errors)" unless opts['quiet']
+    unless churn.errors.empty?
+      raise "Failed to update correctly (#{churn.errors.size} errors)" unless opts['quiet']
       @loog.info('Not failing because of the --quiet flag provided')
     end
     churn

data/lib/judges.rb

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

data/test/commands/test_pull.rb

@@ -34,6 +34,7 @@ require_relative '../../lib/judges/commands/pull'
 class TestPull < Minitest::Test
   def test_pull_simple_factbase
     WebMock.disable_net_connect!
+    stub_request(:get, 'http://example.org/lock/foo?owner=none').to_return(status: 302)
     stub_request(:get, 'http://example.org/exists/foo').to_return(body: 'yes')
     stub_request(:get, 'http://example.org/recent/foo.txt').to_return(body: '42')
     stub_request(:get, 'http://example.org/finished/42').to_return(body: 'yes')
@@ -48,7 +49,8 @@ class TestPull < Minitest::Test
           'host' => 'example.org',
           'port' => 80,
           'ssl' => false,
-          'wait' => 10
+          'wait' => 10,
+          'owner' => 'none'
         },
         ['foo', file]
       )

data/test/commands/test_push.rb

@@ -33,6 +33,8 @@ require_relative '../../lib/judges/commands/push'
 class TestPush < Minitest::Test
   def test_push_simple_factbase
     WebMock.disable_net_connect!
+    stub_request(:get, 'https://example.org/lock/foo?owner=none').to_return(status: 302)
+    stub_request(:get, 'https://example.org/unlock/foo?owner=none').to_return(status: 302)
     stub_request(:put, 'https://example.org/push/foo').to_return(
       status: 200, body: '42'
     )
@@ -46,7 +48,8 @@ class TestPush < Minitest::Test
           'token' => '000',
           'host' => 'example.org',
           'port' => 443,
-          'ssl' => true
+          'ssl' => true,
+          'owner' => 'none'
         },
         ['foo', file]
       )
@@ -55,6 +58,7 @@ class TestPush < Minitest::Test
 
   def test_fails_on_http_error
     WebMock.disable_net_connect!
+    stub_request(:get, 'http://example.org/lock/foo?owner=none').to_return(status: 302)
     stub_request(:put, 'http://example.org/push/foo').to_return(status: 500)
     Dir.mktmpdir do |d|
       file = File.join(d, 'base.fb')
@@ -67,7 +71,8 @@ class TestPush < Minitest::Test
             'token' => '000',
             'host' => 'example.org',
             'port' => 80,
-            'ssl' => false
+            'ssl' => false,
+            'owner' => 'none'
           },
           ['foo', file]
         )

data/test/commands/test_update.rb

@@ -64,7 +64,7 @@ class TestUpdate < Minitest::Test
     Dir.mktmpdir do |d|
       File.write(File.join(d, 'foo.rb'), 'this$is$a$broken$Ruby$script')
       file = File.join(d, 'base.fb')
-      Judges::Update.new(Loog::NULL).run({ 'quiet' => true }, [d, file])
+      Judges::Update.new(Loog::NULL).run({ 'quiet' => true, 'max-cycles' => 2 }, [d, file])
     end
   end
 
@@ -77,4 +77,23 @@ class TestUpdate < Minitest::Test
       end
     end
   end
+
+  def test_update_with_error_and_summary
+    Dir.mktmpdir do |d|
+      File.write(File.join(d, 'foo.rb'), 'this$is$a$broken$Ruby$script')
+      file = File.join(d, 'base.fb')
+      2.times do
+        Judges::Update.new(Loog::NULL).run(
+          { 'quiet' => true, 'summary' => true, 'max-cycles' => 2 },
+          [d, file]
+        )
+      end
+      fb = Factbase.new
+      fb.import(File.binread(file))
+      sums = fb.query('(eq what "judges-summary")').each.to_a
+      assert_equal(1, sums.size)
+      f = sums.first
+      assert(f.error.include?('unexpected global variable'), f.error)
+    end
+  end
 end

data/test/test_churn.rb

@@ -35,4 +35,12 @@ class TestChurn < Minitest::Test
     assert_equal('42/0', (churn + 42).to_s)
     assert_equal('0/17', (churn - 17).to_s)
   end
+
+  def test_with_errors
+    churn = Judges::Churn.new(0, 0)
+    churn << 'oops'
+    assert_equal('0/0/1', churn.to_s)
+    assert_equal('42/0/1', (churn + 42).to_s)
+    assert_equal('0/0/1', (Judges::Churn.new(0, 0) + churn).to_s)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -28,16 +28,16 @@ dependencies:
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: factbase
   requirement: !ruby/object:Gem::Requirement