judges 0.53.1 → 0.53.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60345e60cca92c8891851f29e255831796747e5451a14934538f52c764c3322e
-  data.tar.gz: 27ecf7b216dc3a1f66267168b8bd77c76531067246716765ee3158f6cd1ae00e
+  metadata.gz: 30206b0fdcdc39f9e4fcbb9aa44cc6377aa63d707600c912813e39dbcc08649f
+  data.tar.gz: a90eb5d5bd333faf95484e7f6c114422831245c17175a05c0f82a2ed33caf896
 SHA512:
-  metadata.gz: 87e466051c31be7106a95670c4508789fac2a790627135e26afeef970306c3e7f9762e20c13641277048929e0e8f430343427da49dac387d5a2f09e9f0cde625
-  data.tar.gz: 9aa334a66a192dc65a1e6f7533d6a539c91c72dcbcb7506a0d85ccd01065d7446d58abdd0174dc15c428079078914bf67f08b5aa43a0222155653f82c643799f
+  metadata.gz: f52536f181c8172e6a869c8ce0dfb01b30f62fe31d64c9bfaf775d7bc47bd5e57b8efd7808afd8641e2f888b8447e3899181b5ca2c54aff4c9314345de31afb1
+  data.tar.gz: b51aa8226d7494c97521392fd6e1b2aac6bbb8b60a762af72f0b0ec93d09827e29a36a39ba8a166facba7a047704706576582a0b53fdcfe701671037491958a6

data/.github/workflows/rake.yml

@@ -14,7 +14,7 @@ jobs:
   rake:
     strategy:
       matrix:
-        os: [ubuntu-24.04, macos-15]
+        os: [ubuntu-24.04, macos-15, windows-2022]
         ruby: [3.3]
     runs-on: ${{ matrix.os }}
     steps:

data/.github/workflows/typos.yml

@@ -16,4 +16,4 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v5
-      - uses: crate-ci/typos@v1.35.4
+      - uses: crate-ci/typos@v1.35.5

data/Gemfile

@@ -12,7 +12,6 @@ gem 'diff-lcs', '1.6.2', require: false # GPL
 gem 'minitest', '~>5.25', require: false
 gem 'minitest-reporters', '~>1.7', require: false
 gem 'minitest-retry', '~>0.2', require: false
-gem 'net-ping', '~>2.0', require: false
 gem 'online', '~>0.0', require: false
 gem 'os', '~>1.1', require: false
 gem 'qbash', '~>0.4', require: false

data/Gemfile.lock

@@ -46,7 +46,7 @@ GEM
     crack (1.0.0)
       bigdecimal
       rexml
-    cucumber (10.0.0)
+    cucumber (10.1.0)
       base64 (~> 0.2)
       builder (~> 3.2)
       cucumber-ci-environment (> 9, < 11)
@@ -59,7 +59,7 @@ GEM
       multi_test (~> 1.1)
       sys-uname (~> 1.3)
     cucumber-ci-environment (10.0.1)
-    cucumber-core (15.2.0)
+    cucumber-core (15.2.1)
       cucumber-gherkin (> 27, < 33)
       cucumber-messages (> 26, < 30)
       cucumber-tag-expressions (> 5, < 7)
@@ -78,18 +78,18 @@ GEM
       loog (~> 0.6)
       tago (~> 0.1)
     ellipsized (0.3.0)
-    ethon (0.16.0)
+    ethon (0.17.0)
       ffi (>= 1.15.0)
-    factbase (0.15.0)
+    factbase (0.15.6)
       backtrace (~> 0.4)
-      decoor (~> 0.0)
+      decoor (~> 0.1)
       ellipsized (~> 0.3)
       json (~> 2.7)
       logger (~> 1.0)
       loog (~> 0.6)
       nokogiri (~> 1.10)
-      others (~> 0.0)
-      tago (~> 0.0)
+      others (~> 0.1)
+      tago (~> 0.1)
       yaml (~> 0.3)
     faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
@@ -136,7 +136,6 @@ GEM
     multipart-post (2.4.1)
     net-http (0.6.0)
       uri
-    net-ping (2.0.8)
     nokogiri (1.18.9-aarch64-linux-gnu)
       racc (~> 1.4)
     nokogiri (1.18.9-aarch64-linux-musl)
@@ -179,7 +178,7 @@ GEM
     regexp_parser (2.11.2)
     retries (0.0.5)
     rexml (3.4.1)
-    rubocop (1.79.2)
+    rubocop (1.80.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -255,7 +254,6 @@ DEPENDENCIES
   minitest (~> 5.25)
   minitest-reporters (~> 1.7)
   minitest-retry (~> 0.2)
-  net-ping (~> 2.0)
   online (~> 0.0)
   os (~> 1.1)
   qbash (~> 0.4)

data/features/test.feature

@@ -16,9 +16,9 @@ Feature: Test
     And Exit code is zero
 
   Scenario: Factbase version can be set
-    When I run bin/judges with "--factbase 0.15.0 --verbose test --judge guess ./fixtures"
+    When I run bin/judges with "--factbase 0.15.6 --verbose test --judge guess ./fixtures"
     Then Exit code is zero
-    And Stdout contains "Factbase version to be used: '0.15.0'"
+    And Stdout contains "Factbase version to be used: '0.15.6'"
 
   Scenario: Simple test of no judges
     Given I run bin/judges with "test --judge absent_for_sure ./fixtures"

data/features/update.feature

@@ -55,15 +55,15 @@ Feature: Update
     """
       n = $fb.insert
       n.type = 'first'
-      sleep 0.9
+      sleep 1.9
     """
     Then I have a "second/second.rb" file with content:
     """
       n = $fb.insert
       n.type = 'second'
     """
-    Then I run bin/judges with "--verbose update --lifetime 1 --max-cycles 5 . simple.fb"
-    Then Stdout contains "Update completed in 1 cycle(s), did 2i/0d/2a"
+    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 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.1'
+  s.version = '0.53.3'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =

data/lib/judges/commands/update.rb

@@ -45,7 +45,10 @@ class Judges::Update
     impex = Judges::Impex.new(@loog, args[1])
     fb = impex.import(strict: false)
     fb = Factbase::Logged.new(fb, @loog) if opts['log']
-    options = Judges::Options.new(timeout: opts['timeout'], lifetime: opts['lifetime'])
+    options = Judges::Options.new(timeout: opts['timeout']&.to_i, lifetime: opts['lifetime']&.to_i)
+    if options.lifetime && options.timeout && options.lifetime < options.timeout * 1.1
+      raise "The --timeout=#{options.timeout} must be at least 10 percent smaller than --lifetime=#{options.lifetime}"
+    end
     options += Judges::Options.new(opts['option'])
     if opts['options-file']
       options += Judges::Options.new(
@@ -212,6 +215,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"
@@ -221,8 +225,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/options.rb

@@ -127,6 +127,7 @@ class Judges::Options
         end
         pp
           .reject { |k, _| k.nil? }
+          .compact
           .reject { |k, _| k.is_a?(String) && k.empty? }
           .to_h
           .transform_values { |v| v.nil? ? 'true' : v }

data/lib/judges.rb

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

data/test/commands/test_update.rb

@@ -51,6 +51,39 @@ class TestUpdate < Minitest::Test
     end
   end
 
+  def test_accepts_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')
+      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)
+      refute_empty(xml.xpath('/fb/f[foo]'), xml)
+    end
+  end
+
   def test_extend_existing_factbase
     Dir.mktmpdir do |d|
       file = File.join(d, 'base.fb')

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')

data/test/test_options.rb

@@ -60,6 +60,11 @@ class TestOptions < Minitest::Test
     assert_nil(opts.xxx)
   end
 
+  def test_with_nil_values
+    opts = Judges::Options.new('foo' => nil)
+    assert_nil(opts.foo)
+  end
+
   def test_converts_to_string
     opts = Judges::Options.new('foo' => 44, 'bar' => 'long-string-maybe-secret')
     s = opts.to_s

metadata

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