fbe 0.29.0 → 0.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f217bdf737550a6a1dc1ffe033e3b4a731149b48f357ed5c2ad33b9fa81b2354
-  data.tar.gz: 220d01ad45a7c3f553cc29e2870faa9021b7a42a550e39883632aa8beddff4cb
+  metadata.gz: f08a090d74c79938d45d53b09d1cdb6fafada89c54b5c33b2b4154a1174ac38c
+  data.tar.gz: d927725171355f731620718cc2d7125e1f8e961af53e01c4d36e03c288fcd640
 SHA512:
-  metadata.gz: 943429b3e27f1c5a4c37ca67b6cf8731fe87b66665d094f5237821f780db7269487ac080bf8756561fa67954ae531276dcf0bed8f3a6b6cc0e4286d58ef699a3
-  data.tar.gz: a5e77f3f279f55aa784e25edf1f4f4aa8701852ee15ae30fdc4cab1f02d268c6d7b3343e32c76e352e1abf77687acbaae74033d75a92b0b9b3b0feee133c96d9
+  metadata.gz: 32999571b725d7b68de93231ea2bdb1731ddc2a8d2c84bbf84d248fd25fae5223a3fb3b6cb85c73364815548019055420344d2bc3bba4ef14e57450f131026c5
+  data.tar.gz: 6e26bb3ba8c15c24912b46c3a7841ebd59ab17a9ee3f530e7d19968efdbc8da9d20acaefa9fdece7c61999240118972277588b9ceda5e5a033cb4ef9be94166f

data/.github/workflows/typos.yml

@@ -16,6 +16,6 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v5
-      - uses: crate-ci/typos@v1.35.5
+      - uses: crate-ci/typos@v1.35.6
         with:
           config: .github/.typos.toml

data/lib/fbe/iterate.rb

@@ -69,7 +69,7 @@ end
 #   iterator.over(timeout: 600) do |repo_id, pr_number|
 #     # Process pull request
 #     fetch_and_store_pr(repo_id, pr_number)
-#     pr_number  # Return next PR number to process
+#     pr_number + 1  # Return next PR number to process
 #   end
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -204,9 +204,25 @@ class Fbe::Iterate
       @loog.debug('We are off GitHub quota, cannot even start, sorry')
       return
     end
-    repos = Fbe.unmask_repos(loog: @loog, options: @options, global: @global, quota_aware: @quota_aware)
+    repos = Fbe.unmask_repos(
+      loog: @loog, options: @options, global: @global, quota_aware: @quota_aware
+    ).map { |n| oct.repo_id_by_name(n) }
     restarted = []
     start = Time.now
+    before =
+      repos.to_h do |repo|
+        [
+          repo,
+          @fb.query(
+            "(agg (and
+              (eq what '#{@label}')
+              (eq where 'github')
+              (eq repository #{repo}))
+            (first latest))"
+          ).one&.first || @since
+        ]
+      end
+    starts = before.dup
     loop do
       if @quota_aware && oct.off_quota?
         @loog.info("We are off GitHub quota, time to stop after #{start.ago}")
@@ -231,35 +247,19 @@ class Fbe::Iterate
           @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 = @fb.query(
-          "(agg (and (eq what '#{@label}') (eq where 'github') (eq repository #{rid})) (first latest))"
-        ).one
-        @fb.query("(and (eq what '#{@label}') (eq where 'github') (eq repository #{rid}))").delete!
-        before = before.nil? ? @since : before.first
-        nxt = @fb.query(@query).one(@fb, before:, repository: rid)
-        after =
+        nxt = @fb.query(@query).one(@fb, before: before[repo], repository: repo)
+        before[repo] =
           if nxt.nil?
-            @loog.debug("Next element after ##{before} not suggested, re-starting from ##{@since}: #{@query}")
+            @loog.debug("Next element after ##{before[repo]} not suggested, re-starting from ##{@since}: #{@query}")
             restarted << repo
             @since
           else
-            @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)
-        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
-          else
-            @loog.debug("After is ##{after} at #{repo}, setting the 'latest' to it")
-            after
+            @loog.debug("Next is ##{nxt}, starting from it")
+            yield(repo, nxt)
           end
-        f.what = @label
+        unless before[repo].is_a?(Integer)
+          raise "Iterator must return an Integer, but #{before[repo].class} was returned"
+        end
         seen[repo] += 1
       end
       unless seen.any? { |r, v| v < @repeats && !restarted.include?(r) }
@@ -271,6 +271,20 @@ class Fbe::Iterate
         break
       end
     end
+    repos.each do |repo|
+      next if before[repo] == starts[repo]
+      @fb.query(
+        "(and
+          (eq what '#{@label}')
+          (eq where 'github')
+          (eq repository #{repo}))"
+      ).delete!
+      f = @fb.insert
+      f.where = 'github'
+      f.repository = repo
+      f.latest = before[repo]
+      f.what = @label
+    end
     @loog.debug("Finished scanning #{repos.size} repos in #{start.ago}: #{seen.map { |k, v| "#{k}:#{v}" }.joined}")
   end
 end

data/lib/fbe.rb

@@ -10,5 +10,5 @@
 # License:: MIT
 module Fbe
   # Current version of the gem (changed by +.rultor.yml+ on every release)
-  VERSION = '0.29.0' unless const_defined?(:VERSION)
+  VERSION = '0.29.1' unless const_defined?(:VERSION)
 end

data/test/fbe/test_iterate.rb

@@ -39,8 +39,9 @@ class TestIterate < Fbe::Test
       as 'labels-were-scanned'
       by '(agg (always) (max foo))'
       repeats 2
-      over(timeout: 0.1) do
+      over(timeout: 0.1) do |i|
         sleep 0.2
+        i
       end
     end
     assert_equal(2, fb.size)
@@ -80,4 +81,173 @@ class TestIterate < Fbe::Test
     end
     assert_equal(1, cycles)
   end
+
+  def test_quota_aware_continues_when_quota_available
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    cycles = 0
+    Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+      as 'quota-test'
+      by '(plus 1 1)'
+      quota_aware
+      repeats 5
+      over do |_, nxt|
+        cycles += 1
+        nxt + 1
+      end
+    end
+    assert_equal(5, cycles)
+  end
+
+  def test_raises_when_label_not_set
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    assert_raises(StandardError) do
+      Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+        by '(plus 1 1)'
+        over { |_, nxt| nxt }
+      end
+    end
+  end
+
+  def test_raises_when_query_not_set
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    assert_raises(StandardError) do
+      Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+        as 'no-query-test'
+        over { |_, nxt| nxt }
+      end
+    end
+  end
+
+  def test_raises_when_block_returns_non_integer
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    assert_raises(StandardError) do
+      Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+        as 'non-integer-test'
+        by '(plus 1 1)'
+        over { |_, _| 'not-an-integer' }
+      end
+    end
+  end
+
+  def test_raises_when_label_set_twice
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    assert_raises(StandardError) do
+      Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+        as 'first-label'
+        as 'second-label'
+      end
+    end
+  end
+
+  def test_raises_when_query_set_twice
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    assert_raises(StandardError) do
+      Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+        by '(plus 1 1)'
+        by '(plus 2 2)'
+      end
+    end
+  end
+
+  def test_raises_when_repeats_is_nil
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    assert_raises(StandardError) do
+      Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+        as 'nil-repeats-test'
+        by '(plus 1 1)'
+        repeats nil
+      end
+    end
+  end
+
+  def test_raises_when_repeats_is_not_positive
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    assert_raises(StandardError) do
+      Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+        as 'zero-repeats-test'
+        by '(plus 1 1)'
+        repeats 0
+      end
+    end
+  end
+
+  def test_raises_when_label_is_nil
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    assert_raises(StandardError) do
+      Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+        as nil
+      end
+    end
+  end
+
+  def test_raises_when_query_is_nil
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    assert_raises(StandardError) do
+      Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+        by nil
+      end
+    end
+  end
+
+  def test_persists_marker_facts
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    fb.insert.num = 10
+    Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+      as 'marker-test'
+      by '(agg (always) (max num))'
+      repeats 1
+      over do |_, nxt|
+        nxt + 5
+      end
+    end
+    markers = fb.query("(and (eq what 'marker-test') (eq where 'github'))").each.to_a
+    assert_equal(1, markers.size)
+    assert_equal(15, markers.first.latest)
+  end
+
+  def test_multiple_repositories_with_different_progress
+    opts = Judges::Options.new(['repositories=foo/bar,foo/baz', 'testing=true'])
+    fb = Factbase.new
+    results = []
+    Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+      as 'multi-repo-test'
+      by '(plus 1 1)'
+      repeats 2
+      over do |repo, nxt|
+        results << [repo, nxt]
+        nxt + 1
+      end
+    end
+    assert_equal(4, results.size)
+  end
+
+  def test_all_repos_restart_causes_exit
+    opts = Judges::Options.new(['repositories=foo/bar,foo/baz', 'testing=true'])
+    fb = Factbase.new
+    cycles = 0
+    restarts = 0
+    Fbe.iterate(fb:, loog: Loog::NULL, global: {}, options: opts) do
+      as 'all-restart-test'
+      by '(agg (eq foo 123) (first foo))'
+      repeats 10
+      over do |_, nxt|
+        cycles += 1
+        restarts += 1 if nxt.nil?
+        nxt || 0
+      end
+    end
+    assert_equal(0, cycles)
+    assert_equal(0, restarts)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.29.1
 platform: ruby
 authors:
 - Yegor Bugayenko