judges 0.0.27 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a113f833da56404725368db4e2fdb6047211835ef00e2cb4e5638f3f375be458
-  data.tar.gz: 1cc2c79bcb113aad1b53ebd1743426069e8ce536c85ba489435a9ffb2a16232a
+  metadata.gz: e4506ff0fe002c7bd8077f203ba8a0af5b9d5b9b788e1d42370c6f990d4b9479
+  data.tar.gz: 8cf313cdaa8a859ffe1c286107c767aac93a0196420152c57337dd05d0ed4881
 SHA512:
-  metadata.gz: 130c87d81f8b9d2e2c46c95bce66918c58732e15f4fba363ae0a85ad20448204275dff7bcbc1b0810304ba7e72f434ccab07dd523f1d31866c37c61c4cd6bf33
-  data.tar.gz: b2cdb4ba68c86a471b561598d677919e75fc5f639e1a23a57665ed49d06e9ae7f8cba9a3a763f8c8bc5b94a3a256ba4c1798d898127c3448129be4fc096ab249
+  metadata.gz: f19785b0268c7dce59b6d9478137e2e2e1172ebc03fd803b576d0c1d155eecadea11d38ecaa258f8ecefef031e183807660dee7b0f7aede0c875a42f101ae62d
+  data.tar.gz: 433e49e718acd4b17ba9efdbce605181ca2b6cd88a7a36601bf71dc926f07185f652d57e1005750b28fe2c98467f05c1b93ddd93dee4461dd40f28a58a209097

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     judges (0.0.0)
       backtrace (~> 0.3)
-      factbase (~> 0.0.27)
+      factbase (~> 0.0.28)
       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.27)
+    factbase (0.0.28)
       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.27'
+  ver = '0.0.29'
 
   loog = Loog::REGULAR
 
@@ -87,6 +87,14 @@ class App
     end
   end
 
+  desc 'Import YAML into a factbase'
+  command :import do |c|
+    c.action do |global, options, args|
+      require_relative '../lib/judges/commands/import'
+      Judges::Import.new(loog).run(options, args)
+    end
+  end
+
   desc 'Remove the facts that are too old'
   command :trim do |c|
     c.desc 'Only the facts that match the expression are deleted'

data/features/import.feature

@@ -0,0 +1,17 @@
+Feature: Import
+  I want to import YAML into a factbase
+
+  Scenario: Simple import of a small YAML
+    Given I make a temp directory
+    Then I have a "simple.yaml" file with content:
+    """
+    -
+      foo: 42
+      bar: 2024-03-04T22:22:22Z
+      t: Hello, world!
+    -
+      z: 3.14
+    """
+    Then I run bin/judges with "--verbose import simple.yaml simple.fb"
+    Then Stdout contains "Import finished"
+    And Exit code is zero

data/features/update.feature

@@ -12,7 +12,7 @@ Feature: Update
     Then Stdout contains "foo → "
     Then Stdout contains "bar → "
     Then Stdout contains "1 judge(s) processed"
-    Then Stdout contains "Update finished in 3 cycles"
+    Then Stdout contains "Update finished: 3 cycles"
     And Exit code is zero
 
   Scenario: Simple run of a few judges, with a lib
@@ -28,5 +28,5 @@ Feature: Update
     """
     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"
+    Then Stdout contains "Update finished: 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.27'
+  s.version = '0.0.29'
   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.27'
+  s.add_runtime_dependency 'factbase', '~>0.0.28'
   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/import.rb

@@ -0,0 +1,55 @@
+# 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 'time'
+require 'factbase/looged'
+require_relative '../../judges'
+require_relative '../../judges/impex'
+require_relative '../../judges/to_rel'
+
+# Import.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class Judges::Import
+  def initialize(loog)
+    @loog = loog
+  end
+
+  def run(_opts, args)
+    raise 'Exactly two arguments required' unless args.size == 2
+    raise "File not found #{args[0].to_rel}" unless File.exist?(args[0])
+    start = Time.now
+    yaml = YAML.load_file(args[0], permitted_classes: [Time])
+    impex = Judges::Impex.new(@loog, args[1])
+    fb = impex.import(strict: false)
+    fb = Factbase::Looged.new(fb, @loog)
+    yaml.each do |i|
+      f = fb.insert
+      i.each do |p, v|
+        f.send("#{p}=", v)
+      end
+    end
+    impex.export(fb)
+    @loog.info("Import finished in #{format('%.02f', Time.now - start)}s")
+  end
+end

data/lib/judges/commands/test.rb

@@ -46,6 +46,7 @@ class Judges::Test
     errors = []
     done = 0
     global = {}
+    start = Time.now
     Judges::Packs.new(dir, opts['lib'], @loog).each_with_index do |p, i|
       local = {}
       next unless include?(opts, p.name)
@@ -62,13 +63,14 @@ class Judges::Test
       end
       done += 1
     end
+    lapse = "in #{format('%.02f', Time.now - start)}s"
     if done.zero?
       raise 'No judges tested :(' unless opts['quiet']
-      @loog.warn("\n👍 No judges tested")
+      @loog.warn("\n👍 No judges tested #{lapse}")
     elsif errors.empty?
-      @loog.info("\n👍 All #{done} judge(s) tested successfully")
+      @loog.info("\n👍 All #{done} judge(s) tested successfully #{lapse}")
     else
-      @loog.info("\n❌ #{done} judge(s) tested, #{errors.size} of them failed")
+      @loog.info("\n❌ #{done} judge(s) tested, #{errors.size} of them failed #{lapse}")
       raise "#{errors.size} tests failed" unless opts['quiet']
     end
   end

data/lib/judges/commands/trim.rb

@@ -46,11 +46,13 @@ class Judges::Trim
     else
       raise 'Specify either --days or --query' unless opts['days'].nil?
     end
+    start = Time.now
     deleted = fb.query(query).delete!
+    lapse = "in #{format('%.02f', Time.now - start)}s"
     if deleted.zero?
-      @loog.info('No facts deleted')
+      @loog.info("No facts deleted #{lapse}")
     else
-      @loog.info("🗑 #{deleted} fact(s) deleted")
+      @loog.info("🗑 #{deleted} fact(s) deleted #{lapse}")
       impex.export(fb)
     end
   end

data/lib/judges/commands/update.rb

@@ -48,6 +48,7 @@ class Judges::Update
     @loog.debug("The following options provided:\n\t#{options.to_s.gsub("\n", "\n\t")}")
     packs = Judges::Packs.new(dir, opts['lib'], @loog)
     c = 0
+    start = Time.now
     loop do
       c += 1
       diff = cycle(opts, packs, fb, options)
@@ -57,11 +58,13 @@ class Judges::Update
         @loog.info('Too many cycles already, as set by --max-cycles, breaking')
         break
       end
-      @loog.info("By #{diff} facts the factbase \
-        #{diff.positive? ? 'increased' : 'decreased'} \
-        its size at the cycle ##{c}")
+      @loog.info(
+        "By #{diff} facts the factbase " \
+        "#{diff.positive? ? 'increased' : 'decreased'} " \
+        "its size at the cycle ##{c}"
+      )
     end
-    @loog.info("Update finished in #{c} cycles")
+    @loog.info("Update finished: #{c} cycles in #{format('%.02f', Time.now - start)}s")
   end
 
   private

data/test/commands/test_eval.rb

@@ -35,7 +35,7 @@ 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'])
+      Judges::Eval.new(Loog::NULL).run({}, [file, '$fb.insert.foo = 42'])
       fb = Factbase.new
       fb.import(File.binread(file))
       xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)

data/test/commands/test_import.rb

@@ -0,0 +1,57 @@
+# 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/import'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Yegor Bugayenko
+# License:: MIT
+class TestImport < Minitest::Test
+  def test_import_from_yaml
+    Dir.mktmpdir do |d|
+      file = File.join(d, 'base.fb')
+      yaml = File.join(d, 'input.yml')
+      File.write(
+        yaml,
+        <<-YAML
+        -
+          foo: 42
+          bar: 2024-03-04T22:22:22Z
+          t: Hello, world!
+        -
+          z: 3.14
+        YAML
+      )
+      Judges::Import.new(Loog::NULL).run({}, [yaml, file])
+      fb = Factbase.new
+      fb.import(File.binread(file))
+      xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
+      assert(!xml.xpath('/fb[count(f)=2]').empty?, xml)
+    end
+  end
+end

data/test/commands/test_join.rb

@@ -42,7 +42,7 @@ class TestJoin < Minitest::Test
       fb2 = Factbase.new
       fb2.insert.foo_bar = 42
       File.binwrite(slave, fb2.export)
-      Judges::Join.new(Loog::VERBOSE).run({}, [master, slave])
+      Judges::Join.new(Loog::NULL).run({}, [master, slave])
       fb = Factbase.new
       fb.import(File.binread(master))
       xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)

data/test/commands/test_print.rb

@@ -38,7 +38,7 @@ class TestPrint < Minitest::Test
       fb = Factbase.new
       fb.insert
       File.binwrite(f, fb.export)
-      Judges::Print.new(Loog::VERBOSE).run({ format: 'yaml', auto: true }, [f])
+      Judges::Print.new(Loog::NULL).run({ format: 'yaml', auto: true }, [f])
       y = File.join(d, 'base.yaml')
       assert(File.exist?(y))
       assert_equal(1, YAML.load_file(y)['facts'].size)

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::NULL).run({ 'days' => 10 }, [file])
       after = Factbase.new
       after.import(File.binread(file))
       assert_equal(1, after.size)

data/test/commands/test_update.rb

@@ -36,7 +36,7 @@ class TestUpdate < Minitest::Test
     Dir.mktmpdir do |d|
       File.write(File.join(d, 'foo.rb'), 'return if $fb.size > 2; $fb.insert.zzz = $options.foo_bar + 1')
       file = File.join(d, 'base.fb')
-      Judges::Update.new(Loog::VERBOSE).run({ 'option' => ['foo_bar=42'] }, [d, file])
+      Judges::Update.new(Loog::NULL).run({ 'option' => ['foo_bar=42'] }, [d, file])
       fb = Factbase.new
       fb.import(File.binread(file))
       xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
@@ -51,7 +51,7 @@ class TestUpdate < Minitest::Test
       fb.insert.foo_bar = 42
       File.binwrite(file, fb.export)
       File.write(File.join(d, 'foo.rb'), '$fb.insert.tt = 4')
-      Judges::Update.new(Loog::VERBOSE).run({ 'max-cycles' => 1 }, [d, file])
+      Judges::Update.new(Loog::NULL).run({ 'max-cycles' => 1 }, [d, file])
       fb = Factbase.new
       fb.import(File.binread(file))
       xml = Nokogiri::XML.parse(Factbase::ToXML.new(fb).xml)
@@ -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::VERBOSE).run({ 'quiet' => true }, [d, file])
+      Judges::Update.new(Loog::NULL).run({ 'quiet' => true }, [d, file])
     end
   end
 end

data/test/fb/test_if_absent.rb

@@ -80,13 +80,13 @@ class TestIfAbsent < Minitest::Test
   def test_complex_injects
     fb = Factbase.new
     f1 = fb.insert
-    f1.foo = 'hello, "dude"!'
+    f1.foo = 'hello, dude!'
     f1.abc = 42
     t = Time.now
     f1.z = t
     f1.bar = 3.14
     n = if_absent(fb) do |f|
-      f.foo = 'hello, "dude"!'
+      f.foo = "hello, \\\"dude\\\" \\' \\' ( \n\n ) (!"
       f.abc = 42
       f.z = t + 1
       f.bar = 3.15

data/test/test_impex.rb

@@ -34,7 +34,7 @@ class TestImpex < Minitest::Test
   def test_basic
     Dir.mktmpdir do |d|
       f = File.join(d, 'foo.rb')
-      impex = Judges::Impex.new(Loog::VERBOSE, f)
+      impex = Judges::Impex.new(Loog::NULL, f)
       impex.import(strict: false)
       impex.export(Factbase.new)
     end
@@ -43,7 +43,7 @@ class TestImpex < Minitest::Test
   def test_strict_import
     Dir.mktmpdir do |d|
       f = File.join(d, 'x.rb')
-      impex = Judges::Impex.new(Loog::VERBOSE, f)
+      impex = Judges::Impex.new(Loog::NULL, f)
       impex.import(strict: false)
       impex.export(Factbase.new)
       impex.import

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, nil, Loog::VERBOSE)
+      pack = Judges::Pack.new(d, nil, Loog::NULL)
       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, nil, Loog::VERBOSE)
+      pack = Judges::Pack.new(d, nil, Loog::NULL)
       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, nil, Loog::VERBOSE)
+      pack = Judges::Pack.new(d, nil, Loog::NULL)
       pack.run(Factbase.new, {}, {}, {})
     end
   end
@@ -101,7 +101,7 @@ class TestPack < Minitest::Test
       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)
+      pack = Judges::Pack.new(dir, lib, Loog::NULL)
       fb = Factbase.new
       pack.run(fb, {}, {}, {})
       assert_equal(42, fb.query('()').each.to_a.first.bar)

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, nil, Loog::VERBOSE).each do |p|
+      Judges::Packs.new(d, nil, Loog::NULL).each do |p|
         assert_equal('foo.rb', p.script)
         found += 1
         assert_equal('something.yml', File.basename(p.tests.first))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.29
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.27
+        version: 0.0.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.27
+        version: 0.0.28
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +113,7 @@ files:
 - Rakefile
 - bin/judges
 - features/gem_package.feature
+- features/import.feature
 - features/inspect.feature
 - features/join.feature
 - features/misc.feature
@@ -129,6 +130,7 @@ files:
 - judges.gemspec
 - lib/judges.rb
 - lib/judges/commands/eval.rb
+- lib/judges/commands/import.rb
 - lib/judges/commands/inspect.rb
 - lib/judges/commands/join.rb
 - lib/judges/commands/print.rb
@@ -144,6 +146,7 @@ files:
 - lib/judges/to_rel.rb
 - renovate.json
 - test/commands/test_eval.rb
+- test/commands/test_import.rb
 - test/commands/test_inspect.rb
 - test/commands/test_join.rb
 - test/commands/test_print.rb