fbe 0.31.2 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a677f7f6496d3ae71e301f9f495b4907391bbde215407b702a8fbb956912935
-  data.tar.gz: 2afe6bbef989ffc24291cf00db87f917513469f0ae2a99ecbac4429692dbf479
+  metadata.gz: e782b5b62b94f84bcd91047a11d9597ecfd038721e98717b6d0ca880d55276d6
+  data.tar.gz: e6fce4664e48cf191f8bc36319c2b1da042932c9a1e2e1e56c96d3f9dee76ee6
 SHA512:
-  metadata.gz: ed332e9aece1b31c3cc25716dd16dea036ebffa048caaaa8028b84a91702852d146910e46b1dfb731e7cbf9d6af54f8b0fd1409e282f61be5fd2398935cb4581
-  data.tar.gz: c0edfee023e86ccc3a669111b7c68492d35d030d2d1e31f0262059f91e12839709b0f73f15a14b7b3755347b44fa3b5e157754c6babbec7dee2c2ee33ae120f9
+  metadata.gz: f11e700c5230f040bc376f333cb7752af379acb06452977a89fb6ff0be34a4217c80d2f261d845be5fe9bb934e2e35c527480a757a4c4568b8c8742550571632
+  data.tar.gz: 9df8ad3c5936aa7a0f4246e40684df7dd8408260b6561db8206827f17f6ee2963759b638da31d04443ace8759ce62a51786b023472b86df3ad35c877e2d0e76a

data/Gemfile.lock

@@ -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)

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
@@ -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
@@ -151,10 +153,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
 
@@ -215,10 +218,10 @@ class Fbe::Iterate
           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
@@ -273,17 +276,13 @@ class Fbe::Iterate
     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}")
   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.32.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.32.0
 platform: ruby
 authors:
 - Yegor Bugayenko