fbe 0.31.2 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a677f7f6496d3ae71e301f9f495b4907391bbde215407b702a8fbb956912935
-  data.tar.gz: 2afe6bbef989ffc24291cf00db87f917513469f0ae2a99ecbac4429692dbf479
+  metadata.gz: '05709f3a8b84855b1cb59a586eb4ae7a83f2f87bf0d8490d14a4b59659513cd6'
+  data.tar.gz: 54da9a5a7e9d638859cfdb0b7c9b192673fdb2ede19ae4e3afecdbcf1164db36
 SHA512:
-  metadata.gz: ed332e9aece1b31c3cc25716dd16dea036ebffa048caaaa8028b84a91702852d146910e46b1dfb731e7cbf9d6af54f8b0fd1409e282f61be5fd2398935cb4581
-  data.tar.gz: c0edfee023e86ccc3a669111b7c68492d35d030d2d1e31f0262059f91e12839709b0f73f15a14b7b3755347b44fa3b5e157754c6babbec7dee2c2ee33ae120f9
+  metadata.gz: ab66f21e8f0f80070e3a8908fade06c2088659660d6d9aa127f6bc86e555b3efc4d3542aae40cfd301e2caa0af80a9227b02aaac5ce7e562ec346dad85d06ecf
+  data.tar.gz: e381efafdacff36bf1119f0075c18f558af4531a17a4e2ad9d15663f330bca2da7cde3c0862d2d98db5ee6bbe28e12d41c8617bd923b334c5b833befbfe8dcbb

data/Gemfile.lock

@@ -60,7 +60,7 @@ GEM
       tago (~> 0.0)
       typhoeus (~> 1.4)
     benchmark (0.4.1)
-    bigdecimal (3.2.2)
+    bigdecimal (3.2.3)
     builder (3.3.0)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.4)
@@ -76,7 +76,7 @@ GEM
     ellipsized (0.3.0)
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    factbase (0.15.7)
+    factbase (0.16.1)
       backtrace (~> 0.4)
       decoor (~> 0.1)
       ellipsized (~> 0.3)
@@ -114,7 +114,7 @@ GEM
     graphql-client (0.26.0)
       activesupport (>= 3.0)
       graphql (>= 1.13.0)
-    hashdiff (1.2.0)
+    hashdiff (1.2.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     intercepted (0.2.0)
@@ -207,10 +207,10 @@ GEM
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-performance (1.25.0)
+    rubocop-performance (1.26.0)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
@@ -233,7 +233,7 @@ GEM
     sqlite3 (2.7.3-x86_64-darwin)
     sqlite3 (2.7.3-x86_64-linux-gnu)
     strscan (3.1.5)
-    tago (0.1.0)
+    tago (0.2.0)
     timeout (0.4.3)
     total (0.4.1)
     typhoeus (1.5.0)

data/lib/fbe/conclude.rb

@@ -19,14 +19,14 @@ require_relative 'octo'
 # @yield [Factbase::Fact] The fact
 def Fbe.conclude(
   fb: Fbe.fb, judge: $judge, loog: $loog, options: $options, global: $global,
-  start: $start, time: Time, &
+  start: $start, &
 )
   raise 'The fb is nil' if fb.nil?
   raise 'The $judge is not set' if judge.nil?
   raise 'The $global is not set' if global.nil?
   raise 'The $options is not set' if options.nil?
   raise 'The $loog is not set' if loog.nil?
-  c = Fbe::Conclude.new(fb:, judge:, loog:, options:, global:, start:, time:)
+  c = Fbe::Conclude.new(fb:, judge:, loog:, options:, global:, start:)
   c.instance_eval(&)
 end
 
@@ -61,8 +61,7 @@ class Fbe::Conclude
   # @param [Hash] global The hash for global caching
   # @param [Judges::Options] options The options coming from the +judges+ tool
   # @param [Loog] loog The logging facility
-  # @param [Time] time The time
-  def initialize(fb:, judge:, global:, options:, loog:, start:, time: Time)
+  def initialize(fb:, judge:, global:, options:, loog:, start:)
     @fb = fb
     @judge = judge
     @loog = loog
@@ -74,7 +73,6 @@ class Fbe::Conclude
     @lifetime_aware = true
     @quota_aware = true
     @timeout = 60
-    @time = time
   end
 
   # Make this block not aware of GitHub API quota.
@@ -92,7 +90,7 @@ class Fbe::Conclude
   # When the lifetime is over, the loop will NOT gracefully stop.
   #
   # @return [nil] Nothing is returned
-  def lifetime_aware
+  def lifetime_unaware
     @lifetime_aware = false
   end
 
@@ -195,7 +193,6 @@ class Fbe::Conclude
   #   end
   def roll(&)
     passed = 0
-    start = @time.now
     oct = Fbe.octo(loog: @loog, options: @options, global: @global)
     @fb.query(@query).each do |a|
       if @quota_aware && oct.off_quota?
@@ -206,9 +203,8 @@ class Fbe::Conclude
         @loog.debug('We ran out of lifetime, must stop here')
         break
       end
-      now = @time.now
-      if now > start + @timeout
-        @loog.debug("We've spent more than #{start.ago}, must stop here")
+      if Time.now > @start + @timeout
+        @loog.debug("We've spent more than #{@start.ago}, must stop here")
         break
       end
       @fb.txn do |fbt|

data/lib/fbe/iterate.rb

@@ -8,7 +8,9 @@ require 'tago'
 require 'time'
 require_relative '../fbe'
 require_relative 'fb'
+require_relative 'if_absent'
 require_relative 'octo'
+require_relative 'overwrite'
 require_relative 'unmask_repos'
 
 # Creates an instance of {Fbe::Iterate} and evaluates it with the provided block.
@@ -26,7 +28,7 @@ require_relative 'unmask_repos'
 # @raise [RuntimeError] If required globals are not set
 # @example Iterate through repositories processing issues
 #   Fbe.iterate do
-#     as 'issues-iterator'
+#     as 'issues_iterator'
 #     by '(and (eq what "issue") (gt created_at $before))'
 #     repeats 5
 #     quota_aware
@@ -35,12 +37,12 @@ require_relative 'unmask_repos'
 #       issue_id + 1
 #     end
 #   end
-def Fbe.iterate(fb: Fbe.fb, loog: $loog, options: $options, global: $global, &)
+def Fbe.iterate(fb: Fbe.fb, loog: $loog, options: $options, global: $global, start: $start, &)
   raise 'The fb is nil' if fb.nil?
   raise 'The $global is not set' if global.nil?
   raise 'The $options is not set' if options.nil?
   raise 'The $loog is not set' if loog.nil?
-  c = Fbe::Iterate.new(fb:, loog:, options:, global:)
+  c = Fbe::Iterate.new(fb:, loog:, options:, global:, start:)
   c.instance_eval(&)
 end
 
@@ -62,7 +64,7 @@ end
 #
 # @example Processing pull requests with state management
 #   iterator = Fbe::Iterate.new(fb: fb, loog: loog, options: options, global: global)
-#   iterator.as('pull-requests')
+#   iterator.as('pull_requests')
 #   iterator.by('(and (eq what "pull_request") (gt number $before))')
 #   iterator.repeats(10)
 #   iterator.quota_aware
@@ -82,16 +84,18 @@ class Fbe::Iterate
   # @param [Loog] loog The logging facility for debug output
   # @param [Judges::Options] options The options containing repository configuration
   # @param [Hash] global The hash for global caching of API responses
-  def initialize(fb:, loog:, options:, global:)
+  def initialize(fb:, loog:, options:, global:, start:)
     @fb = fb
     @loog = loog
     @options = options
     @global = global
+    @start = start
     @label = nil
     @since = 0
     @query = nil
     @repeats = 1
-    @quota_aware = false
+    @quota_aware = true
+    @lifetime_aware = true
   end
 
   # Makes the iterator aware of GitHub API quota limits.
@@ -104,8 +108,15 @@ class Fbe::Iterate
   # @example Enable quota awareness
   #   iterator.quota_aware
   #   iterator.over { |repo, item| ... }  # Will stop if quota exhausted
-  def quota_aware
-    @quota_aware = true
+  def quota_unaware
+    @quota_aware = false
+  end
+
+  # Makes the iterator aware of lifetime limits.
+  #
+  # @return [nil] Nothing is returned
+  def lifetime_unaware
+    @lifetime_aware = false
   end
 
   # Sets the maximum number of iterations per repository.
@@ -151,10 +162,11 @@ class Fbe::Iterate
   # @return [nil] Nothing is returned
   # @raise [RuntimeError] If label is already set or nil
   # @example Set label for issue processing
-  #   iterator.as('issue-processor')
+  #   iterator.as('issue_processor')
   def as(label)
     raise 'Label is already set' unless @label.nil?
     raise 'Cannot set "label" to nil' if label.nil?
+    raise "Wrong label format '#{label}', use [_a-z][a-zA-Z0-9_]*" unless label.match?(/\A[_a-z][a-zA-Z0-9_]*\z/)
     @label = label
   end
 
@@ -185,7 +197,6 @@ class Fbe::Iterate
   # 4. If query returns a value: call the block with (repo_id, query_result)
   # 5. Store the block's return value as the new "latest" for next iteration
   #
-  # @param [Float] timeout Maximum seconds to run (default: 120)
   # @yield [Integer, Object] Repository ID and the result from query execution
   # @yieldreturn [Integer] The value to store as "latest" for next iteration
   # @return [nil] Nothing is returned
@@ -195,7 +206,7 @@ class Fbe::Iterate
   #     fetch_and_process_issue(repo_id, issue_number)
   #     issue_number + 1  # Return next issue number to process
   #   end
-  def over(timeout: 2 * 60, &)
+  def over
     raise 'Use "as" first' if @label.nil?
     raise 'Use "by" first' if @query.nil?
     seen = {}
@@ -208,27 +219,27 @@ class Fbe::Iterate
       loog: @loog, options: @options, global: @global, quota_aware: @quota_aware
     ).map { |n| oct.repo_id_by_name(n) }
     restarted = []
-    start = Time.now
+    started = Time.now
     before =
       repos.to_h do |repo|
         [
           repo,
           @fb.query(
             "(agg (and
-              (eq what '#{@label}')
+              (eq what 'iterate')
               (eq where 'github')
               (eq repository #{repo}))
-            (first latest))"
+            (first #{@label}))"
           ).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}")
+        @loog.info("We are off GitHub quota, time to stop after #{started.ago}")
         break
       end
-      if Time.now - start > timeout
+      if @lifetime_aware && @options.lifetime && Time.now - @start > @options.lifetime - 10
         @loog.info('We are over time, it is time to stop')
         break
       end
@@ -237,8 +248,8 @@ class Fbe::Iterate
           @loog.info("We are off GitHub quota, we must skip #{repo}")
           break
         end
-        if Time.now - start > timeout
-          @loog.info("We are doing this for #{start.ago} already, won't check #{repo}")
+        if @lifetime_aware && @options.lifetime && Time.now - @start > @options.lifetime - 10
+          @loog.info("We are working for #{started.ago} already, won't check repository ##{repo}")
           next
         end
         next if restarted.include?(repo)
@@ -263,28 +274,24 @@ class Fbe::Iterate
         seen[repo] += 1
       end
       unless seen.any? { |r, v| v < @repeats && !restarted.include?(r) }
-        @loog.debug("No more repos to scan (out of #{repos.size}), quitting after #{start.ago}")
+        @loog.debug("No more repos to scan (out of #{repos.size}), quitting after #{started.ago}")
         break
       end
       if restarted.size == repos.size
-        @loog.debug("All #{repos.size} repos restarted, quitting after #{start.ago}")
+        @loog.debug("All #{repos.size} repos restarted, quitting after #{started.ago}")
         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
+      f =
+        Fbe.if_absent(fb: @fb, always: true) do |n|
+          n.what = 'iterate'
+          n.where = 'github'
+          n.repository = repo
+        end
+      Fbe.overwrite(f, @label, before[repo], fb: @fb)
     end
-    @loog.debug("Finished scanning #{repos.size} repos in #{start.ago}: #{seen.map { |k, v| "#{k}:#{v}" }.joined}")
+    @loog.debug("Finished scanning #{repos.size} repos in #{started.ago}: #{seen.map { |k, v| "#{k}:#{v}" }.joined}")
   end
 end

data/lib/fbe/tombstone.rb

@@ -34,7 +34,7 @@ class Fbe::Tombstone
         n.repo = repo
       end
     f.send(:"#{@fid}=", SecureRandom.random_number(99_999)) if f[@fid].nil?
-    nn = f['issues']&.map { |ii| ii.split('-').map(&:to_i) } || []
+    nn = f['issues']&.map { |ii| ii.split('-').map(&:to_i).then { |ii| ii.size == 1 ? ii << ii[0] : ii } } || []
     issue = [issue] unless issue.is_a?(Array)
     issue.each do |i|
       nn << [i, i]
@@ -47,7 +47,9 @@ class Fbe::Tombstone
           merged << [a, b]
         end
       end
-    Fbe.overwrite(f, 'issues', merged.map { |ii| "#{ii[0]}-#{ii[1]}" }, fb: @fb, fid: @fid)
+    Fbe.overwrite(
+      f, 'issues', merged.map { |ii| ii[0] == ii[1] ? ii[0].to_s : "#{ii[0]}-#{ii[1]}" }, fb: @fb, fid: @fid
+    )
   end
 
   # Is it there?
@@ -64,7 +66,7 @@ class Fbe::Tombstone
     issue.all? do |i|
       f['issues'].any? do |ii|
         a, b = ii.split('-').map(&:to_i)
-        (a..b).cover?(i)
+        b.nil? ? a == i : (a..b).cover?(i)
       end
     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.31.2' unless const_defined?(:VERSION)
+  VERSION = '0.33.0' unless const_defined?(:VERSION)
 end

metadata

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