judges 0.23.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8e8b3c462c8c85767f611787af11de8c7966829c43866c31bab6626101e9762
-  data.tar.gz: 0c87fba4ce9a6f8c79149acecc07b3036804e2b51941fef4bf676ef1c2c79ef5
+  metadata.gz: 864078e89f5d4c966698d554864af0c76867423811bd8e8888c935873cf2040e
+  data.tar.gz: 28ba277b76e781eee992fd0eb49af944576329d9d761bc40a496e97dcbece222
 SHA512:
-  metadata.gz: 217b87a1d9154652a255377e1a8919e1841895aa6d3b86c1f2e24eb66cda198a931ad3fb91062962234bea707c0af90ceaf7c1da6eccd6cbc4af37de33f67379
-  data.tar.gz: f0dfac8980ba3588b52f0aa38175bba961b7f786d1d567878e394e901b644edeef99446ebab1e41af8ce3e29d49ff4e7727c1e017b35fba6e05e821735cb20c2
+  metadata.gz: abd995369192cce4656db009c16126908d3246387a405726027a47d2bab09f8e9f4edbb8f66f44c0593b9db8ad8b8da05b1e489fc8310785f7100932807a7949
+  data.tar.gz: 4156be82ef0bf1d1061efa41054f21dbab4c2114eeb356da6e0a54b530a9745a0246c942e0139e179485d442bdbbf544db150bc65c0d1ccda12ef8a60720680d

data/Gemfile.lock

@@ -19,39 +19,41 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.3.4)
-      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionpack (7.2.0)
+      actionview (= 7.2.0)
+      activesupport (= 7.2.0)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
+      useragent (~> 0.16)
+    actionview (7.2.0)
+      activesupport (= 7.2.0)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.4)
+    activesupport (7.2.0)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ansi (1.5.0)
     ast (2.4.2)
     backtrace (0.4.0)
     base64 (0.2.0)
-    baza.rb (0.0.1)
+    baza.rb (0.0.4)
       backtrace (> 0)
       faraday (> 0)
       faraday-http-cache (> 0)
@@ -60,10 +62,11 @@ GEM
       iri (> 0)
       loog (> 0)
       retries (~> 0)
+      tago (~> 0)
       typhoeus (~> 1.3)
     bigdecimal (3.1.8)
     builder (3.3.0)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crack (1.0.0)
       bigdecimal
@@ -154,7 +157,6 @@ GEM
     moments (0.3.0)
     multi_test (1.1.0)
     multipart-post (2.4.1)
-    mutex_m (0.2.0)
     net-http (0.4.1)
       uri
     net-ping (2.0.8)
@@ -173,7 +175,7 @@ GEM
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     others (0.0.3)
-    parallel (1.26.1)
+    parallel (1.26.2)
     parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
@@ -196,10 +198,10 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      irb
+    railties (7.2.0)
+      actionpack (= 7.2.0)
+      activesupport (= 7.2.0)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
@@ -213,7 +215,7 @@ GEM
     reline (0.5.9)
       io-console (~> 0.5)
     retries (0.0.5)
-    rexml (3.3.4)
+    rexml (3.3.5)
       strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
@@ -251,6 +253,7 @@ GEM
     rubocop-rspec (3.0.4)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
+    securerandom (0.3.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -272,6 +275,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     uri (0.13.0)
+    useragent (0.16.10)
     webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)

data/README.md

@@ -48,6 +48,8 @@ options:
   max: 100
 expected:
   - /fb[count(f)=1]
+expected_failure:
+  - 'file not found'
 after:
   - first.rb
   - second.rb
@@ -72,6 +74,9 @@ The `after` (default: `[]`) is a list of relative file names
 of Ruby scripts that are executed after the judge
 (`$fb` and `$loog` are passed into them).
 
+The `expected_failure (default: `[]`) is a list of strings that must
+be present in the message of the exception being raised.
+
 ## How to contribute
 
 Read

data/assets/index.xsl

@@ -162,13 +162,13 @@ SOFTWARE.
     <xsl:param name="cols"/>
     <xsl:choose>
       <xsl:when test="string-length($cols) &gt; 0">
-        <col style="width: 10em;"/>
+        <col style=""/>
         <xsl:call-template name="col">
           <xsl:with-param name="cols" select="substring-after($cols, ',')"/>
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
-        <col style=""/>
+        <col style="width: 50%;"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>

data/bin/judges

@@ -118,7 +118,7 @@ class JudgesGLI extend GLI::App
     c.desc 'Comma separated list of columns to show in HTML output (no spaces!)'
     c.flag([:columns], default_value: 'when,what')
     c.desc 'Comma separated list of hidden columns, not to be rendered (no spaces!)'
-    c.flag([:hidden], default_value: '_id,_time,_version')
+    c.flag([:hidden], default_value: '_id,_time,_version,_job')
     c.desc 'Print even if target file already exists and is older than the factbase'
     c.switch([:force], default_value: false)
     run_it(c, 'print')

data/features/test.feature

@@ -163,3 +163,18 @@ Feature: Test
     """
     Then I run bin/judges with "test mine"
     And Exit code is zero
+
+  Scenario: Test with exception
+    Given I make a temp directory
+    Then I have a "mine/foo/foo.rb" file with content:
+    """
+    raise 'this is a joke'
+    """
+    Then I have a "mine/foo/simple.yml" file with content:
+    """
+    ---
+    expected_failure:
+      - a joke
+    """
+    Then I run bin/judges with "test mine"
+    And Exit code is zero

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

data/lib/judges/commands/print.rb

@@ -95,7 +95,7 @@ class Judges::Print
         'title' => opts['title'],
         'date' => Time.now.utc.iso8601,
         'columns' => opts['columns'] || 'when,what,who',
-        'hidden' => opts['hidden'] || '_id,_version,_time',
+        'hidden' => opts['hidden'] || '_id,_version,_time,_job',
         'version' => Judges::VERSION
       )
     )

data/lib/judges/commands/pull.rb

@@ -22,7 +22,7 @@
 
 require 'typhoeus'
 require 'iri'
-require 'baza'
+require 'baza-rb'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 
@@ -42,7 +42,7 @@ class Judges::Pull
   def run(opts, args)
     raise 'Exactly two arguments required' unless args.size == 2
     fb = Factbase.new
-    baza = Baza.new(
+    baza = BazaRb.new(
       opts['host'], opts['port'].to_i, opts['token'],
       ssl: opts['ssl'],
       timeout: (opts['timeout'] || 30).to_i,

data/lib/judges/commands/push.rb

@@ -22,7 +22,7 @@
 
 require 'typhoeus'
 require 'iri'
-require 'baza'
+require 'baza-rb'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 
@@ -43,7 +43,7 @@ class Judges::Push
     raise 'Exactly two arguments required' unless args.size == 2
     name = args[0]
     fb = Judges::Impex.new(@loog, args[1]).import
-    baza = Baza.new(
+    baza = BazaRb.new(
       opts['host'], opts['port'].to_i, opts['token'],
       ssl: opts['ssl'],
       timeout: (opts['timeout'] || 30).to_i,

data/lib/judges/commands/test.rb

@@ -146,7 +146,18 @@ class Judges::Test
     (1..runs).each do |r|
       fbx = fb
       fbx = Factbase::Looged.new(fb, @loog) if opts['log']
-      judge.run(fbx, {}, {}, options)
+      expected_failure = yaml['expected_failure']
+      begin
+        judge.run(fbx, {}, {}, options)
+        raise 'Exception expected but not raised' if expected_failure
+      # rubocop:disable Lint/RescueException
+      rescue Exception => e
+        # rubocop:enable Lint/RescueException
+        raise e unless expected_failure
+        if expected_failure.is_a?(Array) && expected_failure.none? { |s| e.message.include?(s) }
+          raise "Exception #{e.class} raised with #{e.message.inspect}, but this is not what was expected"
+        end
+      end
       next unless assert
       assert(judge, tname, fb, yaml) if r == runs || opts['assert_once'].is_a?(FalseClass)
     end

data/lib/judges.rb

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

data/test/commands/test_eval.rb

@@ -24,6 +24,7 @@ require 'minitest/autorun'
 require 'loog'
 require 'nokogiri'
 require 'factbase/to_xml'
+require_relative '../test__helper'
 require_relative '../../lib/judges'
 require_relative '../../lib/judges/commands/eval'
 

data/test/commands/test_import.rb

@@ -24,6 +24,7 @@ require 'minitest/autorun'
 require 'loog'
 require 'nokogiri'
 require 'factbase/to_xml'
+require_relative '../test__helper'
 require_relative '../../lib/judges'
 require_relative '../../lib/judges/commands/import'
 

data/test/commands/test_test.rb

@@ -22,6 +22,7 @@
 
 require 'minitest/autorun'
 require 'loog'
+require_relative '../test__helper'
 require_relative '../../lib/judges'
 require_relative '../../lib/judges/commands/test'
 
@@ -143,4 +144,33 @@ class TestTest < Minitest::Test
       Judges::Test.new(Loog::NULL).run({}, [d])
     end
   end
+
+  def test_with_expected_failure
+    Dir.mktmpdir do |d|
+      save_it(File.join(d, 'foo/foo.rb'), 'raise "this is intentional";')
+      save_it(
+        File.join(d, 'foo/x.yml'),
+        <<-YAML
+        input: []
+        expected_failure:
+          - intentional
+        YAML
+      )
+      Judges::Test.new(Loog::NULL).run({}, [d])
+    end
+  end
+
+  def test_with_expected_failure_no_string
+    Dir.mktmpdir do |d|
+      save_it(File.join(d, 'foo/foo.rb'), 'raise "this is intentional";')
+      save_it(
+        File.join(d, 'foo/x.yml'),
+        <<-YAML
+        input: []
+        expected_failure: true
+        YAML
+      )
+      Judges::Test.new(Loog::VERBOSE).run({}, [d])
+    end
+  end
 end

data/test/commands/test_update.rb

@@ -24,6 +24,7 @@ require 'minitest/autorun'
 require 'loog'
 require 'nokogiri'
 require 'factbase/to_xml'
+require_relative '../test__helper'
 require_relative '../../lib/judges'
 require_relative '../../lib/judges/commands/update'
 

data/test/test_judge.rb

@@ -24,6 +24,7 @@ require 'minitest/autorun'
 require 'tmpdir'
 require 'loog'
 require 'factbase'
+require_relative 'test__helper'
 require_relative '../lib/judges'
 require_relative '../lib/judges/judge'
 
@@ -105,4 +106,15 @@ class TestJudge < Minitest::Test
       end
     end
   end
+
+  def test_with_standard_error
+    assert_raises do
+      Dir.mktmpdir do |d|
+        dir = File.join(d, 'judges')
+        save_it(File.join(dir, "#{File.basename(d)}.rb"), 'raise "intentional"')
+        judge = Judges::Judge.new(dir, lib, Loog::NULL)
+        judge.run(Factbase.new, {}, {}, {})
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-09 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace