judges 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c96f4af35d626de3ae2f9de6d510550b2307a014b0a76148219f8a04091907
-  data.tar.gz: 19e2b425671a4a711b1c0ebf62b1ad17c25d13c355aeef050a48c030b22a47a0
+  metadata.gz: ed5fca9c346d6f092bde73a242e8b347f2abba9f7330767db25edca3d1df1dd3
+  data.tar.gz: cbb70db60a4dc7c953cfa6feea4d5955a27f76cf34b3c5403423e8e3b804db84
 SHA512:
-  metadata.gz: fe53d0e31dcd30a125d8130fbb46ed1f13709a13f642c8e19db9ae74ef4aeb1485ea374ede9f1abe1f0f1308331fc98f507c532a97803a75b96c8fbf4a6f79b3
-  data.tar.gz: 36a8369665200eb177572803b555c4948ccfe1f96cc2ed695c9c104bcb8cf89ca11204224ddf2549ad5fa5f7ff7082069edd87e1aa94ac1acca7be22df54f1a7
+  metadata.gz: c6d4dffa49971e1dc77788263b005d843223bf96faba1cb67333b773f411fdd9b6920577f1edaab9ae9e6fcb7191c37febc2b1ae0ee55d6fa272f45f36242aa2
+  data.tar.gz: a0cde0d189d3ae6bf15da5252fb03dc530103de68adeb2379dc048a2354987bb5371863352640a64cc04663db5b4c099ff7ae474f793ce4ff7f6589f5f0b4da5

data/Gemfile

@@ -24,7 +24,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'cucumber', '9.2.0', require: false
-gem 'minitest', '5.22.3', require: false
+gem 'minitest', '5.23.0', require: false
 gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '6.1.2', require: false
 gem 'rubocop', '1.63.5', require: false

data/bin/judges

@@ -32,7 +32,7 @@ Encoding.default_internal = Encoding::UTF_8
 class App
   extend GLI::App
 
-  ver = '0.0.23'
+  ver = '0.0.24'
 
   loog = Loog::REGULAR
 
@@ -59,6 +59,8 @@ class App
   command :update do |c|
     c.desc 'Options to pass to every judge'
     c.flag([:o, :option], multiple: true, arg_name: '<key=value>')
+    c.desc 'The location of a Ruby library (directory with .rb files to include)'
+    c.flag([:lib])
     c.desc 'Maximum number of update cycles to run'
     c.flag([:'max-cycles'], default_value: 8, type: Integer)
     c.desc 'Stay quiet even if some judges fail'
@@ -111,6 +113,8 @@ class App
   command :test do |c|
     c.desc 'Name of the test pack to run'
     c.flag([:pack], multiple: true)
+    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?'
     c.switch([:quiet], default_value: false)
     c.action do |global, options, args|

data/features/inspect.feature

@@ -0,0 +1,16 @@
+Feature: Inspect
+  I want to inspect a factbase
+
+  Scenario: Simple inspect of a small factbase
+    Given I make a temp directory
+    Then I have a "simple/simple_judge.rb" file with content:
+    """
+      return if $fb.size > 2
+      n = $fb.insert
+      n.kind = 'yes!'
+    """
+    Then I run bin/judges with "update . simple.fb"
+    Then I run bin/judges with "inspect simple.fb"
+    Then Stdout contains "Facts: 3"
+    And Exit code is zero
+

data/features/misc.feature

@@ -0,0 +1,11 @@
+Feature: Misc
+  I want to get some meta info
+
+  Scenario: Help can be printed
+    When I run bin/judges with "-h"
+    Then Exit code is zero
+    And Stdout contains "--help"
+
+  Scenario: Version can be printed
+    When I run bin/judges with "--version"
+    Then Exit code is zero

data/features/print.feature

@@ -0,0 +1,41 @@
+Feature: Print
+  I want to print a factbase
+
+  Scenario: Simple print of a small factbase, to YAML
+    Given I make a temp directory
+    Then I have a "simple/simple_judge.rb" file with content:
+    """
+      return if $fb.size > 2
+      n = $fb.insert
+      n.kind = 'yes!'
+    """
+    Then I run bin/judges with "update . simple.fb"
+    Then I run bin/judges with "print --format=yaml simple.fb simple.yml"
+    Then Stdout contains "printed"
+    And Exit code is zero
+
+  Scenario: Simple print of a small factbase, to JSON
+    Given I make a temp directory
+    Then I have a "simple/simple_judge.rb" file with content:
+    """
+      return if $fb.size > 2
+      n = $fb.insert
+      n.kind = 'yes!'
+    """
+    Then I run bin/judges with "update . simple.fb"
+    Then I run bin/judges with "print --format=json simple.fb simple.json"
+    Then Stdout contains "printed"
+    And Exit code is zero
+
+  Scenario: Simple print of a small factbase, to XML
+    Given I make a temp directory
+    Then I have a "simple/simple_judge.rb" file with content:
+    """
+      return if $fb.size > 2
+      n = $fb.insert
+      n.kind = 'yes!'
+    """
+    Then I run bin/judges with "update . simple.fb"
+    Then I run bin/judges with "print --format=xml --auto simple.fb"
+    Then Stdout contains "printed"
+    And Exit code is zero

data/features/test.feature

@@ -0,0 +1,32 @@
+Feature: Test
+  I want to test a few judges
+
+  Scenario: Simple test of a few judges
+    Given I run bin/judges with "test ./fixtures"
+    Then Stdout contains "👉 Testing"
+    Then Stdout contains "judge(s) tested successfully"
+    And Exit code is zero
+
+  Scenario: Simple test of just one pack
+    Given I run bin/judges with "test --pack reward_for_good_bug ./fixtures"
+    Then Stdout contains "judge(s) tested successfully"
+    And Exit code is zero
+
+  Scenario: Simple test of no packs
+    Given I run bin/judges with "test --pack absent_for_sure ./fixtures"
+    Then Exit code is not zero
+
+  Scenario: Simple test of a few judges, with a lib
+    Given I make a temp directory
+    Then I have a "mypacks/mypack/simple_judge.rb" file with content:
+    """
+      n = $fb.insert
+      n.foo = $foo
+    """
+    Then I have a "mylib/foo.rb" file with content:
+    """
+      $foo = 42
+    """
+    Then I run bin/judges with "test --lib mylib mypacks"
+    Then Stdout contains "All 1 judge(s) tested successfully"
+    And Exit code is zero

data/features/trim.feature

@@ -0,0 +1,14 @@
+Feature: Trim
+  I want to trim a factbase
+
+  Scenario: Simple trimming of a factbase
+    Given I make a temp directory
+    Then I have a "simple/simple_judge.rb" file with content:
+    """
+      return if $fb.size > 2
+      $fb.insert.time = Time.now - 100 * 60 * 60 * 24
+    """
+    Then I run bin/judges with "--verbose update . simple.fb"
+    Given I run bin/judges with "trim --days 5 simple.fb"
+    Then Stdout contains "3 fact(s) deleted"
+    And Exit code is zero

data/features/update.feature

@@ -0,0 +1,32 @@
+Feature: Update
+  I want to run a few judges over a factbase
+
+  Scenario: Simple run of a few judges
+    Given I make a temp directory
+    Then I have a "simple/simple_judge.rb" file with content:
+    """
+      n = $fb.insert
+      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 "1 judge(s) processed"
+    Then Stdout contains "Update finished in 3 cycles"
+    And Exit code is zero
+
+  Scenario: Simple run of a few judges, with a lib
+    Given I make a temp directory
+    Then I have a "mypacks/mypack/simple_judge.rb" file with content:
+    """
+      n = $fb.insert
+      n.foo = $foo
+    """
+    Then I have a "mylib/foo.rb" file with content:
+    """
+      $foo = 42
+    """
+    Then I run bin/judges with "update --lib mylib --max-cycles 1 mypacks simple.fb"
+    Then Stdout contains "1 judge(s) processed"
+    Then Stdout contains "Update finished in 1 cycles"
+    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.0.23'
+  s.version = '0.0.24'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description = '
@@ -42,7 +42,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 'factbase', '~>0.0.21'
+  s.add_runtime_dependency 'factbase', '~>0.0.22'
   s.add_runtime_dependency 'gli', '~>2.21'
   s.add_runtime_dependency 'loog', '~>0.2'
   s.add_runtime_dependency 'nokogiri', '~> 1.10'

data/lib/judges/commands/test.rb

@@ -44,7 +44,7 @@ class Judges::Test
     @loog.info("Testing judges in #{dir.to_rel}...")
     errors = []
     done = 0
-    Judges::Packs.new(dir, @loog).each_with_index do |p, i|
+    Judges::Packs.new(dir, opts['lib'], @loog).each_with_index do |p, i|
       next unless include?(opts, p.name)
       @loog.info("\n👉 Testing #{p.script} (##{i}) in #{p.dir.to_rel}...")
       p.tests.each do |f|

data/lib/judges/commands/trim.rb

@@ -37,10 +37,14 @@ class Judges::Trim
     raise 'Exactly one argument required' unless args.size == 1
     impex = Judges::Impex.new(@loog, args[0])
     fb = impex.import
-    day = Time.now - (opts['days'].to_i * 60 * 60 * 24)
-    p "(lt time #{day.utc.iso8601})"
+    days = opts['days']
+    day = Time.now - (days * 60 * 60 * 24)
     deleted = fb.query("(lt time #{day.utc.iso8601})").delete!
-    @loog.info("#{deleted} facts deleted because they are too old")
-    impex.export(fb)
+    if deleted.zero?
+      @loog.info('No facts deleted')
+    else
+      @loog.info("🗑 #{deleted} fact(s) deleted, because they were older than #{days} days")
+      impex.export(fb)
+    end
   end
 end

data/lib/judges/commands/update.rb

@@ -46,7 +46,7 @@ class Judges::Update
     fb = Factbase::Looged.new(fb, @loog)
     options = Judges::Options.new(opts['option'])
     @loog.debug("The following options provided:\n\t#{options.to_s.gsub("\n", "\n\t")}")
-    packs = Judges::Packs.new(dir, @loog)
+    packs = Judges::Packs.new(dir, opts['lib'], @loog)
     c = 0
     loop do
       c += 1

data/lib/judges/impex.rb

@@ -39,7 +39,7 @@ class Judges::Impex
     fb = Factbase.new
     if File.exist?(@file)
       fb.import(File.binread(@file))
-      @loog.info("The factbase imported from #{@file.to_rel} (#{File.size(@file)} bytes)")
+      @loog.info("The factbase imported from #{@file.to_rel} (#{File.size(@file)} bytes, #{fb.size} facts)")
     elsif strict
       raise "The factbase is absent at #{@file.to_rel}"
     end
@@ -49,12 +49,12 @@ class Judges::Impex
   def import_to(fb)
     raise "The factbase is absent at #{@file.to_rel}" unless File.exist?(@file)
     fb.import(File.binread(@file))
-    @loog.info("The factbase loaded from #{@file.to_rel} (#{File.size(@file)} bytes)")
+    @loog.info("The factbase loaded from #{@file.to_rel} (#{File.size(@file)} bytes, #{fb.size} facts)")
   end
 
   def export(fb)
     FileUtils.mkdir_p(File.dirname(@file))
     File.binwrite(@file, fb.export)
-    @loog.info("Factbase exported to #{@file.to_rel} (#{File.size(@file)} bytes)")
+    @loog.info("Factbase exported to #{@file.to_rel} (#{File.size(@file)} bytes, #{fb.size} facts)")
   end
 end

data/lib/judges/pack.rb

@@ -20,9 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'yaml'
-require 'time'
 require_relative '../judges'
+require_relative '../judges/to_rel'
 require_relative '../judges/fb/once'
 require_relative '../judges/fb/if_absent'
 
@@ -33,8 +32,9 @@ require_relative '../judges/fb/if_absent'
 class Judges::Pack
   attr_reader :dir
 
-  def initialize(dir, loog)
+  def initialize(dir, lib, loog)
     @dir = dir
+    @lib = lib
     @loog = loog
   end
 
@@ -44,6 +44,13 @@ class Judges::Pack
     $judge = File.basename(@dir)
     $options = options
     $loog = @loog
+    unless @lib.nil?
+      raise "Lib dir #{@lib.to_rel} is absent" unless File.exist?(@lib)
+      raise "Lib #{@lib.to_rel} is not a directory" unless File.directory?(@lib)
+      Dir.glob(File.join(@lib, '*.rb')).each do |f|
+        require_relative(File.absolute_path(f))
+      end
+    end
     s = File.join(@dir, script)
     raise "Can't load '#{s}'" unless File.exist?(s)
     begin
@@ -60,7 +67,9 @@ class Judges::Pack
 
   # Get the name of the .rb script in the pack.
   def script
-    File.basename(Dir.glob(File.join(@dir, '*.rb')).first)
+    s = Dir.glob(File.join(@dir, '*.rb')).first
+    raise "No *.rb scripts in #{@dir.to_rel}" if s.nil?
+    File.basename(s)
   end
 
   # Return all .yml tests files.

data/lib/judges/packs.rb

@@ -28,8 +28,9 @@ require_relative 'pack'
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 class Judges::Packs
-  def initialize(dir, loog)
+  def initialize(dir, lib, loog)
     @dir = dir
+    @lib = lib
     @loog = loog
   end
 
@@ -38,7 +39,7 @@ class Judges::Packs
   def each
     Dir.glob(File.join(@dir, '**/*.rb')).each do |f|
       d = File.dirname(File.absolute_path(f))
-      yield Judges::Pack.new(d, @loog)
+      yield Judges::Pack.new(d, @lib, @loog)
     end
   end
 

data/test/commands/test_trim.rb

@@ -39,7 +39,7 @@ class TestTrim < Minitest::Test
       before.insert.time = Time.now + 1
       before.insert.time = Time.now - (100 * 24 * 60 * 60)
       File.binwrite(file, before.export)
-      Judges::Trim.new(Loog::VERBOSE).run({ 'days' => '10' }, [file])
+      Judges::Trim.new(Loog::VERBOSE).run({ 'days' => 10 }, [file])
       after = Factbase.new
       after.import(File.binread(file))
       assert_equal(1, after.size)

data/test/test_pack.rb

@@ -35,7 +35,7 @@ class TestPack < Minitest::Test
   def test_basic_run
     Dir.mktmpdir do |d|
       File.write(File.join(d, 'foo.rb'), '$fb.insert')
-      pack = Judges::Pack.new(d, Loog::VERBOSE)
+      pack = Judges::Pack.new(d, nil, Loog::VERBOSE)
       fb = Factbase.new
       pack.run(fb, {})
       assert_equal(1, fb.size)
@@ -45,7 +45,7 @@ class TestPack < Minitest::Test
   def test_run_isolated
     Dir.mktmpdir do |d|
       File.write(File.join(d, 'bar.rb'), '$fb.insert')
-      pack = Judges::Pack.new(d, Loog::VERBOSE)
+      pack = Judges::Pack.new(d, nil, Loog::VERBOSE)
       fb1 = Factbase.new
       pack.run(fb1, {})
       assert_equal(1, fb1.size)
@@ -58,7 +58,7 @@ class TestPack < Minitest::Test
   def test_with_supplemenary_functions
     Dir.mktmpdir do |d|
       File.write(File.join(d, 'x.rb'), 'once($fb).insert')
-      pack = Judges::Pack.new(d, Loog::VERBOSE)
+      pack = Judges::Pack.new(d, nil, Loog::VERBOSE)
       pack.run(Factbase.new, {})
     end
   end
@@ -70,8 +70,23 @@ class TestPack < Minitest::Test
       FileUtils.mkdir(dir)
       File.write(File.join(dir, 'foo.rb'), '$loog.info("judge=" + $judge)')
       log = Loog::Buffer.new
-      Judges::Pack.new(dir, log).run(Factbase.new, {})
+      Judges::Pack.new(dir, nil, log).run(Factbase.new, {})
       assert(log.to_s.include?("judge=#{j}"))
     end
   end
+
+  def test_with_library
+    Dir.mktmpdir do |d|
+      dir = File.join(d, 'packs')
+      FileUtils.mkdir_p(dir)
+      File.write(File.join(dir, 'x.rb'), 'once($fb).insert.bar = $foo')
+      lib = File.join(d, 'lib')
+      FileUtils.mkdir_p(lib)
+      File.write(File.join(lib, 'y.rb'), '$foo = 42')
+      pack = Judges::Pack.new(dir, lib, Loog::VERBOSE)
+      fb = Factbase.new
+      pack.run(fb, {})
+      assert_equal(42, fb.query('()').each.to_a.first.bar)
+    end
+  end
 end

data/test/test_packs.rb

@@ -36,7 +36,7 @@ class TestPacks < Minitest::Test
       File.write(File.join(d, 'foo.rb'), 'hey')
       File.write(File.join(d, 'something.yml'), "---\nfoo: 42")
       found = 0
-      Judges::Packs.new(d, Loog::VERBOSE).each do |p|
+      Judges::Packs.new(d, nil, Loog::VERBOSE).each do |p|
         assert_equal('foo.rb', p.script)
         found += 1
         assert_equal('something.yml', File.basename(p.tests.first))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.21
+        version: 0.0.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.21
+        version: 0.0.22
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -111,10 +111,15 @@ files:
 - README.md
 - Rakefile
 - bin/judges
-- features/cli.feature
 - features/gem_package.feature
+- features/inspect.feature
+- features/misc.feature
+- features/print.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- features/test.feature
+- features/trim.feature
+- features/update.feature
 - fixtures/reward_for_good_bug/README.md
 - fixtures/reward_for_good_bug/no-reward.yml
 - fixtures/reward_for_good_bug/reward_it.rb

data/features/cli.feature

@@ -1,79 +0,0 @@
-Feature: Simple Run
-  I want to run a few judges over a factbase
-
-  Scenario: Help can be printed
-    When I run bin/judges with "-h"
-    Then Exit code is zero
-    And Stdout contains "--help"
-
-  Scenario: Version can be printed
-    When I run bin/judges with "--version"
-    Then Exit code is zero
-
-  Scenario: Simple run of a few judges
-    Given I make a temp directory
-    Then I have a "simple/simple_judge.rb" file with content:
-    """
-      n = $fb.insert
-      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 "1 judge(s) processed"
-    Then Stdout contains "Update finished in 3 cycles"
-    And Exit code is zero
-
-  Scenario: Simple test of a few judges
-    Given I run bin/judges with "test ./fixtures"
-    Then Stdout contains "👉 Testing"
-    Then Stdout contains "judge(s) tested successfully"
-    And Exit code is zero
-
-  Scenario: Simple test of just one pack
-    Given I run bin/judges with "test --pack reward_for_good_bug ./fixtures"
-    Then Stdout contains "judge(s) tested successfully"
-    And Exit code is zero
-
-  Scenario: Simple test of no packs
-    Given I run bin/judges with "test --pack absent_for_sure ./fixtures"
-    Then Exit code is not zero
-
-  Scenario: Simple trimming of a factbase
-    Given I make a temp directory
-    Then I have a "simple/simple_judge.rb" file with content:
-    """
-      return if $fb.size > 2
-      $fb.insert.time = Time.now - 100 * 60 * 60 * 24
-    """
-    Then I run bin/judges with "--verbose update . simple.fb"
-    Given I run bin/judges with "trim --days 5 simple.fb"
-    Then Stdout contains "3 facts deleted"
-    And Exit code is zero
-
-  Scenario: Simple print of a small factbase
-    Given I make a temp directory
-    Then I have a "simple/simple_judge.rb" file with content:
-    """
-      return if $fb.size > 2
-      n = $fb.insert
-      n.kind = 'yes!'
-    """
-    Then I run bin/judges with "update . simple.fb"
-    Then I run bin/judges with "print --format=yaml simple.fb simple.yml"
-    Then Stdout contains "printed"
-    And Exit code is zero
-
-  Scenario: Simple inspect of a small factbase
-    Given I make a temp directory
-    Then I have a "simple/simple_judge.rb" file with content:
-    """
-      return if $fb.size > 2
-      n = $fb.insert
-      n.kind = 'yes!'
-    """
-    Then I run bin/judges with "update . simple.fb"
-    Then I run bin/judges with "inspect simple.fb"
-    Then Stdout contains "Facts: 3"
-    And Exit code is zero
-