judges 0.53.2 → 0.53.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa86305c49cd5701b671c3e8a6705e07971e7000ea5c327ad6db9e0aa688f4c8
-  data.tar.gz: 9f9445c8c832b285b75d6b816127bb504e6bb3e548616c6cc999dda56dbe15c4
+  metadata.gz: 8ee9872053ac43a975675a9eaed91b496bdb91ba0d3dc5595f956073c5ba2a13
+  data.tar.gz: 67e1409f8793c1fa9ad634d732f3596ef4ff08e9d587a14dc0a8b1ce3490622c
 SHA512:
-  metadata.gz: b07a315a2bbd216ce359b6f81b1a04993929dc58feaa315413254ef0d72335a6fca76ef1716e597b39e81c8d5cc9f4a03f2d9de365b0e614f9420425afa9c81b
-  data.tar.gz: 9732e62b8e45b852b6eaa673a5924d61f7d6f67e0fae1f4bd76f0ecc996337236c3b52e2212a1b7efe2a31a701aae2f874f1be1bf15f814131dea9f90f4c3761
+  metadata.gz: ca7c356028c05c6bfdab1e6d7e826865dfe6f4e3ca5bec43718465a2ec03f39ba7823fb2fee05982e95c1ca0312003b3856f65a9e3e737d48ad3613c1afcb5b7
+  data.tar.gz: 692e4a5de4b92d85fcc15a22b7004dc72e5ebf83c339c34e5a8d4ac9bce08e62327f57ad1e96e50f3ddc4ce98fb149caadf567a9fe13943150fa1fda67ec667c

data/Gemfile.lock

@@ -177,7 +177,7 @@ GEM
       tago (> 0)
     regexp_parser (2.11.2)
     retries (0.0.5)
-    rexml (3.4.1)
+    rexml (3.4.2)
     rubocop (1.80.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
@@ -208,7 +208,7 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-cobertura (3.0.0)
+    simplecov-cobertura (3.1.0)
       rexml
       simplecov (~> 0.19)
     simplecov-html (0.13.2)

data/features/update.feature

@@ -63,7 +63,7 @@ Feature: Update
       n.type = 'second'
     """
     Then I run bin/judges with "--verbose update --quiet --lifetime 2 --timeout 1 --max-cycles 5 . simple.fb"
-    Then Stdout contains "Update completed in 2 cycle(s), did 1i/0d/1a"
+    Then Stdout contains "Update completed in 2 cycle(s), did 3i/0d/3a"
     And Exit code is zero
 
   Scenario: Use options from a file
@@ -93,7 +93,6 @@ Feature: Update
     """
     Then I run bin/judges with "--verbose update --timeout 1 --quiet . foo.fb"
     Then Stdout contains "execution expired"
-    Then Stdout contains "judge timed out after"
     Then Stdout contains "1 judge(s) processed"
     Then Stdout contains "Update completed in 1 cycle(s), did 0i/0d/0a"
     And Exit code is zero

data/judges.gemspec

@@ -9,7 +9,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.53.2'
+  s.version = '0.53.4'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =

data/lib/judges/commands/update.rb

@@ -69,8 +69,13 @@ class Judges::Update
       start: @start, shuffle: opts['shuffle'], boost: opts['boost'],
       demote: opts['demote']
     )
-    Timeout.timeout(opts['lifetime']) do
-      loop_them(impex, judges, fb, opts, options)
+    begin
+      Timeout.timeout(opts['lifetime']) do
+        loop_them(impex, judges, fb, opts, options)
+      end
+    rescue Timeout::Error, Timeout::ExitException => e
+      raise e unless opts['quiet']
+      @loog.info("Had to stop due to the --lifetime=#{opts['lifetime']}")
     end
   end
 
@@ -215,6 +220,7 @@ class Judges::Update
   def one_judge(opts, fb, judge, global, options, errors)
     local = {}
     start = Time.now
+    fb = Factbase::Tallied.new(fb)
     begin
       if opts['lifetime'] && Time.now - @start > opts['lifetime']
         throw :"👎 The '#{judge.name}' judge skipped, no time left"
@@ -224,8 +230,8 @@ class Judges::Update
       end
     rescue Timeout::Error, Timeout::ExitException => e
       errors << "Judge #{judge.name} stopped by timeout after #{start.ago}: #{e.message}"
-      throw :"👎 The '#{judge.name}' judge timed out after #{start.ago}: #{e.message}"
     end
+    fb.churn
   end
 
   def include?(opts, name)

data/lib/judges/judge.rb

@@ -53,10 +53,10 @@ class Judges::Judge
   # @param [Hash] global Global configuration options shared across all judges
   # @param [Hash] local Local configuration options specific to this judge
   # @param [Judges::Options] options Command-line options object
-  # @return [Factbase::Churn] Object containing statistics about the changes made to the factbase
+  # @return [nil] Nothing
   # @raise [RuntimeError] If the lib directory doesn't exist, the script can't be loaded, or execution fails
   def run(fb, global, local, options)
-    $fb = Factbase::Tallied.new(fb)
+    $fb = fb
     $judge = File.basename(@dir)
     $options = options
     $loog = @loog
@@ -76,7 +76,7 @@ class Judges::Judge
     raise "Can't load '#{s}'" unless File.exist?(s)
     elapsed(@loog, good: "#{$judge} completed", level: Logger::INFO) do
       load(s, true)
-      $fb.churn
+      nil
       # rubocop:disable Lint/RescueException
     rescue Exception => e
       # rubocop:enable Lint/RescueException

data/lib/judges.rb

@@ -8,5 +8,5 @@
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Judges
-  VERSION = '0.53.2' unless const_defined?(:VERSION)
+  VERSION = '0.53.4' unless const_defined?(:VERSION)
 end

data/test/commands/test_update.rb

@@ -39,6 +39,20 @@ class TestUpdate < Minitest::Test
     end
   end
 
+  def test_cancels_slow_execution
+    Dir.mktmpdir do |d|
+      10.times do |i|
+        save_it(File.join(d, "foo-#{i}/foo-#{i}.rb"), '$fb.insert.foo = 0.05; sleep 2;')
+      end
+      file = File.join(d, 'base.fb')
+      Judges::Update.new(Loog::NULL).run({ 'lifetime' => 0.12, 'timeout' => 0.1, 'quiet' => true }, [d, file])
+      fb = Factbase.new
+      fb.import(File.binread(file))
+      xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
+      refute_empty(xml.xpath('/fb/f[foo]'), xml)
+    end
+  end
+
   def test_cancels_slow_judge
     Dir.mktmpdir do |d|
       save_it(File.join(d, 'foo/foo.rb'), 'sleep 10; $fb.insert.foo = 1')
@@ -55,7 +69,28 @@ class TestUpdate < Minitest::Test
     Dir.mktmpdir do |d|
       save_it(File.join(d, 'foo/foo.rb'), '$fb.insert.foo = 1; sleep 10')
       file = File.join(d, 'base.fb')
-      Judges::Update.new(Loog::NULL).run({ 'timeout' => 0.1, 'quiet' => true }, [d, file])
+      Judges::Update.new(Loog::NULL).run(
+        { 'timeout' => 0.1, 'quiet' => true, 'fail-fast' => true },
+        [d, file]
+      )
+      fb = Factbase.new
+      fb.import(File.binread(file))
+      xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
+      refute_empty(xml.xpath('/fb/f[foo]'), xml)
+    end
+  end
+
+  def test_reports_changes_from_slow_judge
+    Dir.mktmpdir do |d|
+      save_it(File.join(d, 'foo/foo.rb'), '$fb.insert.foo = 1; sleep 10')
+      file = File.join(d, 'base.fb')
+      log = Loog::Buffer.new
+      Judges::Update.new(Loog::Tee.new(log, Loog::NULL)).run(
+        { 'timeout' => 0.1, 'quiet' => true, 'fail-fast' => true },
+        [d, file]
+      )
+      assert_includes(log.to_s, 'did 1i/0d/1a')
+      assert_includes(log.to_s, 'Update completed in 1 cycle(s), did 1i/0d/1a')
       fb = Factbase.new
       fb.import(File.binread(file))
       xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)

data/test/test_judge.rb

@@ -25,30 +25,6 @@ class TestJudge < Minitest::Test
     end
   end
 
-  def test_counts_churn
-    Dir.mktmpdir do |d|
-      save_it(File.join(d, "#{File.basename(d)}.rb"), '$fb.insert.foo = 42')
-      judge = Judges::Judge.new(d, nil, Loog::NULL)
-      fb = Factbase.new
-      c = judge.run(fb, {}, {}, {})
-      assert_equal(1, c.inserted)
-      assert_equal(0, c.deleted)
-      assert_equal(1, c.added)
-    end
-  end
-
-  def test_counts_churn_after_txn
-    Dir.mktmpdir do |d|
-      save_it(File.join(d, "#{File.basename(d)}.rb"), '$fb.txn { |fbt| fbt.insert.foo = 42 }')
-      judge = Judges::Judge.new(d, nil, Loog::NULL)
-      fb = Factbase.new
-      c = judge.run(fb, {}, {}, {})
-      assert_equal(1, c.inserted)
-      assert_equal(0, c.deleted)
-      assert_equal(1, c.added)
-    end
-  end
-
   def test_run_isolated
     Dir.mktmpdir do |d|
       save_it(File.join(d, "#{File.basename(d)}.rb"), '$fb.insert')

metadata

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