judges 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14d7a10c327b1cbd22dcc87773e6c3f218598a5f7d879f6f8c3ff2ddabc9018c
-  data.tar.gz: '0106468efd8e11754252950a2249ab0f2cbd22a9ed2081867e88e154ae2c0cc0'
+  metadata.gz: fe5a5448e7e30ad547e467c6493f793b9148ea9cfea8317406902d53b4f7a270
+  data.tar.gz: 36b9e68a0797bb79118c51b68b56a2740b5ace3eaae26ed83af97b38f2f80cbc
 SHA512:
-  metadata.gz: 7035bfcbf8e162ef9c4504fdb9953ad275bae7c00123d692bfd8b612bef16745e144b3b51e10560890d79681c48fb37d1f2d3a9030f6caba8896c0a76a6925e6
-  data.tar.gz: '09533523b712227e1fced16b32a74abd450e9f454d217574c9b35334564718f034283bd9b61cdc39ee1e654798ddb4f439199284d6ed66827024dcb347299c50'
+  metadata.gz: 4601b3a1361db40b6b5c4a4d718f47016299583155933ca2168471f0c94de92e81ee9328831b99203b81faa6a872f9ac745bdaaba77ff159513161b32c7a316c
+  data.tar.gz: ed839d853ee202832dc23572b52059ea00f1992e148740bc55ade1ec951d4a03759b6f4359e85c1efbb57029a69328f60df5de28d6fed70e548f852586ce88ab

data/.github/workflows/copyrights.yml

@@ -27,4 +27,4 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: yegor256/copyrights-action@0.0.3
+      - uses: yegor256/copyrights-action@0.0.4

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.30.0', require: false
+gem 'rubocop-rspec', '2.31.0', 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

@@ -8,8 +8,10 @@ PATH
       gli (~> 2.21)
       iri (~> 0.8)
       loog (~> 0.2)
+      moments (~> 0.3)
       nokogiri (~> 1.10)
       retries (~> 0.0)
+      tago (~> 0.0)
       typhoeus (~> 1.3)
 
 GEM
@@ -85,7 +87,7 @@ GEM
     erubi (1.12.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.0.44)
+    factbase (0.0.48)
       json (~> 2.7)
       loog (~> 0.2)
       nokogiri (~> 1.10)
@@ -114,6 +116,7 @@ GEM
     loog (0.5.1)
     mini_mime (1.1.5)
     minitest (5.23.1)
+    moments (0.3.0)
     multi_test (1.1.0)
     mutex_m (0.2.0)
     net-ping (2.0.8)
@@ -131,7 +134,7 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.24.0)
+    parallel (1.25.1)
     parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
@@ -139,7 +142,7 @@ GEM
       stringio
     public_suffix (5.0.5)
     racc (1.8.0)
-    rack (3.0.11)
+    rack (3.1.0)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -170,8 +173,8 @@ GEM
     reline (0.5.8)
       io-console (~> 0.5)
     retries (0.0.5)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.0)
+      strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.0)
@@ -202,19 +205,19 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
+    rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
+    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.30.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.28.3)
+    rubocop-rspec_rails (2.29.0)
       rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
@@ -228,8 +231,9 @@ GEM
     simplecov_json_formatter (0.1.4)
     stringio (3.1.0)
     strscan (3.1.0)
-    sys-uname (1.2.3)
+    sys-uname (1.3.0)
       ffi (~> 1.1)
+    tago (0.0.1)
     thor (1.3.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
@@ -263,7 +267,7 @@ DEPENDENCIES
   rspec-rails (= 6.1.2)
   rubocop (= 1.64.1)
   rubocop-performance (= 1.21.0)
-  rubocop-rspec (= 2.30.0)
+  rubocop-rspec (= 2.31.0)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)
   webmock (= 3.23.1)

data/README.md

@@ -34,6 +34,8 @@ global variables available to it:
 Every `.yml` file must be formatted as such:
 
 ```yaml
+category: slow
+runs: 1
 skip: false
 input:
   -
@@ -52,6 +54,12 @@ via the command line `--option` flag of the `update` command; and `expected` is
 an array of XPath expressions that must be present in the XML of the Factbase
 when the test is finished.
 
+The `category` (default: `[]`) may have one or an array of categories,
+which then may be turned on via the `--category` command line flag.
+
+The `runs` (default: `1`) is the number of times the `.rb` script should
+be executed. After each execution, all expected XPath expressions are validated.
+
 ## How to contribute
 
 Read

data/bin/judges

@@ -64,6 +64,8 @@ class App
     c.flag([:'max-cycles'], default_value: 8, type: Integer)
     c.desc 'Stay quiet even if some judges fail'
     c.switch([:q, :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/update'
       Judges::Update.new(loog).run(options, args)

data/features/test.feature

@@ -47,6 +47,25 @@ Feature: Test
     Then Stdout contains "All 1 judge(s) and 1 tests passed"
     And Exit code is zero
 
+  Scenario: Simple test with two runs
+    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: 3
+    input: []
+    expected:
+      - /fb/f[foo=count(/fb/f)]
+    """
+    Then I run bin/judges with "test ."
+    Then Stdout contains "All 1 judge(s) and 1 tests passed"
+    And Exit code is zero
+
   Scenario: Enable only one category
     Given I make a temp directory
     Then I have a "mine/good/good.rb" file with content:

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.6.0'
+  s.version = '0.8.0'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =
@@ -48,8 +48,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'gli', '~>2.21'
   s.add_runtime_dependency 'iri', '~>0.8'
   s.add_runtime_dependency 'loog', '~>0.2'
+  s.add_runtime_dependency 'moments', '~>0.3'
   s.add_runtime_dependency 'nokogiri', '~>1.10'
   s.add_runtime_dependency 'retries', '~>0.0'
+  s.add_runtime_dependency 'tago', '~>0.0'
   s.add_runtime_dependency 'typhoeus', '~>1.3'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/judges/churn.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative '../judges'
+
+# How many facts were modified.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class Judges::Churn
+  attr_reader :added, :removed
+
+  def initialize(added, removed)
+    @added = added
+    @removed = removed
+  end
+
+  def to_s
+    "#{@added}/#{@removed}"
+  end
+
+  def zero?
+    @added.zero? && @removed.zero?
+  end
+
+  def +(other)
+    if other.is_a?(Judges::Churn)
+      Judges::Churn.new(@added + other.added, @removed + other.removed)
+    else
+      Judges::Churn.new(@added + other, @removed)
+    end
+  end
+
+  def -(other)
+    if other.is_a?(Judges::Churn)
+      Judges::Churn.new(@added - other.added, @removed - other.removed)
+    else
+      Judges::Churn.new(@added, @removed + other)
+    end
+  end
+end

data/lib/judges/commands/test.rb

@@ -122,7 +122,7 @@ class Judges::Test
       end
     end
     options = Judges::Options.new(opts['option']) + Judges::Options.new(yaml['options'])
-    (1..(opts['runs'] || 1)).each do
+    (1..(opts['runs'] || yaml['runs'] || 1)).each do
       judge.run(Factbase::Looged.new(fb, @loog), {}, {}, options)
     end
     xpaths = yaml['expected']

data/lib/judges/commands/update.rb

@@ -25,6 +25,7 @@ require 'factbase/looged'
 require_relative '../../judges'
 require_relative '../../judges/to_rel'
 require_relative '../../judges/judges'
+require_relative '../../judges/churn'
 require_relative '../../judges/options'
 require_relative '../../judges/impex'
 require_relative '../../judges/elapsed'
@@ -44,7 +45,7 @@ class Judges::Update
     raise "The directory is absent: #{dir.to_rel}" unless File.exist?(dir)
     impex = Judges::Impex.new(@loog, args[1])
     fb = impex.import(strict: false)
-    fb = Factbase::Looged.new(fb, @loog)
+    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")}")
@@ -72,42 +73,21 @@ class Judges::Update
     end
   end
 
-  # How many facts were modified.
-  class Churn
-    attr_reader :added, :removed
-
-    def initialize(added, removed)
-      @added = added
-      @removed = removed
-    end
-
-    def to_s
-      "#{@added}/-#{@removed}"
-    end
-
-    def zero?
-      @added.zero? && @removed.zero?
-    end
-
-    def +(other)
-      Churn.new(@added + other.added, @removed + other.removed)
-    end
-  end
-
   private
 
   # Run all judges in a full cycle, one by one.
   # @return [Churn] How many modifications have been made
   def cycle(opts, judges, fb, options)
     errors = []
-    churn = Churn.new(0, 0)
+    churn = Judges::Churn.new(0, 0)
     global = {}
     elapsed(@loog) do
       done = judges.each_with_index do |p, i|
-        @loog.info("\n👉 Running #{p.name} (##{i}) at #{p.dir.to_rel}...")
+        @loog.info("\n\n👉 Running #{p.name} (##{i}) at #{p.dir.to_rel}...")
         elapsed(@loog) do
-          churn += one_judge(fb, p, global, options)
-          throw :"👍 The judge #{p.name} modified #{churn} facts\n"
+          c = one_judge(fb, p, global, options)
+          churn += c
+          throw :"👍 The judge #{p.name} modified #{c.zero? ? 'no' : c} facts"
         end
       rescue StandardError, SyntaxError => e
         @loog.warn(Backtrace.new(e))
@@ -132,9 +112,9 @@ class Judges::Update
     after = fb.size
     diff = after - before
     if diff.positive?
-      Churn.new(diff, 0)
+      Judges::Churn.new(diff, 0)
     else
-      Churn.new(0, -diff)
+      Judges::Churn.new(0, -diff)
     end
   end
 end

data/lib/judges/elapsed.rb

@@ -20,6 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'tago'
+
 def elapsed(loog)
   start = Time.now
   begin
@@ -27,6 +29,6 @@ def elapsed(loog)
   rescue UncaughtThrowError => e
     tag = e.tag
     throw e unless tag.is_a?(Symbol)
-    loog.info("#{tag} in #{format('%.02f', Time.now - start)}s")
+    loog.info("#{tag} in #{start.ago}")
   end
 end

data/lib/judges.rb

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

data/test/commands/test_print.rb

@@ -41,7 +41,7 @@ class TestPrint < Minitest::Test
       Judges::Print.new(Loog::NULL).run({ format: 'yaml', auto: true }, [f])
       y = File.join(d, 'base.yaml')
       assert(File.exist?(y))
-      assert_equal(1, YAML.load_file(y)['facts'].size)
+      assert_equal(1, YAML.load_file(y).size)
     end
   end
 

data/test/test_churn.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require_relative '../lib/judges'
+require_relative '../lib/judges/churn'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestChurn < Minitest::Test
+  def test_basic
+    churn = Judges::Churn.new(0, 0)
+    assert_equal('0/0', churn.to_s)
+    assert_equal('42/0', (churn + 42).to_s)
+    assert_equal('0/17', (churn - 17).to_s)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-07 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: moments
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: tago
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +218,7 @@ files:
 - lib/judges.rb
 - lib/judges/baza.rb
 - lib/judges/categories.rb
+- lib/judges/churn.rb
 - lib/judges/commands/eval.rb
 - lib/judges/commands/import.rb
 - lib/judges/commands/inspect.rb
@@ -220,6 +249,7 @@ files:
 - test/test__helper.rb
 - test/test_baza.rb
 - test/test_categories.rb
+- test/test_churn.rb
 - test/test_impex.rb
 - test/test_judge.rb
 - test/test_judges.rb