judges 0.35.0 → 0.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6ea5b0cb2d8ad5e54b8fe3dc642b389b9fbca98f9f4d28924ecd8d4c8f85fb4
-  data.tar.gz: 35fba3154528724481be97f23bce59ff30761f100c6d056a6514a72c5f660b02
+  metadata.gz: 1fde75565aa4889287865d272f2ce95ae788b12bb7fdbf5ea8737d1c8124570d
+  data.tar.gz: ff4f2cc790568ab9c627be92224eb606f9ff91bea1e87a96e88a4fb1acfef4e0
 SHA512:
-  metadata.gz: 402a83df023ef0428007ff704a910491c6ad382b1285bb376dc85cc127772be58cac9d60cb447a585556b5578cda3c9b36e15c09bb166063d24834be1e27ee8b
-  data.tar.gz: e88e01844ae33059d03b030c893d5d3f8dbb2ed9e654c8a78f87c3da9c21cbebde989cffb43bee8944e82f08d6774cab85d428da8c694aba49b28860bcd41249
+  metadata.gz: 3aafb547e3d7e1709cb0be1e0bc05c88d7148d9179ad847e7837e116a7419aa04a8d7595b5af85f8b09b3dc29508918f48df74411f0f007e553f8be7bc9857ab
+  data.tar.gz: 3d7b9bb6c2919cadb493102bb95eb5233103d9d66e75df536feb678bf76bf9bd49f01b1cbf4361fbb9c2809c2760c8809749594b71ea1aca75f5f52a3b95636e

data/Gemfile.lock

@@ -6,7 +6,7 @@ PATH
       baza.rb (~> 0)
       concurrent-ruby (~> 1.2)
       elapsed (~> 0)
-      factbase (>= 0.7.0)
+      factbase (>= 0.7.5)
       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,14 +114,14 @@ GEM
     erubi (1.13.1)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.7.4)
-      backtrace (> 0)
-      decoor (> 0)
+    factbase (0.7.5)
+      backtrace (>= 0.4.0)
+      decoor (>= 0.0.1)
       json (~> 2.7)
-      loog (> 0)
+      loog (>= 0.6.0)
       nokogiri (~> 1.10)
-      others (> 0)
-      tago (> 0)
+      others (>= 0.0.3)
+      tago (>= 0.0.2)
       yaml (~> 0.3)
     faraday (2.12.2)
       faraday-net_http (>= 2.0, < 3.5)
@@ -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)

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
 
@@ -74,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
 
@@ -84,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.5 --verbose test --judge guess ./fixtures"
+    Then Exit code is zero
+    And Stdout contains "Factbase version to be used: '0.7.5'"
+
   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.35.0'
+  s.version = '0.36.1'
   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.5'
   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'
@@ -149,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(

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.35.0'
+  VERSION = '0.36.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.36.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 bindir: bin
 cert_chain: []
-date: 2025-03-03 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -205,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