judges 0.0.29 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4506ff0fe002c7bd8077f203ba8a0af5b9d5b9b788e1d42370c6f990d4b9479
-  data.tar.gz: 8cf313cdaa8a859ffe1c286107c767aac93a0196420152c57337dd05d0ed4881
+  metadata.gz: 1c9e50999193ddf009d02379799add455856fae20b4f47e67a1760d56d7de3b0
+  data.tar.gz: af70fa8273042c07df059589181795769518c94d54c4430cf9fe9d2999da799a
 SHA512:
-  metadata.gz: f19785b0268c7dce59b6d9478137e2e2e1172ebc03fd803b576d0c1d155eecadea11d38ecaa258f8ecefef031e183807660dee7b0f7aede0c875a42f101ae62d
-  data.tar.gz: 433e49e718acd4b17ba9efdbce605181ca2b6cd88a7a36601bf71dc926f07185f652d57e1005750b28fe2c98467f05c1b93ddd93dee4461dd40f28a58a209097
+  metadata.gz: ce9ee17c4b5cf1aadc125678bde1e0a7b4bd07a6e1cb2e54696e5e478a68371f9e4c7a6c18f7961be77f056903a1e49eb943d4c9d949fedb96db71ed2f23350e
+  data.tar.gz: fbadf8ca9127b21114b483b7a7f5e6b109d8c804f101a27fe6140c6a77e68a0f522bda5b32a366415b946d1c59c01130ab509a22e9f5c95037dbf605414d7667

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     judges (0.0.0)
       backtrace (~> 0.3)
-      factbase (~> 0.0.28)
+      factbase (~> 0.0.30)
       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.28)
+    factbase (0.0.30)
       json (~> 2.7)
       loog (~> 0.2)
       nokogiri (~> 1.10)
@@ -112,7 +112,7 @@ GEM
       racc
     psych (5.1.2)
       stringio
-    racc (1.7.3)
+    racc (1.8.0)
     rack (3.0.11)
     rack-session (2.0.0)
       rack (>= 3.0.0)

data/Rakefile

@@ -69,6 +69,7 @@ end
 task :copyright do
   sh "grep -q -r '#{Date.today.strftime('%Y')}' \
     --include '*.rb' \
+    --include '*.yml' \
     --include '*.txt' \
     --include 'Rakefile' \
     ."

data/bin/judges

@@ -32,7 +32,7 @@ Encoding.default_internal = Encoding::UTF_8
 class App
   extend GLI::App
 
-  ver = '0.0.29'
+  ver = '0.0.31'
 
   loog = Loog::REGULAR
 
@@ -115,6 +115,8 @@ class App
     c.switch([:auto], default_value: false)
     c.desc 'Only the facts that match the expression are printed'
     c.flag([:query], default_value: '()')
+    c.desc 'Print even if target file already exists and is older than the factbase'
+    c.switch([:force], default_value: false)
     c.action do |global, options, args|
       require_relative '../lib/judges/commands/print'
       Judges::Print.new(loog).run(options, args)

data/features/import.feature

@@ -13,5 +13,5 @@ Feature: Import
       z: 3.14
     """
     Then I run bin/judges with "--verbose import simple.yaml simple.fb"
-    Then Stdout contains "Import finished"
+    Then Stdout contains "Import of 2 facts finished"
     And Exit code is zero

data/features/print.feature

@@ -4,7 +4,6 @@ Feature: Print
   Scenario: Simple print of a small factbase, to YAML
     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 "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
@@ -12,7 +11,6 @@ Feature: Print
   Scenario: Simple print of a small factbase, to JSON
     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 "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
@@ -20,7 +18,6 @@ Feature: Print
   Scenario: Simple print of a small factbase, to XML
     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 "update . simple.fb"
     Then I run bin/judges with "print --format=xml --auto simple.fb"
     Then Stdout contains "printed"
     And Exit code is zero
@@ -29,7 +26,15 @@ Feature: Print
     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
+
+  Scenario: Print twice, without --force
+    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 "print --auto simple.fb"
+    Then Stdout contains "printed"
+    Then I run bin/judges with "print --auto simple.fb"
+    Then Stdout contains "No need to print"
+    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.29'
+  s.version = '0.0.31'
   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.28'
+  s.add_runtime_dependency 'factbase', '~>0.0.30'
   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

@@ -20,13 +20,10 @@
 # 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'
+require_relative '../../judges/elapsed'
 
 # Eval.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -40,12 +37,15 @@ class Judges::Eval
   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)
+    elapsed(@loog) do
+      $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)
+      throw :'Evaluated successfully'
+    end
   end
 end

data/lib/judges/commands/import.rb

@@ -25,6 +25,7 @@ require 'factbase/looged'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 require_relative '../../judges/to_rel'
+require_relative '../../judges/elapsed'
 
 # Import.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -38,18 +39,20 @@ class Judges::Import
   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)
+    elapsed(@loog) do
+      yaml = YAML.load_file(args[0], permitted_classes: [Time])
+      @loog.info("YAML loaded from #{args[0].to_rel} (#{yaml.size} facts)")
+      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)
+      throw :"Import of #{yaml.size} facts finished"
     end
-    impex.export(fb)
-    @loog.info("Import finished in #{format('%.02f', Time.now - start)}s")
   end
 end

data/lib/judges/commands/join.rb

@@ -22,6 +22,7 @@
 
 require_relative '../../judges'
 require_relative '../../judges/impex'
+require_relative '../../judges/elapsed'
 
 # Join.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -36,9 +37,11 @@ class Judges::Join
     raise 'Exactly two arguments required' unless args.size == 2
     master = Judges::Impex.new(@loog, args[0])
     slave = Judges::Impex.new(@loog, args[1])
-    fb = master.import
-    slave.import_to(fb)
-    master.export(fb)
-    @loog.info('Two factbases joined')
+    elapsed(@loog) do
+      fb = master.import
+      slave.import_to(fb)
+      master.export(fb)
+      throw :'Two factbases joined'
+    end
   end
 end

data/lib/judges/commands/print.rb

@@ -24,6 +24,7 @@ require 'fileutils'
 require 'factbase'
 require_relative '../../judges'
 require_relative '../../judges/impex'
+require_relative '../../judges/elapsed'
 
 # Update.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -36,29 +37,38 @@ class Judges::Print
 
   def run(opts, args)
     raise 'At lease one argument required' if args.empty?
-    o = args[1]
     f = args[0]
     fb = Judges::Impex.new(@loog, f).import
     fb.query("(not #{opts['query']})").delete! unless opts['query'].nil?
+    o = args[1]
     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(/\.[^.]*$/, ''))
       o = "#{o}.#{opts[:format]}"
     end
     FileUtils.mkdir_p(File.dirname(o))
-    output =
-      case opts[:format].downcase
-        when 'yaml'
-          require 'factbase/to_yaml'
-          Factbase::ToYAML.new(fb).yaml
-        when 'json'
-          require 'factbase/to_json'
-          Factbase::ToJSON.new(fb).json
-        when 'xml'
-          require 'factbase/to_xml'
-          Factbase::ToXML.new(fb).xml
+    if !opts['force'] && File.exist?(o)
+      if File.mtime(f) < File.mtime(o)
+        @loog.info("No need to print to #{o.to_rel}, since it's up to date (#{File.size(o)} bytes)")
+        return
       end
-    File.binwrite(o, output)
-    @loog.info("Factbase printed to #{o.to_rel} (#{File.size(o)} bytes)")
+      @loog.debug("The factbase #{f.to_rel} is younger than the target #{o.to_rel}, need to print")
+    end
+    elapsed(@loog) do
+      output =
+        case opts[:format].downcase
+          when 'yaml'
+            require 'factbase/to_yaml'
+            Factbase::ToYAML.new(fb).yaml
+          when 'json'
+            require 'factbase/to_json'
+            Factbase::ToJSON.new(fb).json
+          when 'xml'
+            require 'factbase/to_xml'
+            Factbase::ToXML.new(fb).xml
+        end
+      File.binwrite(o, output)
+      throw :"Factbase printed to #{o.to_rel} (#{File.size(o)} bytes)"
+    end
   end
 end

data/lib/judges/commands/test.rb

@@ -29,6 +29,7 @@ require_relative '../../judges'
 require_relative '../../judges/to_rel'
 require_relative '../../judges/packs'
 require_relative '../../judges/options'
+require_relative '../../judges/elapsed'
 
 # Test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -46,33 +47,29 @@ 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)
-      @loog.info("\n👉 Testing #{p.script} (##{i}) in #{p.dir.to_rel}...")
-      p.tests.each do |f|
-        yaml = YAML.load_file(f, permitted_classes: [Time])
-        @loog.info("Testing #{f.to_rel}:")
-        begin
-          test_one(p, global, local, yaml)
-        rescue StandardError => e
-          @loog.warn(Backtrace.new(e))
-          errors << f
+    elapsed(@loog) do
+      Judges::Packs.new(dir, opts['lib'], @loog).each_with_index do |p, i|
+        local = {}
+        next unless include?(opts, p.name)
+        @loog.info("\n👉 Testing #{p.script} (##{i}) in #{p.dir.to_rel}...")
+        p.tests.each do |f|
+          yaml = YAML.load_file(f, permitted_classes: [Time])
+          @loog.info("Testing #{f.to_rel}:")
+          begin
+            test_one(p, global, local, yaml)
+          rescue StandardError => e
+            @loog.warn(Backtrace.new(e))
+            errors << f
+          end
         end
+        done += 1
       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 #{lapse}")
-    elsif errors.empty?
-      @loog.info("\n👍 All #{done} judge(s) tested successfully #{lapse}")
-    else
-      @loog.info("\n❌ #{done} judge(s) tested, #{errors.size} of them failed #{lapse}")
-      raise "#{errors.size} tests failed" unless opts['quiet']
+      throw :'👍 No judges tested' if done.zero?
+      throw :"👍 All #{done} judge(s) tested successfully" if errors.empty?
+      throw :"❌ #{done} judge(s) tested, #{errors.size} of them failed"
     end
+    raise "#{errors.size} tests failed" unless opts['quiet'] || errors.empty?
+    raise 'No judges tested :(' unless opts['quiet'] || !done.zero?
   end
 
   private

data/lib/judges/commands/trim.rb

@@ -23,6 +23,7 @@
 require 'time'
 require_relative '../../judges'
 require_relative '../../judges/impex'
+require_relative '../../judges/elapsed'
 
 # Trim.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -46,14 +47,11 @@ 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 #{lapse}")
-    else
-      @loog.info("🗑 #{deleted} fact(s) deleted #{lapse}")
+    elapsed(@loog) do
+      deleted = fb.query(query).delete!
+      throw :'No facts deleted' if deleted.zero?
       impex.export(fb)
+      throw :"🗑 #{deleted} fact(s) deleted"
     end
   end
 end

data/lib/judges/commands/update.rb

@@ -27,6 +27,7 @@ require_relative '../../judges/to_rel'
 require_relative '../../judges/packs'
 require_relative '../../judges/options'
 require_relative '../../judges/impex'
+require_relative '../../judges/elapsed'
 
 # Update.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -48,23 +49,27 @@ 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)
-      impex.export(fb)
-      break if diff.zero?
-      if !opts['max-cycles'].nil? && c >= opts['max-cycles']
-        @loog.info('Too many cycles already, as set by --max-cycles, breaking')
-        break
+    elapsed(@loog) do
+      loop do
+        c += 1
+        if c > 1
+          @loog.info("\n\nStarting cycle ##{c}#{opts['max-cycles'] ? " (out of #{opts['max-cycles']})" : ''}...")
+        end
+        diff = cycle(opts, packs, fb, options)
+        impex.export(fb)
+        break if diff.zero?
+        if !opts['max-cycles'].nil? && c >= opts['max-cycles']
+          @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}"
+        )
       end
-      @loog.info(
-        "By #{diff} facts the factbase " \
-        "#{diff.positive? ? 'increased' : 'decreased'} " \
-        "its size at the cycle ##{c}"
-      )
+      throw :"Update finished: #{c} cycles"
     end
-    @loog.info("Update finished: #{c} cycles in #{format('%.02f', Time.now - start)}s")
   end
 
   private
@@ -73,26 +78,25 @@ class Judges::Update
     errors = []
     diff = 0
     global = {}
-    done = packs.each_with_index do |p, i|
-      local = {}
-      @loog.info("👉 Running #{p.name} (##{i}) at #{p.dir.to_rel}...")
-      before = fb.size
-      begin
-        p.run(fb, global, local, options)
-      rescue StandardError => e
-        @loog.warn(Backtrace.new(e))
-        errors << p.script
+    elapsed(@loog) do
+      done = packs.each_with_index do |p, i|
+        local = {}
+        @loog.info("👉 Running #{p.name} (##{i}) at #{p.dir.to_rel}...")
+        before = fb.size
+        begin
+          p.run(fb, global, local, options)
+        rescue StandardError => e
+          @loog.warn(Backtrace.new(e))
+          errors << p.script
+        end
+        after = fb.size
+        @loog.info("👍 The judge #{p.dir.to_rel} added #{after - before} facts") if after > before
+        diff += after - before
       end
-      after = fb.size
-      @loog.info("👍 Pack #{p.dir.to_rel} added #{after - before} facts") if after > before
-      diff += after - before
-    end
-    if errors.empty?
-      @loog.info("👍 #{done} judge(s) processed")
-    else
-      @loog.info("❌ #{done} judge(s) processed with #{errors.size} errors")
-      raise "Failed to update correctly (#{errors.size} errors)" unless opts['quiet']
+      throw :"👍 #{done} judge(s) processed" if errors.empty?
+      throw :"❌ #{done} judge(s) processed with #{errors.size} errors"
     end
+    raise "Failed to update correctly (#{errors.size} errors)" unless errors.empty? || opts['quiet']
     diff
   end
 end

data/lib/judges/elapsed.rb

@@ -0,0 +1,32 @@
+# 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.
+
+def elapsed(loog)
+  start = Time.now
+  begin
+    yield
+  rescue UncaughtThrowError => e
+    tag = e.tag
+    throw e unless tag.is_a?(Symbol)
+    loog.info("#{tag} in #{format('%.02f', Time.now - start)}s")
+  end
+end

data/lib/judges/pack.rb

@@ -22,6 +22,7 @@
 
 require_relative '../judges'
 require_relative '../judges/to_rel'
+require_relative '../judges/elapsed'
 require_relative '../judges/fb/once'
 require_relative '../judges/fb/if_absent'
 
@@ -55,8 +56,9 @@ class Judges::Pack
     end
     s = File.join(@dir, script)
     raise "Can't load '#{s}'" unless File.exist?(s)
-    begin
+    elapsed(@loog) do
       load(s, true)
+      throw :"#{name} finished"
     ensure
       $fb = $judge = $options = $loog = nil
     end

data/test/commands/test_print.rb

@@ -44,4 +44,19 @@ class TestPrint < Minitest::Test
       assert_equal(1, YAML.load_file(y)['facts'].size)
     end
   end
+
+  def test_print_twice
+    Dir.mktmpdir do |d|
+      f = File.join(d, 'base.fb')
+      fb = Factbase.new
+      fb.insert
+      File.binwrite(f, fb.export)
+      Judges::Print.new(Loog::NULL).run({ format: 'yaml', auto: true }, [f])
+      y = File.join(d, 'base.yaml')
+      assert(File.exist?(y))
+      mtime = File.mtime(y)
+      Judges::Print.new(Loog::NULL).run({ format: 'yaml', auto: true }, [f])
+      assert_equal(mtime, File.mtime(y))
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.31
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-19 00:00:00.000000000 Z
+date: 2024-05-21 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.28
+        version: 0.0.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.28
+        version: 0.0.30
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,7 @@ files:
 - lib/judges/commands/test.rb
 - lib/judges/commands/trim.rb
 - lib/judges/commands/update.rb
+- lib/judges/elapsed.rb
 - lib/judges/fb/if_absent.rb
 - lib/judges/fb/once.rb
 - lib/judges/impex.rb