judges 0.12.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdaaebbfb61ca792443a79d06439a3946f92bf9fdeb46fdf89ab0f702f0a2176
-  data.tar.gz: 617dce64bda23eb2d4987ef45b60987766248d48ee5770b6c4f35964d4f73cdf
+  metadata.gz: 0e42894e95397d8b62afd1deaf3407d31321475e378f4ebdfd88216571ff742d
+  data.tar.gz: d59aaa5f47aa2f7373b78e36869bc09aacd1c52f881c910c45d292407c3da203
 SHA512:
-  metadata.gz: 8e0cfe9f3488ed3e67f687400a2d4ab7bd6ccae47985d0eec8681bca3aac61c9bdbef4025ca974adff07e7aadb9a6ab594bc1765f2fccaabc7fa23d0c250201e
-  data.tar.gz: 8148daa02d6d83ddcc6dcd6093108cbe051cd205876a924c65590a02b52e861b9d9517cef775e4e86e7ff007cc040379ce11d86c4e1b758a7a4eff6aa82ec327
+  metadata.gz: 1be5c4aad65f212b8bc700616851356ccf331be5b51a1ccc1e2d9d71e2225c8f648d0604e4ae5b1957d4b0623d43b8de6e78da2a8b1ed5ecdbbbe6db9eba3fc4
+  data.tar.gz: 8174ac41e04c618635c868b06164b79939cc2891066bda8063f806f9395b8985a650eab5770fd778fe86ad7f42d8f9496f46331a3cff175d570f39d0af2e00a2

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     judges (0.0.0)
       backtrace (~> 0.3)
-      concurrent-ruby (= 1.2.3)
+      concurrent-ruby (~> 1.2)
       factbase (~> 0.0)
       gli (~> 2.21)
       iri (~> 0.8)
@@ -51,7 +51,7 @@ GEM
     base64 (0.2.0)
     bigdecimal (3.1.8)
     builder (3.3.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crack (1.0.0)
       bigdecimal
@@ -180,7 +180,7 @@ GEM
     reline (0.5.9)
       io-console (~> 0.5)
     retries (0.0.5)
-    rexml (3.3.0)
+    rexml (3.3.1)
       strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)

data/bin/judges

@@ -65,6 +65,8 @@ class App
     c.flag([:'max-cycles'], default_value: 8, type: Integer)
     c.desc 'Stay quiet even if some judges fail'
     c.switch([:q, :quiet], default_value: false)
+    c.desc 'Place a summarization fact into the factbase'
+    c.switch([:summary], default_value: false)
     c.desc 'Use default logging facility'
     c.switch([:log], default_value: true)
     c.action do |global, options, args|

data/features/update.feature

@@ -9,8 +9,8 @@ Feature: Update
       n.kind = 'yes!'
     """
     Then I run bin/judges with "--verbose update --quiet -o foo=1 -o bar=2 --max-cycles 3 . simple.fb"
-    Then Stdout contains "foo → "
-    Then Stdout contains "bar → "
+    Then Stdout contains "FOO → "
+    Then Stdout contains "BAR → "
     Then Stdout contains "1 judge(s) processed"
     Then Stdout contains "Update finished in 3 cycle(s), modified 3/0 fact(s)"
     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.12.0'
+  s.version = '0.13.1'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'backtrace', '~>0.3'
-  s.add_runtime_dependency 'concurrent-ruby', '1.2.3'
+  s.add_runtime_dependency 'concurrent-ruby', '~>1.2'
   s.add_runtime_dependency 'factbase', '~>0.0'
   s.add_runtime_dependency 'gli', '~>2.21'
   s.add_runtime_dependency 'iri', '~>0.8'

data/lib/judges/churn.rb

@@ -27,34 +27,40 @@ require_relative '../judges'
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 class Judges::Churn
-  attr_reader :added, :removed
+  attr_reader :added, :removed, :errors
 
-  def initialize(added, removed)
+  def initialize(added, removed, errors = [])
     @added = added
     @removed = removed
+    @errors = errors
   end
 
   def to_s
-    "#{@added}/#{@removed}"
+    "#{@added}/#{@removed}#{@errors.empty? ? '' : "/#{@errors.size}"}"
   end
 
   def zero?
-    @added.zero? && @removed.zero?
+    @added.zero? && @removed.zero? && @errors.empty?
+  end
+
+  def <<(error)
+    @errors << error
+    nil
   end
 
   def +(other)
     if other.is_a?(Judges::Churn)
-      Judges::Churn.new(@added + other.added, @removed + other.removed)
+      Judges::Churn.new(@added + other.added, @removed + other.removed, @errors + other.errors)
     else
-      Judges::Churn.new(@added + other, @removed)
+      Judges::Churn.new(@added + other, @removed, @errors)
     end
   end
 
   def -(other)
     if other.is_a?(Judges::Churn)
-      Judges::Churn.new(@added - other.added, @removed - other.removed)
+      Judges::Churn.new(@added - other.added, @removed - other.removed, @errors + other.errors)
     else
-      Judges::Churn.new(@added, @removed + other)
+      Judges::Churn.new(@added, @removed + other, @errors)
     end
   end
 end

data/lib/judges/commands/update.rb

@@ -47,7 +47,11 @@ class Judges::Update
     fb = impex.import(strict: false)
     fb = Factbase::Looged.new(fb, @loog) if opts['log']
     options = Judges::Options.new(opts['option'])
-    @loog.debug("The following options provided:\n\t#{options.to_s.gsub("\n", "\n\t")}")
+    if options.empty?
+      @loog.debug('No options provided by the --option flag')
+    else
+      @loog.debug("The following options provided:\n\t#{options.to_s.gsub("\n", "\n\t")}")
+    end
     judges = Judges::Judges.new(dir, opts['lib'], @loog)
     c = 0
     churn = Judges::Churn.new(0, 0)
@@ -72,6 +76,17 @@ class Judges::Update
       end
       throw :"Update finished in #{c} cycle(s), modified #{churn} fact(s)"
     end
+    return if churn.zero? || !opts['summary']
+    fb.query('(eq what "judges-summary")').delete!
+    f = fb.insert
+    f.what = 'judges-summary'
+    f.when = Time.now
+    f.version = Judges::VERSION
+    f.cycles = c
+    f.added = churn.added.size
+    f.removed = churn.removed.size
+    churn.errors.each { |e| f.error = e }
+    impex.export(fb)
   end
 
   private
@@ -79,7 +94,6 @@ class Judges::Update
   # Run all judges in a full cycle, one by one.
   # @return [Churn] How many modifications have been made
   def cycle(opts, judges, fb, options)
-    errors = []
     churn = Judges::Churn.new(0, 0)
     global = {}
     elapsed(@loog) do
@@ -92,13 +106,13 @@ class Judges::Update
         end
       rescue StandardError, SyntaxError => e
         @loog.warn(Backtrace.new(e))
-        errors << p.script
+        churn << e.message
       end
-      throw :"👍 #{done} judge(s) processed" if errors.empty?
-      throw :"❌ #{done} judge(s) processed with #{errors.size} errors"
+      throw :"👍 #{done} judge(s) processed" if churn.errors.empty?
+      throw :"❌ #{done} judge(s) processed with #{churn.errors.size} errors"
     end
-    unless errors.empty?
-      raise "Failed to update correctly (#{errors.size} errors)" unless opts['quiet']
+    unless churn.errors.empty?
+      raise "Failed to update correctly (#{churn.errors.size} errors)" unless opts['quiet']
       @loog.info('Not failing because of the --quiet flag provided')
     end
     churn

data/lib/judges/options.rb

@@ -34,6 +34,11 @@ class Judges::Options
     @pairs = pairs
   end
 
+  def empty?
+    touch # this will trigger method_missing() method, which will create @hash
+    @hash.empty?
+  end
+
   def +(other)
     touch # this will trigger method_missing() method, which will create @hash
     h = @hash.dup
@@ -62,15 +67,16 @@ class Judges::Options
       pp = pp.split(',') if pp.is_a?(String)
       pp.compact!
       pp.reject!(&:empty?)
-      pp.to_h do |pair|
+      pp.map! do |pair|
         p = pair.split('=', 2)
-        k = p[0].strip
+        k = p[0].strip.upcase
         v = p[1]
         v = v.nil? ? 'true' : v.strip
         [k.to_sym, v.match?(/^[0-9]+$/) ? v.to_i : v]
       end
+      pp.reject { |p| p[0].empty? }.to_h
     end
-    k = args[0].downcase
+    k = args[0].upcase
     @hash[k]
   end
 end

data/lib/judges.rb

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

data/test/commands/test_update.rb

@@ -64,7 +64,7 @@ class TestUpdate < Minitest::Test
     Dir.mktmpdir do |d|
       File.write(File.join(d, 'foo.rb'), 'this$is$a$broken$Ruby$script')
       file = File.join(d, 'base.fb')
-      Judges::Update.new(Loog::NULL).run({ 'quiet' => true }, [d, file])
+      Judges::Update.new(Loog::NULL).run({ 'quiet' => true, 'max-cycles' => 2 }, [d, file])
     end
   end
 
@@ -77,4 +77,23 @@ class TestUpdate < Minitest::Test
       end
     end
   end
+
+  def test_update_with_error_and_summary
+    Dir.mktmpdir do |d|
+      File.write(File.join(d, 'foo.rb'), 'this$is$a$broken$Ruby$script')
+      file = File.join(d, 'base.fb')
+      2.times do
+        Judges::Update.new(Loog::NULL).run(
+          { 'quiet' => true, 'summary' => true, 'max-cycles' => 2 },
+          [d, file]
+        )
+      end
+      fb = Factbase.new
+      fb.import(File.binread(file))
+      sums = fb.query('(eq what "judges-summary")').each.to_a
+      assert_equal(1, sums.size)
+      f = sums.first
+      assert(f.error.include?('unexpected global variable'), f.error)
+    end
+  end
 end

data/test/test_churn.rb

@@ -35,4 +35,12 @@ class TestChurn < Minitest::Test
     assert_equal('42/0', (churn + 42).to_s)
     assert_equal('0/17', (churn - 17).to_s)
   end
+
+  def test_with_errors
+    churn = Judges::Churn.new(0, 0)
+    churn << 'oops'
+    assert_equal('0/0/1', churn.to_s)
+    assert_equal('42/0/1', (churn + 42).to_s)
+    assert_equal('0/0/1', (Judges::Churn.new(0, 0) + churn).to_s)
+  end
 end

data/test/test_options.rb

@@ -41,19 +41,27 @@ class TestOptions < Minitest::Test
     assert_equal(42, opts.max)
   end
 
+  def test_case_insensitive
+    opts = Judges::Options.new(['aBcDeF=1', 'aBCDEf=2'])
+    assert_equal(2, opts.abcdef)
+  end
+
   def test_with_nil
     opts = Judges::Options.new(nil)
     assert(opts.foo.nil?)
+    assert(opts.empty?)
   end
 
   def test_with_empty_string
     opts = Judges::Options.new('   ')
     assert(opts.foo.nil?)
+    assert(opts.empty?)
   end
 
   def test_with_empty_strings
     opts = Judges::Options.new(['', nil])
     assert(opts.foo.nil?)
+    assert(opts.empty?)
   end
 
   def test_with_string
@@ -72,7 +80,7 @@ class TestOptions < Minitest::Test
   def test_converts_to_string
     opts = Judges::Options.new('foo' => 44, 'bar' => 'long-string-maybe-secret')
     s = opts.to_s
-    assert(s.include?('foo → "44"'))
+    assert(s.include?('FOO → "44"'))
     assert(s.include?('"long********************"'))
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2024-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -28,16 +28,16 @@ dependencies:
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: factbase
   requirement: !ruby/object:Gem::Requirement