fbe 0.31.0 → 0.31.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2621af2f5ed4213f7137482238a6c1fc2af0f534a88b196e277cdf17bb9d27de
-  data.tar.gz: 65bfa710cd5680c579207ea1ce650c25ed743b39b835ce1500cd1b62d7d57fd4
+  metadata.gz: 3a677f7f6496d3ae71e301f9f495b4907391bbde215407b702a8fbb956912935
+  data.tar.gz: 2afe6bbef989ffc24291cf00db87f917513469f0ae2a99ecbac4429692dbf479
 SHA512:
-  metadata.gz: a0d04610b4d6bd1bf32587b73baade530e6b22aead4fffe69f0bd6067f254d4f0899701ed84bf8a38f2fc9798ab39708d71a05d0a9681d001da5d12e8c4d47e5
-  data.tar.gz: dc62b030009940330564967622a9e0c16f16bce715d0fcd9e00cb54a7e617a24bfd68e70409b98fcc7cfbcc70c1ff356286b4047530ebcf808fe2f20c68b1f55
+  metadata.gz: ed332e9aece1b31c3cc25716dd16dea036ebffa048caaaa8028b84a91702852d146910e46b1dfb731e7cbf9d6af54f8b0fd1409e282f61be5fd2398935cb4581
+  data.tar.gz: c0edfee023e86ccc3a669111b7c68492d35d030d2d1e31f0262059f91e12839709b0f73f15a14b7b3755347b44fa3b5e157754c6babbec7dee2c2ee33ae120f9

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.7
+      - uses: crate-ci/typos@v1.36.2
         with:
           config: .github/.typos.toml

data/Gemfile.lock

@@ -189,7 +189,7 @@ GEM
     regexp_parser (2.11.2)
     retries (0.0.5)
     rexml (3.4.2)
-    rubocop (1.80.1)
+    rubocop (1.80.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

data/lib/fbe/conclude.rb

@@ -199,7 +199,7 @@ class Fbe::Conclude
     oct = Fbe.octo(loog: @loog, options: @options, global: @global)
     @fb.query(@query).each do |a|
       if @quota_aware && oct.off_quota?
-        @loog.debug('We ran out of GitHub quota, must stop here')
+        @loog.info('We ran out of GitHub quota, must stop here')
         break
       end
       if @lifetime_aware && @options.lifetime && Time.now - @start > @options.lifetime - 10

data/lib/fbe/fb.rb

@@ -44,8 +44,12 @@ def Fbe.fb(fb: $fb, global: $global, options: $options, loog: $loog)
           max = fbt.query('(max _id)').one
           f._id = (max.nil? ? 0 : max) + 1
           f._time = Time.now
-          f._version = "#{Factbase::VERSION}/#{Judges::VERSION}/#{options.action_version}"
-          f._job = options.job_id unless options.job_id.nil?
+          f._version = [
+            Factbase::VERSION,
+            Judges::VERSION,
+            options.action_version
+          ].compact.join('/')
+          f._job = options.job_id.to_i if options.job_id
         end
       Factbase::Impatient.new(
         Factbase::Logged.new(

data/lib/fbe/iterate.rb

@@ -201,7 +201,7 @@ class Fbe::Iterate
     seen = {}
     oct = Fbe.octo(loog: @loog, options: @options, global: @global)
     if oct.off_quota?
-      @loog.debug('We are off GitHub quota, cannot even start, sorry')
+      @loog.info('We are off GitHub quota, cannot even start, sorry')
       return
     end
     repos = Fbe.unmask_repos(
@@ -234,7 +234,7 @@ class Fbe::Iterate
       end
       repos.each do |repo|
         if @quota_aware && oct.off_quota?
-          @loog.debug("We are off GitHub quota, we must skip #{repo}")
+          @loog.info("We are off GitHub quota, we must skip #{repo}")
           break
         end
         if Time.now - start > timeout

data/lib/fbe/octo.rb

@@ -164,7 +164,7 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
           def off_quota?(threshold: 50)
             left = @origin.rate_limit!.remaining
             if left < threshold
-              @loog.info("Too much GitHub API quota consumed already (#{left} < #{threshold}), stopping")
+              @loog.info("Too much GitHub API quota consumed already (#{left} < #{threshold})")
               true
             else
               @loog.debug("Still #{left} GitHub API quota left (>#{threshold})")
@@ -712,29 +712,40 @@ class Fbe::FakeOctokit
   #   client.pull_request('octocat/Hello-World', 1)
   #   # => {:id=>42, :number=>1, :additions=>12, ...}
   def pull_request(repo, number)
-    {
-      id: 42,
-      number:,
-      repo: {
-        full_name: repo
-      },
-      base: {
+    if number == 29
+      {
+        id: 42,
+        number:,
+        user: { id: 421, login: 'user' },
+        created_at: Time.parse('2024-08-20 15:35:30 UTC'),
+        additions: 12,
+        deletions: 5
+      }
+    else
+      {
+        id: 42,
+        number:,
         repo: {
           full_name: repo
-        }
-      },
-      state: 'closed',
-      user: { login: 'yegor256', id: 526_301, type: 'User' },
-      head: { ref: 'master', sha: '6dcb09b5b57875f334f61aebed695e2e4193db5e' },
-      additions: 12,
-      deletions: 5,
-      changed_files: 3,
-      comments: 2,
-      review_comments: 2,
-      closed_at: Time.parse('2024-12-20'),
-      merged_at: Time.parse('2024-12-20'),
-      created_at: Time.parse('2024-09-20')
-    }
+        },
+        base: {
+          repo: {
+            full_name: repo
+          }
+        },
+        state: 'closed',
+        user: { login: 'yegor256', id: 526_301, type: 'User' },
+        head: { ref: 'master', sha: '6dcb09b5b57875f334f61aebed695e2e4193db5e' },
+        additions: 12,
+        deletions: 5,
+        changed_files: 3,
+        comments: 2,
+        review_comments: 2,
+        closed_at: Time.parse('2024-12-20'),
+        merged_at: Time.parse('2024-12-20'),
+        created_at: Time.parse('2024-09-20')
+      }
+    end
   end
 
   # Lists pull requests for a repository.
@@ -831,6 +842,13 @@ class Fbe::FakeOctokit
     ]
   end
 
+  def pull_request_review_comments(_repo, _number, _review, _options = {})
+    [
+      { id: 22_447_120, user: { login: 'yegor256', id: 526_301, type: 'User' } },
+      { id: 22_447_121, user: { login: 'yegor256', id: 526_301, type: 'User' } }
+    ]
+  end
+
   def review_comments(_repo, _number)
     [
       {

data/lib/fbe/tombstone.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
 # SPDX-License-Identifier: MIT
 
+require 'securerandom'
 require_relative '../fbe'
 require_relative 'fb'
 require_relative 'if_absent'
@@ -38,20 +39,14 @@ class Fbe::Tombstone
     issue.each do |i|
       nn << [i, i]
     end
-    nn = nn.sort_by(&:first)
-    merged = []
-    nn.each do |a, b|
-      if merged.empty?
-        merged << [a, b]
-      else
-        last = merged[-1]
-        if last[1] == a - 1
-          last[1] = b
+    merged =
+      nn.sort.each_with_object([]) do |(a, b), merged|
+        if !merged.empty? && merged[-1][0] <= a && a <= merged[-1][1] + 1
+          merged[-1][1] = b if b > merged[-1][1]
         else
           merged << [a, b]
         end
       end
-    end
     Fbe.overwrite(f, 'issues', merged.map { |ii| "#{ii[0]}-#{ii[1]}" }, fb: @fb, fid: @fid)
   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.0' unless const_defined?(:VERSION)
+  VERSION = '0.31.2' unless const_defined?(:VERSION)
 end

metadata

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