judges 0.53.0 → 0.53.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28476c2fdf2ce4ade1719df441e59d5b1b0cd8f2504419bb298aa11c05c7bbc1
-  data.tar.gz: 6a02a3d691eb27817517a49e60e089a72c40c2e41a844c992c50e0368ea04e18
+  metadata.gz: aa86305c49cd5701b671c3e8a6705e07971e7000ea5c327ad6db9e0aa688f4c8
+  data.tar.gz: 9f9445c8c832b285b75d6b816127bb504e6bb3e548616c6cc999dda56dbe15c4
 SHA512:
-  metadata.gz: 35b6719aac90034754e98a74a2a16da99995b06f6bf17e7d20a1c604cbb5efdf7af388b41ee60cf55c9b022076eaa8a862c93ed2db70168d05c3e6d1b3025502
-  data.tar.gz: c92556ae80920c8079187acf6bae340a42f9636b96d92f998229e62e931defa5b0dd6e5b3dc3ea2bc25fadff1417e234e97c0ed1f6b07a05bb66c83dd612855f
+  metadata.gz: b07a315a2bbd216ce359b6f81b1a04993929dc58feaa315413254ef0d72335a6fca76ef1716e597b39e81c8d5cc9f4a03f2d9de365b0e614f9420425afa9c81b
+  data.tar.gz: 9732e62b8e45b852b6eaa673a5924d61f7d6f67e0fae1f4bd76f0ecc996337236c3b52e2212a1b7efe2a31a701aae2f874f1be1bf15f814131dea9f90f4c3761

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,16 +55,15 @@ Feature: Update
     """
       n = $fb.insert
       n.type = 'first'
-      sleep 1
+      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 --quiet --lifetime 1 --max-cycles 5 . simple.fb"
-    Then Stdout contains "The 'second' judge skipped, no time left"
-    Then Stdout contains "Update completed in 1 cycle(s), did 1i/0d/1a"
+    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"
     And Exit code is zero
 
   Scenario: Use options from a file

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.0'
+  s.version = '0.53.2'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =

data/lib/judges/commands/update.rb

@@ -42,11 +42,13 @@ class Judges::Update
     raise 'Exactly two arguments required' unless args.size == 2
     dir = args[0]
     raise "The directory is absent: #{dir.to_rel}" unless File.exist?(dir)
-    start = Time.now
     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(
@@ -62,8 +64,19 @@ class Judges::Update
     else
       @loog.debug("The following options provided:\n\t#{options.to_s.gsub("\n", "\n\t")}")
     end
-    judges = Judges::Judges.new(dir, opts['lib'], @loog, start:, shuffle: opts['shuffle'], boost: opts['boost'],
-                                                         demote: opts['demote'])
+    judges = Judges::Judges.new(
+      dir, opts['lib'], @loog,
+      start: @start, shuffle: opts['shuffle'], boost: opts['boost'],
+      demote: opts['demote']
+    )
+    Timeout.timeout(opts['lifetime']) do
+      loop_them(impex, judges, fb, opts, options)
+    end
+  end
+
+  private
+
+  def loop_them(impex, judges, fb, opts, options)
     c = 0
     churn = Factbase::Churn.new
     errors = []
@@ -80,14 +93,14 @@ class Judges::Update
       loop do
         c += 1
         if c > 1
-          if opts['lifetime'] && Time.now - @start > opts['lifetime']
+          if opts['lifetime'] && Time.now - @start > opts['lifetime'] * 0.51
             @loog.info("Not starting cycle ##{c}, no time left")
             c -= 1
             break
           end
           @loog.info("\nStarting cycle ##{c}#{" (out of #{opts['max-cycles']})" if opts['max-cycles']}...")
         end
-        delta = cycle(opts, judges, fb, options, start, errors)
+        delta = cycle(opts, judges, fb, options, errors)
         churn += delta
         impex.export(fb)
         if delta.zero?
@@ -107,26 +120,23 @@ class Judges::Update
       throw :"👍 Update completed in #{c} cycle(s), did #{churn}"
     end
     return unless %w[add append].include?(opts['summary'])
-    summarize(fb, churn, errors, start, c)
+    summarize(fb, churn, errors, c)
     impex.export(fb)
   end
 
-  private
-
   # Update the summary.
   # @param [Factbase] fb The factbase
   # @param [Churn] churn The churn
   # @param [Array<String>] errors List of errors
-  # @param [Time] start When we started
   # @param [Integer] cycles How many cycles
-  def summarize(fb, churn, errors, start, cycles)
+  def summarize(fb, churn, errors, cycles)
     before = fb.query('(eq what "judges-summary")').each.to_a
     if before.empty?
       s = fb.insert
       s.what = 'judges-summary'
       s.when = Time.now
       s.version = Judges::VERSION
-      s.seconds = Time.now - start
+      s.seconds = Time.now - @start
       s.cycles = cycles
       s.inserted = churn.inserted.size
       s.deleted = churn.deleted.size
@@ -153,10 +163,9 @@ class Judges::Update
   # @param [Judges::Judges] judges The judges
   # @param [Factbase] fb The factbase
   # @param [Judges::Options] options The options
-  # @param [Float] start When we started
   # @param [Array<String>] errors List of errors
   # @return [Factbase::Churn] How many modifications have been made
-  def cycle(opts, judges, fb, options, start, errors)
+  def cycle(opts, judges, fb, options, errors)
     churn = Factbase::Churn.new
     global = {}
     used = 0
@@ -168,7 +177,7 @@ class Judges::Update
             next
           end
           next unless include?(opts, judge.name)
-          @loog.info("\n👉 Running #{judge.name} (##{i}) at #{judge.dir.to_rel} (#{start.ago} already)...")
+          @loog.info("\n👉 Running #{judge.name} (##{i}) at #{judge.dir.to_rel} (#{@start.ago} already)...")
           used += 1
           elapsed(@loog, level: Logger::INFO) do
             c = one_judge(opts, fb, judge, global, options, errors)

data/lib/judges/options.rb

@@ -86,9 +86,14 @@ class Judges::Options
   #   # token → "supe****oken"
   def to_s
     to_h.map do |k, v|
-      v = v.to_s
-      v = "#{v[0..3]}#{'*' * (v.length - 8)}#{v[-4..]}" if v.length > 8
-      "#{k} → \"#{v}\""
+      v = "#{v[0..3]}#{'*' * (v.length - 8)}#{v[-4..]}" if v.is_a?(String) && v.length > 8
+      v =
+        if v.is_a?(String)
+          "\"#{v}\""
+        else
+          "#{v} (#{v.class.name})"
+        end
+      "#{k} → #{v}"
     end.sort.join("\n")
   end
 
@@ -122,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.0' unless const_defined?(:VERSION)
+  VERSION = '0.53.2' unless const_defined?(:VERSION)
 end

data/test/commands/test_update.rb

@@ -51,6 +51,18 @@ 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 }, [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_extend_existing_factbase
     Dir.mktmpdir do |d|
       file = File.join(d, 'base.fb')
@@ -89,6 +101,18 @@ class TestUpdate < Minitest::Test
     end
   end
 
+  def test_terminates_on_lifetime
+    Dir.mktmpdir do |d|
+      save_it(File.join(d, 'foo/foo.rb'), 'sleep 999')
+      file = File.join(d, 'base.fb')
+      log = Loog::Buffer.new
+      assert_raises(StandardError) do
+        Judges::Update.new(Loog::Tee.new(log, Loog::NULL)).run({ 'lifetime' => 0.1 }, [d, file])
+      end
+      assert_includes(log.to_s, 'execution expired')
+    end
+  end
+
   def test_passes_timeout_and_lifetime_through
     %w[lifetime timeout].each do |o|
       Dir.mktmpdir do |d|

data/test/test_options.rb

@@ -60,10 +60,15 @@ 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
-    assert_includes(s, 'FOO → "44"', s)
+    assert_includes(s, 'FOO → 44 (Integer)', s)
     assert_includes(s, '"long****************cret"', s)
   end
 

metadata

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