judges 0.60.3 → 0.60.4

data/lib/judges/commands/pull.rb

@@ -3,16 +3,16 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require 'typhoeus'
-require 'iri'
 require 'baza-rb'
 require 'elapsed'
+require 'iri'
+require 'typhoeus'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 
 # The +pull+ command.
 #
-# This class is instantiated by the +bin/judge+ command line interface. You
+# This class is instantiated by the +bin/judges+ command line interface. You
 # are not supposed to instantiate it yourself.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -30,7 +30,7 @@ class Judges::Pull
   # @param [Array] args List of command line arguments
   # @raise [RuntimeError] If not exactly two arguments provided
   def run(opts, args)
-    raise 'Exactly two arguments required' unless args.size == 2
+    raise(ArgumentError, 'Exactly two arguments required') unless args.size == 2
     fb = Factbase.new
     baza = BazaRb.new(
       opts['host'], opts['port'].to_i, opts['token'],
@@ -47,16 +47,16 @@ class Judges::Pull
           jid = baza.recent(name)
           unless baza.exit_code(jid).zero?
             @loog.warn("STDOUT of the job ##{jid} (from the server):\n#{baza.stdout(jid)}")
-            raise "The job ##{jid} ('#{name}') is broken, maybe you should expire it"
+            raise(StandardError, "The job ##{jid} ('#{name}') is broken, maybe you should expire it")
           end
           fb.import(baza.pull(wait(name, baza, jid, opts['wait'])))
           Judges::Impex.new(@loog, args[1]).export(fb)
         ensure
           baza.unlock(name, opts['owner'])
         end
-        throw :"👍 Pulled #{fb.size} facts by name '#{name}'"
+        throw(:"👍 Pulled #{fb.size} facts by name '#{name}'")
       else
-        throw :"⚠️ Nothing to pull - name '#{name}' not found on server"
+        throw(:"⚠️ Nothing to pull - name '#{name}' not found on server")
       end
     end
   end
@@ -64,14 +64,17 @@ class Judges::Pull
   private
 
   def wait(name, baza, id, limit)
-    raise 'Waiting time is nil' if limit.nil?
+    raise(StandardError, 'Waiting time is nil') if limit.nil?
     start = Time.now
     loop do
       break if baza.finished?(id)
-      sleep 1
-      raise "Time is over, the job ##{id} ('#{name}') is still not completed" if Time.now - start > limit
-      lapsed = Time.now - start
-      @loog.debug("Still waiting for the job ##{id} ('#{name}') to finish... (#{format('%.2f', lapsed)}s already)")
+      sleep(1)
+      if Time.now - start > limit
+        raise(StandardError, "Time is over, the job ##{id} ('#{name}') is still not completed")
+      end
+      @loog.debug(
+        "Still waiting for the job ##{id} ('#{name}') to finish... (#{format('%.2f', Time.now - start)}s already)"
+      )
     end
     id
   end

data/lib/judges/commands/push.rb

@@ -3,16 +3,16 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require 'typhoeus'
-require 'iri'
 require 'baza-rb'
 require 'elapsed'
+require 'iri'
+require 'typhoeus'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 
 # The +push+ command.
 #
-# This class is instantiated by the +bin/judge+ command line interface. You
+# This class is instantiated by the +bin/judges+ command line interface. You
 # are not supposed to instantiate it yourself.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -30,7 +30,7 @@ class Judges::Push
   # @param [Array] args List of command line arguments
   # @raise [RuntimeError] If not exactly two arguments provided
   def run(opts, args)
-    raise 'Exactly two arguments required: <name> and <path>' unless args.size == 2
+    raise(ArgumentError, 'Exactly two arguments required: <name> and <path>') unless args.size == 2
     name = args[0]
     fb = Judges::Impex.new(@loog, args[1]).import
     baza = BazaRb.new(
@@ -45,7 +45,7 @@ class Judges::Push
       baza.lock(name, opts['owner'])
       begin
         baza.push(name, fb.export, opts['meta'] || [])
-        throw :"👍 Pushed #{fb.size} facts to baza"
+        throw(:"👍 Pushed #{fb.size} facts to baza")
       ensure
         baza.unlock(name, opts['owner'])
       end

data/lib/judges/commands/test.rb

@@ -2,22 +2,23 @@
 
 # SPDX-FileCopyrightText: Copyright (c) 2024-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
-require 'nokogiri'
-require 'factbase'
+
 require 'backtrace'
-require 'factbase/to_xml'
 require 'elapsed'
 require 'ellipsized'
+require 'factbase'
+require 'factbase/to_xml'
+require 'nokogiri'
 require 'timeout'
 require_relative '../../judges'
-require_relative '../../judges/to_rel'
+require_relative '../../judges/categories'
 require_relative '../../judges/judges'
 require_relative '../../judges/options'
-require_relative '../../judges/categories'
+require_relative '../../judges/to_rel'
 
 # The +test+ command.
 #
-# This class is instantiated by the +bin/judge+ command line interface. You
+# This class is instantiated by the +bin/judges+ command line interface. You
 # are not supposed to instantiate it yourself.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -34,8 +35,9 @@ class Judges::Test
   # @param [Hash] opts Command line options (start with '--')
   # @param [Array] args List of command line arguments
   # @raise [RuntimeError] If not exactly one argument provided
+  # rubocop:disable Metrics/MethodLength
   def run(opts, args)
-    raise 'Exactly one argument required' unless args.size == 1
+    raise(ArgumentError, 'Exactly one argument required') unless args.size == 1
     dir = args[0]
     @loog.info("Testing judges in #{dir.to_rel}...")
     errors = []
@@ -51,87 +53,112 @@ class Judges::Test
         @loog.info("👉 Testing #{judge.script} (##{i}) in #{judge.dir.to_rel}...")
         buf = Loog::Buffer.new
         judge = judge.with_loog(buf)
-        judge.tests.each do |f|
-          tname = File.basename(f).gsub(/\.yml$/, '')
-          visible << "  #{judge.name}/#{tname}"
-          next unless include?(opts, judge.name, tname)
-          yaml = YAML.load_file(f, permitted_classes: [Time])
-          if yaml['skip']
-            buf.info("Skipped #{f.to_rel}")
-            next
-          end
-          unless Judges::Categories.new(opts['enable'], opts['disable']).ok?(yaml['category'])
-            buf.info("Skipped #{f.to_rel} because of its category")
-            next
-          end
-          buf.info("🛠️ Testing #{f.to_rel}:")
-          start = Time.now
-          badge = "#{judge.name}/#{tname}"
-          begin
-            fb = Factbase.new
-            prepare(fb, yaml)
-            yaml['before']&.each do |n|
-              j = judges.get(n).with_loog(buf)
-              buf.info("Running #{j.script} judge as a pre-condition...")
-              test_one(fb, opts, j, n, yaml, assert: false)
-            end
-            test_one(fb, opts, judge, tname, yaml)
-            yaml['after']&.each do |rb|
-              buf.info("Running #{rb} assertion script...")
-              $fb = fb
-              $loog = buf
-              if yaml['timeout']
-                Timeout.timeout(yaml['timeout']) do
-                  load(File.join(judge.dir, rb), true)
-                end
-              else
-                load(File.join(judge.dir, rb), true)
-              end
-            end
-            tests += 1
-          rescue StandardError => e
-            @loog.info(buf.to_s)
-            @loog.warn(Backtrace.new(e))
-            errors << badge
-          end
-          times[badge] = Time.now - start
-        end
+        tests += run_judge_tests(judge, buf, opts, judges, visible, times, errors)
         tested += 1
       end
-      unless times.empty?
-        fmt = "%-60s\t%9s\t%-9s"
-        @loog.info(
-          [
-            'Test summary:',
-            format(fmt, 'Script', 'Seconds', 'Result'),
-            format(fmt, '---', '---', '---'),
-            times.sort_by { |_, v| v }.reverse.map do |script, sec|
-              format(fmt, script.ellipsized(50), format('%.3f', sec), errors.include?(script) ? 'ERROR' : 'OK')
-            end.join("\n  ")
-          ].join("\n  ")
-        )
-      end
-      throw :'👍 No judges tested' if tested.zero?
-      throw :"👍 All #{tested} judge(s) but no tests passed" if tests.zero?
-      throw :"👍 All #{tested} judge(s) and #{tests} tests passed" if errors.empty?
-      throw :"❌ #{tested} judge(s) tested, #{errors.size} of them failed"
+      print_test_summary(times, errors, tested, tests)
     end
     unless errors.empty?
-      raise "#{errors.size} tests failed" unless opts['quiet']
-      @loog.debug('Not failing the build with tests failures, due to the --quiet option')
+      raise(StandardError, "#{errors.size} tests failed") unless opts['quiet']
+      @loog.debug('Not failing the build with test failures, due to the --quiet option')
     end
     return unless tested.zero? || tests.zero?
     if opts['judge'].nil?
-      raise 'There are seems to be no judges' unless opts['quiet']
+      raise(StandardError, 'There seem to be no judges') unless opts['quiet']
       @loog.debug('Not failing the build with no judges tested, due to the --quiet option')
     else
-      raise 'There are seems to be no judges' if visible.empty?
+      raise(StandardError, 'There seem to be no judges') if visible.empty?
       @loog.info("The following judges are available to use with the --judge option:\n  #{visible.join("\n  ")}")
     end
   end
+  # rubocop:enable Metrics/MethodLength
 
   private
 
+  def run_judge_tests(judge, buf, opts, judges, visible, times, errors)
+    count = 0
+    judge.tests.each do |f|
+      tname = File.basename(f).gsub(/\.yml$/, '')
+      visible << "  #{judge.name}/#{tname}"
+      next unless include?(opts, judge.name, tname)
+      yaml = YAML.load_file(f, permitted_classes: [Time])
+      next if skip_test?(buf, f, yaml, opts)
+      buf.info("🛠️ Testing #{f.to_rel}:")
+      badge = "#{judge.name}/#{tname}"
+      start = Time.now
+      begin
+        count += run_single_test(judge, buf, opts, judges, yaml, badge)
+      rescue StandardError => e
+        @loog.info(buf.to_s)
+        @loog.warn(Backtrace.new(e))
+        errors << badge
+      end
+      times[badge] = Time.now - start
+    end
+    count
+  end
+
+  def skip_test?(buf, path, yaml, opts)
+    if yaml['skip']
+      buf.info("Skipped #{path.to_rel}")
+      return true
+    end
+    unless Judges::Categories.new(opts['enable'], opts['disable']).ok?(yaml['category'])
+      buf.info("Skipped #{path.to_rel} because of its category")
+      return true
+    end
+    false
+  end
+
+  def run_single_test(judge, buf, opts, judges, yaml, badge)
+    fb = Factbase.new
+    prepare(fb, yaml)
+    yaml['before']&.each do |n|
+      j = judges.get(n).with_loog(buf)
+      buf.info("Running #{j.script} judge as a pre-condition...")
+      test_one(fb, opts, j, n, yaml, assert: false)
+    end
+    tname = badge.split('/').last
+    test_one(fb, opts, judge, tname, yaml)
+    run_after_assertions(judge, buf, fb, yaml)
+    1
+  end
+
+  def run_after_assertions(judge, buf, fb, yaml)
+    yaml['after']&.each do |rb|
+      buf.info("Running #{rb} assertion script...")
+      $fb = fb
+      $loog = buf
+      if yaml['timeout']
+        Timeout.timeout(yaml['timeout']) do
+          load(File.join(judge.dir, rb), true)
+        end
+      else
+        load(File.join(judge.dir, rb), true)
+      end
+    end
+  end
+
+  def print_test_summary(times, errors, tested, tests)
+    unless times.empty?
+      fmt = "%-60s\t%9s\t%-9s"
+      @loog.info(
+        [
+          'Test summary:',
+          format(fmt, 'Script', 'Seconds', 'Result'),
+          format(fmt, '---', '---', '---'),
+          times.sort_by { |_, v| v }.reverse.map do |script, sec|
+            format(fmt, script.ellipsized(50), format('%.3f', sec), errors.include?(script) ? 'ERROR' : 'OK')
+          end.join("\n  ")
+        ].join("\n  ")
+      )
+    end
+    throw(:'👍 No judges tested') if tested.zero?
+    throw(:"👍 All #{tested} judge(s) but no tests passed") if tests.zero?
+    throw(:"👍 All #{tested} judge(s) and #{tests} tests passed") if errors.empty?
+    throw(:"❌ #{tested} judge(s) tested, #{errors.size} of them failed")
+  end
+
   def include?(opts, name, tname = nil)
     judges = opts['judge'] || []
     return true if judges.empty?
@@ -148,14 +175,14 @@ class Judges::Test
         i.each do |k, vv|
           if vv.is_a?(Array)
             vv.each do |v|
-              f.send(:"#{k}=", v)
+              f.public_send(:"#{k}=", v)
             end
           else
             if k == '_id'
               vv = id
               id += 1
             end
-            f.send(:"#{k}=", vv)
+            f.public_send(:"#{k}=", vv)
           end
         end
       end
@@ -170,6 +197,7 @@ class Judges::Test
   # @param [Hash] yaml The YAML to be tested
   # @param [Boolean] assert Should we assert (TRUE) or simply skip (FALSE)?
   # @return [nil] Always NIL
+  # rubocop:disable Metrics/MethodLength
   def test_one(fb, opts, judge, tname, yaml, assert: true)
     options = Judges::Options.new(opts['option']) + Judges::Options.new(yaml['options'])
     runs = opts['runs'] || yaml['runs'] || 1
@@ -177,10 +205,10 @@ class Judges::Test
     (1..runs).each do |r|
       fbx = fb
       if opts['log']
-        require 'factbase/logged'
+        require('factbase/logged')
         fbx = Factbase::Logged.new(fb, @loog)
       end
-      expected_failure = yaml['expected_failure']
+      failure = yaml['expected_failure']
       begin
         if timeout
           Timeout.timeout(timeout) do
@@ -189,28 +217,32 @@ class Judges::Test
         else
           judge.run(fbx, {}, {}, options)
         end
-        raise 'Exception expected but not raised' if expected_failure
+        raise(StandardError, 'Exception expected but not raised') if failure
       rescue Timeout::Error => e
-        raise "Test timed out after #{timeout} seconds"
+        raise(StandardError, "Test timed out after #{timeout} seconds")
       # rubocop:disable Lint/RescueException
       rescue Exception => e
         # rubocop:enable Lint/RescueException
-        raise e unless expected_failure
-        if expected_failure.is_a?(Array) && expected_failure.none? { |s| e.message.include?(s) }
-          raise "Exception #{e.class} raised with #{e.message.inspect}, but this is not what was expected"
+        raise(e) unless failure
+        if failure.is_a?(Array) && failure.none? { |s| e.message.include?(s) }
+          raise(
+            StandardError,
+            "Exception #{e.class} raised with #{e.message.inspect}, but this is not what was expected"
+          )
         end
       end
       next unless assert
       assert(judge, tname, fb, yaml) if r == runs || opts['assert_once'].is_a?(FalseClass)
     end
   end
+  # rubocop:enable Metrics/MethodLength
 
   def assert(judge, tname, fb, yaml)
     xpaths = yaml['expected']
     return if xpaths.nil?
     xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
     xpaths.each do |xp|
-      raise "#{judge.name}/#{tname} doesn't match '#{xp}':\n#{xml}" if xml.xpath(xp).empty?
+      raise(StandardError, "#{judge.name}/#{tname} doesn't match '#{xp}':\n#{xml}") if xml.xpath(xp).empty?
     end
   end
 end

data/lib/judges/commands/trim.rb

@@ -3,14 +3,14 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require 'time'
 require 'elapsed'
+require 'time'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 
 # The +trim+ command.
 #
-# This class is instantiated by the +bin/judge+ command line interface. You
+# This class is instantiated by the +bin/judges+ command line interface. You
 # are not supposed to instantiate it yourself.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -28,14 +28,14 @@ class Judges::Trim
   # @param [Array] args List of command line arguments
   # @raise [RuntimeError] If not exactly one argument provided
   def run(opts, args)
-    raise 'Exactly one argument required' unless args.size == 1
+    raise(ArgumentError, 'Exactly one argument required') unless args.size == 1
     impex = Judges::Impex.new(@loog, args[0])
     fb = impex.import
     elapsed(@loog, level: Logger::INFO) do
       deleted = fb.query(opts['query']).delete!
-      throw :'⚠️ No facts deleted' if deleted.zero?
+      throw(:'⚠️ No facts deleted') if deleted.zero?
       impex.export(fb)
-      throw :"👍 #{deleted} fact(s) deleted"
+      throw(:"👍 #{deleted} fact(s) deleted")
     end
   end
 end