judges 0.25.1 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9985ec7aa091bbab98e33915b990f49cc3d6370ab0949f0b6b2820f848430b52
-  data.tar.gz: a15f89c6a0be6b38fb4d0d2dc6f0c89fcb9149920e02692d9bcd4112271dbf32
+  metadata.gz: d7ddc9ee179c24bb4b9fb1fe4c1447bbc3bafe6efa533565aae29e310bb08efa
+  data.tar.gz: '084241cc86f8cbd93ff5fb83402ea7ebfb794e2ba303bbabbae6483185988908'
 SHA512:
-  metadata.gz: b0b6120abac3e27fb11609e1932d7cb5a1d0317572c1f57c9b9642fdd021ca7552b8305ec364056d1d8184c4782f38a74ed20d7016139512627af3d3c1868d37
-  data.tar.gz: 3f55277c36cff1c75798c0b24cb44a9f9a71a96a3be552f449942b49971d4a4be7b95c05f200533d4e476f839cee80f1a343beef942e19ad3bd9a11dea83cedc
+  metadata.gz: 7e4731457f4cf139056b1ff8bdc553d56d7f8344a5f9b076a2bfe91ab2da6234135b8967cb2dad34d3858477abb9eebfa791399876a0d030f08abc184417fb35
+  data.tar.gz: 4c1f6d824ca49f9374aef2a4bbb9bb4d585e7cc53d0458864110b6f7a99956df8d8ff1814e6a7e996b2b413b189913a41cdd88006ea404438cbbef0ee47529b2

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 'rspec-rails', '6.1.4', require: false
 gem 'rubocop', '1.65.1', 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,18 +2,19 @@ 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
@@ -53,7 +54,7 @@ GEM
     ast (2.4.2)
     backtrace (0.4.0)
     base64 (0.2.0)
-    baza.rb (0.0.4)
+    baza.rb (0.0.7)
       backtrace (> 0)
       faraday (> 0)
       faraday-http-cache (> 0)
@@ -93,18 +94,21 @@ GEM
       bigdecimal
     cucumber-gherkin (27.0.0)
       cucumber-messages (>= 19.1.4, < 23)
-    cucumber-html-formatter (21.6.0)
-      cucumber-messages (> 19, < 25)
+    cucumber-html-formatter (21.7.0)
+      cucumber-messages (> 19, < 27)
     cucumber-messages (22.0.0)
     cucumber-tag-expressions (6.1.0)
     decoor (0.0.1)
     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)
-    factbase (0.3.0)
+    factbase (0.4.0)
       backtrace (> 0)
       decoor (> 0)
       json (~> 2.7)
@@ -148,7 +152,7 @@ GEM
       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 +179,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
@@ -225,7 +229,7 @@ GEM
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.3)
+    rspec-rails (6.1.4)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -276,6 +280,10 @@ GEM
     unicode-display_width (2.5.0)
     uri (0.13.0)
     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)
@@ -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)
+  rspec-rails (= 6.1.4)
   rubocop (= 1.65.1)
   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"/>
@@ -143,7 +143,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 +185,7 @@ SOFTWARE.
       </xsl:when>
       <xsl:otherwise>
         <th>
-          <xsl:text>&nbsp;</xsl:text>
+          <xsl:text> </xsl:text>
         </th>
       </xsl:otherwise>
     </xsl:choose>
@@ -259,4 +259,4 @@ SOFTWARE.
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

data/bin/judges

@@ -150,7 +150,7 @@ class JudgesGLI extend GLI::App
     run_it(c, 'test')
   end
 
-  desc 'Push the factbase to the server'
+  desc 'Push the factbase to the server and unlock it over there'
   command :push do |c|
     c.desc 'Authentication token'
     c.flag([:token])
@@ -173,7 +173,7 @@ class JudgesGLI extend GLI::App
     run_it(c, 'push')
   end
 
-  desc 'Pull the factbase from the server'
+  desc 'Pull the factbase from the server and lock it over there'
   command :pull do |c|
     c.desc 'Authentication token'
     c.flag([:token])

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.1'
+  s.version = '0.26.0'
   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.
 #
@@ -41,6 +41,9 @@ class Judges::Print
     @loog = loog
   end
 
+  # Run it (it is supposed to be called by the +bin/judges+ script.
+  # @param [Hash] opts Command line options (start with '--')
+  # @param [Array] args List of command line arguments
   def run(opts, args)
     raise 'At lease one argument required' if args.empty?
     f = args[0]
@@ -61,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'
@@ -89,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'
 
@@ -39,6 +40,9 @@ class Judges::Pull
     @loog = loog
   end
 
+  # Run it (it is supposed to be called by the +bin/judges+ script.
+  # @param [Hash] opts Command line options (start with '--')
+  # @param [Array] args List of command line arguments
   def run(opts, args)
     raise 'Exactly two arguments required' unless args.size == 2
     fb = Factbase.new
@@ -50,16 +54,21 @@ class Judges::Pull
       retries: (opts['retries'] || 3).to_i
     )
     name = args[0]
-    elapsed(@loog) do
-      baza.lock(name, opts['owner'])
+    elapsed(@loog, level: Logger::INFO) do
       if baza.name_exists?(name)
-        jid = baza.recent(name)
-        unless baza.exit_code(jid).zero?
-          @loog.warn("STDOUT of the job ##{jid} (from the server):\n#{baza.stdout(jid)}")
-          raise "The job ##{jid} ('#{name}') is broken, maybe you should expire it"
+        baza.lock(name, opts['owner'])
+        begin
+          jid = baza.recent(name)
+          unless baza.exit_code(jid).zero?
+            @loog.warn("STDOUT of the job ##{jid} (from the server):\n#{baza.stdout(jid)}")
+            raise "The job ##{jid} ('#{name}') is broken, maybe you should expire it"
+          end
+          fb.import(baza.pull(wait(name, baza, jid, opts['wait'])))
+          Judges::Impex.new(@loog, args[1]).export(fb)
+        rescue StandardError => e
+          baza.unlock(name, opts['owner'])
+          raise e
         end
-        fb.import(baza.pull(wait(name, baza, jid, opts['wait'])))
-        Judges::Impex.new(@loog, args[1]).export(fb)
         throw :"Pulled #{fb.size} facts by the name '#{name}'"
       else
         throw :"There is nothing to pull, the name '#{name}' is absent on the server"

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'
 
@@ -39,6 +40,9 @@ class Judges::Push
     @loog = loog
   end
 
+  # Run it (it is supposed to be called by the +bin/judges+ script.
+  # @param [Hash] opts Command line options (start with '--')
+  # @param [Array] args List of command line arguments
   def run(opts, args)
     raise 'Exactly two arguments required' unless args.size == 2
     name = args[0]
@@ -51,11 +55,14 @@ class Judges::Push
       retries: (opts['retries'] || 3).to_i,
       compression: opts.fetch('zip', true)
     )
-    elapsed(@loog) do
+    elapsed(@loog, level: Logger::INFO) do
       baza.lock(name, opts['owner'])
-      id = baza.push(name, fb.export, opts['meta'] || [])
-      baza.unlock(name, opts['owner'])
-      throw :"Pushed #{fb.size} facts, job ID is #{id}"
+      begin
+        id = baza.push(name, fb.export, opts['meta'] || [])
+        throw :"Pushed #{fb.size} facts, job ID is #{id}"
+      ensure
+        baza.unlock(name, opts['owner'])
+      end
     end
   end
 end

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.
 #
@@ -45,6 +45,9 @@ class Judges::Test
     @loog = loog
   end
 
+  # Run it (it is supposed to be called by the +bin/judges+ script.
+  # @param [Hash] opts Command line options (start with '--')
+  # @param [Array] args List of command line arguments
   def run(opts, args)
     raise 'Exactly one argument required' unless args.size == 1
     dir = args[0]
@@ -54,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.
 #
@@ -38,11 +38,14 @@ class Judges::Trim
     @loog = loog
   end
 
+  # Run it (it is supposed to be called by the +bin/judges+ script.
+  # @param [Hash] opts Command line options (start with '--')
+  # @param [Array] args List of command line arguments
   def run(opts, args)
     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.
 #
@@ -43,6 +43,9 @@ class Judges::Update
     @loog = loog
   end
 
+  # Run it (it is supposed to be called by the +bin/judges+ script.
+  # @param [Hash] opts Command line options (start with '--')
+  # @param [Array] args List of command line arguments
   def run(opts, args)
     raise 'Exactly two arguments required' unless args.size == 2
     dir = args[0]
@@ -60,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
@@ -102,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.1'
+  VERSION = '0.26.0'
 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_pull.rb

@@ -39,6 +39,7 @@ class TestPull < Minitest::Test
     stub_request(:get, 'http://example.org/recent/foo.txt').to_return(body: '42')
     stub_request(:get, 'http://example.org/finished/42').to_return(body: 'yes')
     stub_request(:get, 'http://example.org/exit/42.txt').to_return(body: '0')
+    stub_request(:get, 'http://example.org/unlock/foo?owner=none').to_return(status: 302)
     fb = Factbase.new
     fb.insert.foo = 42
     stub_request(:get, 'http://example.org/pull/42.fb').to_return(body: fb.export)
@@ -68,6 +69,7 @@ class TestPull < Minitest::Test
     stub_request(:get, 'http://example.org/finished/42').to_return(body: 'yes')
     stub_request(:get, 'http://example.org/exit/42.txt').to_return(body: '1')
     stub_request(:get, 'http://example.org/stdout/42.txt').to_return(body: 'oops, some trouble here')
+    stub_request(:get, 'http://example.org/unlock/foo?owner=none').to_return(status: 302)
     Dir.mktmpdir do |d|
       file = File.join(d, 'base.fb')
       e =

data/test/commands/test_push.rb

@@ -60,6 +60,7 @@ class TestPush < Minitest::Test
     WebMock.disable_net_connect!
     stub_request(:get, 'http://example.org/lock/foo?owner=none').to_return(status: 302)
     stub_request(:put, 'http://example.org/push/foo').to_return(status: 500)
+    stub_request(:get, 'http://example.org/unlock/foo?owner=none').to_return(status: 302)
     Dir.mktmpdir do |d|
       file = File.join(d, 'base.fb')
       fb = Factbase.new

data/test/commands/test_test.rb

@@ -170,7 +170,7 @@ class TestTest < Minitest::Test
         expected_failure: true
         YAML
       )
-      Judges::Test.new(Loog::VERBOSE).run({}, [d])
+      Judges::Test.new(Loog::NULL).run({}, [d])
     end
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.26.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 2024-08-18 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