fbe 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b87495cdbc9d14a665375e86f7ff41abe3c437b3652275865aea95e1c85ef2b
-  data.tar.gz: 5850f13fae6766c49d13977c08de32ef215428152ece1054cce1ea361cea3306
+  metadata.gz: ddb68efaa2108636f7d036c7ce41054cb2df54b5dbb080c44fca22dc7afb0b56
+  data.tar.gz: 6f6e8fd827d6d9728a9149ccab9e2c70bc5cbefba0ec96845f5d1bf5f6dc7381
 SHA512:
-  metadata.gz: '019491772bc7ecf4d1c889622de991184da5f3b74725cb9facfac40c579e53aac8cea42e7cb5037e0d972feeb6b619e3310ec0f7a6503d455e99accb958f6614'
-  data.tar.gz: 95aa42ad2d82ab4d68120320a77c561443edc4443a3970f5e380a423d2c79fbd0deccff2e8af834181d5311fa099dda6c5e00055421ddc0a308a12bb8a4f2330
+  metadata.gz: 917d79f1b09563a98a7ef0dbfa86155de181c79dec11768854eef48b0f03d8ae7e23432ab01b69266ea498abf987d5723f3e0d54d694be2ce21e2686af9e47c9
+  data.tar.gz: ebe3be674f88f238e9d7d6506c2a0c03f27589ced7ee7eb899d1a869bca1964c752a7544299e0aebf6d080052b3bcf6b31bcd8c2224212b00bd3c202a8acf5ca

data/Gemfile.lock

@@ -89,7 +89,7 @@ GEM
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.13.2)
+    irb (1.14.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iri (0.8.0)

data/README.md

@@ -11,7 +11,8 @@
 [![Hits-of-Code](https://hitsofcode.com/github/zerocracy/fbe)](https://hitsofcode.com/view/github/zerocracy/fbe)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/zerocracy/fbe/blob/master/LICENSE.txt)
 
-It's a collection of tools.
+It's a collection of tools for
+[zerocracy/judges-action](https://github.com/zerocracy/judges-action).
 
 ## How to contribute
 

data/fbe.gemspec

@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'English'
 require_relative 'lib/fbe'
 
 Gem::Specification.new do |s|

data/lib/fbe/conclude.rb

@@ -38,7 +38,7 @@ end
 # Copyright:: Copyright (c) 2024 Zerocracy
 # License:: MIT
 class Fbe::Conclude
-  def initialize(fb: Fbe.fb, judge: $judge, loog: $loog, options: $options, global: $global)
+  def initialize(fb:, judge:, loog:, options:, global:)
     @fb = fb
     @judge = judge
     @loog = loog
@@ -88,8 +88,8 @@ class Fbe::Conclude
   private
 
   def roll(&)
+    passed = 0
     catch :stop do
-      passed = 0
       @fb.txn do |fbt|
         fbt.query(@query).each do |a|
           throw :stop if @quota_aware && Fbe.octo(loog: @loog, options: @options, global: @global).off_quota
@@ -99,6 +99,7 @@ class Fbe::Conclude
         end
       end
     end
+    @loog.debug("Found and processed #{passed} facts by: #{@query}")
   end
 
   def fill(fact, prev)

data/lib/fbe/fb.rb

@@ -22,6 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'loog'
 require 'judges'
 require 'factbase'
 require 'factbase/looged'

data/lib/fbe/iterate.rb

@@ -38,7 +38,7 @@ end
 # Copyright:: Copyright (c) 2024 Zerocracy
 # License:: MIT
 class Fbe::Iterate
-  def initialize(fb: Fbe.fb, loog: $loog, options: $options, global: $global)
+  def initialize(fb:, loog:, options:, global:)
     @fb = fb
     @loog = loog
     @options = options
@@ -84,24 +84,25 @@ class Fbe::Iterate
     oct = Fbe.octo(loog: @loog, options: @options, global: @global)
     repos = Fbe.unmask_repos(loog: @loog, options: @options, global: @global)
     restarted = []
+    fb = Fbe.fb(fb: @fb, global: @global, options: @options)
     loop do
       repos.each do |repo|
         next if restarted.include?(repo)
         seen[repo] = 0 if seen[repo].nil?
         if seen[repo] >= @repeats
-          @loog.debug("We've seen too many in the #{repo} repo, time to move to the next one")
+          @loog.debug("We've seen too many (#{seen[repo]}) in #{repo}, let's see next one")
           next
         end
         rid = oct.repo_id_by_name(repo)
-        before = Fbe.fb.query(
+        before = fb.query(
           "(agg (and (eq what '#{@label}') (eq where 'github') (eq repository #{rid})) (first latest))"
         ).one
-        Fbe.fb.query("(and (eq what '#{@label}') (eq where 'github') (eq repository #{rid}))").delete!
+        fb.query("(and (eq what '#{@label}') (eq where 'github') (eq repository #{rid}))").delete!
         before = before.nil? ? @since : before.first
-        nxt = Fbe.fb.query(@query).one(before:, repository: rid)
+        nxt = fb.query(@query).one(before:, repository: rid)
         after =
           if nxt.nil?
-            @loog.debug("Next is nil, starting from the beginning at #{@since}")
+            @loog.debug("Next element after ##{before} not suggested, re-starting from ##{@since}: #{@query}")
             restarted << repo
             @since
           else
@@ -109,15 +110,15 @@ class Fbe::Iterate
             yield(rid, nxt)
           end
         raise "Iterator must return an Integer, while #{after.class} returned" unless after.is_a?(Integer)
-        f = Fbe.fb.insert
+        f = fb.insert
         f.where = 'github'
         f.repository = rid
         f.latest =
           if after.nil?
-            @loog.debug("After is nil at #{repo}, setting the `latest` to nxt: ##{nxt}")
+            @loog.debug("After is nil at #{repo}, setting the 'latest' to ##{nxt}")
             nxt
           else
-            @loog.debug("After is ##{after} at #{repo}, setting the `latest` to it")
+            @loog.debug("After is ##{after} at #{repo}, setting the 'latest' to it")
             after
           end
         f.what = @label
@@ -131,8 +132,12 @@ class Fbe::Iterate
         @loog.debug('We are off GitHub quota, time to stop')
         break
       end
-      unless seen.values.any? { |v| v < @repeats }
-        @loog.debug('No more repos to scan, quitting')
+      unless seen.any? { |r, v| v < @repeats && !restarted.include?(r) }
+        @loog.debug("No more repos to scan (out of #{repos.size}), quitting")
+        break
+      end
+      if restarted.size == repos.size
+        @loog.debug("All #{repos.size} repos restarted, quitting")
         break
       end
     end

data/lib/fbe/unmask_repos.rb

@@ -52,6 +52,7 @@ module Fbe
       re = Fbe.mask_to_regex(mask[1..])
       repos.reject! { |r| re.match?(r) }
     end
+    raise "No repos found matching: #{options.repositories}" if repos.empty?
     loog.debug("Scanning #{repos.size} repositories: #{repos.join(', ')}...")
     repos
   end

data/lib/fbe.rb

@@ -27,5 +27,5 @@
 # License:: MIT
 module Fbe
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.11'
+  VERSION = '0.0.13'
 end

data/test/fbe/test_conclude.rb

@@ -50,7 +50,7 @@ class TestConclude < Minitest::Test
     fb = Factbase.new
     fb.insert.foo = 1
     fb.insert.bar = 2
-    Fbe.conclude(fb:, judge: 'judge-one', loog: Loog::NULL) do
+    Fbe.conclude(fb:, judge: 'judge-one', loog: Loog::NULL, global: {}, options: Judges::Options.new) do
       on '(exists foo)'
       draw do |n, prev|
         n.sum = prev.foo + 1
@@ -64,12 +64,10 @@ class TestConclude < Minitest::Test
   end
 
   def test_maybe
-    $fb = Factbase.new
-    $global = {}
-    $options = Judges::Options.new
-    $loog = Loog::NULL
-    Fbe.fb.insert.foo = 1
-    Fbe.conclude(judge: 'issue-was-opened', loog: Loog::NULL) do
+    options = Judges::Options.new
+    fb = Fbe.fb(global: {}, options:)
+    fb.insert.foo = 1
+    Fbe.conclude(fb:, judge: 'issue-was-opened', loog: Loog::NULL, options:, global: {}) do
       on '(exists foo)'
       maybe do |n, prev|
         n.repository = 111
@@ -80,24 +78,22 @@ class TestConclude < Minitest::Test
         "it's a test." * 20
       end
     end
-    f = Fbe.fb.query('(exists issue)').each.to_a[0]
+    f = fb.query('(exists issue)').each.to_a[0]
     assert_equal(1, f.issue)
     assert(f._id.positive?)
   end
 
   def test_consider
-    $fb = Factbase.new
-    $global = {}
-    $options = Judges::Options.new
-    $loog = Loog::NULL
-    Fbe.fb.insert.foo = 1
-    Fbe.conclude(judge: 'issue-was-closed', loog: Loog::NULL) do
+    fb = Factbase.new
+    fb.insert.foo = 1
+    options = Judges::Options.new
+    Fbe.conclude(fb:, judge: 'issue-was-closed', loog: Loog::NULL, options:, global: {}) do
       on '(exists foo)'
       consider do |_prev|
-        Fbe.fb.insert.bar = 42
+        fb.insert.bar = 42
       end
     end
-    f = Fbe.fb.query('(exists bar)').each.to_a[0]
+    f = fb.query('(exists bar)').each.to_a[0]
     assert_equal(42, f.bar)
   end
 end

data/test/fbe/test_iterate.rb

@@ -34,20 +34,54 @@ require_relative '../../lib/fbe/iterate'
 # License:: MIT
 class TestIterate < Minitest::Test
   def test_simple
-    $options = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
-    $global = {}
-    $fb = Factbase.new
-    $fb.insert.foo = 42
-    Fbe.iterate(loog: Loog::NULL) do
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    fb.insert.foo = 42
+    Fbe.iterate(fb:, loog: Loog::NULL, options: opts, global: {}) do
       as 'labels-were-scanned'
       by '(agg (always) (max foo))'
       repeats 2
       over do |_repository, foo|
-        f = $fb.insert
+        f = fb.insert
         f.foo = foo + 1
         f.foo
       end
     end
-    assert_equal(4, $fb.size)
+    assert_equal(4, fb.size)
+  end
+
+  def test_many_repeats
+    opts = Judges::Options.new(['repositories=foo/bar,foo/second', 'testing=true'])
+    cycles = 0
+    reps = 5
+    Fbe.iterate(fb: Factbase.new, loog: Loog::NULL, global: {}, options: opts) do
+      as 'labels-were-scanned'
+      by '(plus 1 1)'
+      repeats reps
+      over do |_, nxt|
+        cycles += 1
+        nxt
+      end
+    end
+    assert_equal(reps * 2, cycles)
+  end
+
+  def test_with_restart
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    cycles = 0
+    fb = Factbase.new
+    f = fb.insert
+    f.foo = 42
+    Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+      as 'labels-were-scanned'
+      by '(agg (and (eq foo 42) (not (exists bar))) (max foo))'
+      repeats 10
+      over do |_, nxt|
+        cycles += 1
+        f.bar = 1
+        nxt
+      end
+    end
+    assert_equal(1, cycles)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-06 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace