judges 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe5a5448e7e30ad547e467c6493f793b9148ea9cfea8317406902d53b4f7a270
-  data.tar.gz: 36b9e68a0797bb79118c51b68b56a2740b5ace3eaae26ed83af97b38f2f80cbc
+  metadata.gz: a66536b050bc10aad0401eece9025c2cca7cc98862b18fd8fc31be03a390c8b9
+  data.tar.gz: 022e2a420efcfd08c7df9690f81dba7490fcbc1b9c16fe5991224140fa843d67
 SHA512:
-  metadata.gz: 4601b3a1361db40b6b5c4a4d718f47016299583155933ca2168471f0c94de92e81ee9328831b99203b81faa6a872f9ac745bdaaba77ff159513161b32c7a316c
-  data.tar.gz: ed839d853ee202832dc23572b52059ea00f1992e148740bc55ade1ec951d4a03759b6f4359e85c1efbb57029a69328f60df5de28d6fed70e548f852586ce88ab
+  metadata.gz: 928a033f2853602094977d119c30f0a64516f4548e4c776540b9861bcf1792b96100947d6d36d4e971468ce314434dd46c2e0e0ba033a11fed5fccb02f879928
+  data.tar.gz: 7a47a73a1627723225d93c98d1ba3391bb27c20322411ffe55dfc21f4ee176578fb42e8c62e47b1efa87faa1e5160df5a28fe52f046ecaf197458fa49208d6a7

data/.github/workflows/rake.yml

@@ -31,7 +31,7 @@ jobs:
     name: test
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12, windows-2022]
+        os: [ubuntu-20.04, macos-12]
         ruby: [3.2]
     runs-on: ${{ matrix.os }}
     steps:

data/Gemfile

@@ -30,7 +30,7 @@ gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '6.1.2', require: false
 gem 'rubocop', '1.64.1', require: false
 gem 'rubocop-performance', '1.21.0', require: false
-gem 'rubocop-rspec', '2.31.0', require: false
+gem 'rubocop-rspec', '3.0.1', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false
 gem 'webmock', '3.23.1', require: false

data/Gemfile.lock

@@ -87,10 +87,11 @@ GEM
     erubi (1.12.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.0.48)
+    factbase (0.0.50)
       json (~> 2.7)
       loog (~> 0.2)
       nokogiri (~> 1.10)
+      tago (~> 0.0)
       yaml (~> 0.3)
     ffi (1.17.0-aarch64-linux-gnu)
     ffi (1.17.0-arm-linux-gnu)
@@ -135,14 +136,14 @@ GEM
     nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     parallel (1.25.1)
-    parser (3.3.2.0)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
       stringio
     public_suffix (5.0.5)
     racc (1.8.0)
-    rack (3.1.0)
+    rack (3.1.3)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -170,7 +171,7 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.8)
+    reline (0.5.9)
       io-console (~> 0.5)
     retries (0.0.5)
     rexml (3.3.0)
@@ -205,20 +206,11 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.0)
-      rubocop (~> 1.41)
     rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.31.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.29.0)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.0.1)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -233,7 +225,7 @@ GEM
     strscan (3.1.0)
     sys-uname (1.3.0)
       ffi (~> 1.1)
-    tago (0.0.1)
+    tago (0.0.2)
     thor (1.3.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
@@ -267,7 +259,7 @@ DEPENDENCIES
   rspec-rails (= 6.1.2)
   rubocop (= 1.64.1)
   rubocop-performance (= 1.21.0)
-  rubocop-rspec (= 2.31.0)
+  rubocop-rspec (= 3.0.1)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)
   webmock (= 3.23.1)

data/bin/judges

@@ -51,6 +51,7 @@ class App
       loog = Loog::VERBOSE
     end
     loog.debug("judges #{Judges::VERSION}")
+    loog.debug("facbase #{Factbase::VERSION}")
     true
   end
 
@@ -141,11 +142,13 @@ class App
     c.desc 'Name of the judge to run (directory name)'
     c.flag([:judge], multiple: true)
     c.desc 'How many times to run?'
-    c.flag([:runs], type: Integer, default_value: 1)
+    c.flag([:runs], type: Integer)
     c.desc 'The location of a Ruby library (directory with .rb files to include)'
     c.flag([:lib])
     c.desc 'Stay quiet even if some tests fail or simply no tests executed?'
     c.switch([:quiet], default_value: false)
+    c.desc 'Use default logging facility'
+    c.switch([:log], default_value: true)
     c.action do |global, options, args|
       require_relative '../lib/judges/commands/test'
       Judges::Test.new(loog).run(options, args)

data/features/test.feature

@@ -47,7 +47,7 @@ Feature: Test
     Then Stdout contains "All 1 judge(s) and 1 tests passed"
     And Exit code is zero
 
-  Scenario: Simple test with two runs
+  Scenario: Simple test with many runs
     Given I make a temp directory
     Then I have a "foo/simple.rb" file with content:
     """
@@ -57,10 +57,30 @@ Feature: Test
     Then I have a "foo/good.yml" file with content:
     """
     ---
-    runs: 3
+    runs: 5
     input: []
     expected:
-      - /fb/f[foo=count(/fb/f)]
+      - /fb[count(f)=5]
+    """
+    Then I run bin/judges with "test ."
+    Then Stdout contains "All 1 judge(s) and 1 tests passed"
+    And Exit code is zero
+
+  Scenario: Simple test with many runs and many asserts
+    Given I make a temp directory
+    Then I have a "foo/simple.rb" file with content:
+    """
+      n = $fb.insert
+      n.foo = $fb.size
+    """
+    Then I have a "foo/good.yml" file with content:
+    """
+    ---
+    runs: 5
+    input: []
+    assert_once: false
+    expected:
+      - /fb/f[foo = 1]
     """
     Then I run bin/judges with "test ."
     Then Stdout contains "All 1 judge(s) and 1 tests passed"

data/features/update.feature

@@ -12,7 +12,7 @@ Feature: Update
     Then Stdout contains "foo → "
     Then Stdout contains "bar → "
     Then Stdout contains "1 judge(s) processed"
-    Then Stdout contains "Update finished in 3 cycle(s), +3 fact(s)"
+    Then Stdout contains "Update finished in 3 cycle(s), modified 3/0 fact(s)"
     And Exit code is zero
 
   Scenario: Simple run of a few judges, with a lib

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.8.0'
+  s.version = '0.10.0'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =

data/lib/judges/commands/test.rb

@@ -122,9 +122,16 @@ class Judges::Test
       end
     end
     options = Judges::Options.new(opts['option']) + Judges::Options.new(yaml['options'])
-    (1..(opts['runs'] || yaml['runs'] || 1)).each do
-      judge.run(Factbase::Looged.new(fb, @loog), {}, {}, options)
+    runs = opts['runs'] || yaml['runs'] || 1
+    (1..runs).each do |r|
+      fbx = fb
+      fbx = Factbase::Looged.new(fb, @loog) if opts['log']
+      judge.run(fbx, {}, {}, options)
+      assert(judge, tname, fb, yaml) if r == runs || opts['assert_once'].is_a?(FalseClass)
     end
+  end
+
+  def assert(judge, tname, fb, yaml)
     xpaths = yaml['expected']
     return if xpaths.nil?
     xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)

data/lib/judges/commands/update.rb

@@ -46,20 +46,21 @@ class Judges::Update
     impex = Judges::Impex.new(@loog, args[1])
     fb = impex.import(strict: false)
     fb = Factbase::Looged.new(fb, @loog) if opts['log']
-    before = fb.size
     options = Judges::Options.new(opts['option'])
     @loog.debug("The following options provided:\n\t#{options.to_s.gsub("\n", "\n\t")}")
     judges = Judges::Judges.new(dir, opts['lib'], @loog)
     c = 0
+    churn = Judges::Churn.new(0, 0)
     elapsed(@loog) do
       loop do
         c += 1
         if c > 1
           @loog.info("\n\nStarting cycle ##{c}#{opts['max-cycles'] ? " (out of #{opts['max-cycles']})" : ''}...")
         end
-        churn = cycle(opts, judges, fb, options)
+        delta = cycle(opts, judges, fb, options)
+        churn += delta
         impex.export(fb)
-        if churn.zero?
+        if delta.zero?
           @loog.info("The update cycle ##{c} has made no changes to the factbase, let's stop")
           break
         end
@@ -67,9 +68,9 @@ class Judges::Update
           @loog.info("Too many cycles already, as set by --max-cycles=#{opts['max-cycles']}, breaking")
           break
         end
-        @loog.info("At the cycle #{c}, the factbase was modified by #{churn} fact(s)")
+        @loog.info("The cycle #{c} modified #{delta} fact(s)")
       end
-      throw :"Update finished in #{c} cycle(s), #{format('+%d', fb.size - before)} fact(s)"
+      throw :"Update finished in #{c} cycle(s), modified #{churn} fact(s)"
     end
   end
 

data/lib/judges.rb

@@ -25,5 +25,5 @@
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 module Judges
-  VERSION = '0.8.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace