judges 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 583517ec65d24d9415fde952e8ce79daa7fc31662b72642c24e8bafcc211eea5
-  data.tar.gz: 9ab9e0ecbf4f9adec75e07c19053e9c8c0dd28233af16dea85cee57db732fd75
+  metadata.gz: 8399b8c8623c0d099deeb50055658e072bae333b0d851cd0aaef22f441655950
+  data.tar.gz: c8ef8e75705e8d0cf3bdb8033c054f7ac4c239566bf0cb80b6a9cc0943932986
 SHA512:
-  metadata.gz: '07668e2dde2cfa7290b622e4a683796aaa7913a0591f84c64e4dd0eb5d46b9cd5c5a6e4088caa8f2025f28171aa93d1f44784b6366b63f5ac1da37814b8cc84b'
-  data.tar.gz: 704b1c14632b39c402075fcb5f51c45711b5668a8e7b037b7a2d0a4b6ff209a55f687cdbfa5f0e7b646aefc08e0f17597089f2a632ef7dd89f4b7905782b4111
+  metadata.gz: 7a187a9441700826cf7b539ed264a7d80e5e749169219c62d717cee1451cd77e78f5e9a130617dd2e589ad0c13d504e27482527db2dc6b80da12561ff8d1e3e4
+  data.tar.gz: 38c5ae3b4af2981b56d9069a794d791ea107cfae27421f12dce9b001a8ff1d60f38c972362fbd659c4e53f750b35a6192ff66b4869280510286c3d585073d0ae

data/bin/judges

@@ -29,7 +29,7 @@ require 'factbase'
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
-ver = '0.0.16'
+ver = '0.0.18'
 
 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)
   c.action do |global, options, args|
     require_relative '../lib/judges/commands/update'
     Judges::Update.new(loog).run(options, args)
@@ -96,7 +98,9 @@ end
 desc 'Run automated tests for all judges'
 command :test do |c|
   c.desc 'Name of the test pack to run'
-  c.flag([:pack], default_value: '')
+  c.flag([:pack], multiple: true)
+  c.desc 'Fail if no judges tested?'
+  c.flag([:quiet], default_value: false)
   c.action do |global, options, args|
     require_relative '../lib/judges/commands/test'
     Judges::Test.new(loog).run(options, args)

data/features/cli.feature

@@ -19,7 +19,7 @@ Feature: Simple Run
         n.kind = 'yes!'
       end
     """
-    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 2 . simple.fb"
     Then Stdout contains "foo → "
     Then Stdout contains "bar → "
     Then Stdout contains "1 judges processed"
@@ -27,29 +27,36 @@ Feature: Simple Run
 
   Scenario: Simple test of a few judges
     Given I run bin/judges with "test ./fixtures"
-    Then Stdout contains "judges tested"
+    Then Stdout contains "👉 Testing"
+    Then Stdout contains "judges tested successfully"
     And Exit code is zero
 
   Scenario: Simple test of just one pack
-    Given I run bin/judges with "test --pack absent_for_sure ./fixtures"
-    Then Stdout contains "judges tested"
+    Given I run bin/judges with "test --pack reward_for_good_bug ./fixtures"
+    Then Stdout contains "judges tested successfully"
     And Exit code is zero
 
+  Scenario: Simple test of no packs
+    Given I run bin/judges with "test --pack absent_for_sure ./fixtures"
+    Then Exit code is not zero
+
   Scenario: Simple trimming of a factbase
     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.16'
+  s.version = '0.0.18'
   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/test.rb

@@ -42,8 +42,9 @@ class Judges::Test
     dir = args[0]
     @loog.info("Testing judges in #{dir.to_rel}...")
     errors = []
-    done = Judges::Packs.new(dir, @loog).each_with_index do |p, i|
-      next if !opts['pack'].nil? && p.name != opts['pack']
+    done = 0
+    Judges::Packs.new(dir, @loog).each_with_index do |p, i|
+      next unless include?(opts, p.name)
       @loog.info("\n👉 Testing #{p.script} (##{i}) in #{p.dir.to_rel}...")
       p.tests.each do |f|
         yaml = YAML.load_file(f, permitted_classes: [Time])
@@ -55,7 +56,9 @@ class Judges::Test
           errors << f
         end
       end
+      done += 1
     end
+    raise 'No judges tested :(' if done.zero? && !opts['quiet']
     if errors.empty?
       @loog.info("\nAll #{done} judges tested successfully")
     else
@@ -66,6 +69,12 @@ class Judges::Test
 
   private
 
+  def include?(opts, name)
+    packs = opts['pack'] || []
+    return true if packs.empty?
+    packs.include?(name)
+  end
+
   def test_one(pack, yaml)
     fb = Factbase.new
     yaml['input'].each do |i|

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
+      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
+      c += 1
+      @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_test.rb

@@ -45,7 +45,7 @@ class TestTest < Minitest::Test
           - /fb/f[bar='4']
         YAML
       )
-      Judges::Test.new(Loog::VERBOSE).run({}, [d])
+      Judges::Test.new(Loog::NULL).run({}, [d])
     end
   end
 
@@ -65,7 +65,7 @@ class TestTest < Minitest::Test
         YAML
       )
       assert_raises do
-        Judges::Test.new(Loog::VERBOSE).run({}, [d])
+        Judges::Test.new(Loog::NULL).run({}, [d])
       end
     end
   end
@@ -84,7 +84,24 @@ class TestTest < Minitest::Test
           - /fb/f[foo='42']
         YAML
       )
-      Judges::Test.new(Loog::VERBOSE).run({}, [d])
+      Judges::Test.new(Loog::NULL).run({}, [d])
+    end
+  end
+
+  def test_one_pack_negative
+    Dir.mktmpdir do |d|
+      File.write(File.join(d, 'foo.rb'), '')
+      File.write(
+        File.join(d, 'x.yml'),
+        <<-YAML
+        input: []
+        expected:
+          - /fb[count(f)=1]
+        YAML
+      )
+      assert_raises do
+        Judges::Test.new(Loog::NULL).run({ 'pack' => [File.basename(dir)] }, [d])
+      end
     end
   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
@@ -49,7 +49,7 @@ class TestUpdate < Minitest::Test
       fb = Factbase.new
       fb.insert.foo_bar = 42
       File.binwrite(file, fb.export)
-      File.write(File.join(d, 'foo.rb'), '$fb.insert.tt = 4')
+      File.write(File.join(d, 'foo.rb'), 'return if $fb.size > 2; $fb.insert.tt = 4')
       Judges::Update.new(Loog::VERBOSE).run({}, [d, file])
       fb = Factbase.new
       fb.import(File.binread(file))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
 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