judges 0.25.2 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 793749ccbd3ca4e609283aa272ccb8d47c0b1c67f6c2dc10b0282844aff12715
-  data.tar.gz: 8c02acf326f92a4819f6a4c8e76f956fa56a68623c0b9c1948ee87466b220566
+  metadata.gz: d63aeb8f8b74f82c29128b4a8106fa8b51def765011a1388040b1938f64b150c
+  data.tar.gz: 390ccdd6187927993548da9854ed8dfaa1eadb91e858e791f16d1a7f0c549774
 SHA512:
-  metadata.gz: bb5f2d0b72d068eeb686f4458e0a1b2241eeb0a54ff5dbf64025170f6607fcf8c840d7bb9ba53c4b43762256d99ceb479e3311094c55db6e66ed30225362911c
-  data.tar.gz: af19e76d102ff80655af90132aea9fa83d985e96a9c7ea5baab107d74baf6045efce82deb5df70277e0a3186a5bdddd303cb8288617d3df7de2a7d140af61b61
+  metadata.gz: 295de9b2be80178f94a719eae6cf0fefb37872b39a305899f543c795318f3dddc27a52af6ccca4faaf6ece019db004d725af33f27a893175b4f405d35ab9a3b7
+  data.tar.gz: a9bb032efbb194da0bbcbc34a5f7141f8a9eda7555ae9c157569cc3aeb4669bc90f8761390c13c31a58802d7e0c47a2bfa8340b5de4d557a2e538b6e4e9dcd97

data/Gemfile

@@ -24,16 +24,17 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'cucumber', '9.2.0', require: false
-gem 'minitest', '5.24.1', require: false
+gem 'minitest', '5.25.1', require: false
 gem 'minitest-reporters', '1.7.1', require: false
 gem 'net-ping', '2.0.8', require: false
 gem 'rake', '13.2.1', require: false
 gem 'random-port', '~>0.0', require: false
-gem 'rspec-rails', '6.1.3', require: false
-gem 'rubocop', '1.65.1', require: false
+gem 'rspec-rails', '7.0.1', require: false
+gem 'rubocop', '1.66.0', require: false
 gem 'rubocop-performance', '1.21.1', require: false
 gem 'rubocop-rspec', '3.0.4', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false
+gem 'w3c_validators', '1.3.7', require: false
 gem 'webmock', '3.23.1', require: false
 gem 'yard', '0.9.36', require: false

data/Gemfile.lock

@@ -2,26 +2,27 @@ PATH
   remote: .
   specs:
     judges (0.0.0)
-      backtrace (~> 0)
-      baza.rb (~> 0)
+      backtrace (> 0)
+      baza.rb (> 0)
       concurrent-ruby (~> 1.2)
-      factbase (~> 0)
+      elapsed (> 0)
+      factbase (> 0)
       gli (~> 2.21)
-      iri (~> 0)
-      loog (~> 0)
+      iri (> 0)
+      loog (> 0)
       moments (~> 0.3)
       nokogiri (~> 1.10)
-      others (~> 0)
-      retries (~> 0)
-      tago (~> 0)
+      others (> 0)
+      retries (> 0)
+      tago (> 0)
       typhoeus (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.2.0)
-      actionview (= 7.2.0)
-      activesupport (= 7.2.0)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -30,13 +31,13 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (7.2.0)
-      activesupport (= 7.2.0)
+    actionview (7.2.1)
+      activesupport (= 7.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.2.0)
+    activesupport (7.2.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -53,8 +54,9 @@ GEM
     ast (2.4.2)
     backtrace (0.4.0)
     base64 (0.2.0)
-    baza.rb (0.0.4)
+    baza.rb (0.0.8)
       backtrace (> 0)
+      elapsed (> 0)
       faraday (> 0)
       faraday-http-cache (> 0)
       faraday-multipart (> 0)
@@ -101,6 +103,9 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     drb (2.2.1)
+    elapsed (0.0.1)
+      loog (> 0)
+      tago (> 0)
     erubi (1.13.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
@@ -113,14 +118,14 @@ GEM
       others (> 0)
       tago (> 0)
       yaml (~> 0.3)
-    faraday (2.10.1)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.11.0)
+      faraday-net_http (>= 2.0, < 3.4)
       logger
     faraday-http-cache (2.5.1)
       faraday (>= 0.8)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (3.1.1)
+    faraday-net_http (3.3.0)
       net-http
     faraday-retry (2.2.1)
       faraday (~> 2.0)
@@ -142,13 +147,13 @@ GEM
     iri (0.8.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    logger (1.6.0)
+    logger (1.6.1)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     loog (0.6.0)
     mini_mime (1.1.5)
-    minitest (5.24.1)
+    minitest (5.25.1)
     minitest-reporters (1.7.1)
       ansi
       builder
@@ -175,7 +180,7 @@ GEM
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     others (0.0.3)
-    parallel (1.26.2)
+    parallel (1.26.3)
     parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
@@ -198,9 +203,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.2.0)
-      actionpack (= 7.2.0)
-      activesupport (= 7.2.0)
+    railties (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -215,37 +220,36 @@ GEM
     reline (0.5.9)
       io-console (~> 0.5)
     retries (0.0.5)
-    rexml (3.3.5)
+    rexml (3.3.6)
       strscan
-    rspec-core (3.13.0)
+    rspec-core (3.13.1)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.3)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
+    rspec-rails (7.0.1)
+      actionpack (>= 7.0)
+      activesupport (>= 7.0)
+      railties (>= 7.0)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    rubocop (1.65.1)
+    rubocop (1.66.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.0)
+    rubocop-ast (1.32.1)
       parser (>= 3.3.1.0)
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
@@ -268,14 +272,18 @@ GEM
     sys-uname (1.3.0)
       ffi (~> 1.1)
     tago (0.0.2)
-    thor (1.3.1)
+    thor (1.3.2)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    uri (0.13.0)
+    uri (0.13.1)
     useragent (0.16.10)
+    w3c_validators (1.3.7)
+      json (>= 1.8)
+      nokogiri (~> 1.6)
+      rexml (~> 3.2)
     webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -283,7 +291,7 @@ GEM
     webrick (1.8.1)
     yaml (0.3.0)
     yard (0.9.36)
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   aarch64-linux
@@ -297,17 +305,18 @@ PLATFORMS
 DEPENDENCIES
   cucumber (= 9.2.0)
   judges!
-  minitest (= 5.24.1)
+  minitest (= 5.25.1)
   minitest-reporters (= 1.7.1)
   net-ping (= 2.0.8)
   rake (= 13.2.1)
   random-port (~> 0.0)
-  rspec-rails (= 6.1.3)
-  rubocop (= 1.65.1)
+  rspec-rails (= 7.0.1)
+  rubocop (= 1.66.0)
   rubocop-performance (= 1.21.1)
   rubocop-rspec (= 3.0.4)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)
+  w3c_validators (= 1.3.7)
   webmock (= 3.23.1)
   yard (= 0.9.36)
 

data/assets/index.xsl

@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:output method="xml" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes"/>
+  <xsl:output method="xml" omit-xml-declaration="yes" encoding="UTF-8" indent="yes"/>
   <xsl:param name="title"/>
   <xsl:param name="date"/>
   <xsl:param name="version"/>
@@ -36,9 +36,11 @@ SOFTWARE.
     </script>
   </xsl:template>
   <xsl:template match="/">
+    <xsl:text disable-output-escaping='yes'>&lt;!DOCTYPE html&gt;</xsl:text>
     <html>
       <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta charset="UTF-8"/>
+        <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
         <title>
           <xsl:choose>
             <xsl:when test="$title = ''">
@@ -49,8 +51,6 @@ SOFTWARE.
             </xsl:otherwise>
           </xsl:choose>
         </title>
-        <meta charset="UTF-8"/>
-        <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
         <link rel="icon" href="https://www.zerocracy.com/svg/logo.svg" type="image/svg"/>
         <link href="https://cdn.jsdelivr.net/gh/yegor256/tacit@gh-pages/tacit-css.min.css" rel="stylesheet"/>
         <link href="https://cdn.jsdelivr.net/gh/yegor256/drops@gh-pages/drops.min.css" rel="stylesheet"/>
@@ -125,9 +125,21 @@ SOFTWARE.
               <xsl:text> bytes, version </xsl:text>
               <xsl:value-of select="fb/@version"/>
               <xsl:text>.</xsl:text>
+              <br/>
+              <span id="current-time">Loading current time...</span>
             </p>
           </footer>
         </section>
+        <script type="text/javascript">
+          function updateTime() {
+            const now = new Date();
+            const isoTime = now.toISOString();
+            const timeElement = document.getElementById('current-time');
+            timeElement.textContent = `Current time: ${isoTime}`;
+          }
+          updateTime();
+          setInterval(updateTime, 1000);
+        </script>
       </body>
     </html>
   </xsl:template>
@@ -143,7 +155,7 @@ SOFTWARE.
           <xsl:call-template name="th">
             <xsl:with-param name="cols" select="$columns"/>
           </xsl:call-template>
-        </th>
+        </tr>
       </thead>
       <tbody>
         <xsl:apply-templates select="f"/>
@@ -185,7 +197,7 @@ SOFTWARE.
       </xsl:when>
       <xsl:otherwise>
         <th>
-          <xsl:text>&nbsp;</xsl:text>
+          <xsl:text> </xsl:text>
         </th>
       </xsl:otherwise>
     </xsl:choose>
@@ -259,4 +271,4 @@ SOFTWARE.
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

data/features/join.feature

@@ -8,5 +8,5 @@ Feature: Join
     Then I run bin/judges with "update . first.fb"
     Then I run bin/judges with "update . second.fb"
     Then I run bin/judges with "join first.fb second.fb"
-    Then Stdout contains "joined"
-    And Exit code is zero
+    Then Exit code is zero
+    And Stdout contains "joined"

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.25.2'
+  s.version = '0.26.1'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =
@@ -42,18 +42,19 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_dependency 'backtrace', '~>0'
-  s.add_dependency 'baza.rb', '~>0'
+  s.add_dependency 'backtrace', '>0'
+  s.add_dependency 'baza.rb', '>0'
   s.add_dependency 'concurrent-ruby', '~>1.2'
-  s.add_dependency 'factbase', '~>0'
+  s.add_dependency 'elapsed', '>0'
+  s.add_dependency 'factbase', '>0'
   s.add_dependency 'gli', '~>2.21'
-  s.add_dependency 'iri', '~>0'
-  s.add_dependency 'loog', '~>0'
+  s.add_dependency 'iri', '>0'
+  s.add_dependency 'loog', '>0'
   s.add_dependency 'moments', '~>0.3'
   s.add_dependency 'nokogiri', '~>1.10'
-  s.add_dependency 'others', '~>0'
-  s.add_dependency 'retries', '~>0'
-  s.add_dependency 'tago', '~>0'
+  s.add_dependency 'others', '>0'
+  s.add_dependency 'retries', '>0'
+  s.add_dependency 'tago', '>0'
   s.add_dependency 'typhoeus', '~>1.3'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/judges/commands/eval.rb

@@ -20,10 +20,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'elapsed'
 require 'factbase/looged'
 require_relative '../../judges'
 require_relative '../../judges/impex'
-require_relative '../../judges/elapsed'
 
 # The +eval+ command.
 #
@@ -41,7 +41,7 @@ class Judges::Eval
   def run(_opts, args)
     raise 'Exactly two arguments required' unless args.size == 2
     impex = Judges::Impex.new(@loog, args[0])
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       $fb = impex.import(strict: false)
       $fb = Factbase::Looged.new($fb, @loog)
       expr = args[1]

data/lib/judges/commands/import.rb

@@ -20,12 +20,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'elapsed'
 require 'time'
 require 'factbase/looged'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 require_relative '../../judges/to_rel'
-require_relative '../../judges/elapsed'
 
 # The +import+ command.
 #
@@ -43,7 +43,7 @@ class Judges::Import
   def run(_opts, args)
     raise 'Exactly two arguments required' unless args.size == 2
     raise "File not found #{args[0].to_rel}" unless File.exist?(args[0])
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       yaml = YAML.load_file(args[0], permitted_classes: [Time])
       @loog.info("YAML loaded from #{args[0].to_rel} (#{yaml.size} facts)")
       impex = Judges::Impex.new(@loog, args[1])

data/lib/judges/commands/join.rb

@@ -20,9 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'elapsed'
 require_relative '../../judges'
 require_relative '../../judges/impex'
-require_relative '../../judges/elapsed'
 
 # The +join+ command.
 #
@@ -41,7 +41,7 @@ class Judges::Join
     raise 'Exactly two arguments required' unless args.size == 2
     master = Judges::Impex.new(@loog, args[0])
     slave = Judges::Impex.new(@loog, args[1])
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       fb = master.import
       slave.import_to(fb)
       master.export(fb)

data/lib/judges/commands/print.rb

@@ -24,9 +24,9 @@ require 'time'
 require 'fileutils'
 require 'factbase'
 require 'nokogiri'
+require 'elapsed'
 require_relative '../../judges'
 require_relative '../../judges/impex'
-require_relative '../../judges/elapsed'
 
 # The +print+ command.
 #
@@ -64,7 +64,7 @@ class Judges::Print
       end
       @loog.debug("The factbase #{f.to_rel} is younger than the target #{o.to_rel}, need to print")
     end
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       output =
         case fmt
           when 'yaml'
@@ -92,7 +92,7 @@ class Judges::Print
     xslt = Nokogiri::XSLT(File.read(File.join(__dir__, '../../../assets/index.xsl')))
     require 'factbase/to_xml'
     xml = Factbase::ToXML.new(fb).xml
-    xslt.transform(
+    xslt.apply_to(
       Nokogiri::XML(xml),
       Nokogiri::XSLT.quote_params(
         'title' => opts['title'],

data/lib/judges/commands/pull.rb

@@ -23,6 +23,7 @@
 require 'typhoeus'
 require 'iri'
 require 'baza-rb'
+require 'elapsed'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 
@@ -53,7 +54,7 @@ class Judges::Pull
       retries: (opts['retries'] || 3).to_i
     )
     name = args[0]
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       if baza.name_exists?(name)
         baza.lock(name, opts['owner'])
         begin

data/lib/judges/commands/push.rb

@@ -23,6 +23,7 @@
 require 'typhoeus'
 require 'iri'
 require 'baza-rb'
+require 'elapsed'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 
@@ -52,9 +53,9 @@ class Judges::Push
       timeout: (opts['timeout'] || 30).to_i,
       loog: @loog,
       retries: (opts['retries'] || 3).to_i,
-      compression: opts.fetch('zip', true)
+      compress: opts.fetch('zip', true)
     )
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       baza.lock(name, opts['owner'])
       begin
         id = baza.push(name, fb.export, opts['meta'] || [])

data/lib/judges/commands/test.rb

@@ -25,12 +25,12 @@ require 'factbase'
 require 'backtrace'
 require 'factbase/looged'
 require 'factbase/to_xml'
+require 'elapsed'
 require_relative '../../judges'
 require_relative '../../judges/to_rel'
 require_relative '../../judges/judges'
 require_relative '../../judges/options'
 require_relative '../../judges/categories'
-require_relative '../../judges/elapsed'
 
 # The +test+ command.
 #
@@ -57,7 +57,7 @@ class Judges::Test
     tests = 0
     visible = []
     judges = Judges::Judges.new(dir, opts['lib'], @loog)
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       judges.each_with_index do |judge, i|
         visible << judge.name
         next unless include?(opts, judge.name)

data/lib/judges/commands/trim.rb

@@ -21,9 +21,9 @@
 # SOFTWARE.
 
 require 'time'
+require 'elapsed'
 require_relative '../../judges'
 require_relative '../../judges/impex'
-require_relative '../../judges/elapsed'
 
 # The +trim+ command.
 #
@@ -45,7 +45,7 @@ class Judges::Trim
     raise 'Exactly one argument required' unless args.size == 1
     impex = Judges::Impex.new(@loog, args[0])
     fb = impex.import
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       deleted = fb.query(opts['query']).delete!
       throw :'No facts deleted' if deleted.zero?
       impex.export(fb)

data/lib/judges/commands/update.rb

@@ -22,13 +22,13 @@
 
 require 'backtrace'
 require 'factbase/looged'
+require 'elapsed'
 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'
 
 # The +update+ command.
 #
@@ -63,7 +63,7 @@ class Judges::Update
     judges = Judges::Judges.new(dir, opts['lib'], @loog)
     c = 0
     churn = Judges::Churn.new(0, 0)
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       loop do
         c += 1
         if c > 1
@@ -105,11 +105,11 @@ class Judges::Update
   def cycle(opts, judges, fb, options)
     churn = Judges::Churn.new(0, 0)
     global = {}
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       done =
         judges.each_with_index do |p, i|
           @loog.info("\n👉 Running #{p.name} (##{i}) at #{p.dir.to_rel}...")
-          elapsed(@loog) do
+          elapsed(@loog, level: Logger::INFO) do
             c = one_judge(fb, p, global, options)
             churn += c
             throw :"👍 The judge #{p.name} modified #{c} facts out of #{fb.size}"

data/lib/judges/impex.rb

@@ -22,9 +22,9 @@
 
 require 'factbase'
 require 'fileutils'
+require 'elapsed'
 require_relative '../judges'
 require_relative '../judges/to_rel'
-require_relative '../judges/elapsed'
 
 # Import/Export of factbases.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -39,7 +39,7 @@ class Judges::Impex
   def import(strict: true)
     fb = Factbase.new
     if File.exist?(@file)
-      elapsed(@loog) do
+      elapsed(@loog, level: Logger::INFO) do
         fb.import(File.binread(@file))
         throw :"The factbase imported from #{@file.to_rel} (#{File.size(@file)} bytes, #{fb.size} facts)"
       end
@@ -52,14 +52,14 @@ class Judges::Impex
 
   def import_to(fb)
     raise "The factbase is absent at #{@file.to_rel}" unless File.exist?(@file)
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       fb.import(File.binread(@file))
       throw :"The factbase loaded from #{@file.to_rel} (#{File.size(@file)} bytes, #{fb.size} facts)"
     end
   end
 
   def export(fb)
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       FileUtils.mkdir_p(File.dirname(@file))
       File.binwrite(@file, fb.export)
       throw :"Factbase exported to #{@file.to_rel} (#{File.size(@file)} bytes, #{fb.size} facts)"

data/lib/judges/judge.rb

@@ -20,9 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'elapsed'
 require_relative '../judges'
 require_relative '../judges/to_rel'
-require_relative '../judges/elapsed'
 
 # A single judge.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -56,7 +56,7 @@ class Judges::Judge
     end
     s = File.join(@dir, script)
     raise "Can't load '#{s}'" unless File.exist?(s)
-    elapsed(@loog) do
+    elapsed(@loog, intro: "#{$judge} finished", level: Logger::INFO) do
       load(s, true)
     ensure
       $fb = $judge = $options = $loog = nil

data/lib/judges.rb

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

data/test/commands/test_join.rb

@@ -42,12 +42,14 @@ class TestJoin < Minitest::Test
       fb2 = Factbase.new
       fb2.insert.foo_bar = 42
       File.binwrite(slave, fb2.export)
-      Judges::Join.new(Loog::NULL).run({}, [master, slave])
+      loog = Loog::Buffer.new
+      Judges::Join.new(loog).run({}, [master, slave])
       fb = Factbase.new
       fb.import(File.binread(master))
       xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
       assert(!xml.xpath('/fb/f[zz="5"]').empty?, xml)
       assert(!xml.xpath('/fb/f[foo_bar="42"]').empty?, xml)
+      assert(loog.to_s.include?('Two factbases joined'), loog.to_s)
     end
   end
 end

data/test/commands/test_print.rb

@@ -23,9 +23,12 @@
 require 'minitest/autorun'
 require 'loog'
 require 'factbase'
+require 'nokogiri'
 require 'yaml'
 require 'fileutils'
 require 'securerandom'
+require 'w3c_validators'
+require 'webmock/minitest'
 require_relative '../../lib/judges'
 require_relative '../../lib/judges/commands/print'
 
@@ -70,6 +73,21 @@ class TestPrint < Minitest::Test
         [f, html]
       )
     end
+    doc = File.read(html)
+    xml =
+      begin
+        Nokogiri::XML.parse(doc) do |c|
+          c.norecover
+          c.strict
+        end
+      rescue StandardError => e
+        raise "#{doc}\n\n#{e}"
+      end
+    assert(xml.errors.empty?, xml)
+    assert(!xml.xpath('/html').empty?, xml)
+    WebMock.enable_net_connect!
+    v = W3CValidators::NuValidator.new.validate_file(html)
+    assert(v.errors.empty?, "#{doc}\n\n#{v.errors.join('; ')}")
   end
 
   def test_print_all_formats

data/test/commands/test_push.rb

@@ -53,6 +53,17 @@ class TestPush < Minitest::Test
         },
         ['foo', file]
       )
+      Judges::Push.new(Loog::NULL).run(
+        {
+          'token' => '000',
+          'host' => 'example.org',
+          'port' => 443,
+          'ssl' => true,
+          'owner' => 'none',
+          'zip' => false
+        },
+        ['foo', file]
+      )
     end
   end
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.25.2
+  version: 0.26.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: baza.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -52,18 +52,32 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: elapsed
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factbase
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,28 +98,28 @@ dependencies:
   name: iri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: loog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -140,42 +154,42 @@ dependencies:
   name: others
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: retries
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tago
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -257,7 +271,6 @@ files:
 - lib/judges/commands/test.rb
 - lib/judges/commands/trim.rb
 - lib/judges/commands/update.rb
-- lib/judges/elapsed.rb
 - lib/judges/impex.rb
 - lib/judges/judge.rb
 - lib/judges/judges.rb

data/lib/judges/elapsed.rb

@@ -1,34 +0,0 @@
-# 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 'tago'
-
-def elapsed(loog)
-  start = Time.now
-  begin
-    yield
-  rescue UncaughtThrowError => e
-    tag = e.tag
-    throw e unless tag.is_a?(Symbol)
-    loog.info("#{tag} in #{start.ago}")
-  end
-end