fbe 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adc685c3339da51fe5383adf29077dbd80f69119ee9b0586c2057a4306f5fdf8
-  data.tar.gz: d32fc6fa6429d9cd5496ccd9e3713eb58addb2a7d5c33e95110d862c190c2816
+  metadata.gz: 22c7a8e786ff71b8449f19751665bc82f32ba777248218bcac806b76b8be3fa2
+  data.tar.gz: 361d1413b6649089e1ba3e8b499d60540b25261da616b94ac56687fe1af1b7fe
 SHA512:
-  metadata.gz: d3adb34a8a544118f6d29ebf354714f2fea1dc8b402a81ecf0047d64abc009855c5acb909b7eba9fa9fe860531a053750a8e78c671019967da3178b8d147e5c8
-  data.tar.gz: 1d05a3074bc928d4eec38529866ef39e11f077f30c8906be3af99a124b89155bcd0ed2ab69a4bb258d2337fa85484c1c8d9b1ecf0e60169d1d81f0cc5e862037
+  metadata.gz: 04b8c247dda95f931519f496cab03d02c8d912eafc0d2114e1dd21d507a9b81ed156d26accd2f5be50394cc3dec1fe4c86d4c0415f4f0a8a5c4d1eccef3510b8
+  data.tar.gz: 75f0f3ca32b28aee6d1206975bb066b7da7c022f9bee785c723d2a88585cce70ec6e7c5da201418676c0b56bda9db385f8af2ddd0557d157137e5dc3241c3563

data/Gemfile.lock

@@ -121,7 +121,7 @@ GEM
     iri (0.11.2)
     joined (0.4.0)
     json (2.13.2)
-    judges (0.53.1)
+    judges (0.53.3)
       backtrace (~> 0.4)
       baza.rb (~> 0.5)
       concurrent-ruby (~> 1.2)
@@ -188,7 +188,7 @@ GEM
     rake (13.3.0)
     regexp_parser (2.11.2)
     retries (0.0.5)
-    rexml (3.4.1)
+    rexml (3.4.2)
     rubocop (1.80.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
@@ -223,7 +223,7 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-cobertura (3.0.0)
+    simplecov-cobertura (3.1.0)
       rexml
       simplecov (~> 0.19)
     simplecov-html (0.13.2)

data/lib/fbe/if_absent.rb

@@ -30,6 +30,7 @@ require_relative 'fb'
 # time of its first creation.
 #
 # @param [Factbase] fb The factbase to check and insert into (defaults to Fbe.fb)
+# @param [Boolean] always If true, return the object in any case
 # @yield [Factbase::Fact] A proxy fact object to set properties on
 # @return [nil, Factbase::Fact] nil if fact exists, otherwise the newly created fact
 # @note String values are properly escaped in queries
@@ -45,7 +46,7 @@ require_relative 'fb'
 #   else
 #     puts "User already exists"
 #   end
-def Fbe.if_absent(fb: Fbe.fb)
+def Fbe.if_absent(fb: Fbe.fb, always: false)
   attrs = {}
   f =
     others(map: attrs) do |*args|
@@ -71,7 +72,8 @@ def Fbe.if_absent(fb: Fbe.fb)
     "(eq #{k} #{vv})"
   end.join(' ')
   q = "(and #{q})"
-  before = fb.query(q).each.to_a.first
+  before = fb.query(q).each.first
+  return before if before && always
   return nil if before
   n = fb.insert
   attrs.each { |k, v| n.send(:"#{k}=", v) }

data/lib/fbe/iterate.rb

@@ -212,6 +212,10 @@ class Fbe::Iterate
         @loog.info("We are off GitHub quota, time to stop after #{start.ago}")
         break
       end
+      if Time.now - start > timeout
+        @loog.info('We are over time, it is time to stop')
+        break
+      end
       repos.each do |repo|
         if @quota_aware && oct.off_quota?
           @loog.debug("We are off GitHub quota, we must skip #{repo}")

data/lib/fbe/overwrite.rb

@@ -17,7 +17,7 @@ require_relative 'fb'
 #
 # @param [Factbase::Fact] fact The fact to modify (must have _id property)
 # @param [String] property The name of the property to set
-# @param [Any] value The value to set (can be any type)
+# @param [Any] value The value to set (can be any type, including array)
 # @param [Factbase] fb The factbase to use (defaults to Fbe.fb)
 # @return [nil] Nothing
 # @raise [RuntimeError] If fact is nil, has no _id, or property is not a String
@@ -27,7 +27,7 @@ require_relative 'fb'
 #   user = fb.query('(eq login "john")').first
 #   updated_user = Fbe.overwrite(user, 'status', 'active')
 #   # All properties preserved, only 'status' is set to 'active'
-def Fbe.overwrite(fact, property, value, fb: Fbe.fb)
+def Fbe.overwrite(fact, property, value, fb: Fbe.fb, fid: '_id')
   raise 'The fact is nil' if fact.nil?
   raise 'The fb is nil' if fb.nil?
   raise "The property is not a String but #{property.class} (#{property})" unless property.is_a?(String)
@@ -36,12 +36,12 @@ def Fbe.overwrite(fact, property, value, fb: Fbe.fb)
   fact.all_properties.each do |prop|
     before[prop.to_s] = fact[prop]
   end
-  id = fact['_id']&.first
-  raise 'There is no _id in the fact, cannot use Fbe.overwrite' if id.nil?
-  raise "No facts by _id = #{id}" if fb.query("(eq _id #{id})").delete!.zero?
+  id = fact[fid]&.first
+  raise "There is no #{fid} in the fact, cannot use Fbe.overwrite" if id.nil?
+  raise "No facts by #{fid} = #{id}" if fb.query("(eq #{fid} #{id})").delete!.zero?
   fb.txn do |fbt|
     n = fbt.insert
-    before[property.to_s] = [value]
+    before[property.to_s] = value.is_a?(Array) ? value : [value]
     before.each do |k, vv|
       next unless n[k].nil?
       vv.each do |v|

data/lib/fbe/tombstone.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
+# SPDX-License-Identifier: MIT
+
+require_relative '../fbe'
+require_relative 'fb'
+require_relative 'if_absent'
+require_relative 'overwrite'
+
+# Checks whether an issue is already under a tombstone.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024-2025 Zerocracy
+# License:: MIT
+class Fbe::Tombstone
+  # Ctor.
+  # @param [Factbase] fb The factbase to use (defaults to Fbe.fb)
+  def initialize(fb: Fbe.fb, fid: '_id')
+    @fb = fb
+    @fid = fid
+  end
+
+  # Put it there.
+  # @param [Integer] repo ID of repository
+  # @param [Integer] issue ID of issue
+  def bury!(repo, issue)
+    f =
+      Fbe.if_absent(fb: @fb, always: true) do |n|
+        n.what = 'tombstone'
+        n.repository = 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 << [issue, issue]
+    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
+        else
+          merged << [a, b]
+        end
+      end
+    end
+    Fbe.overwrite(f, 'issues', merged.map { |ii| "#{ii[0]}-#{ii[1]}" }, fb: @fb, fid: @fid)
+  end
+
+  # Is it there?
+  # @param [Integer] repo ID of repository
+  # @param [Integer] issue ID of issue
+  # @return [Boolean] True if it's there
+  def has?(repo, issue)
+    f = @fb.query(
+      "(and (eq what 'tombstone') (eq repository #{repo}) (exists issues))"
+    ).each.first
+    return false if f.nil?
+    f['issues'].any? do |ii|
+      a, b = ii.split('-').map(&:to_i)
+      (a..b).cover?(issue)
+    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.27.0' unless const_defined?(:VERSION)
+  VERSION = '0.28.0' unless const_defined?(:VERSION)
 end

data/test/fbe/test_iterate.rb

@@ -31,6 +31,21 @@ class TestIterate < Fbe::Test
     assert_equal(4, fb.size)
   end
 
+  def test_stops_on_timeout
+    opts = Judges::Options.new(['repositories=foo/bar', 'testing=true'])
+    fb = Factbase.new
+    fb.insert.foo = 42
+    Fbe.iterate(fb:, loog: Loog::NULL, options: opts, global: {}) do
+      as 'labels-were-scanned'
+      by '(agg (always) (max foo))'
+      repeats 2
+      over(timeout: 0.1) do
+        sleep 0.2
+      end
+    end
+    assert_equal(2, fb.size)
+  end
+
   def test_many_repeats
     opts = Judges::Options.new(['repositories=foo/bar,foo/second', 'testing=true'])
     cycles = 0

data/test/fbe/test_tombstone.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
+# SPDX-License-Identifier: MIT
+
+require 'factbase'
+require_relative '../../lib/fbe/tombstone'
+require_relative '../test__helper'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024-2025 Zerocracy
+# License:: MIT
+class TestTombstone < Fbe::Test
+  def test_simple
+    fb = Factbase.new
+    ts = Fbe::Tombstone.new(fb:)
+    ts.bury!(41, 13)
+    ts.bury!(42, 13)
+    ts.bury!(42, 999)
+    assert(ts.has?(41, 13))
+    assert(ts.has?(42, 999))
+    refute(ts.has?(8, 7))
+    refute(ts.has?(43, 999))
+    refute(ts.has?(43, 990))
+  end
+
+  def test_on_empty
+    fb = Factbase.new
+    ts = Fbe::Tombstone.new(fb:)
+    refute(ts.has?(8, 7))
+  end
+
+  def test_merges_them
+    fb = Factbase.new
+    ts = Fbe::Tombstone.new(fb:)
+    ts.bury!(42, 13)
+    ts.bury!(42, 18)
+    ts.bury!(42, 14)
+    ts.bury!(42, 17)
+    ts.bury!(42, 15)
+    ts.bury!(42, 16)
+    assert(ts.has?(42, 16))
+    refute(ts.has?(42, 22))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -387,6 +387,7 @@ files:
 - lib/fbe/regularly.rb
 - lib/fbe/repeatedly.rb
 - lib/fbe/sec.rb
+- lib/fbe/tombstone.rb
 - lib/fbe/unmask_repos.rb
 - lib/fbe/who.rb
 - renovate.json
@@ -414,6 +415,7 @@ files:
 - test/fbe/test_regularly.rb
 - test/fbe/test_repeatedly.rb
 - test/fbe/test_sec.rb
+- test/fbe/test_tombstone.rb
 - test/fbe/test_unmask_repos.rb
 - test/fbe/test_who.rb
 - test/test__helper.rb