fbe 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af8e39332315cd637642316ea61761792955d43688813b75339b112b58747900
-  data.tar.gz: 6a2fa9d6c135c1ec2500872ace2bba09d00a89fe87c1af6435e54e880f361df4
+  metadata.gz: e1ce252b4d0093ff1f94e319d2c65502e134dad520398ca018fad1820b9dac78
+  data.tar.gz: f0039a70dcd2533e2acd36f80b7ef3ac68441f1f68611b38ee07d9c67449ddf3
 SHA512:
-  metadata.gz: 94a48b37c3d821a8c609e99accfc1fb350b1e317f2cb27c7d351a8a472ff1565edec77d4a3bd2a1d39c758c8e6faa71e5706a1a30fe0364bceffd25144466642
-  data.tar.gz: 8073b49266007c50ae6989ffb1b006fbcddce056cb042be19f5ca39c4e99ad97b58ad77c598d51102b51ef77b9545a4f86fd29cf0323edb7fee9920ff6e65227
+  metadata.gz: 25191aefeccb723456f4de449c6f042ce628c895fc7f2e941f5e63e0685bfb2bccf550e04c288ff28e288acf8a4c0b57f3402b2826cae5ccb5da549c977f1ffe
+  data.tar.gz: 6362777ada12c805d463db462afbfbf5bab5d20b897565b798c2ede567d097f3250622d1a67656731e94f0ac8fc37fb604ace94c150e51e47c2a83ec14f4be60

data/Gemfile.lock

@@ -70,7 +70,7 @@ GEM
       tago (> 0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.9.10)
+    factbase (0.10.0)
       backtrace (~> 0.4)
       decoor (~> 0.0)
       json (~> 2.7)
@@ -92,11 +92,11 @@ GEM
       net-http (>= 0.5.0)
     faraday-retry (2.3.1)
       faraday (~> 2.0)
-    ffi (1.17.1-arm64-darwin)
-    ffi (1.17.1-x64-mingw-ucrt)
-    ffi (1.17.1-x86_64-darwin)
-    ffi (1.17.1-x86_64-linux-gnu)
-    fiber-storage (1.0.0)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x64-mingw-ucrt)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    fiber-storage (1.0.1)
     gli (2.22.2)
       ostruct
     graphql (2.5.3)

data/lib/fbe/conclude.rb

@@ -160,21 +160,20 @@ class Fbe::Conclude
   def roll(&)
     passed = 0
     start = Time.now
-    catch :stop do
-      @fb.txn do |fbt|
-        fbt.query(@query).each do |a|
-          if @quota_aware && Fbe.octo(loog: @loog, options: @options, global: @global).off_quota
-            @loog.debug('We ran out of GitHub quota, must stop here')
-            throw :stop
-          end
-          if Time.now > start + @timeout
-            @loog.debug("We've spent more than #{start.ago}, must stop here")
-            throw :stop
-          end
-          n = yield fbt, a
-          @loog.info("#{n.what}: #{n.details}") unless n.nil?
-          passed += 1
+    oct = Fbe.octo(loog: @loog, options: @options, global: @global)
+    @fb.txn do |fbt|
+      fbt.query(@query).each do |a|
+        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
     end
     @loog.debug("Found and processed #{passed} facts by: #{@query}")

data/lib/fbe/octo.rb

@@ -88,6 +88,7 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
             @loog.info("Too much GitHub API quota consumed already (#{left} < #{threshold}), stopping")
             true
           else
+            @loog.debug("Still #{left} GitHub API quota left (>#{threshold})")
             false
           end
         end
@@ -147,13 +148,14 @@ class Fbe::FakeOctokit
     true
   end
 
-  def user(name)
-    login = name
-    login = name == 526_301 ? 'yegor256' : 'torvalds' if login.is_a?(Integer)
+  # Get details of the user.
+  # @param [String|Integer] uid The login of the user or its ID
+  def user(uid)
+    login = (uid == 526_301 ? 'yegor256' : 'torvalds') if uid.is_a?(Integer)
     {
       id: 444,
       login:,
-      type: name == 29_139_614 ? 'Bot' : 'User'
+      type: uid == 29_139_614 ? 'Bot' : 'User'
     }
   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.7.0' unless const_defined?(:VERSION)
+  VERSION = '0.7.1' unless const_defined?(:VERSION)
 end

data/test/fbe/test_conclude.rb

@@ -61,6 +61,38 @@ class TestConclude < Fbe::Test
     assert_equal(42, f.bar)
   end
 
+  def test_considers_until_quota
+    WebMock.disable_net_connect!
+    fb = Factbase.new
+    5.times do
+      fb.insert.foo = 1
+    end
+    options = Judges::Options.new
+    stub_request(:get, %r{https://api.github.com/users/.*}).to_return(
+      {
+        body: { id: rand(100) }.to_json,
+        headers: { 'Content-Type' => 'application/json', 'X-RateLimit-Remaining' => '999' }
+      },
+      {
+        body: { id: rand(100) }.to_json,
+        headers: { 'Content-Type' => 'application/json', 'X-RateLimit-Remaining' => '9' }
+      }
+    )
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      body: 'hm...', headers: { 'X-RateLimit-Remaining' => '777' }
+    ).times(1)
+    global = {}
+    o = Fbe.octo(loog: Loog::NULL, options:, global:)
+    Fbe.conclude(fb:, judge: 'boom', loog: Loog::NULL, options:, global:) do
+      quota_aware
+      on '(exists foo)'
+      consider do |f|
+        f.bar = o.user("user-#{rand(100)}")[:id]
+      end
+    end
+    assert_equal(2, fb.query('(exists bar)').each.to_a.size)
+  end
+
   def test_ignores_globals
     $fb = nil
     $loog = nil

data/test/fbe/test_octo.rb

@@ -56,7 +56,7 @@ class TestOcto < Fbe::Test
     global = {}
     o = Fbe.octo(loog: Loog::NULL, global:, options: Judges::Options.new)
     stub_request(:get, 'https://api.github.com/users/yegor256')
-      .to_return(status: 200, body: '{}', headers: { 'Cache-Control' => 'public, max-age=60', 'etag' => 'abc' })
+      .to_return(body: '{}', headers: { 'Cache-Control' => 'public, max-age=60', 'etag' => 'abc' })
       .times(1)
       .then
       .to_raise('second request should be cached, not passed to GitHub API!')
@@ -64,12 +64,50 @@ class TestOcto < Fbe::Test
     o.user('yegor256')
   end
 
+  def test_rate_limit_remaining
+    WebMock.disable_net_connect!
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } }
+    )
+    stub_request(:get, 'https://api.github.com/user/42').to_return(
+      body: '', headers: { 'X-RateLimit-Remaining' => '4' }
+    )
+    o = Octokit::Client.new
+    assert_equal(222, o.rate_limit.remaining)
+    o.user(42)
+    assert_equal(4, o.rate_limit.remaining)
+    assert_equal(4, o.rate_limit.remaining)
+  end
+
   def test_off_quota
     WebMock.disable_net_connect!
-    stub_request(:get, 'https://api.github.com/rate_limit')
-      .to_return(status: 200, body: '{}', headers: { 'X-RateLimit-Remaining' => '1000' })
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      body: '{}', headers: { 'X-RateLimit-Remaining' => '333' }
+    )
+    stub_request(:get, 'https://api.github.com/user/42').to_return(
+      body: '', headers: { 'X-RateLimit-Remaining' => '3' }
+    )
     o = Fbe.octo(loog: Loog::NULL, global: {}, options: Judges::Options.new)
     refute(o.off_quota)
+    o.user(42)
+    assert(o.off_quota)
+  end
+
+  def test_off_quota_twice
+    WebMock.disable_net_connect!
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      body: '{}', headers: { 'X-RateLimit-Remaining' => '333' }
+    )
+    stub_request(:get, 'https://api.github.com/user/42').to_return(
+      { body: '', headers: { 'X-RateLimit-Remaining' => '5555' } },
+      { body: '', headers: { 'X-RateLimit-Remaining' => '5' } }
+    )
+    o = Fbe.octo(loog: Loog::VERBOSE, global: {}, options: Judges::Options.new)
+    refute(o.off_quota)
+    o.user(42)
+    refute(o.off_quota)
+    o.user(42)
+    assert(o.off_quota)
   end
 
   def test_retrying
@@ -80,7 +118,7 @@ class TestOcto < Fbe::Test
       .to_raise(Octokit::TooManyRequests.new)
       .times(1)
       .then
-      .to_return(status: 200, body: '{}')
+      .to_return(body: '{}')
     o.user('yegor256')
   end
 
@@ -92,7 +130,7 @@ class TestOcto < Fbe::Test
       .to_return(status: 503)
       .times(1)
       .then
-      .to_return(status: 200, body: '{}')
+      .to_return(body: '{}')
     o.user('yegor256')
   end
 
@@ -136,11 +174,11 @@ class TestOcto < Fbe::Test
     o = Fbe.octo(loog: Loog::NULL, global: {}, options: Judges::Options.new({ 'github_api_pause' => 0.01 }))
     stub_request(:get, 'https://api.github.com/users/foo')
       .to_return(
-        status: 200, body: '{}',
+        body: '{}',
         headers: { 'x-ratelimit-remaining' => '1' }
       )
       .to_return(
-        status: 200, body: '{}',
+        body: '{}',
         headers: { 'x-ratelimit-remaining' => '10000' }
       )
     o.user('foo')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 bindir: bin
 cert_chain: []
-date: 2025-04-15 00:00:00.000000000 Z
+date: 2025-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace