judges 0.52.2 → 0.53.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f56bba6e87688575085f5b43bfec013b8728b31650f5bde0a3eee1af1f3803fa
-  data.tar.gz: 0c82d6af9a4d2baecd9227cd2c9946f8469e9699b72485b11a4c2c55f2223688
+  metadata.gz: 60345e60cca92c8891851f29e255831796747e5451a14934538f52c764c3322e
+  data.tar.gz: 27ecf7b216dc3a1f66267168b8bd77c76531067246716765ee3158f6cd1ae00e
 SHA512:
-  metadata.gz: 48a484a62e6a68a8375802adc912c57d53dc3affe0b874ff51cd6835b8975c8af6ff4b4633e390bee0c792648360b96e984019e20e42d3086a80550f1a592249
-  data.tar.gz: 73b1de98081d97c217d49949d388a016b4dda570ce2c53a2942f13b6632934f116cc2e7aca1d502c43f65d1963298994a88ea4b54d7727e23b62dec379987fec
+  metadata.gz: 87e466051c31be7106a95670c4508789fac2a790627135e26afeef970306c3e7f9762e20c13641277048929e0e8f430343427da49dac387d5a2f09e9f0cde625
+  data.tar.gz: 9aa334a66a192dc65a1e6f7533d6a539c91c72dcbcb7506a0d85ccd01065d7446d58abdd0174dc15c428079078914bf67f08b5aa43a0222155653f82c643799f

data/.github/workflows/actionlint.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Download actionlint
         id: get_actionlint
         run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)

data/.github/workflows/codecov.yml

@@ -12,7 +12,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.3

data/.github/workflows/copyrights.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: yegor256/copyrights-action@0.0.12

data/.github/workflows/eslint.yml

@@ -15,6 +15,6 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - run: npm install
       - run: npx eslint .

data/.github/workflows/markdown-lint.yml

@@ -19,5 +19,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: DavidAnson/markdownlint-cli2-action@v20.0.0

data/.github/workflows/pdd.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: volodya-lombrozo/pdd-action@master

data/.github/workflows/rake.yml

@@ -18,7 +18,7 @@ jobs:
         ruby: [3.3]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.github/workflows/reuse.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: fsfe/reuse-action@v5

data/.github/workflows/typos.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: crate-ci/typos@v1.35.2
+      - uses: actions/checkout@v5
+      - uses: crate-ci/typos@v1.35.4

data/.github/workflows/xcop.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: g4s8/xcop-action@master

data/.github/workflows/yamllint.yml

@@ -15,5 +15,5 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ibiqlik/action-yamllint@v3

data/Gemfile

@@ -6,21 +6,22 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'base64', '~>0.0'
+gem 'base64', '~>0.3'
 gem 'cucumber', '~>10.0', require: false
+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.0', require: false
+gem 'qbash', '~>0.4', require: false
 gem 'rake', '~>13.2', require: false
-gem 'random-port', '~>0.0', require: false
+gem 'random-port', '~>0.7', require: false
 gem 'rubocop', '~>1.74', require: false
-gem 'rubocop-minitest', '~>0.0', require: false
+gem 'rubocop-minitest', '~>0.38', require: false
 gem 'rubocop-performance', '~>1.25', require: false
-gem 'rubocop-rake', '~>0.0', require: false
+gem 'rubocop-rake', '~>0.7', require: false
 gem 'simplecov', '~>0.22', require: false
 gem 'simplecov-cobertura', '~>3.0', require: false
 gem 'w3c_validators', '~>1.3', require: false

data/Gemfile.lock

@@ -28,7 +28,7 @@ GEM
     ast (2.4.3)
     backtrace (0.4.1)
     base64 (0.3.0)
-    baza.rb (0.10.0)
+    baza.rb (0.10.1)
       backtrace (~> 0.4)
       elapsed (~> 0.0)
       faraday (~> 2.13)
@@ -67,7 +67,7 @@ GEM
       bigdecimal
     cucumber-gherkin (32.2.0)
       cucumber-messages (> 25, < 28)
-    cucumber-html-formatter (21.13.0)
+    cucumber-html-formatter (21.14.0)
       cucumber-messages (> 19, < 28)
     cucumber-messages (27.2.0)
     cucumber-tag-expressions (6.1.2)
@@ -80,7 +80,7 @@ GEM
     ellipsized (0.3.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.14.4)
+    factbase (0.15.0)
       backtrace (~> 0.4)
       decoor (~> 0.0)
       ellipsized (~> 0.3)
@@ -176,7 +176,7 @@ GEM
     rake (13.3.0)
     random-port (0.7.5)
       tago (> 0)
-    regexp_parser (2.11.0)
+    regexp_parser (2.11.2)
     retries (0.0.5)
     rexml (3.4.1)
     rubocop (1.79.2)
@@ -221,7 +221,7 @@ GEM
     total (0.4.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    unicode-display_width (3.1.4)
+    unicode-display_width (3.1.5)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uri (1.0.3)
@@ -248,8 +248,9 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  base64 (~> 0.0)
+  base64 (~> 0.3)
   cucumber (~> 10.0)
+  diff-lcs (= 1.6.2)
   judges!
   minitest (~> 5.25)
   minitest-reporters (~> 1.7)
@@ -257,13 +258,13 @@ DEPENDENCIES
   net-ping (~> 2.0)
   online (~> 0.0)
   os (~> 1.1)
-  qbash (~> 0.0)
+  qbash (~> 0.4)
   rake (~> 13.2)
-  random-port (~> 0.0)
+  random-port (~> 0.7)
   rubocop (~> 1.74)
-  rubocop-minitest (~> 0.0)
+  rubocop-minitest (~> 0.38)
   rubocop-performance (~> 1.25)
-  rubocop-rake (~> 0.0)
+  rubocop-rake (~> 0.7)
   simplecov (~> 0.22)
   simplecov-cobertura (~> 3.0)
   w3c_validators (~> 1.3)

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.14.4 --verbose test --judge guess ./fixtures"
+    When I run bin/judges with "--factbase 0.15.0 --verbose test --judge guess ./fixtures"
     Then Exit code is zero
-    And Stdout contains "Factbase version to be used: '0.14.4'"
+    And Stdout contains "Factbase version to be used: '0.15.0'"
 
   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 0.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 --lifetime 1 --max-cycles 5 . simple.fb"
+    Then Stdout contains "Update completed in 1 cycle(s), did 2i/0d/2a"
     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.52.2'
+  s.version = '0.53.1'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =

data/lib/judges/commands/update.rb

@@ -42,11 +42,11 @@ 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(opts['option'])
+    options = Judges::Options.new(timeout: opts['timeout'], lifetime: opts['lifetime'])
+    options += Judges::Options.new(opts['option'])
     if opts['options-file']
       options += Judges::Options.new(
         File.readlines(opts['options-file'])
@@ -61,8 +61,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 = []
@@ -79,14 +90,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?
@@ -106,26 +117,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
@@ -152,10 +160,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
@@ -167,7 +174,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
 

data/lib/judges.rb

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

data/test/commands/test_update.rb

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 require 'loog'
+require 'loog/tee'
 require 'nokogiri'
 require 'factbase/to_xml'
 require_relative '../test__helper'
@@ -88,6 +89,30 @@ 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|
+        save_it(File.join(d, 'foo/foo.rb'), "$loog.info '#{o}=' + $options.#{o}.to_s")
+        file = File.join(d, 'base.fb')
+        log = Loog::Buffer.new
+        Judges::Update.new(Loog::Tee.new(log, Loog::NULL)).run({ o => 666 }, [d, file])
+        assert_includes(log.to_s, "#{o}=666")
+      end
+    end
+  end
+
   def test_update_with_error_no_quiet
     assert_raises(StandardError) do
       Dir.mktmpdir do |d|

data/test/test_options.rb

@@ -63,7 +63,7 @@ class TestOptions < Minitest::Test
   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.52.2
+  version: 0.53.1
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -358,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Command-Line Tool for a Factbase
 test_files: []