judges 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cc71c6f27206802eb89caac6ea4cf95558c5f36f484efea771e5ad5c442084d
-  data.tar.gz: 717c6de821765a54a916dc2eabafaf63827fd5a522584c7af866f5beea5475c7
+  metadata.gz: 14d7a10c327b1cbd22dcc87773e6c3f218598a5f7d879f6f8c3ff2ddabc9018c
+  data.tar.gz: '0106468efd8e11754252950a2249ab0f2cbd22a9ed2081867e88e154ae2c0cc0'
 SHA512:
-  metadata.gz: 895ea9f8d9b1527113c1a33d1c5e5a5d18b16994d00593d7f3eaf5c135c9a9eb9787c7ca969bcbced5b025eef8ff03e3927ecc90d3ee0738b9cee3cf1b948799
-  data.tar.gz: 2c86328e14c85f7685fb46b8cf78bcac87058725db51b57ca447186c61cbf5650dee93570c7000c11105792a14d8b8879d54e861325c1f12a97f200b09e33bb3
+  metadata.gz: 7035bfcbf8e162ef9c4504fdb9953ad275bae7c00123d692bfd8b612bef16745e144b3b51e10560890d79681c48fb37d1f2d3a9030f6caba8896c0a76a6925e6
+  data.tar.gz: '09533523b712227e1fced16b32a74abd450e9f454d217574c9b35334564718f034283bd9b61cdc39ee1e654798ddb4f439199284d6ed66827024dcb347299c50'

data/.github/workflows/{license.yml → copyrights.yml}

@@ -18,40 +18,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 ---
-name: license
+name: copyrights
 'on':
   push:
-    branches:
-      - master
   pull_request:
-    branches:
-      - master
 jobs:
-  license:
+  copyrights:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - shell: bash
-        run: |
-          header="Copyright (c) $(date +%Y) Yegor Bugayenko"
-          failed="false"
-          while IFS= read -r file; do
-            if ! grep -q "${header}" "${file}"; then
-              failed="true"
-              echo "⚠️ Copyright header is not found in: ${file}"
-            else
-              echo "File looks good: ${file}"
-            fi
-          done < <(find . -type f \( \
-            -name "Dockerfile" -o \
-            -name "LICENSE.txt" -o \
-            -name "Makefile" -o \
-            -name "Rakefile" -o \
-            -name "*.sh" -o \
-            -name "*.rb" -o \
-            -name "*.fe" -o \
-            -name "*.yml" \
-            \) -print)
-          if [ "${failed}" = "true" ]; then
-            exit 1
-          fi
+      - uses: yegor256/copyrights-action@0.0.3

data/Gemfile.lock

@@ -47,7 +47,7 @@ GEM
     backtrace (0.4.0)
     base64 (0.2.0)
     bigdecimal (3.1.8)
-    builder (3.2.4)
+    builder (3.3.0)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crack (1.0.0)
@@ -85,7 +85,7 @@ GEM
     erubi (1.12.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.0.42)
+    factbase (0.0.44)
       json (~> 2.7)
       loog (~> 0.2)
       nokogiri (~> 1.10)

data/bin/judges

@@ -138,6 +138,8 @@ class App
     c.flag([:enable], multiple: true)
     c.desc 'Name of the judge to run (directory name)'
     c.flag([:judge], multiple: true)
+    c.desc 'How many times to run?'
+    c.flag([:runs], type: Integer, default_value: 1)
     c.desc 'The location of a Ruby library (directory with .rb files to include)'
     c.flag([:lib])
     c.desc 'Stay quiet even if some tests fail or simply no tests executed?'
@@ -155,9 +157,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 +172,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.6.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|
@@ -122,12 +122,14 @@ class Judges::Test
       end
     end
     options = Judges::Options.new(opts['option']) + Judges::Options.new(yaml['options'])
-    judge.run(Factbase::Looged.new(fb, @loog), {}, {}, options)
+    (1..(opts['runs'] || 1)).each do
+      judge.run(Factbase::Looged.new(fb, @loog), {}, {}, options)
+    end
     xpaths = yaml['expected']
     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.6.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -151,7 +151,7 @@ files:
 - ".gitattributes"
 - ".github/workflows/actionlint.yml"
 - ".github/workflows/codecov.yml"
-- ".github/workflows/license.yml"
+- ".github/workflows/copyrights.yml"
 - ".github/workflows/markdown-lint.yml"
 - ".github/workflows/pdd.yml"
 - ".github/workflows/rake.yml"