judges 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a2c905f28928721f9ed99956f7e9eea5e3b4eabf21a7bffdc324651ea2bf213
-  data.tar.gz: 4e6cb24b4b4aff6b8bab408d5038a8fee454382d293972ddcf78bab0d2c37b51
+  metadata.gz: a113f833da56404725368db4e2fdb6047211835ef00e2cb4e5638f3f375be458
+  data.tar.gz: 1cc2c79bcb113aad1b53ebd1743426069e8ce536c85ba489435a9ffb2a16232a
 SHA512:
-  metadata.gz: ad604005840c419cc0021cc0d55a64c010ca6ab64c73f5e30cfa72c9e43190382b5bf6783794389eb3f21cc6fd24d3b60c3c3f803f29f71480a0eb73cfa7995f
-  data.tar.gz: 4888625231190957df7b5c189215b49cb9ed1ec01c40edf795140a4d6896d7a9b6d7d24e4dd02bf931281ee25ec2db87590be3275d97aa2980cfd3eb7b44a1cf
+  metadata.gz: 130c87d81f8b9d2e2c46c95bce66918c58732e15f4fba363ae0a85ad20448204275dff7bcbc1b0810304ba7e72f434ccab07dd523f1d31866c37c61c4cd6bf33
+  data.tar.gz: b2cdb4ba68c86a471b561598d677919e75fc5f639e1a23a57665ed49d06e9ae7f8cba9a3a763f8c8bc5b94a3a256ba4c1798d898127c3448129be4fc096ab249

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     judges (0.0.0)
       backtrace (~> 0.3)
-      factbase (~> 0.0.23)
+      factbase (~> 0.0.27)
       gli (~> 2.21)
       loog (~> 0.2)
       nokogiri (~> 1.10)
@@ -74,7 +74,7 @@ GEM
     docile (1.4.0)
     drb (2.2.1)
     erubi (1.12.0)
-    factbase (0.0.23)
+    factbase (0.0.27)
       json (~> 2.7)
       loog (~> 0.2)
       nokogiri (~> 1.10)

data/bin/judges

@@ -32,7 +32,7 @@ Encoding.default_internal = Encoding::UTF_8
 class App
   extend GLI::App
 
-  ver = '0.0.26'
+  ver = '0.0.27'
 
   loog = Loog::REGULAR
 
@@ -71,8 +71,16 @@ class App
     end
   end
 
+  desc 'Evaluate a single Ruby expression on the factbase'
+  command :eval do |c|
+    c.action do |global, options, args|
+      require_relative '../lib/judges/commands/eval'
+      Judges::Eval.new(loog).run(options, args)
+    end
+  end
+
   desc 'Join two factbases'
-  command :print do |c|
+  command :join do |c|
     c.action do |global, options, args|
       require_relative '../lib/judges/commands/join'
       Judges::Join.new(loog).run(options, args)
@@ -81,8 +89,10 @@ class App
 
   desc 'Remove the facts that are too old'
   command :trim do |c|
+    c.desc 'Only the facts that match the expression are deleted'
+    c.flag([:query])
     c.desc 'Remove facts that are older than X days'
-    c.flag([:days], type: Integer, default_value: 90)
+    c.flag([:days], type: Integer)
     c.action do |global, options, args|
       require_relative '../lib/judges/commands/trim'
       Judges::Trim.new(loog).run(options, args)
@@ -95,6 +105,8 @@ class App
     c.flag([:format], default_value: 'yaml')
     c.desc 'Generate output name of the file automatically'
     c.switch([:auto], default_value: false)
+    c.desc 'Only the facts that match the expression are printed'
+    c.flag([:query], default_value: '()')
     c.action do |global, options, args|
       require_relative '../lib/judges/commands/print'
       Judges::Print.new(loog).run(options, args)

data/features/inspect.feature

@@ -3,14 +3,9 @@ Feature: Inspect
 
   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 "--verbose eval simple.fb '$fb.insert.foo = 42'"
     Then I run bin/judges with "update . simple.fb"
     Then I run bin/judges with "inspect simple.fb"
-    Then Stdout contains "Facts: 3"
+    Then Stdout contains "Facts: 1"
     And Exit code is zero
 

data/features/join.feature

@@ -0,0 +1,12 @@
+Feature: Join
+  I want to join two factbases
+
+  Scenario: Simple join of two small factbases
+    Given I make a temp directory
+    Then I run bin/judges with "--verbose eval first.fb '$fb.insert.foo = 42'"
+    Then I run bin/judges with "--verbose eval second.fb '$fb.insert.foo = 42'"
+    Then I run bin/judges with "update . first.fb"
+    Then I run bin/judges with "update . second.fb"
+    Then I run bin/judges with "join first.fb second.fb"
+    Then Stdout contains "joined"
+    And Exit code is zero

data/features/print.feature

@@ -3,12 +3,7 @@ Feature: Print
 
   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 "--verbose eval simple.fb '$fb.insert.foo = 42'"
     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"
@@ -16,12 +11,7 @@ Feature: Print
 
   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 "--verbose eval simple.fb '$fb.insert.foo = 42'"
     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"
@@ -29,13 +19,17 @@ Feature: Print
 
   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 "--verbose eval simple.fb '$fb.insert.foo = 42'"
     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
+
+  Scenario: Simple print of a small factbase, to XML, with a query
+    Given I make a temp directory
+    Then I run bin/judges with "--verbose eval simple.fb '$fb.insert.foo = 42'"
+    Then I run bin/judges with "--verbose eval simple.fb '$fb.insert.foo = 43'"
+    Then I run bin/judges with "update . simple.fb"
+    Then I run bin/judges with "print '--query=(eq foo 43)' --auto simple.fb"
+    Then Stdout contains "printed"
+    And Exit code is zero

data/features/trim.feature

@@ -3,12 +3,15 @@ Feature: Trim
 
   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 eval simple.fb '$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"
+    Then Stdout contains "1 fact(s) deleted"
+    And Exit code is zero
+
+  Scenario: Simple trimming of a factbase, with a query
+    Given I make a temp directory
+    Then I run bin/judges with "--verbose eval simple.fb '$fb.insert.foo = 42'"
+    Given I run bin/judges with "trim --query '(eq foo 42)' simple.fb"
+    Then Stdout contains "1 fact(s) deleted"
     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.26'
+  s.version = '0.0.27'
   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.23'
+  s.add_runtime_dependency 'factbase', '~>0.0.27'
   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/eval.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'backtrace'
+require 'factbase/looged'
+require_relative '../../judges'
+require_relative '../../judges/to_rel'
+require_relative '../../judges/packs'
+require_relative '../../judges/options'
+require_relative '../../judges/impex'
+
+# Eval.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class Judges::Eval
+  def initialize(loog)
+    @loog = loog
+  end
+
+  def run(_opts, args)
+    raise 'Exactly two arguments required' unless args.size == 2
+    impex = Judges::Impex.new(@loog, args[0])
+    $fb = impex.import(strict: false)
+    $fb = Factbase::Looged.new($fb, @loog)
+    expr = args[1]
+    # rubocop:disable Security/Eval
+    eval(expr)
+    # rubocop:enable Security/Eval
+    impex.export($fb)
+  end
+end

data/lib/judges/commands/join.rb

@@ -39,5 +39,6 @@ class Judges::Join
     fb = master.import
     slave.import_to(fb)
     master.export(fb)
+    @loog.info('Two factbases joined')
   end
 end

data/lib/judges/commands/print.rb

@@ -39,6 +39,7 @@ class Judges::Print
     o = args[1]
     f = args[0]
     fb = Judges::Impex.new(@loog, f).import
+    fb.query("(not #{opts['query']})").delete! unless opts['query'].nil?
     if o.nil?
       raise 'Either provide output file name or use --auto' unless opts[:auto]
       o = File.join(File.dirname(f), File.basename(f).gsub(/\.[^.]*$/, ''))
@@ -48,11 +49,14 @@ class Judges::Print
     output =
       case opts[:format].downcase
         when 'yaml'
-          fb.to_yaml
+          require 'factbase/to_yaml'
+          Factbase::ToYAML.new(fb).yaml
         when 'json'
-          fb.to_json
+          require 'factbase/to_json'
+          Factbase::ToJSON.new(fb).json
         when 'xml'
-          fb.to_xml
+          require 'factbase/to_xml'
+          Factbase::ToXML.new(fb).xml
       end
     File.binwrite(o, output)
     @loog.info("Factbase printed to #{o.to_rel} (#{File.size(o)} bytes)")

data/lib/judges/commands/test.rb

@@ -24,6 +24,7 @@ require 'nokogiri'
 require 'factbase'
 require 'backtrace'
 require 'factbase/looged'
+require 'factbase/to_xml'
 require_relative '../../judges'
 require_relative '../../judges/to_rel'
 require_relative '../../judges/packs'
@@ -95,7 +96,7 @@ class Judges::Test
       end
     end
     pack.run(Factbase::Looged.new(fb, @loog), global, local, Judges::Options.new(yaml['options']))
-    xml = Nokogiri::XML.parse(fb.to_xml)
+    xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
     yaml['expected'].each do |xp|
       raise "#{pack.script} doesn't match '#{xp}':\n#{xml}" if xml.xpath(xp).empty?
     end

data/lib/judges/commands/trim.rb

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

data/test/commands/test_eval.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require 'loog'
+require 'nokogiri'
+require 'factbase/to_xml'
+require_relative '../../lib/judges'
+require_relative '../../lib/judges/commands/eval'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestEval < Minitest::Test
+  def test_build_factbase_from_scratch
+    Dir.mktmpdir do |d|
+      file = File.join(d, 'base.fb')
+      Judges::Eval.new(Loog::VERBOSE).run({}, [file, '$fb.insert.foo = 42'])
+      fb = Factbase.new
+      fb.import(File.binread(file))
+      xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
+      assert(!xml.xpath('/fb/f[foo="42"]').empty?, xml)
+    end
+  end
+end

data/test/commands/test_join.rb

@@ -23,6 +23,7 @@
 require 'minitest/autorun'
 require 'loog'
 require 'nokogiri'
+require 'factbase/to_xml'
 require_relative '../../lib/judges'
 require_relative '../../lib/judges/commands/join'
 
@@ -44,9 +45,9 @@ class TestJoin < Minitest::Test
       Judges::Join.new(Loog::VERBOSE).run({}, [master, slave])
       fb = Factbase.new
       fb.import(File.binread(master))
-      xml = Nokogiri::XML.parse(fb.to_xml)
-      assert(!xml.xpath('/fb/f[zz="5"]').empty?, fb.to_xml)
-      assert(!xml.xpath('/fb/f[foo_bar="42"]').empty?, fb.to_xml)
+      xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
+      assert(!xml.xpath('/fb/f[zz="5"]').empty?, xml)
+      assert(!xml.xpath('/fb/f[foo_bar="42"]').empty?, xml)
     end
   end
 end

data/test/commands/test_update.rb

@@ -23,6 +23,7 @@
 require 'minitest/autorun'
 require 'loog'
 require 'nokogiri'
+require 'factbase/to_xml'
 require_relative '../../lib/judges'
 require_relative '../../lib/judges/commands/update'
 
@@ -38,8 +39,8 @@ class TestUpdate < Minitest::Test
       Judges::Update.new(Loog::VERBOSE).run({ 'option' => ['foo_bar=42'] }, [d, file])
       fb = Factbase.new
       fb.import(File.binread(file))
-      xml = Nokogiri::XML.parse(fb.to_xml)
-      assert(!xml.xpath('/fb/f[zzz="43"]').empty?)
+      xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
+      assert(!xml.xpath('/fb/f[zzz="43"]').empty?, xml)
     end
   end
 
@@ -53,9 +54,9 @@ class TestUpdate < Minitest::Test
       Judges::Update.new(Loog::VERBOSE).run({ 'max-cycles' => 1 }, [d, file])
       fb = Factbase.new
       fb.import(File.binread(file))
-      xml = Nokogiri::XML.parse(fb.to_xml)
-      assert(!xml.xpath('/fb/f[tt="4"]').empty?)
-      assert(!xml.xpath('/fb/f[foo_bar="42"]').empty?)
+      xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
+      assert(!xml.xpath('/fb/f[tt="4"]').empty?, xml)
+      assert(!xml.xpath('/fb/f[foo_bar="42"]').empty?, xml)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-17 00:00:00.000000000 Z
+date: 2024-05-19 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.23
+        version: 0.0.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.23
+        version: 0.0.27
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,7 @@ files:
 - bin/judges
 - features/gem_package.feature
 - features/inspect.feature
+- features/join.feature
 - features/misc.feature
 - features/print.feature
 - features/step_definitions/steps.rb
@@ -127,6 +128,7 @@ files:
 - fixtures/reward_for_good_bug/simple-reward.yml
 - judges.gemspec
 - lib/judges.rb
+- lib/judges/commands/eval.rb
 - lib/judges/commands/inspect.rb
 - lib/judges/commands/join.rb
 - lib/judges/commands/print.rb
@@ -141,6 +143,7 @@ files:
 - lib/judges/packs.rb
 - lib/judges/to_rel.rb
 - renovate.json
+- test/commands/test_eval.rb
 - test/commands/test_inspect.rb
 - test/commands/test_join.rb
 - test/commands/test_print.rb