judges 0.0.17 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7312c2f398cbad4906226fbc64c489a95428281003dcab21988185b214bea734
-  data.tar.gz: 7ecf453fcef5028bb43219ddfde277bd1e0e3633059afa69bafe895c8b9fa52a
+  metadata.gz: 22748b35c785164e5fef5f8a6d013d92c380e2023d9806759339a11763f51554
+  data.tar.gz: 9245a7682189a256d5cd2b2779c7163189e751db721d0dd0eeb54e804bb0e7ca
 SHA512:
-  metadata.gz: 8000605816940bd197b284921b1a8218e51537c77f98fd7a932f5f47bac5c366dbe48fa3da0113dfa2db0c3760070d943a5d07a189f29ee87ddb3e0f6cedb18f
-  data.tar.gz: 9692dc49019dab0d0573cec9a95bbdd611328a7e2d95b3efc12ae5cc2e6a250d1ed2801d0c54b954872f53cf5d00139bf12c514612b8a86be72d18cf6dfd3d5e
+  metadata.gz: 0b8d102de3483627367d4f8705b5473324f469b9a9d7367bbdee224f3d1db6e37a8ed34bab345ef6930dd321f473781b69e314c53aab2e499c8f8f10916ef519
+  data.tar.gz: d564a60e8d813fb4b785b0e4c084012f360c920ced92138bdf0f247f3aa89e1e5ac86104f928129cc2cc24b1c705d3d7f59c2d25bd59f019a4958024e0dcaa06

data/bin/judges

@@ -29,7 +29,7 @@ require 'factbase'
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
-ver = '0.0.17'
+ver = '0.0.19'
 
 include GLI::App
 
@@ -58,6 +58,8 @@ desc 'Update the factbase by passing all judges one by one'
 command :update do |c|
   c.desc 'Options to pass to every judge'
   c.flag([:o, :option], multiple: true, arg_name: '<key=value>')
+  c.desc 'Maximum number of update cycles to run'
+  c.flag([:'max-cycles'], default_value: 8, type: Integer)
   c.action do |global, options, args|
     require_relative '../lib/judges/commands/update'
     Judges::Update.new(loog).run(options, args)

data/features/cli.feature

@@ -14,15 +14,14 @@ Feature: Simple Run
     Given I make a temp directory
     Then I have a "simple/simple_judge.rb" file with content:
     """
-      $fb.query("(eq kind 'foo')").each do |f|
-        n = $fb.insert
-        n.kind = 'yes!'
-      end
+      n = $fb.insert
+      n.kind = 'yes!'
     """
-    Then I run bin/judges with "--verbose update -o foo=1 -o bar=2 . simple.fb"
+    Then I run bin/judges with "--verbose update -o foo=1 -o bar=2 --max-cycles 3 . simple.fb"
     Then Stdout contains "foo → "
     Then Stdout contains "bar → "
     Then Stdout contains "1 judges processed"
+    Then Stdout contains "Update finished in 3 cycles"
     And Exit code is zero
 
   Scenario: Simple test of a few judges
@@ -44,17 +43,19 @@ Feature: Simple Run
     Given I make a temp directory
     Then I have a "simple/simple_judge.rb" file with content:
     """
+      return if $fb.size > 2
       $fb.insert.time = Time.now - 100 * 60 * 60 * 24
     """
     Then I run bin/judges with "--verbose update . simple.fb"
     Given I run bin/judges with "trim --days 5 simple.fb"
-    Then Stdout contains "1 facts deleted"
+    Then Stdout contains "3 facts deleted"
     And Exit code is zero
 
   Scenario: Simple print of a small factbase
     Given I make a temp directory
     Then I have a "simple/simple_judge.rb" file with content:
     """
+      return if $fb.size > 2
       n = $fb.insert
       n.kind = 'yes!'
     """

data/judges.gemspec

@@ -26,7 +26,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.0.17'
+  s.version = '0.0.19'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description = '
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'backtrace', '~> 0.3'
-  s.add_runtime_dependency 'factbase', '~>0.0.15'
+  s.add_runtime_dependency 'factbase', '~>0.0.16'
   s.add_runtime_dependency 'gli', '~>2.21'
   s.add_runtime_dependency 'loog', '~>0.2'
   s.add_runtime_dependency 'nokogiri', '~> 1.10'

data/lib/judges/commands/update.rb

@@ -44,8 +44,27 @@ class Judges::Update
     fb = impex.import(strict: false)
     options = Judges::Options.new(opts['option'])
     @loog.debug("The following options provided:\n\t#{options.to_s.gsub("\n", "\n\t")}")
+    packs = Judges::Packs.new(dir, @loog)
+    c = 0
+    loop do
+      c += 1
+      diff = cycle(packs, fb, impex, options)
+      break if diff.zero?
+      if !opts['max-cycles'].nil? && c >= opts['max-cycles']
+        @loog.info('Too many cycles already, as set by --max-cycles, breaking')
+        break
+      end
+      @loog.info("#{diff} modifications at the cycle ##{c}")
+    end
+    @loog.info("Update finished in #{c} cycles")
+  end
+
+  private
+
+  def cycle(packs, fb, impex, options)
     errors = []
-    done = Judges::Packs.new(dir, @loog).each_with_index do |p, i|
+    diff = 0
+    done = packs.each_with_index do |p, i|
       @loog.info("Running #{p.dir.to_rel} (##{i})...")
       before = fb.size
       begin
@@ -56,9 +75,11 @@ class Judges::Update
       end
       after = fb.size
       @loog.info("Pack #{p.dir.to_rel} added #{after - before} facts") if after > before
+      diff += after - before
     end
     @loog.info("#{done} judges processed (#{errors.size} errors)")
     raise "Failed to update correctly (#{errors.size} errors)" unless errors.empty?
     impex.export(fb)
+    diff
   end
 end

data/test/commands/test_update.rb

@@ -33,7 +33,7 @@ require_relative '../../lib/judges/commands/update'
 class TestUpdate < Minitest::Test
   def test_build_factbase_from_scratch
     Dir.mktmpdir do |d|
-      File.write(File.join(d, 'foo.rb'), '$fb.insert.zzz = $options.foo_bar + 1')
+      File.write(File.join(d, 'foo.rb'), 'return if $fb.size > 2; $fb.insert.zzz = $options.foo_bar + 1')
       file = File.join(d, 'base.fb')
       Judges::Update.new(Loog::VERBOSE).run({ 'option' => ['foo_bar=42'] }, [d, file])
       fb = Factbase.new
@@ -50,7 +50,7 @@ class TestUpdate < Minitest::Test
       fb.insert.foo_bar = 42
       File.binwrite(file, fb.export)
       File.write(File.join(d, 'foo.rb'), '$fb.insert.tt = 4')
-      Judges::Update.new(Loog::VERBOSE).run({}, [d, file])
+      Judges::Update.new(Loog::VERBOSE).run({ 'max-cycles' => 1 }, [d, file])
       fb = Factbase.new
       fb.import(File.binread(file))
       xml = Nokogiri::XML.parse(fb.to_xml)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.19
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-14 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.15
+        version: 0.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.15
+        version: 0.0.16
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement