judges 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cc71c6f27206802eb89caac6ea4cf95558c5f36f484efea771e5ad5c442084d
-  data.tar.gz: 717c6de821765a54a916dc2eabafaf63827fd5a522584c7af866f5beea5475c7
+  metadata.gz: 8eed10a2293bdfe6ddfc33e7623d7eb8f905428f60fd002c55e7eb75afdcd96f
+  data.tar.gz: df6b6941021d0c4fbcdb22d4608d41365ca7e537104eda09909f56cb4dd8dd3d
 SHA512:
-  metadata.gz: 895ea9f8d9b1527113c1a33d1c5e5a5d18b16994d00593d7f3eaf5c135c9a9eb9787c7ca969bcbced5b025eef8ff03e3927ecc90d3ee0738b9cee3cf1b948799
-  data.tar.gz: 2c86328e14c85f7685fb46b8cf78bcac87058725db51b57ca447186c61cbf5650dee93570c7000c11105792a14d8b8879d54e861325c1f12a97f200b09e33bb3
+  metadata.gz: 07a943829af24cf0388303f9804f8b476449e3feea10ec3fa3703278ffb96e3b8c7a342d06e611e99168a8711397c380fdb70e8504fecaa22be48a6db0627550
+  data.tar.gz: 605f4d9c1598a4950098837ae6d8a8a432b882d1d4da75f93df78e530a584101642fbed0eb76d3df728f7dae4adbe30fb86c517ded6c16ff13f907b89ee4f797

data/bin/judges

@@ -155,9 +155,9 @@ class App
     c.desc 'The IP/hostname of the server'
     c.flag([:host], default_value: 'www.zerocracy.com')
     c.desc 'The TCP port number of the server'
-    c.flag([:port], default_value: 443)
+    c.flag([:port], default_value: 443, type: Integer)
     c.desc 'Connection and read time in seconds'
-    c.flag([:timeout], default_value: 30)
+    c.flag([:timeout], default_value: 30, type: Integer)
     c.desc 'Shall SSL be used?'
     c.switch([:ssl], default_value: true)
     c.action do |global, options, args|
@@ -170,12 +170,14 @@ class App
   command :pull do |c|
     c.desc 'Authentication token'
     c.flag([:token])
+    c.desc 'How many seconds to wait'
+    c.flag([:wait], default_value: 10 * 60, arg_name: '<seconds>', type: Integer)
     c.desc 'The IP/hostname of the server'
     c.flag([:host], default_value: 'www.zerocracy.com')
     c.desc 'The TCP port number of the server'
-    c.flag([:port], default_value: 443)
+    c.flag([:port], default_value: 443, type: Integer)
     c.desc 'Connection and read time in seconds'
-    c.flag([:timeout], default_value: 30)
+    c.flag([:timeout], default_value: 30, type: Integer)
     c.desc 'Shall SSL be used?'
     c.switch([:ssl], default_value: true)
     c.action do |global, options, args|

data/features/pull.feature

@@ -4,7 +4,7 @@ Feature: Pull
   Scenario: Pull a small factbase
     Given We are online
     Given I make a temp directory
-    Then I run bin/judges with "--verbose pull --token 00000000-0000-0000-0000-000000000000 simple simple.fb"
+    Then I run bin/judges with "--verbose pull --token 00000000-0000-0000-0000-000000000000 --wait=15 simple simple.fb"
     Then Stdout contains "Pulled"
     And Exit code is zero
     Then I run bin/judges with "inspect simple.fb"

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

data/lib/judges/commands/pull.rb

@@ -47,7 +47,7 @@ class Judges::Pull
     name = args[0]
     elapsed(@loog) do
       if baza.name_exists?(name)
-        fb.import(baza.pull(wait(baza, baza.recent(name))))
+        fb.import(baza.pull(wait(baza, baza.recent(name), opts['wait'])))
         Judges::Impex.new(@loog, args[1]).export(fb)
         throw :"Pulled #{fb.size} facts by the name '#{name}'"
       else
@@ -58,12 +58,14 @@ class Judges::Pull
 
   private
 
-  def wait(baza, id)
+  def wait(baza, id, limit)
+    raise 'Waiting time is nil' if limit.nil?
     start = Time.now
     loop do
       break if baza.finished?(id)
       sleep 1
-      raise 'Time is over, the job is still not finished' if Time.now - start > 10 * 60
+      raise 'Time is over, the job is still not finished' if Time.now - start > limit
+      @loog.debug("Still waiting for the job ##{id} to finish... (#{format('%.2f', Time.now - start)}s already)")
     end
     id
   end

data/lib/judges/commands/test.rb

@@ -69,7 +69,7 @@ class Judges::Test
           end
           @loog.info("🛠️ Testing #{f.to_rel}:")
           begin
-            test_one(opts, p, yaml)
+            test_one(opts, p, tname, yaml)
             tests += 1
           rescue StandardError => e
             @loog.warn(Backtrace.new(e))
@@ -106,7 +106,7 @@ class Judges::Test
     judges.any? { |n| n.match?(%r{^#{name}(/#{tre})?$}) }
   end
 
-  def test_one(opts, judge, yaml)
+  def test_one(opts, judge, tname, yaml)
     fb = Factbase.new
     inputs = yaml['input']
     inputs&.each do |i|
@@ -127,7 +127,7 @@ class Judges::Test
     return if xpaths.nil?
     xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
     xpaths.each do |xp|
-      raise "#{judge.script} doesn't match '#{xp}':\n#{xml}" if xml.xpath(xp).empty?
+      raise "#{judge.name}/#{tname} doesn't match '#{xp}':\n#{xml}" if xml.xpath(xp).empty?
     end
   end
 end

data/lib/judges/commands/update.rb

@@ -82,7 +82,7 @@ class Judges::Update
     end
 
     def to_s
-      "#{format('+%d', @added)}/#{format('+%d', -@removed)}"
+      "#{@added}/-#{@removed}"
     end
 
     def zero?
@@ -105,8 +105,10 @@ class Judges::Update
     elapsed(@loog) do
       done = judges.each_with_index do |p, i|
         @loog.info("\n👉 Running #{p.name} (##{i}) at #{p.dir.to_rel}...")
-        churn += one_judge(fb, p, global, options)
-        @loog.info("👍 The judge #{p.name} modified #{churn} facts")
+        elapsed(@loog) do
+          churn += one_judge(fb, p, global, options)
+          throw :"👍 The judge #{p.name} modified #{churn} facts\n"
+        end
       rescue StandardError, SyntaxError => e
         @loog.warn(Backtrace.new(e))
         errors << p.script
@@ -132,7 +134,7 @@ class Judges::Update
     if diff.positive?
       Churn.new(diff, 0)
     else
-      Churn.new(0, diff)
+      Churn.new(0, -diff)
     end
   end
 end

data/lib/judges.rb

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

data/test/commands/test_pull.rb

@@ -47,7 +47,8 @@ class TestPull < Minitest::Test
           'token' => '000',
           'host' => 'example.org',
           'port' => 80,
-          'ssl' => false
+          'ssl' => false,
+          'wait' => 10
         },
         ['foo', file]
       )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yegor Bugayenko