fbe 0.48.7 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc71748bcfb59be79127dfc1373ee3dfe84e14e9843583322d89f95bef91969f
-  data.tar.gz: 26450c3e7d5e30e7e745464ef6b478fe99dbef34484401d6ca6fffabeb1bc5f0
+  metadata.gz: 75b5c811806afc0a6b0d5982d06a1624b6904b93ae151aa90c7cfa24d84945a0
+  data.tar.gz: 35c528503b021c5729b2400eb2c907e81fa8a5064e6ec5d14f930060e4fac685
 SHA512:
-  metadata.gz: 979762592673b5f9ea6136185c339a5be403e164d5f7d614fdd2d2bdec646e69f274325fc2991b5085bbc3e7017329a5e3be96925dc7d2d65efe64b0813428e7
-  data.tar.gz: d8103526278d4b6c6e1c84b34ef358d310b02add12c5ee001223568dd65626c122ba1440074dcc8a043922ff19fd8458747119c41cb699c0229b33bf780e0c59
+  metadata.gz: 4117821cd66f1a138430e80ae34598440eee4de363db299997faa39fc77355dd382d73e70f9ba8f00111ccda29087e45f80e3cab1b267b270657280c7ce74864
+  data.tar.gz: 39eaa129a3ac957b5d6d675f8d8412c8c63f2a915b518b13195b3f36e3ac1f18dc47e538d2a9cce9f4c3f7381ea4c19448eec66a7b3c67e255cf481bc1b07321

data/.github/workflows/copyrights.yml

@@ -5,7 +5,11 @@
 name: copyrights
 'on':
   push:
+    branches:
+      - master
   pull_request:
+    branches:
+      - master
 jobs:
   copyrights:
     timeout-minutes: 15

data/Gemfile.lock

@@ -142,7 +142,7 @@ GEM
       timeout (~> 0.4)
       total (~> 0.4)
       typhoeus (~> 1.3)
-    language_server-protocol (3.17.0.5)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     liquid (5.12.0)
       bigdecimal
@@ -206,7 +206,7 @@ GEM
     regexp_parser (2.12.0)
     retries (0.0.5)
     rexml (3.4.4)
-    rubocop (1.88.1)
+    rubocop (1.88.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

data/lib/fbe/conclude.rb

@@ -19,17 +19,20 @@ require_relative 'over'
 # @param [Loog] loog The logging facility
 # @param [Time] epoch When the entire update started
 # @param [Time] kickoff When the particular judge started
+# @param [Integer] slot Seconds a single iteration may need; the loop stops
+#   before starting a new one when less than this many seconds remain in the
+#   timeout (or lifetime) budget
 # @yield [Factbase::Fact] The fact
 def Fbe.conclude(
   fb: Fbe.fb, judge: $judge, loog: $loog, options: $options, global: $global,
-  epoch: $epoch || Time.now, kickoff: $kickoff || Time.now, &
+  epoch: $epoch || Time.now, kickoff: $kickoff || Time.now, slot: 1, &
 )
   raise(Fbe::Error, 'The fb is nil') if fb.nil?
   raise(Fbe::Error, 'The $judge is not set') if judge.nil?
   raise(Fbe::Error, 'The $global is not set') if global.nil?
   raise(Fbe::Error, 'The $options is not set') if options.nil?
   raise(Fbe::Error, 'The $loog is not set') if loog.nil?
-  c = Fbe::Conclude.new(fb:, judge:, loog:, options:, global:, epoch:, kickoff:)
+  c = Fbe::Conclude.new(fb:, judge:, loog:, options:, global:, epoch:, kickoff:, slot:)
   c.instance_eval(&)
 end
 
@@ -66,7 +69,8 @@ class Fbe::Conclude
   # @param [Loog] loog The logging facility
   # @param [Time] epoch When the entire update started
   # @param [Time] kickoff When the particular judge started
-  def initialize(fb:, judge:, global:, options:, loog:, epoch:, kickoff:)
+  # @param [Integer] slot Seconds a single iteration may need
+  def initialize(fb:, judge:, global:, options:, loog:, epoch:, kickoff:, slot: 1)
     @fb = fb
     @judge = judge
     @loog = loog
@@ -74,6 +78,7 @@ class Fbe::Conclude
     @global = global
     @epoch = epoch
     @kickoff = kickoff
+    @slot = slot
     @query = nil
     @follows = []
     @lifetime = true
@@ -184,6 +189,13 @@ class Fbe::Conclude
   # monitoring quotas and timeouts, and processing each fact through
   # the provided block.
   #
+  # Besides the {Fbe.over?} check (which stops once the elapsed time crosses
+  # the fixed 90% margin of the timeout), the loop also reserves one +@slot+
+  # up front: it stops before starting a new iteration when fewer than +@slot+
+  # seconds remain in the timeout (or lifetime) budget. This prevents a slow
+  # single step from starting late and overrunning the hard timeout enforced
+  # by the +judges+ gem.
+  #
   # @yield [Factbase::Transaction, Factbase::Fact] Transaction and the matching fact
   # @return [Integer] The count of facts processed
   # @example
@@ -207,6 +219,14 @@ class Fbe::Conclude
         global: @global, options: @options, loog: @loog, epoch: @epoch, kickoff: @kickoff,
         quota_aware: @quota, lifetime_aware: @lifetime, timeout_aware: @timeout
       )
+      if @timeout && @options.timeout && @options.timeout - (Time.now - @kickoff) < @slot
+        @loog.info("Less than #{@slot}s left before the timeout, must stop here")
+        break
+      end
+      if @lifetime && @options.lifetime && @options.lifetime - (Time.now - @epoch) < @slot
+        @loog.info("Less than #{@slot}s left before the lifetime ends, must stop here")
+        break
+      end
       @fb.txn do |fbt|
         n = yield(fbt, a)
         unless n.nil?

data/lib/fbe/octo.rb

@@ -182,6 +182,7 @@ def Fbe.octo(options: $options, global: $global, loog: $loog) # rubocop:disable
                 false
               end
             end
+            # @see https://github.com/zerocracy/pages-action/issues/131
             def user_name_by_id(id) # rubocop:disable Layout/EmptyLineBetweenDefs
               raise(Fbe::Error, 'The ID of the user is nil') if id.nil?
               raise(Fbe::Error, 'The ID of the user must be an Integer') unless id.is_a?(Integer)
@@ -189,6 +190,8 @@ def Fbe.octo(options: $options, global: $global, loog: $loog) # rubocop:disable
               name = json[:login].downcase
               @loog.debug("GitHub user ##{id} has a name: @#{name}")
               name
+            rescue Octokit::NotFound, Octokit::Forbidden => e
+              raise(Fbe::Error, "GitHub user ##{id} is not accessible: #{e.message}")
             end
             def repo_id_by_name(name) # rubocop:disable Layout/EmptyLineBetweenDefs
               raise(Fbe::Error, 'The name of the repo is nil') if name.nil?

data/lib/fbe.rb

@@ -9,6 +9,6 @@
 # Copyright:: Copyright (c) 2024-2026 Zerocracy
 # License:: MIT
 module Fbe
-  VERSION = '0.48.7' unless const_defined?(:VERSION)
+  VERSION = '0.49.0' unless const_defined?(:VERSION)
   class Error < StandardError; end
 end

metadata

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