fbe 0.24.2 → 0.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1896cdb2e02c15259d12df1f1ecddb5049b902ff0b52dd67cb25a9c113606175
-  data.tar.gz: b3fdf07d9b80f1b7cffb9974f09296c8f1f33eb44d88f4faa54918f747fcd0cf
+  metadata.gz: ce758baa2b569c87b5c6318bd2a58df0a5041c578164bb07f337c197a83ef4a7
+  data.tar.gz: fa85c249bc4ea36ecf435e0412bccd9a1c8885ed222f0538be0c02ebd4f59ccc
 SHA512:
-  metadata.gz: bfa0a5da515f2054d9e22c7894ea329f70894a7751dc9879c77ba074fcc07df24d70a0332771381c9698b37b83a896bd88bccd40b49877a97d35a688e858af0b
-  data.tar.gz: f15e90b61d66b43e54bf44ecc767b7943ab5f22167203e1ea36900a1b29476a8208bbcece5f8d1c66eb9d5abf9d49d551d190fdcef7dc01c274ce749282cd218
+  metadata.gz: 43e184c1ee6955ca80cd5a4ba01aa47cf5e59ce8ad1767c03e535c77c253a1bb9223d6603825ef99c6d094828d03e3ae7b6a68e3cc4b7766cfb108c3058fa714
+  data.tar.gz: f1399b8d6b1022a2460f6c1049bd2b58aa924933773c0bdbec3cc21ba65e28aeca6712d382fdd070e0ec5f44f8c5ac3608aacdb9d87857c11f00b45bc6efd728

data/Gemfile.lock

@@ -189,7 +189,7 @@ GEM
     regexp_parser (2.10.0)
     retries (0.0.5)
     rexml (3.4.1)
-    rubocop (1.77.0)
+    rubocop (1.78.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

data/lib/fbe/conclude.rb

@@ -17,13 +17,13 @@ require_relative 'if_absent'
 # @param [Judges::Options] options The options coming from the +judges+ tool
 # @param [Loog] loog The logging facility
 # @yield [Factbase::Fact] The fact
-def Fbe.conclude(fb: Fbe.fb, judge: $judge, loog: $loog, options: $options, global: $global, &)
+def Fbe.conclude(fb: Fbe.fb, judge: $judge, loog: $loog, options: $options, global: $global, time: Time, &)
   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:)
+  c = Fbe::Conclude.new(fb:, judge:, loog:, options:, global:, time:)
   c.instance_eval(&)
 end
 
@@ -58,7 +58,8 @@ 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:)
+  # @param [Time] time The time
+  def initialize(fb:, judge:, global:, options:, loog:, time: Time)
     @fb = fb
     @judge = judge
     @loog = loog
@@ -68,6 +69,7 @@ class Fbe::Conclude
     @follows = []
     @quota_aware = false
     @timeout = 60
+    @time = time
   end
 
   # Make this block aware of GitHub API quota.
@@ -180,22 +182,23 @@ class Fbe::Conclude
   #   end
   def roll(&)
     passed = 0
-    start = Time.now
+    start = @time.now
     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')
+        break
+      end
+      now = @time.now
+      if now > start + @timeout
+        @loog.debug("We've spent more than #{start.ago}, must stop here")
+        break
+      end
       @fb.txn do |fbt|
-        if @quota_aware && oct.off_quota?
-          @loog.debug('We ran out of GitHub quota, must stop here')
-          throw :commit
-        end
-        if Time.now > start + @timeout
-          @loog.debug("We've spent more than #{start.ago}, must stop here")
-          throw :commit
-        end
         n = yield fbt, a
         @loog.info("#{n.what}: #{n.details}") unless n.nil?
-        passed += 1
       end
+      passed += 1
     end
     @loog.debug("Found and processed #{passed} facts by: #{@query}")
     passed

data/lib/fbe/octo.rb

@@ -665,7 +665,8 @@ class Fbe::FakeOctokit
         user: { login: 'yegor256', id: 526_301, type: 'User' },
         created_at: Time.parse('2025-06-01 12:00:55 UTC'),
         updated_at: Time.parse('2025-06-01 15:47:18 UTC'),
-        closed_at: Time.parse('2025-06-02 15:00:00 UTC')
+        closed_at: Time.parse('2025-06-02 15:00:00 UTC'),
+        closed_by: { id: 526_301, login: 'yegor256' }
       }
     elsif number == 143
       {
@@ -676,7 +677,8 @@ class Fbe::FakeOctokit
         pull_request: { merged_at: nil },
         created_at: Time.parse('2025-05-29 17:00:55 UTC'),
         updated_at: Time.parse('2025-05-29 19:00:00 UTC'),
-        closed_at: Time.parse('2025-06-01 18:20:00 UTC')
+        closed_at: Time.parse('2025-06-01 18:20:00 UTC'),
+        closed_by: { id: 526_301, login: 'yegor256' }
       }
     else
       {
@@ -708,6 +710,11 @@ class Fbe::FakeOctokit
       repo: {
         full_name: repo
       },
+      base: {
+        repo: {
+          full_name: repo
+        }
+      },
       state: 'closed',
       user: { login: 'yegor256', id: 526_301, type: 'User' },
       head: { ref: 'master', sha: '6dcb09b5b57875f334f61aebed695e2e4193db5e' },
@@ -716,6 +723,7 @@ class Fbe::FakeOctokit
       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')
     }

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.24.2' unless const_defined?(:VERSION)
+  VERSION = '0.24.3' unless const_defined?(:VERSION)
 end

data/test/fbe/test_conclude.rb

@@ -125,4 +125,48 @@ class TestConclude < Fbe::Test
     end
     assert_equal(2, fb.size)
   end
+
+  def test_stop_if_timeout_exceeded
+    $fb = Factbase.new
+    $fb.insert.then do |f|
+      f._id = 1
+      f.foo = 5
+    end
+    $fb.insert.then do |f|
+      f._id = 2
+      f.foo = 4
+    end
+    $fb.insert.then do |f|
+      f._id = 3
+      f.bar = 3
+    end
+    $fb.insert.then do |f|
+      f._id = 4
+      f.foo = 2
+    end
+    $fb.insert.then do |f|
+      f._id = 5
+      f.foo = 1
+    end
+    $global = {}
+    $options = Judges::Options.new({ 'testing' => true })
+    $loog = Loog::NULL
+    $judge = ''
+    total = 0
+    now = Time.now
+    time = Minitest::Mock.new
+    time.expect(:now, now)
+    time.expect(:now, now + 4)
+    time.expect(:now, now + 8)
+    time.expect(:now, now + 12)
+    Fbe.conclude(time: time) do
+      on '(exists foo)'
+      timeout 10
+      consider do |f|
+        total += f.foo
+      end
+    end
+    assert_equal(9, total)
+    time.verify
+  end
 end

data/test/fbe/test_octo.rb

@@ -662,4 +662,51 @@ class TestOcto < Fbe::Test
       https://github.com/octokit/octokit.rb/blob/ea3413c3174571e87c83d358fc893cc7613091fa/lib/octokit/connection.rb#L109-L119
     MSG
   end
+
+  def test_octo_cache_still_available_on_duration_of_age
+    WebMock.disable_net_connect!
+    now = Time.now
+    age = 60
+    stub_request(:get, 'https://api.github.com/rate_limit')
+      .to_return(
+        status: 200, headers: { 'Content-Type' => 'application/json', 'X-RateLimit-Remaining' => '5000' },
+        body: { 'rate' => { 'limit' => 5000, 'remaining' => 5000, 'reset' => 1_672_531_200 } }.to_json
+      )
+    Dir.mktmpdir do |dir|
+      sqlite_cache = File.expand_path('t.db', dir)
+      o = Fbe.octo(loog: fake_loog, global: {}, options: Judges::Options.new({ 'sqlite_cache' => sqlite_cache }))
+      stub_request(:get, 'https://api.github.com/repositories/798641472').to_return(
+        status: 200,
+        body: { id: 798_641_472, name: 'factbase' }.to_json,
+        headers: {
+          'Date' => now.httpdate,
+          'Content-Type' => 'application/json; charset=utf-8',
+          'Cache-Control' => "public, max-age=#{age}, s-maxage=#{age}",
+          'Etag' => 'W/"f5f1ea995fd7266816f681aca5a81f539420c469070a47568bebdaa3055487bc"',
+          'Last-Modified' => 'Fri, 04 Jul 2025 13:39:42 GMT'
+        }
+      ).times(1).then.to_raise('no more request to /repositories/798641472')
+      assert_equal('factbase', o.repo(798_641_472)['name'])
+      Time.stub(:now, now + age - 1) do
+        assert_equal('factbase', o.repo(798_641_472)['name'])
+      end
+      stub_request(:get, 'https://api.github.com/repositories/798641472').to_return(
+        status: 200,
+        body: { id: 798_641_472, name: 'factbase_changed' }.to_json,
+        headers: {
+          'Date' => (now + age).httpdate,
+          'Content-Type' => 'application/json; charset=utf-8',
+          'Cache-Control' => "public, max-age=#{age}, s-maxage=#{age}",
+          'Etag' => 'W/"f5f1ea995fd7266816f681aca5a81f539420c469070a47568bebdaa3055487be"',
+          'Last-Modified' => 'Fri, 04 Jul 2025 13:39:42 GMT'
+        }
+      ).times(1).then.to_raise('no more request to /repositories/798641472')
+      Time.stub(:now, now + age) do
+        assert_equal('factbase_changed', o.repo(798_641_472)['name'])
+      end
+      Time.stub(:now, now + (2 * age) - 1) do
+        assert_equal('factbase_changed', o.repo(798_641_472)['name'])
+      end
+    end
+  end
 end

metadata

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