fbe 0.37.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c4277fcddc577e646187cc3d3743de609385c1021bbd21382d4aaf0056cbd8
-  data.tar.gz: 140f785a6b8f9707c916eccc070999d84eeb3eeb7fd78dbe263506601a806632
+  metadata.gz: 04d71d826c4bd4c4ee4a8b22f04561ca31cc997f4e398f129e7d792d65a898ef
+  data.tar.gz: 7a95d256e71402d57fcf2e5f47d77a70c1edb4112bd961344b879470ededfe77
 SHA512:
-  metadata.gz: b03e2a36505b3699fa81962ad8534067de0301f21d565a3aef08c0bb3591ab2fec20fcb8fa66204501ea02edfd722de31f87a9b2e293bdf3b924e6c80cb43713
-  data.tar.gz: 912f5403cb51c1eec1b9c4fe6014f6f089ca2057fabfb8169e17c349b3a2ff5ed2d072a06e8327a6b6d650ac2b8c0580b58b0cb47ddc61d3bed9e4d0542e0244
+  metadata.gz: 2e21419e49aeebc86275f380df70423c030fad50c83626d8b45a28716589d75047fce9e8ee0ea81b5c5b6dd6bf7324a1f0d07625d28c750bef3de1d3324a4e28
+  data.tar.gz: e8c45307769eea587953ecb193c2516da44020007a5b8e0c45516f8f71a78100758e38fdc3224c707f50e95459ad37695a0848b7129dae868be2989b4351a5a7

data/Gemfile.lock

@@ -76,7 +76,7 @@ GEM
     ellipsized (0.3.0)
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    factbase (0.16.5)
+    factbase (0.16.7)
       backtrace (~> 0.4)
       decoor (~> 0.1)
       ellipsized (~> 0.3)

data/lib/fbe/conclude.rb

@@ -16,17 +16,19 @@ require_relative 'octo'
 # @param [Hash] global The hash for global caching
 # @param [Judges::Options] options The options coming from the +judges+ tool
 # @param [Loog] loog The logging facility
+# @param [Time] epoch When the entire update started
+# @param [Time] kickoff When the particular judge started
 # @yield [Factbase::Fact] The fact
 def Fbe.conclude(
   fb: Fbe.fb, judge: $judge, loog: $loog, options: $options, global: $global,
-  start: $start, &
+  epoch: $epoch || Time.now, kickoff: $kickoff || Time.now, &
 )
   raise 'The fb is nil' if fb.nil?
   raise 'The $judge is not set' if judge.nil?
   raise 'The $global is not set' if global.nil?
   raise 'The $options is not set' if options.nil?
   raise 'The $loog is not set' if loog.nil?
-  c = Fbe::Conclude.new(fb:, judge:, loog:, options:, global:, start:)
+  c = Fbe::Conclude.new(fb:, judge:, loog:, options:, global:, epoch:, kickoff:)
   c.instance_eval(&)
 end
 
@@ -61,13 +63,16 @@ class Fbe::Conclude
   # @param [Hash] global The hash for global caching
   # @param [Judges::Options] options The options coming from the +judges+ tool
   # @param [Loog] loog The logging facility
-  def initialize(fb:, judge:, global:, options:, loog:, start:)
+  # @param [Time] epoch When the entire update started
+  # @param [Time] kickoff When the particular judge started
+  def initialize(fb:, judge:, global:, options:, loog:, epoch:, kickoff:)
     @fb = fb
     @judge = judge
     @loog = loog
     @options = options
     @global = global
-    @start = start
+    @epoch = epoch
+    @kickoff = kickoff
     @query = nil
     @follows = []
     @lifetime_aware = true
@@ -192,18 +197,17 @@ 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 (#{@start.ago} already), must stop here")
+      if @lifetime_aware && @options.lifetime && Time.now - @epoch > @options.lifetime * 0.9
+        @loog.debug("We ran out of lifetime (#{@epoch.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")
+      if @timeout_aware && @options.timeout && Time.now - @kickoff > @options.timeout * 0.9
+        @loog.debug("We've spent more than #{kickoff.ago}, must stop here")
         break
       end
       @fb.txn do |fbt|

data/lib/fbe/consider.rb

@@ -15,13 +15,15 @@ require_relative 'fb'
 # @param [Hash] global The hash for global caching
 # @param [Judges::Options] options The options coming from the +judges+ tool
 # @param [Loog] loog The logging facility
+# @param [Time] epoch When the entire update started
+# @param [Time] kickoff When the particular judge started
 # @yield [Factbase::Fact] The fact
 def Fbe.consider(
   query,
   fb: Fbe.fb, judge: $judge, loog: $loog, options: $options, global: $global,
-  start: $start, &
+  epoch: $epoch || Time.now, kickoff: $kickoff || Time.now, &
 )
-  Fbe.conclude(fb:, judge:, loog:, options:, global:, start:) do
+  Fbe.conclude(fb:, judge:, loog:, options:, global:, epoch:, kickoff:) do
     on query
     consider(&)
   end

data/lib/fbe/iterate.rb

@@ -37,12 +37,15 @@ require_relative 'unmask_repos'
 #       issue_id + 1
 #     end
 #   end
-def Fbe.iterate(fb: Fbe.fb, loog: $loog, options: $options, global: $global, start: $start, &)
+def Fbe.iterate(
+  fb: Fbe.fb, loog: $loog, options: $options, global: $global,
+  epoch: $epoch || Time.now, kickoff: $kickoff || Time.now, &
+)
   raise 'The fb is nil' if fb.nil?
   raise 'The $global is not set' if global.nil?
   raise 'The $options is not set' if options.nil?
   raise 'The $loog is not set' if loog.nil?
-  c = Fbe::Iterate.new(fb:, loog:, options:, global:, start:)
+  c = Fbe::Iterate.new(fb:, loog:, options:, global:, epoch:, kickoff:)
   c.instance_eval(&)
 end
 
@@ -84,12 +87,13 @@ class Fbe::Iterate
   # @param [Loog] loog The logging facility for debug output
   # @param [Judges::Options] options The options containing repository configuration
   # @param [Hash] global The hash for global caching of API responses
-  def initialize(fb:, loog:, options:, global:, start:)
+  def initialize(fb:, loog:, options:, global:, epoch:, kickoff:)
     @fb = fb
     @loog = loog
     @options = options
     @global = global
-    @start = start
+    @epoch = epoch
+    @kickoff = kickoff
     @label = nil
     @since = 0
     @query = nil
@@ -227,7 +231,6 @@ class Fbe::Iterate
       loog: @loog, options: @options, global: @global, quota_aware: @quota_aware
     ).map { |n| oct.repo_id_by_name(n) }
     restarted = []
-    started = Time.now
     before =
       repos.to_h do |repo|
         [
@@ -247,12 +250,12 @@ class Fbe::Iterate
         @loog.info("We are off GitHub quota, time to stop after #{started.ago}")
         break
       end
-      if @lifetime_aware && @options.lifetime && Time.now - @start > @options.lifetime - 10
-        @loog.debug("We ran out of lifetime (#{@start.ago} already), must stop here")
+      if @lifetime_aware && @options.lifetime && Time.now - @epoch > @options.lifetime * 0.9
+        @loog.debug("We ran out of lifetime (#{@epoch.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")
+      if @timeout_aware && @options.timeout && Time.now - @kickoff > @options.timeout * 0.9
+        @loog.debug("We've spent more than #{@kickoff.ago}, must stop here")
         break
       end
       repos.each do |repo|
@@ -260,12 +263,12 @@ class Fbe::Iterate
           @loog.info("We are off GitHub quota, we must skip #{repo}")
           break
         end
-        if @lifetime_aware && @options.lifetime && Time.now - @start > @options.lifetime - 10
-          @loog.info("We are working for #{@start.ago} already, won't check repository ##{repo}")
+        if @lifetime_aware && @options.lifetime && Time.now - @epoch > @options.lifetime * 0.9
+          @loog.info("We are working for #{@epoch.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}")
+        if @timeout_aware && @options.timeout && Time.now - @kickoff > @options.timeout * 0.9
+          @loog.debug("We've spent more than #{@kickoff.ago}, won't check repository ##{repo}")
           break
         end
         next if restarted.include?(repo)
@@ -290,11 +293,11 @@ class Fbe::Iterate
         seen[repo] += 1
       end
       unless seen.any? { |r, v| v < @repeats && !restarted.include?(r) }
-        @loog.debug("No more repos to scan (out of #{repos.size}), quitting after #{started.ago}")
+        @loog.debug("No more repos to scan (out of #{repos.size}), quitting after #{@kickoff.ago}")
         break
       end
       if restarted.size == repos.size
-        @loog.debug("All #{repos.size} repos restarted, quitting after #{started.ago}")
+        @loog.debug("All #{repos.size} repos restarted, quitting after #{@kickoff.ago}")
         break
       end
     end
@@ -308,6 +311,6 @@ class Fbe::Iterate
         end
       Fbe.overwrite(f, @label, before[repo], fb: @fb)
     end
-    @loog.debug("Finished scanning #{repos.size} repos in #{started.ago}: #{seen.map { |k, v| "#{k}:#{v}" }.joined}")
+    @loog.debug("Finished scanning #{repos.size} repos in #{@kickoff.ago}: #{seen.map { |k, v| "#{k}:#{v}" }.joined}")
   end
 end

data/lib/fbe/unmask_repos.rb

@@ -49,16 +49,18 @@ end
 # @param [Judges::Options] options Options containing 'repositories' field with masks
 # @param [Hash] global Global cache for storing API responses
 # @param [Loog] loog Logger for debug output
-# @param [Time] start When did we start the entire pipeline
+# @param [Time] epoch When the entire update started
+# @param [Time] kickoff When the particular judge started
 # @param [quota_aware] Boolean Should we stop if quota is off?
 # @param [lifetime_aware] Boolean Should we stop if lifetime is over?
+# @param [timeout_aware] Boolean Should we stop if timeout is over?
 # @return [Array<String>] Shuffled list of repository full names (e.g., 'org/repo')
 # @raise [RuntimeError] If no repositories match the provided masks
 # @note Exclusion patterns must start with '-' (e.g., '-org/pattern*')
 # @note Results are shuffled to distribute load when processing
 def Fbe.unmask_repos(
-  options: $options, global: $global, loog: $loog, start: $start,
-  quota_aware: true, lifetime_aware: true
+  options: $options, global: $global, loog: $loog, epoch: $epoch || Time.now, kickoff: $kickoff || Time.now,
+  quota_aware: true, lifetime_aware: true, timeout_aware: true
 )
   raise 'Repositories mask is not specified' unless options.repositories
   raise 'Repositories mask is empty' if options.repositories.empty?
@@ -90,7 +92,11 @@ def Fbe.unmask_repos(
       loog.info("No GitHub quota left, it is time to stop at #{repo}")
       break
     end
-    if lifetime_aware && options.lifetime && Time.now - start > options.lifetime - 10
+    if lifetime_aware && options.lifetime && Time.now - epoch > options.lifetime * 0.9
+      loog.info("No time left, it is time to stop at #{repo}")
+      break
+    end
+    if timeout_aware && options.timeout && Time.now - kickoff > options.timeout * 0.9
       loog.info("No time left, it is time to stop at #{repo}")
       break
     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.37.0' unless const_defined?(:VERSION)
+  VERSION = '0.38.0' unless const_defined?(:VERSION)
 end

metadata

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