judges 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8399b8c8623c0d099deeb50055658e072bae333b0d851cd0aaef22f441655950
-  data.tar.gz: c8ef8e75705e8d0cf3bdb8033c054f7ac4c239566bf0cb80b6a9cc0943932986
+  metadata.gz: 9e7ff33d6367a36af90626c45f6ba74195f2e5383bf5f6f30c2888e5ba02eb07
+  data.tar.gz: b8032fc55743542a488d478cb4eb4dab78b979c2aec60ad6fbbeca3c53eceb5f
 SHA512:
-  metadata.gz: 7a187a9441700826cf7b539ed264a7d80e5e749169219c62d717cee1451cd77e78f5e9a130617dd2e589ad0c13d504e27482527db2dc6b80da12561ff8d1e3e4
-  data.tar.gz: 38c5ae3b4af2981b56d9069a794d791ea107cfae27421f12dce9b001a8ff1d60f38c972362fbd659c4e53f750b35a6192ff66b4869280510286c3d585073d0ae
+  metadata.gz: 02cb9fee069f3ed10bfad753df016b20b2e1736a66ad9ab633e309f5ae99d5e8445d92f4e909ac826bf95f6cf8b73f3eb2e07968cd38129738e918dcd8f972aa
+  data.tar.gz: a097276735f3a2f5226061f807c82cb97920aa3ad27e660dc9d7328489dab28692dd0a772a8529a078ffdcc175a145a059b1441206e9f8d9378751ed9b9e3b1c

data/bin/judges

@@ -29,7 +29,7 @@ require 'factbase'
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
-ver = '0.0.18'
+ver = '0.0.20'
 
 include GLI::App
 
@@ -59,7 +59,7 @@ command :update do |c|
   c.desc 'Options to pass to every judge'
   c.flag([:o, :option], multiple: true, arg_name: '<key=value>')
   c.desc 'Maximum number of update cycles to run'
-  c.flag([:'max-cycles'], default_value: 8)
+  c.flag([:'max-cycles'], default_value: 8, type: Integer)
   c.action do |global, options, args|
     require_relative '../lib/judges/commands/update'
     Judges::Update.new(loog).run(options, args)

data/features/cli.feature

@@ -14,15 +14,14 @@ Feature: Simple Run
     Given I make a temp directory
     Then I have a "simple/simple_judge.rb" file with content:
     """
-      $fb.query("(eq kind 'foo')").each do |f|
-        n = $fb.insert
-        n.kind = 'yes!'
-      end
+      n = $fb.insert
+      n.kind = 'yes!'
     """
-    Then I run bin/judges with "--verbose update -o foo=1 -o bar=2 --max-cycles 2 . simple.fb"
+    Then I run bin/judges with "--verbose update -o foo=1 -o bar=2 --max-cycles 3 . simple.fb"
     Then Stdout contains "foo → "
     Then Stdout contains "bar → "
     Then Stdout contains "1 judges processed"
+    Then Stdout contains "Update finished in 3 cycles"
     And Exit code is zero
 
   Scenario: Simple test of a few judges

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.18'
+  s.version = '0.0.20'
   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.16'
+  s.add_runtime_dependency 'factbase', '~>0.0.17'
   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

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

data/lib/judges/commands/update.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'backtrace'
+require 'factbase/looged'
 require_relative '../../judges'
 require_relative '../../judges/to_rel'
 require_relative '../../judges/packs'
@@ -42,18 +43,19 @@ class Judges::Update
     raise "The directory is absent: #{dir.to_rel}" unless File.exist?(dir)
     impex = Judges::Impex.new(@loog, args[1])
     fb = impex.import(strict: false)
+    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)
     c = 0
     loop do
+      c += 1
       diff = cycle(packs, fb, impex, options)
       break if diff.zero?
-      if !opts['max-cycles'].nil? && c > opts['max-cycles']
+      if !opts['max-cycles'].nil? && c >= opts['max-cycles']
         @loog.info('Too many cycles already, as set by --max-cycles, breaking')
         break
       end
-      c += 1
       @loog.info("#{diff} modifications at the cycle ##{c}")
     end
     @loog.info("Update finished in #{c} cycles")
@@ -65,7 +67,7 @@ class Judges::Update
     errors = []
     diff = 0
     done = packs.each_with_index do |p, i|
-      @loog.info("Running #{p.dir.to_rel} (##{i})...")
+      @loog.info("👍 Running #{p.name} (##{i}) at #{p.dir.to_rel}...")
       before = fb.size
       begin
         p.run(fb, options)

data/lib/judges/fb/if_absent.rb

@@ -27,7 +27,7 @@ def if_absent(fb)
   attrs = {}
   f = Judges::Accumulator.new(attrs)
   yield f
-  q = attrs.map { |k, v| "(eq #{k} #{v})" }.join(' ')
+  q = attrs.map { |k, v| "(eq #{k} '#{v}')" }.join(' ')
   return unless fb.query("(and #{q})").each.to_a.empty?
   n = fb.insert
   attrs.each { |k, v| n.send("#{k}=", v) }

data/test/commands/test_update.rb

@@ -49,8 +49,8 @@ class TestUpdate < Minitest::Test
       fb = Factbase.new
       fb.insert.foo_bar = 42
       File.binwrite(file, fb.export)
-      File.write(File.join(d, 'foo.rb'), 'return if $fb.size > 2; $fb.insert.tt = 4')
-      Judges::Update.new(Loog::VERBOSE).run({}, [d, file])
+      File.write(File.join(d, 'foo.rb'), '$fb.insert.tt = 4')
+      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)

data/test/fb/test_if_absent.rb

@@ -33,9 +33,9 @@ require_relative '../../lib/judges/fb/if_absent'
 class TestIfAbsent < Minitest::Test
   def test_ignores
     fb = Factbase.new
-    fb.insert.foo = 42
+    fb.insert.foo = 'hello dude'
     n = if_absent(fb) do |f|
-      f.foo = 42
+      f.foo = 'hello dude'
     end
     assert(n.nil?)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.20
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.17
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement