fbe 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0081d0ed95bf4d88cc396b55651521cf252d5a7894c93e5942a4f44f902a3bd
-  data.tar.gz: b9624f277446d361ac46b2e89d04e4b8b4a20c93adfa8c2f5b0452febde43b7b
+  metadata.gz: 17e78fab223160b05d20f3c4aa670b964c6a0c53c67e6f2b264fb353839f940a
+  data.tar.gz: d578180e2a82801da972e29ba894d747ed15cca21c306accdeacdde4150fa1ab
 SHA512:
-  metadata.gz: 92fd51fff1c6f6347bfe1a89caa2e94bca3277c963ccaf4cce54b33144e1a38f6e060f771e8cab07503d064f1a1c4cbae47cbd5faca2ac338b6240e8308d3aff
-  data.tar.gz: 3e03f00ef4d1c127aa021c89a72ec3f8b273b43fe2bef85bc944063e52ae0fb77a4f93d8883b6c4855852b5f67c067ffd37be04bc7b1b73cc70b454d8e295a94
+  metadata.gz: 8fec611bb907d4a15f4e69ac3e9f290fba29ec25982b74bb2f3d8de3e640e7456a40cfe0b858fbe8e2b55d13f09751223f444e604a26b0a669923fa2e869bd16
+  data.tar.gz: 19b80901292ff4651d6332c4f23e980ae0201b7356ede8639ea41265f1d2999445718cf7dfe81c78fbb4096441f694e9dbc2d640e3e3f6cf1d7abca3bb3b9e4a

data/lib/fbe/conclude.rb

@@ -28,8 +28,8 @@ require_relative 'octo'
 require_relative 'if_absent'
 
 # Create a conclude code block.
-def Fbe.conclude(fbx = Fbe.fb, judge = $judge, loog = $loog, &)
-  c = Fbe::Conclude.new(fbx, judge, loog)
+def Fbe.conclude(fb: Fbe.fb, judge: $judge, loog: $loog, options: $options, global: $global, &)
+  c = Fbe::Conclude.new(fb:, judge:, loog:, options:, global:)
   c.instance_eval(&)
 end
 
@@ -38,10 +38,12 @@ end
 # Copyright:: Copyright (c) 2024 Zerocracy
 # License:: MIT
 class Fbe::Conclude
-  def initialize(fb, judge, loog)
+  def initialize(fb: Fbe.fb, judge: $judge, loog: $loog, options: $options, global: $global)
     @fb = fb
     @judge = judge
     @loog = loog
+    @options = options
+    @global = global
     @query = nil
     @follows = []
     @quota_aware = false
@@ -70,7 +72,7 @@ class Fbe::Conclude
 
   def maybe(&)
     roll do |fbt, a|
-      Fbe.if_absent(fbt) do |n|
+      Fbe.if_absent(fb: fbt) do |n|
         fill(n, a, &)
       end
     end
@@ -90,7 +92,7 @@ class Fbe::Conclude
       passed = 0
       @fb.txn do |fbt|
         fbt.query(@query).each do |a|
-          throw :stop if @quota_aware && Fbe.octo(loog: @loog).off_quota
+          throw :stop if @quota_aware && Fbe.octo(loog: @loog, options: @options, global: @global).off_quota
           n = yield fbt, a
           @loog.info("#{n.what}: #{n.details}") unless n.nil?
           passed += 1

data/lib/fbe/fb.rb

@@ -29,20 +29,20 @@ require 'factbase/pre'
 require 'factbase/rules'
 require_relative '../fbe'
 
-def Fbe.fb(global: $global)
+def Fbe.fb(fb: $fb, global: $global, options: $options)
   global[:fb] ||= begin
     rules = Dir.glob(File.join('rules', '*.fe')).map { |f| File.read(f) }
-    fb = Factbase::Rules.new(
-      $fb,
+    fbe = Factbase::Rules.new(
+      fb,
       "(and \n#{rules.join("\n")}\n)",
       uid: '_id'
     )
-    fb = Factbase::Pre.new(fb) do |f|
-      max = $fb.query('(eq _id (max _id))').each.to_a.first
+    fbe = Factbase::Pre.new(fbe) do |f|
+      max = fb.query('(eq _id (max _id))').each.to_a.first
       f._id = (max.nil? ? 0 : max._id) + 1
       f._time = Time.now
-      f._version = "#{Factbase::VERSION}/#{Judges::VERSION}/#{$options.judges_action_version}"
+      f._version = "#{Factbase::VERSION}/#{Judges::VERSION}/#{options.judges_action_version}"
     end
-    Factbase::Looged.new(fb, Loog::NULL)
+    Factbase::Looged.new(fbe, Loog::NULL)
   end
 end

data/lib/fbe/if_absent.rb

@@ -28,7 +28,7 @@ require_relative '../fbe'
 require_relative 'fb'
 
 # Injects a fact if it's absent in the factbase.
-def Fbe.if_absent(fb = Fbe.fb)
+def Fbe.if_absent(fb: Fbe.fb)
   attrs = {}
   f = others(map: attrs) do |*args|
     k = args[0]

data/lib/fbe/iterate.rb

@@ -28,8 +28,8 @@ require_relative 'octo'
 require_relative 'fb'
 
 # Create a conclude code block.
-def Fbe.iterate(fbx = Fbe.fb, loog = $loog, &)
-  c = Fbe::Iterate.new(fbx, loog)
+def Fbe.iterate(fb: Fbe.fb, loog: $loog, options: $options, global: $global, &)
+  c = Fbe::Iterate.new(fb:, loog:, options:, global:)
   c.instance_eval(&)
 end
 
@@ -38,13 +38,15 @@ end
 # Copyright:: Copyright (c) 2024 Zerocracy
 # License:: MIT
 class Fbe::Iterate
-  def initialize(fb, loog)
+  def initialize(fb: Fbe.fb, loog: $loog, options: $options, global: $global)
     @fb = fb
     @loog = loog
+    @options = options
+    @global = global
     @label = nil
     @since = 0
     @query = nil
-    @limit = 100
+    @repeats = 1
     @quota_aware = false
   end
 
@@ -52,9 +54,10 @@ class Fbe::Iterate
     @quota_aware = true
   end
 
-  def limit(limit)
-    raise 'Cannot set "limit" to nil' if limit.nil?
-    @limit = limit
+  def repeats(repeats)
+    raise 'Cannot set "repeats" to nil' if repeats.nil?
+    raise 'The "repeats" must be a positive integer' unless repeats.positive?
+    @repeats = repeats
   end
 
   def by(query)
@@ -69,16 +72,23 @@ class Fbe::Iterate
     @label = label
   end
 
+  # It makes a number of repeats of going through all repositories
+  # provided by the "repositories" configuration option. In each "repeat"
+  # it yields the repository ID and a number that is retrieved by the
+  # "query". The query is supplied with two parameter:
+  # "$before" (the value from the previous repeat and "$rid" (the repo ID).
   def over(&)
     raise 'Use "as" first' if @label.nil?
     raise 'Use "by" first' if @query.nil?
     seen = {}
-    oct = Fbe.octo(loog: @loog)
-    repos = Fbe.unmask_repos(loog: @loog)
+    oct = Fbe.octo(loog: @loog, options: @options, global: @global)
+    repos = Fbe.unmask_repos(loog: @loog, options: @options, global: @global)
+    restarted = []
     loop do
       repos.each do |repo|
+        next if restarted.include?(repo)
         seen[repo] = 0 if seen[repo].nil?
-        if seen[repo] > @limit
+        if seen[repo] >= @repeats
           @loog.debug("We've seen too many in the #{repo} repo, time to move to the next one")
           next
         end
@@ -87,14 +97,15 @@ class Fbe::Iterate
           "(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!
-        before = before.nil? ? @since : before[0]
+        before = before.nil? ? @since : before.first
         nxt = Fbe.fb.query(@query).one(before:, repository: rid)
         after =
           if nxt.nil?
             @loog.debug("Next is nil, starting from the beginning at #{@since}")
+            restarted << repo
             @since
           else
-            @loog.debug("Next is #{nxt}, starting from it...")
+            @loog.debug("Next is ##{nxt}, starting from it...")
             yield(rid, nxt)
           end
         raise "Iterator must return an Integer, while #{after.class} returned" unless after.is_a?(Integer)
@@ -103,10 +114,10 @@ class Fbe::Iterate
         f.repository = rid
         f.latest =
           if after.nil?
-            @loog.debug("After is nil, setting the `latest` to nxt: #{nxt}")
+            @loog.debug("After is nil at #{repo}, setting the `latest` to nxt: ##{nxt}")
             nxt
           else
-            @loog.debug("After is #{after}, setting the `latest` to it")
+            @loog.debug("After is ##{after} at #{repo}, setting the `latest` to it")
             after
           end
         f.what = @label
@@ -120,7 +131,7 @@ class Fbe::Iterate
         @loog.debug('We are off GitHub quota, time to stop')
         break
       end
-      unless seen.values.any? { |v| v < @limit }
+      unless seen.values.any? { |v| v < @repeats }
         @loog.debug('No more repos to scan, quitting')
         break
       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.7'
+  VERSION = '0.0.9'
 end

data/test/fbe/test_conclude.rb

@@ -49,7 +49,7 @@ class TestConclude < Minitest::Test
     fb = Factbase.new
     fb.insert.foo = 1
     fb.insert.bar = 2
-    Fbe.conclude(fb, 'judge-one', Loog::NULL) do
+    Fbe.conclude(fb:, judge: 'judge-one', loog: Loog::NULL) do
       on '(exists foo)'
       draw do |n, prev|
         n.sum = prev.foo + 1
@@ -68,7 +68,7 @@ class TestConclude < Minitest::Test
     $options = Judges::Options.new
     $loog = Loog::NULL
     Fbe.fb.insert.foo = 1
-    Fbe.conclude(Fbe.fb, 'issue-was-opened', Loog::NULL) do
+    Fbe.conclude(judge: 'issue-was-opened', loog: Loog::NULL) do
       on '(exists foo)'
       maybe do |n, prev|
         n.repository = 111
@@ -90,7 +90,7 @@ class TestConclude < Minitest::Test
     $options = Judges::Options.new
     $loog = Loog::NULL
     Fbe.fb.insert.foo = 1
-    Fbe.conclude(Fbe.fb, 'issue-was-closed', Loog::NULL) do
+    Fbe.conclude(judge: 'issue-was-closed', loog: Loog::NULL) do
       on '(exists foo)'
       consider do |_prev|
         Fbe.fb.insert.bar = 42

data/test/fbe/test_if_absent.rb

@@ -37,7 +37,7 @@ class TestIfAbsent < Minitest::Test
   def test_ignores
     fb = Factbase.new
     fb.insert.foo = 'hello dude'
-    n = Fbe.if_absent(fb) do |f|
+    n = Fbe.if_absent(fb:) do |f|
       f.foo = 'hello dude'
     end
     assert(n.nil?)
@@ -47,7 +47,7 @@ class TestIfAbsent < Minitest::Test
     fb = Factbase.new
     t = Time.now
     fb.insert.foo = t
-    n = Fbe.if_absent(fb) do |f|
+    n = Fbe.if_absent(fb:) do |f|
       f.foo = t
     end
     assert(n.nil?)
@@ -55,14 +55,14 @@ class TestIfAbsent < Minitest::Test
 
   def test_injects
     fb = Factbase.new
-    n = Fbe.if_absent(fb) do |f|
+    n = Fbe.if_absent(fb:) do |f|
       f.foo = 42
     end
     assert_equal(42, n.foo)
   end
 
   def test_injects_and_reads
-    Fbe.if_absent(Factbase.new) do |f|
+    Fbe.if_absent(fb: Factbase.new) do |f|
       f.foo = 42
       assert_equal(42, f.foo)
     end
@@ -76,7 +76,7 @@ class TestIfAbsent < Minitest::Test
     t = Time.now
     f1.z = t
     f1.bar = 3.14
-    n = Fbe.if_absent(fb) do |f|
+    n = Fbe.if_absent(fb:) do |f|
       f.foo = 'hello, "dude"!'
       f.abc = 42
       f.z = t
@@ -93,7 +93,7 @@ class TestIfAbsent < Minitest::Test
     t = Time.now
     f1.z = t
     f1.bar = 3.14
-    n = Fbe.if_absent(fb) do |f|
+    n = Fbe.if_absent(fb:) do |f|
       f.foo = "hello, \\\"dude\\\" \\' \\' ( \n\n ) (!   '"
       f.abc = 42
       f.z = t + 1

data/test/fbe/test_iterate.rb

@@ -38,10 +38,10 @@ class TestIterate < Minitest::Test
     $global = {}
     $fb = Factbase.new
     $fb.insert.foo = 42
-    Fbe.iterate($fb, Loog::NULL) do
+    Fbe.iterate(loog: Loog::NULL) do
       as 'labels-were-scanned'
       by '(agg (always) (max foo))'
-      limit 2
+      repeats 2
       over do |_repository, foo|
         f = $fb.insert
         f.foo = foo + 1

metadata

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