fbe 0.48.4 → 0.48.6

data/lib/fbe/over.rb

@@ -22,9 +22,13 @@ def Fbe.over?(
   epoch: $epoch || Time.now, kickoff: $kickoff || Time.now,
   quota_aware: true, lifetime_aware: true, timeout_aware: true
 )
-  if quota_aware && Fbe.octo(loog:, options:, global:).off_quota?(threshold: 100)
-    loog.info('We are off GitHub quota, time to stop')
-    return true
+  if quota_aware
+    octo = Fbe.octo(loog:, options:, global:)
+    if octo.off_quota?(threshold: 100, resource: :core) ||
+       octo.off_quota?(resource: :search, threshold: 10)
+      loog.info('We are off GitHub quota, time to stop')
+      return true
+    end
   end
   if lifetime_aware && options.lifetime && Time.now - epoch > options.lifetime * 0.9
     loog.info("We ran out of lifetime (#{epoch.ago} already), must stop here")

data/lib/fbe/overwrite.rb

@@ -40,19 +40,41 @@ def Fbe.overwrite(fact, property_or_hash, values = nil, fb: Fbe.fb, fid: '_id')
       before[k.to_s] = fact[k]
     end
     modified = false
+    overwrites = false
     property_or_hash.each do |k, vv|
+      sk = k.to_s
       raise(Fbe::Error, "The value for #{k} is nil") if vv.nil?
       vv = [vv] unless vv.is_a?(Array)
-      next if before[k.to_s] == vv
-      before[k.to_s] = vv
+      existing = before[sk]
+      next if existing == vv
+      before[sk] = vv
       modified = true
+      overwrites = true unless existing.nil?
     end
     return fact unless modified
+    unless overwrites
+      property_or_hash.each do |k, vv|
+        sk = k.to_s
+        next unless fact[sk].nil?
+        vv = [vv] unless vv.is_a?(Array)
+        vv.each do |v|
+          fact.public_send(:"#{sk}=", v)
+        end
+      end
+      return
+    end
     id = fact[fid]&.first
     raise(Fbe::Error, "There is no #{fid} in the fact, cannot use Fbe.overwrite") if id.nil?
     raise(Fbe::Error, "No facts by #{fid} = #{id}") if fb.query("(eq #{fid} #{id})").delete!.zero?
     fb.txn do |fbt|
       n = fbt.insert
+      f = n
+      while f.instance_variable_defined?(:@fact) || f.instance_variable_defined?(:@origin)
+        iv = f.instance_variable_defined?(:@fact) ? :@fact : :@origin
+        f = f.instance_variable_get(iv)
+      end
+      map = f.instance_variable_get(:@map)
+      %w[_id _time _version _job].each { |k| map.delete(k) if before.key?(k) }
       before.each do |k, vv|
         next unless n[k].nil?
         vv.each do |v|
@@ -82,6 +104,13 @@ def Fbe.overwrite(fact, property_or_hash, values = nil, fb: Fbe.fb, fid: '_id')
   raise(Fbe::Error, "No facts by #{fid} = #{id}") if fb.query("(eq #{fid} #{id})").delete!.zero?
   fb.txn do |fbt|
     n = fbt.insert
+    f = n
+    while f.instance_variable_defined?(:@fact) || f.instance_variable_defined?(:@origin)
+      iv = f.instance_variable_defined?(:@fact) ? :@fact : :@origin
+      f = f.instance_variable_get(iv)
+    end
+    map = f.instance_variable_get(:@map)
+    %w[_id _time _version _job].each { |k| map.delete(k) if before.key?(k) }
     before[property.to_s] = values
     before.each do |k, vv|
       next unless n[k].nil?

data/lib/fbe/pmp.rb

@@ -28,6 +28,13 @@ require_relative 'fb'
 #   Fbe.pmp.cost.hourly_rate
 #   Fbe.pmp.time.deadline
 #
+# Custom areas (not defined in +assets/pmp.xml+) are also supported. When
+# accessing a property through a custom area, the returned value is read
+# directly from the factbase without XML defaults or type coercion. The
+# returned +Pmpv+ object will have +nil+ for +default+, +type+, and +memo+.
+#
+#   Fbe.pmp.my_custom.my_prop  # reads from factbase, no XML defaults
+#
 # @param [Factbase] fb The factbase
 # @param [Hash] global The hash for global caching
 # @param [Judges::Options] options The options coming from the +judges+ tool
@@ -42,7 +49,10 @@ require_relative 'fb'
 #
 #   # Get deadline from time area
 #   deadline = Fbe.pmp.time.deadline
-def Fbe.pmp(fb: Fbe.fb, global: $global, options: $options, loog: $loog) # rubocop:disable Metrics/AbcSize
+#
+#   # Read custom property (nil default/type/memo)
+#   val = Fbe.pmp.my_custom.my_prop
+def Fbe.pmp(fb: Fbe.fb, global: $global, options: $options, loog: $loog) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   xml = Nokogiri::XML(File.read(File.join(__dir__, '../../assets/pmp.xml')))
   pmpv =
     Class.new(SimpleDelegator) do
@@ -55,6 +65,7 @@ def Fbe.pmp(fb: Fbe.fb, global: $global, options: $options, loog: $loog) # ruboc
         @memo = memo
       end
     end
+  query = ->(area) { Fbe.fb(global:, fb:, options:, loog:).query("(and (eq what 'pmp') (eq area '#{area}'))") }
   Class.new do
     define_method(:areas) do
       xml.xpath('/pmp/area/@name').map(&:value)
@@ -62,42 +73,53 @@ def Fbe.pmp(fb: Fbe.fb, global: $global, options: $options, loog: $loog) # ruboc
     others do |*args1|
       area = args1.first.to_s
       node = xml.at_xpath("/pmp/area[@name='#{area}']")
-      raise Fbe::Error, "Unknown area #{area.inspect}" if node.nil?
-      Class.new do
-        define_method(:properties) do
-          node.xpath('p/name').map(&:text)
-        end
-        others do |*args2|
-          param = args2.first.to_s
-          f = Fbe.fb(global:, fb:, options:, loog:).query("(and (eq what 'pmp') (eq area '#{area}'))").each.first
-          result = f&.[](param)&.first
-          prop = node.at_xpath("p[name='#{param}']")
-          default = nil
-          type = nil
-          memo = nil
-          if prop
-            default = prop.at_xpath('default').text
-            type = prop.at_xpath('type').text
-            memo = prop.at_xpath('memo').text
-            default =
+      if node.nil?
+        Class.new do
+          define_method(:properties) do
+            query.call(area).each.first&.all_properties&.map(&:to_s) || []
+          end
+          others do |*args2|
+            param = args2.first.to_s
+            result = query.call(area).each.first&.[](param)&.first
+            pmpv.new(result, nil, nil, nil)
+          end
+        end.new
+      else
+        Class.new do
+          define_method(:properties) do
+            node.xpath('p/name').map(&:text)
+          end
+          others do |*args2|
+            param = args2.first.to_s
+            result = query.call(area).each.first&.[](param)&.first
+            prop = node.at_xpath("p[name='#{param}']")
+            default = nil
+            type = nil
+            memo = nil
+            if prop
+              default = prop.at_xpath('default').text
+              type = prop.at_xpath('type').text
+              memo = prop.at_xpath('memo').text
+              default =
+                case type
+                when 'int' then Integer(default, 10)
+                when 'float' then Float(default)
+                when 'bool' then default == 'true'
+                else default
+                end
+            end
+            result ||= default
+            result =
               case type
-              when 'int' then Integer(default, 10)
-              when 'float' then Float(default)
-              when 'bool' then default == 'true'
-              else default
+              when 'int' then Integer(Float(result).truncate)
+              when 'float' then Float(result)
+              when 'bool' then result.to_s == 'true'
+              else result
               end
+            pmpv.new(result, default, type, memo)
           end
-          result ||= default
-          result =
-            case type
-            when 'int' then Integer(Float(result).truncate)
-            when 'float' then Float(result)
-            when 'bool' then result == 'true'
-            else result
-            end
-          pmpv.new(result, default, type, memo)
-        end
-      end.new
+        end.new
+      end
     end
   end.new
 end

data/lib/fbe/regularly.rb

@@ -44,18 +44,18 @@ def Fbe.regularly(area, p_every_days, p_since_days = nil, fb: Fbe.fb, judge: $ju
   ).each.first
   if recent
     loog.info(
-      "#{$judge} statistics were collected #{recent.when.ago} ago, " \
+      "#{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")
+  loog.info("#{judge} statistics weren't collected for the last #{interval} days")
   fb.txn do |fbt|
     f = fbt.insert
     f.what = judge
     f.when = Time.now
     unless p_since_days.nil?
-      days = pmp.nil? ? 28 : pmp[p_since_days].first
+      days = pmp.nil? || pmp[p_since_days].nil? ? 28 : pmp[p_since_days].first
       since = Time.now - (days * 24 * 60 * 60)
       f.since = since
     end

data/lib/fbe/repeatedly.rb

@@ -45,7 +45,7 @@ def Fbe.repeatedly(area, p_every_hours, fb: Fbe.fb, judge: $judge, loog: $loog,
       (gt when (minus (to_time (env 'TODAY' '#{Time.now.utc.iso8601}')) '#{hours} hours')))"
   ).each.first
   if recent
-    loog.info("#{$judge} was executed #{recent.when.ago} ago, skipping now (we run it every #{hours} hours)")
+    loog.info("#{judge} was executed #{recent.when.ago} ago, skipping now (we run it every #{hours} hours)")
     return
   end
   f = fb.query("(and (eq what '#{judge}'))").each.first
@@ -53,7 +53,7 @@ def Fbe.repeatedly(area, p_every_hours, fb: Fbe.fb, judge: $judge, loog: $loog,
     f = fb.insert
     f.what = judge
   end
-  Fbe.overwrite(f, 'when', Time.now)
   yield(fb.query("(and (eq what '#{judge}'))").each.first)
+  Fbe.overwrite(f, 'when', Time.now)
   nil
 end

data/lib/fbe/sec.rb

@@ -10,21 +10,20 @@ require_relative '../fbe'
 #
 # The number of seconds is taken from the +fact+ provided, usually stored
 # there in the +seconds+ property. The seconds are formatted into a
-# human-readable string like "3 days ago" or "5 hours ago" using the
-# tago gem.
+# compact human-readable string like "3d" or "5h" using the tago gem.
 #
 # @param [Factbase::Fact] fact The fact containing the seconds property
 # @param [String, Symbol] prop The property name with seconds (defaults to :seconds)
-# @return [String] Human-readable time interval (e.g., "2 weeks ago", "3 hours ago")
+# @return [String] Human-readable time interval (e.g., "2w", "3h", "5m33s")
 # @raise [RuntimeError] If the specified property doesn't exist in the fact
 # @note Uses the tago gem's ago method for formatting
 # @example Format elapsed time from a fact
 #   build_fact = fb.query('(eq type "build")').first
 #   build_fact.duration = 7200  # 2 hours in seconds
-#   puts Fbe.sec(build_fact, :duration)  # => "2 hours ago"
+#   puts Fbe.sec(build_fact, :duration)  # => "2h"
 def Fbe.sec(fact, prop = :seconds)
   s = fact[prop.to_s]
   raise(Fbe::Error, "There is no #{prop.inspect} property") if s.nil?
   s = Integer(s.first.to_s, 10)
-  (Time.now + s).ago
+  (Time.now - s).ago
 end

data/lib/fbe/tombstone.rb

@@ -56,7 +56,7 @@ class Fbe::Tombstone
         n.where = where
         n.repository = repo
       end
-    f.public_send(:"#{@fid}=", SecureRandom.random_number(99_999)) if f[@fid].nil?
+    f.public_send(:"#{@fid}=", SecureRandom.random_number(9_999_999_999_999)) if f[@fid].nil?
     nn = f['issues']&.map do |ii|
       ii.split('-').map do |i|
         Integer(i, 10)

data/lib/fbe/unmask_repos.rb

@@ -24,7 +24,7 @@ require_relative 'over'
 def Fbe.mask_to_regex(mask)
   org, repo = mask.split('/')
   raise(Fbe::Error, "Org '#{org}' can't have an asterisk") if org.include?('*')
-  Regexp.compile("#{org}/#{repo.gsub('*', '.*')}", Regexp::IGNORECASE)
+  Regexp.compile("\\A#{Regexp.escape(org)}/#{Regexp.escape(repo).gsub('\\*', '.*')}\\z", Regexp::IGNORECASE)
 end
 
 # Resolves repository masks to actual GitHub repository names.
@@ -96,7 +96,6 @@ def Fbe.unmask_repos( # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticCompl
   raise(Fbe::Error, "No repos found matching: #{options.repositories.inspect}") if repos.empty?
   repos.shuffle!
   loog.debug("Scanning #{repos.size} repositories: #{repos.joined}...")
-  repos.each { |repo| octo.repository(repo) }
   return repos unless block_given?
   repos.each do |repo|
     break if Fbe.over?(global:, options:, loog:, epoch:, kickoff:, quota_aware:, lifetime_aware:, timeout_aware:)

data/lib/fbe.rb

@@ -9,6 +9,6 @@
 # Copyright:: Copyright (c) 2024-2026 Zerocracy
 # License:: MIT
 module Fbe
-  VERSION = '0.48.4' unless const_defined?(:VERSION)
+  VERSION = '0.48.6' 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.4
+  version: 0.48.6
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -356,6 +356,7 @@ files:
 - ".gitignore"
 - ".pdd"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".rultor.yml"
 - ".yamllint.yml"
 - Gemfile
@@ -386,6 +387,7 @@ files:
 - lib/fbe/delete.rb
 - lib/fbe/delete_one.rb
 - lib/fbe/enter.rb
+- lib/fbe/fake_octokit.rb
 - lib/fbe/fb.rb
 - lib/fbe/github_graph.rb
 - lib/fbe/if_absent.rb
@@ -422,7 +424,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="