judges 0.34.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e26309233bda6e09c9673cc9b17b3a6309897e2e2a19505288889fe947af3d7
-  data.tar.gz: 895a20352dd34b430f3001de0ba8c5eb97e0f1fd2de77386ad63d9282831e021
+  metadata.gz: 18f43a54137335635c83546194f70f967bb731b09b33776c9ee8b5539cd5475a
+  data.tar.gz: 9ecd3d91db07e3f7602493ca6c19efb6f975647b2550ef1a6e07aa784fc0f822
 SHA512:
-  metadata.gz: 7bb06d82f69a67972774c2a7ef92bfc1655bcd30f4c162cae6d1669192725a3e7fc28efecaab9fda0bf3ac4a31b84725412248009ff22a7c77e289ae0699947c
-  data.tar.gz: 621ea22a9b604c2433e07ff6a5c241c86d8559de17b59def8d2878477fe5c4340a565090daa38770b054d81960ec45250db10282dd356b05367397fba066e65c
+  metadata.gz: fdf630e6da9a50c250b195c0220f16274065c0ee6a92e237a393d31f62769637fdb18fd064b6c479b9bf8c2605eda772ffb9985a37593e187b44020cf49e73b1
+  data.tar.gz: 32d39b254fac069747749c24e093b6e73fbfc09ca740a577e1c71804c8365eda13914f58e79e83947b8550c0f752f9054405e1e4aa4daa464e17ebc7e173dc0d

data/.gitignore

@@ -1,10 +1,11 @@
-coverage/
-.idea/
 *.gem
-.bundle/
 .DS_Store
-rdoc/
-doc/
+.bundle/
+.idea/
 .yardoc/
+coverage/
+doc/
+node_modules/
+rdoc/
 temp/
 vendor/

data/.rultor.yml

@@ -3,7 +3,7 @@
 ---
 # yamllint disable rule:line-length
 docker:
-  image: yegor256/rultor-ruby
+  image: yegor256/ruby
 assets:
   rubygems.yml: yegor256/home#assets/rubygems.yml
 install: |

data/Gemfile

@@ -12,7 +12,7 @@ gem 'minitest-reporters', '1.7.1', require: false
 gem 'rake', '13.2.1', require: false
 gem 'random-port', '~>0.0', require: false
 gem 'rspec-rails', '7.1.1', require: false
-gem 'rubocop', '1.72.2', require: false
+gem 'rubocop', '1.73.1', require: false
 gem 'rubocop-minitest', '>0', require: false
 gem 'rubocop-performance', '>0', require: false
 gem 'rubocop-rake', '>0', require: false

data/Gemfile.lock

@@ -6,7 +6,7 @@ PATH
       baza.rb (~> 0)
       concurrent-ruby (~> 1.2)
       elapsed (~> 0)
-      factbase (>= 0.7.0)
+      factbase (= 0.7.4)
       gli (~> 2.21)
       iri (~> 0)
       loog (~> 0)
@@ -16,6 +16,7 @@ PATH
       retries (~> 0)
       tago (~> 0)
       timeout (~> 0)
+      total (~> 0)
       typhoeus (~> 1.3)
 
 GEM
@@ -113,7 +114,7 @@ GEM
     erubi (1.13.1)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.7.3)
+    factbase (0.7.4)
       backtrace (> 0)
       decoor (> 0)
       json (~> 2.7)
@@ -253,7 +254,7 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.2)
-    rubocop (1.72.2)
+    rubocop (1.73.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -264,7 +265,7 @@ GEM
       rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
+    rubocop-ast (1.38.1)
       parser (>= 3.3.1.0)
     rubocop-minitest (0.37.1)
       lint_roller (~> 1.1)
@@ -297,6 +298,7 @@ GEM
     tago (0.0.2)
     thor (1.3.2)
     timeout (0.4.3)
+    total (0.4.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
@@ -304,7 +306,7 @@ GEM
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    uri (1.0.2)
+    uri (1.0.3)
     useragent (0.16.11)
     w3c_validators (1.3.7)
       json (>= 1.8)
@@ -336,7 +338,7 @@ DEPENDENCIES
   rake (= 13.2.1)
   random-port (~> 0.0)
   rspec-rails (= 7.1.1)
-  rubocop (= 1.72.2)
+  rubocop (= 1.73.1)
   rubocop-minitest (> 0)
   rubocop-performance (> 0)
   rubocop-rake (> 0)

data/README.md

@@ -86,7 +86,7 @@ be present in the message of the exception being raised.
 
 Read
 [these guidelines](https://www.yegor256.com/2014/04/15/github-guidelines.html).
-Make sure you build is green before you contribute
+Make sure your build is green before you contribute
 your pull request. You will need to have
 [Ruby](https://www.ruby-lang.org/en/) 3.0+ and
 [Bundler](https://bundler.io/) installed. Then:

data/bin/judges

@@ -7,8 +7,9 @@ $stdout.sync = true
 
 require 'gli'
 require 'loog'
+require 'tago'
 require 'time'
-require 'factbase'
+require 'total'
 require_relative '../lib/judges'
 
 Encoding.default_external = Encoding::UTF_8
@@ -19,8 +20,10 @@ class JudgesGLI extend GLI::App
   def self.run_it(cmd, ruby)
     cmd.action do |global, options, args|
       require_relative "../lib/judges/commands/#{ruby}"
+      start = Time.now
       @@loog.debug("Running '#{ruby}' command...")
       Object.const_get("Judges::#{ruby.capitalize}").new(@@loog).run(options, args)
+      @@loog.debug("Command '#{ruby}' finished in #{start.ago}")
     end
   end
 
@@ -36,16 +39,25 @@ class JudgesGLI extend GLI::App
 
   desc 'Make it more verbose, logging as much as possible'
   switch([:v, :verbose])
+  desc 'Version of Factbase to use'
+  flag([:factbase], type: String)
 
   pre do |global, command, options, args|
     if global[:verbose]
       @@loog = Loog::VERBOSE
     end
     @@loog.debug("Judges #{Judges::VERSION}")
+    if global[:factbase]
+      ver = global[:factbase]
+      @@loog.debug("Factbase version to be used: '#{ver}' (set via --factbase)")
+      gem 'factbase', ver
+    end
+    require 'factbase'
     @@loog.debug("Factbase #{Factbase::VERSION}")
     @@loog.debug("Ruby: #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}")
     @@loog.debug("Current directory: #{Dir.getwd}")
     @@loog.debug("Time: #{Time.now.utc.iso8601}")
+    @@loog.debug("Total memory: #{Total::Mem.new.bytes / (1024 * 1024)}Mb")
     true
   end
 
@@ -55,6 +67,8 @@ class JudgesGLI extend GLI::App
     c.flag([:o, :option], multiple: true, arg_name: '<key=value>')
     c.desc 'File with options, one k=v pair per line'
     c.flag([:'options-file'])
+    c.desc 'Name of the judge to run (directory name)'
+    c.flag([:judge], multiple: true)
     c.desc 'The location of a Ruby library (directory with .rb files to include)'
     c.flag([:lib])
     c.desc 'Maximum time in seconds to spend on every judge (forcefully terminate if over time)'
@@ -72,6 +86,8 @@ class JudgesGLI extend GLI::App
 
   desc 'Evaluate a single Ruby expression on the factbase'
   command :eval do |c|
+    c.desc 'Use default logging facility'
+    c.switch([:log], default_value: true)
     run_it(c, 'eval')
   end
 
@@ -82,6 +98,8 @@ class JudgesGLI extend GLI::App
 
   desc 'Import YAML into a factbase'
   command :import do |c|
+    c.desc 'Use default logging facility'
+    c.switch([:log], default_value: true)
     run_it(c, 'import')
   end
 

data/features/test.feature

@@ -15,6 +15,11 @@ Feature: Test
     Then Stdout contains "All 1 judge(s) and 1 tests passed"
     And Exit code is zero
 
+  Scenario: Factbase version can be set
+    When I run bin/judges with "--factbase 0.7.4 --verbose test --judge guess ./fixtures"
+    Then Exit code is zero
+    And Stdout contains "Factbase version to be used: '0.7.4'"
+
   Scenario: Simple test of no judges
     Given I run bin/judges with "test --judge absent_for_sure ./fixtures"
     Then Exit code is zero

data/features/update.feature

@@ -44,7 +44,7 @@ Feature: Update
       $fb.insert.foo = 1
     """
     Then I run bin/judges with "--verbose update --timeout 1 --quiet . foo.fb"
-    Then Stdout contains "timed out"
+    Then Stdout contains "execution expired"
     Then Stdout contains "1 judge(s) processed"
     Then Stdout contains "Update finished 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.34.0'
+  s.version = '0.36.0'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'baza.rb', '~>0'
   s.add_dependency 'concurrent-ruby', '~>1.2'
   s.add_dependency 'elapsed', '~>0'
-  s.add_dependency 'factbase', '>=0.7.0'
+  s.add_dependency 'factbase', '0.7.4'
   s.add_dependency 'gli', '~>2.21'
   s.add_dependency 'iri', '~>0'
   s.add_dependency 'loog', '~>0'
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'retries', '~>0'
   s.add_dependency 'tago', '~>0'
   s.add_dependency 'timeout', '~>0'
+  s.add_dependency 'total', '~>0'
   s.add_dependency 'typhoeus', '~>1.3'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/judges/commands/eval.rb

@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: MIT
 
 require 'elapsed'
-require 'factbase/looged'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 
@@ -21,12 +20,15 @@ class Judges::Eval
     @loog = loog
   end
 
-  def run(_opts, args)
+  def run(opts, args)
     raise 'Exactly two arguments required' unless args.size == 2
     impex = Judges::Impex.new(@loog, args[0])
     elapsed(@loog, level: Logger::INFO) do
       $fb = impex.import(strict: false)
-      $fb = Factbase::Looged.new($fb, @loog)
+      if opts['log']
+        require 'factbase/logged'
+        $fb = Factbase::Logged.new($fb, @loog)
+      end
       expr = args[1]
       # rubocop:disable Security/Eval
       eval(expr)

data/lib/judges/commands/import.rb

@@ -5,7 +5,6 @@
 
 require 'elapsed'
 require 'time'
-require 'factbase/looged'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 require_relative '../../judges/to_rel'
@@ -23,7 +22,7 @@ class Judges::Import
     @loog = loog
   end
 
-  def run(_opts, args)
+  def run(opts, args)
     raise 'Exactly two arguments required' unless args.size == 2
     raise "File not found #{args[0].to_rel}" unless File.exist?(args[0])
     elapsed(@loog, level: Logger::INFO) do
@@ -31,7 +30,10 @@ class Judges::Import
       @loog.info("YAML loaded from #{args[0].to_rel} (#{yaml.size} facts)")
       impex = Judges::Impex.new(@loog, args[1])
       fb = impex.import(strict: false)
-      fb = Factbase::Looged.new(fb, @loog)
+      if opts['log']
+        require 'factbase/logged'
+        fb = Factbase::Logged.new(fb, @loog)
+      end
       yaml.each do |i|
         f = fb.insert
         i.each do |p, v|

data/lib/judges/commands/test.rb

@@ -6,7 +6,6 @@
 require 'nokogiri'
 require 'factbase'
 require 'backtrace'
-require 'factbase/looged'
 require 'factbase/to_xml'
 require 'elapsed'
 require_relative '../../judges'
@@ -92,7 +91,9 @@ class Judges::Test
             'Time summaries:',
             format(fmt, 'Script', 'Seconds'),
             format(fmt, '---', '---'),
-            times.map { |script, sec| format(fmt, script, format('%.3f', sec)) }.join("\n  ")
+            times.sort_by { |_, v| v }.reverse.map do |script, sec|
+              format(fmt, script, format('%.3f', sec))
+            end.join("\n  ")
           ].join("\n  ")
         )
       end
@@ -147,7 +148,10 @@ class Judges::Test
     runs = opts['runs'] || yaml['runs'] || 1
     (1..runs).each do |r|
       fbx = fb
-      fbx = Factbase::Looged.new(fb, @loog) if opts['log']
+      if opts['log']
+        require 'factbase/logged'
+        fbx = Factbase::Logged.new(fb, @loog)
+      end
       expected_failure = yaml['expected_failure']
       begin
         judge.run(fbx, {}, {}, options)

data/lib/judges/commands/update.rb

@@ -5,15 +5,14 @@
 
 require 'backtrace'
 require 'elapsed'
-require 'factbase/looged'
 require 'factbase/churn'
 require 'tago'
 require 'timeout'
 require_relative '../../judges'
-require_relative '../../judges/to_rel'
+require_relative '../../judges/impex'
 require_relative '../../judges/judges'
 require_relative '../../judges/options'
-require_relative '../../judges/impex'
+require_relative '../../judges/to_rel'
 
 # The +update+ command.
 #
@@ -39,7 +38,10 @@ class Judges::Update
     start = Time.now
     impex = Judges::Impex.new(@loog, args[1])
     fb = impex.import(strict: false)
-    fb = Factbase::Looged.new(fb, @loog) if opts['log']
+    if opts['log']
+      require 'factbase/logged'
+      fb = Factbase::Logged.new(fb, @loog)
+    end
     options = Judges::Options.new(opts['option'])
     if opts['options-file']
       options += Judges::Options.new(
@@ -111,12 +113,13 @@ class Judges::Update
     global = {}
     elapsed(@loog, level: Logger::INFO) do
       done =
-        judges.each_with_index do |p, i|
-          @loog.info("\n👉 Running #{p.name} (##{i}) at #{p.dir.to_rel} (#{start.ago} already)...")
+        judges.each_with_index do |judge, i|
+          next unless include?(opts, judge.name)
+          @loog.info("\n👉 Running #{judge.name} (##{i}) at #{judge.dir.to_rel} (#{start.ago} already)...")
           elapsed(@loog, level: Logger::INFO) do
-            c = one_judge(opts, fb, p, global, options, errors)
+            c = one_judge(opts, fb, judge, global, options, errors)
             churn += c
-            throw :"👍 The '#{p.name}' judge #{c} out of #{fb.size}"
+            throw :"👍 The '#{judge.name}' judge #{c} out of #{fb.size}"
           end
         rescue StandardError, SyntaxError => e
           @loog.warn(Backtrace.new(e))
@@ -152,4 +155,10 @@ class Judges::Update
       throw :"👎 The '#{judge.name}' judge timed out: #{e.message}"
     end
   end
+
+  def include?(opts, name)
+    judges = opts['judge'] || []
+    return true if judges.empty?
+    judges.any?(name)
+  end
 end

data/lib/judges/judge.rb

@@ -55,6 +55,11 @@ class Judges::Judge
     elapsed(@loog, intro: "#{$judge} finished", level: Logger::INFO) do
       load(s, true)
       $fb.churn
+      # rubocop:disable Lint/RescueException
+    rescue Exception => e
+      # rubocop:enable Lint/RescueException
+      @loog.error(Backtrace.new(e))
+      raise e.message
     ensure
       $fb = $judge = $options = $loog = nil
     end

data/lib/judges.rb

@@ -8,5 +8,5 @@
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 module Judges
-  VERSION = '0.34.0'
+  VERSION = '0.36.0'
 end

data/test/commands/test_update.rb

@@ -28,6 +28,17 @@ class TestUpdate < Minitest::Test
     end
   end
 
+  def test_with_only_one_judge
+    Dir.mktmpdir do |d|
+      save_it(File.join(d, 'foo/foo.rb'), 'return if $fb.size > 2; $fb.insert')
+      save_it(File.join(d, 'bar/bar.rb'), '-&- bug here -&-')
+      file = File.join(d, 'base.fb')
+      Judges::Update.new(Loog::NULL).run({ 'judge' => ['foo'] }, [d, file])
+      assert_path_exists(file)
+      assert_raises(StandardError) { Judges::Update.new(Loog::NULL).run({}, [d, file]) }
+    end
+  end
+
   def test_cancels_slow_judge
     Dir.mktmpdir do |d|
       save_it(File.join(d, 'foo/foo.rb'), 'sleep 10; $fb.insert.foo = 1')

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Yegor Bugayenko
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -70,16 +69,16 @@ dependencies:
   name: factbase
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +205,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: total
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -318,7 +331,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -334,8 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Command-Line Tool for a Factbase
 test_files: []