judges 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c525e90c9ec78d8d7b745c026e07d033427b6193e185bd28d2edc153f254c863
-  data.tar.gz: bff22a2e3f8d9813261f76df90a7087454e393e66f997822717422d4ddfdc084
+  metadata.gz: 29aaf4f403a8df4007afa115bfbf0afd09f42ab8ad493536599944e84ed2b82e
+  data.tar.gz: 5c5dc615c168c150c908589f0f775144d4117003129a07515dd252f2ba622c22
 SHA512:
-  metadata.gz: 7a490f1f175fdf0e663ae3f104c2901b86eed9e6d9b16192e59829802a821ae0cec67dc9a72400d7d40f2be228e3c8323508c8e7a210c1f562db0055d4e1a762
-  data.tar.gz: 3ec540d2d05fae0b620a3ee89ac4c1dad8d06cd3387cca7a4076490b9710bedcece3a373500208517ac47f0d14469444c60c783f810227045e7ae831a404aaa5
+  metadata.gz: 642b71de17e43f5000b052dca656a3d374288f021f3fc1e7b75a7a095a50c9084ff3874e9c03bc954df8feb9eeac5482d5aaab35b869db6e879d2204a30e6427
+  data.tar.gz: 146de657cb25b3e5ab88cf2444b6876c2dabc3be82eba3525a3c4115ede82dc366da5a51c6e9c32ea97aa3af57e6aab514756033d9e1cd3f9ad28b7ad23f99f9

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

@@ -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,10 +87,11 @@ GEM
     erubi (1.12.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.0.44)
+    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)
@@ -114,6 +117,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,15 +135,15 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.24.0)
-    parser (3.3.2.0)
+    parallel (1.25.1)
+    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.0.11)
+    rack (3.1.3)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -167,11 +171,11 @@ 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.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,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.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      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.28.3)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.0.1)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -228,8 +223,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.2)
     thor (1.3.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
@@ -263,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
 
@@ -64,6 +65,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)
@@ -144,6 +147,8 @@ class App
     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/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.7.0'
+  s.version = '0.9.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/commands/test.rb

@@ -123,7 +123,9 @@ class Judges::Test
     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)
+      fbx = fb
+      fbx = Factbase::Looged.new(fb, @loog) if opts['log']
+      judge.run(fbx, {}, {}, options)
     end
     xpaths = yaml['expected']
     return if xpaths.nil?

data/lib/judges/commands/update.rb

@@ -45,21 +45,22 @@ 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)
-    before = fb.size
+    fb = Factbase::Looged.new(fb, @loog) if opts['log']
     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
 
@@ -87,7 +88,7 @@ class Judges::Update
         elapsed(@loog) do
           c = one_judge(fb, p, global, options)
           churn += c
-          throw :"👍 The judge #{p.name} modified #{c} facts"
+          throw :"👍 The judge #{p.name} modified #{c.zero? ? 'no' : c} facts"
         end
       rescue StandardError, SyntaxError => e
         @loog.warn(Backtrace.new(e))

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.7.0'
+  VERSION = '0.9.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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-10 00:00:00.000000000 Z
+date: 2024-06-13 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