fbe 0.35.0 → 0.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bddbb890f6001c0df689c40caf9803218154009f27a5510be94599b874d218b
-  data.tar.gz: 2f202ab71bd13a341d545889be0e54daa2a4cc512af81607d12c5e26267eb147
+  metadata.gz: b06cd95d05dd6dfa4e79d2c3e128bb3c8bae254dae8abe5842cc59e12adf26f5
+  data.tar.gz: 626b6720065bfdf41480b3728545963fc2477e5baa7d6e07f404a396b52df9ca
 SHA512:
-  metadata.gz: e22ef6d4ca2d1235418d6b6bcea3a317a962b1dc0b5ac4841becd708df6cd41f838178d08ebd74bb08e25a8cf7f597ca3a9378d4a71cc945f26fe8a8da05a4a0
-  data.tar.gz: 2a771ac3b0ecd1eb64aae745518cac12adb5f5cb24f548829c74b4961856f51d2fa01e5a2fb4c841ba706d664b58740793da621b22a9f7408bc0da769ab843a2
+  metadata.gz: 9df729eb9a4e4733ccf08c68fa289c2c05da96e3360a285e7432bc7e2ba0a1cbce56e74b5b1c34dc12023eca1395b045af9ad2f8698ce63a7d47ad5ffdd1273e
+  data.tar.gz: 24fc078561ad2d0a6169a2aebf965325497f8feca78446fcc6c4f6890c3e685c3bae9ba9c2da049dbdd8090b4363ab9b4acdbfa476c8c1a9f6222d6cf7b28910

data/Gemfile.lock

@@ -76,7 +76,7 @@ GEM
     ellipsized (0.3.0)
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    factbase (0.16.4)
+    factbase (0.16.5)
       backtrace (~> 0.4)
       decoor (~> 0.1)
       ellipsized (~> 0.3)
@@ -107,7 +107,7 @@ GEM
     filesize (0.2.0)
     gli (2.22.2)
       ostruct
-    graphql (2.5.11)
+    graphql (2.5.12)
       base64
       fiber-storage
       logger
@@ -157,13 +157,13 @@ GEM
     multipart-post (2.4.1)
     net-http (0.6.0)
       uri
-    nokogiri (1.18.9-arm64-darwin)
+    nokogiri (1.18.10-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x64-mingw-ucrt)
+    nokogiri (1.18.10-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-darwin)
+    nokogiri (1.18.10-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-linux-gnu)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     obk (0.3.2)
     octokit (10.0.0)
@@ -176,7 +176,7 @@ GEM
     parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
-    prism (1.4.0)
+    prism (1.5.1)
     public_suffix (6.0.2)
     qbash (0.4.5)
       backtrace (> 0)
@@ -186,7 +186,7 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.0)
-    regexp_parser (2.11.2)
+    regexp_parser (2.11.3)
     retries (0.0.5)
     rexml (3.4.4)
     rubocop (1.80.2)

data/lib/fbe/conclude.rb

@@ -71,8 +71,8 @@ class Fbe::Conclude
     @query = nil
     @follows = []
     @lifetime_aware = true
+    @timeout_aware = true
     @quota_aware = true
-    @timeout = 60
   end
 
   # Make this block not aware of GitHub API quota.
@@ -94,15 +94,13 @@ class Fbe::Conclude
     @lifetime_aware = false
   end
 
-  # Make sure this block runs for less than allowed amount of seconds.
+  # Make this block NOT aware of timeout limitations.
   #
-  # When the quota is reached, the loop will gracefully stop to avoid.
-  # This helps prevent interruptions in long-running operations.
+  # When the timeout is over, the loop will NOT gracefully stop.
   #
-  # @param [Float] sec Seconds
   # @return [nil] Nothing is returned
-  def timeout(sec)
-    @timeout = sec
+  def timeout_unaware
+    @timeout_aware = false
   end
 
   # Set the query that should find the facts in the factbase.
@@ -194,17 +192,18 @@ class Fbe::Conclude
   def roll(&)
     passed = 0
     oct = Fbe.octo(loog: @loog, options: @options, global: @global)
+    started = Time.now
     @fb.query(@query).each do |a|
       if @quota_aware && oct.off_quota?
         @loog.info('We ran out of GitHub quota, must stop here')
         break
       end
       if @lifetime_aware && @options.lifetime && Time.now - @start > @options.lifetime - 10
-        @loog.debug('We ran out of lifetime, must stop here')
+        @loog.debug("We ran out of lifetime (#{@start.ago} already), must stop here")
         break
       end
-      if Time.now > @start + @timeout
-        @loog.debug("We've spent more than #{@start.ago}, must stop here")
+      if @timeout_aware && @options.timeout && Time.now - started > @options.timeout - 5
+        @loog.debug("We've spent more than #{started.ago}, must stop here")
         break
       end
       @fb.txn do |fbt|

data/lib/fbe/iterate.rb

@@ -32,7 +32,7 @@ require_relative 'unmask_repos'
 #     by '(and (eq what "issue") (gt created_at $before))'
 #     repeats 5
 #     quota_aware
-#     over(timeout: 300) do |repository_id, issue_id|
+#     over do |repository_id, issue_id|
 #       process_issue(repository_id, issue_id)
 #       issue_id + 1
 #     end
@@ -96,6 +96,7 @@ class Fbe::Iterate
     @repeats = 1
     @quota_aware = true
     @lifetime_aware = true
+    @timeout_aware = true
   end
 
   # Makes the iterator aware of GitHub API quota limits.
@@ -119,6 +120,13 @@ class Fbe::Iterate
     @lifetime_aware = false
   end
 
+  # Makes the iterator aware of timeout limits.
+  #
+  # @return [nil] Nothing is returned
+  def timeout_unaware
+    @timeout_aware = false
+  end
+
   # Sets the maximum number of iterations per repository.
   #
   # Controls how many times the query will be executed for each repository
@@ -202,7 +210,7 @@ class Fbe::Iterate
   # @return [nil] Nothing is returned
   # @raise [RuntimeError] If block doesn't return an Integer
   # @example Process issues incrementally
-  #   iterator.over(timeout: 300) do |repo_id, issue_number|
+  #   iterator.over do |repo_id, issue_number|
   #     fetch_and_process_issue(repo_id, issue_number)
   #     issue_number + 1  # Return next issue number to process
   #   end
@@ -240,7 +248,11 @@ class Fbe::Iterate
         break
       end
       if @lifetime_aware && @options.lifetime && Time.now - @start > @options.lifetime - 10
-        @loog.info('We are over time, it is time to stop')
+        @loog.debug("We ran out of lifetime (#{@start.ago} already), must stop here")
+        break
+      end
+      if @timeout_aware && @options.timeout && Time.now - started > @options.timeout - 5
+        @loog.debug("We've spent more than #{started.ago}, must stop here")
         break
       end
       repos.each do |repo|
@@ -249,9 +261,13 @@ class Fbe::Iterate
           break
         end
         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}")
+          @loog.info("We are working for #{@start.ago} already, won't check repository ##{repo}")
           next
         end
+        if @timeout_aware && @options.timeout && Time.now - started > @options.timeout - 5
+          @loog.debug("We've spent more than #{started.ago}, won't check repository ##{repo}")
+          break
+        end
         next if restarted.include?(repo)
         seen[repo] = 0 if seen[repo].nil?
         if seen[repo] >= @repeats

data/lib/fbe/regularly.rb

@@ -43,12 +43,13 @@ def Fbe.regularly(area, p_every_days, p_since_days = nil, fb: Fbe.fb, judge: $ju
       (gt when (minus (to_time (env 'TODAY' '#{Time.now.utc.iso8601}')) '#{interval} days')))"
   ).each.first
   if recent
-    loog.debug(
+    loog.info(
       "#{$judge} statistics were collected #{recent.when.ago} ago, " \
       "skipping now (we run it every #{interval} days)"
     )
     return
   end
+  loog.info("#{$judge} statistics weren't collected for the last #{interval} days")
   fb.txn do |fbt|
     f = fbt.insert
     f.what = judge

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.35.0' unless const_defined?(:VERSION)
+  VERSION = '0.36.1' unless const_defined?(:VERSION)
 end

metadata

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