judges 0.53.0 → 0.53.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28476c2fdf2ce4ade1719df441e59d5b1b0cd8f2504419bb298aa11c05c7bbc1
-  data.tar.gz: 6a02a3d691eb27817517a49e60e089a72c40c2e41a844c992c50e0368ea04e18
+  metadata.gz: 60345e60cca92c8891851f29e255831796747e5451a14934538f52c764c3322e
+  data.tar.gz: 27ecf7b216dc3a1f66267168b8bd77c76531067246716765ee3158f6cd1ae00e
 SHA512:
-  metadata.gz: 35b6719aac90034754e98a74a2a16da99995b06f6bf17e7d20a1c604cbb5efdf7af388b41ee60cf55c9b022076eaa8a862c93ed2db70168d05c3e6d1b3025502
-  data.tar.gz: c92556ae80920c8079187acf6bae340a42f9636b96d92f998229e62e931defa5b0dd6e5b3dc3ea2bc25fadff1417e234e97c0ed1f6b07a05bb66c83dd612855f
+  metadata.gz: 87e466051c31be7106a95670c4508789fac2a790627135e26afeef970306c3e7f9762e20c13641277048929e0e8f430343427da49dac387d5a2f09e9f0cde625
+  data.tar.gz: 9aa334a66a192dc65a1e6f7533d6a539c91c72dcbcb7506a0d85ccd01065d7446d58abdd0174dc15c428079078914bf67f08b5aa43a0222155653f82c643799f

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.53.0'
+  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,7 +42,6 @@ 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']
@@ -62,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 = []
@@ -80,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?
@@ -107,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
@@ -153,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
@@ -168,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.53.0' unless const_defined?(:VERSION)
+  VERSION = '0.53.1' unless const_defined?(:VERSION)
 end

data/test/commands/test_update.rb

@@ -89,6 +89,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

@@ -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.53.0
+  version: 0.53.1
 platform: ruby
 authors:
 - Yegor Bugayenko