fbe 0.23.3 → 0.23.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c12118d96ea30271b8b724c90d498eb3cc34a679bbef6be04153a53eec96e8e
-  data.tar.gz: 45363b59481ccff7b37d367acbabba81e7bddf0a649c204ac4e87559d9622729
+  metadata.gz: 157b3bb591e16d535883feb11b531f9f64a9b87dd078f858345a7f91cc29185d
+  data.tar.gz: bb1b991edbcec6cf8caaedb11e32e8359d5f0487d1339572f0e43e4cf296354f
 SHA512:
-  metadata.gz: 04f4c500161bbb87de44b25e1c160c2c03276c4f4737589dea8691c76f0a4a24824b74d4b278db5ac777e306d8c01b7879434ced44ee28b9efcd0cf96c4b0ea9
-  data.tar.gz: 1f75a0011d1be3518a72b99d8ffd5e6e4746b4a0a130d3e6507c145b389197419e788a2b0eb7e09fce0ba913ef0621be2754fcfa2000babb03bf58d0250b9748
+  metadata.gz: 9821935ea70538efc8847b7368ed2af195f40f348f07ab432f52712bdafa85b5c629455079d8697ca0c7b5a969c93233d99d133ae5744a1c7c7f359a26483d89
+  data.tar.gz: 105e6d4f0934d8ce1b166e43417c258944f0e502ee6de1fa8487f9ccbe656f1f9f67c5a50a76403a98f89986576e44aad6bb9f12d75e8ee7a2d7e096b67ccdcb

data/lib/fbe/octo.rb

@@ -87,7 +87,7 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
             )
             if options.sqlite_cache
               maxsize = Filesize.from(options.sqlite_cache_maxsize || '10M').to_i
-              maxvsize = Filesize.from(options.sqlite_cache_maxxsize || '10K').to_i
+              maxvsize = Filesize.from(options.sqlite_cache_maxvsize || '10K').to_i
               store = Fbe::Middleware::SqliteStore.new(options.sqlite_cache, Fbe::VERSION, loog:, maxsize:, maxvsize:)
               loog.info(
                 "Using HTTP cache in SQLite file: #{store.path} (" \
@@ -150,14 +150,14 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
                 .join("\n")
               @loog.info(
                 "GitHub API trace (#{grouped.count} URLs vs #{@trace.count} requests, " \
-                "#{@origin.rate_limit.remaining} quota left):\n#{message}"
+                "#{@origin.rate_limit!.remaining} quota left):\n#{message}"
               )
               @trace.clear
             end
           end
 
           def off_quota?(threshold: 50)
-            left = @origin.rate_limit.remaining
+            left = @origin.rate_limit!.remaining
             if left < threshold
               @loog.info("Too much GitHub API quota consumed already (#{left} < #{threshold}), stopping")
               true
@@ -258,6 +258,7 @@ class Fbe::FakeOctokit
     end
     o
   end
+  alias rate_limit! rate_limit
 
   # Lists repositories for a user or organization.
   #

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

data/test/fbe/test_conclude.rb

@@ -79,8 +79,12 @@ class TestConclude < Fbe::Test
       }
     )
     stub_request(:get, 'https://api.github.com/rate_limit').to_return(
-      body: 'hm...', headers: { 'X-RateLimit-Remaining' => '777' }
-    ).times(1)
+      { body: 'hm...', headers: { 'X-RateLimit-Remaining' => '777' } },
+      { body: 'hm...', headers: { 'X-RateLimit-Remaining' => '777' } },
+      { body: 'hm...', headers: { 'X-RateLimit-Remaining' => '777' } },
+      { body: 'hm...', headers: { 'X-RateLimit-Remaining' => '999' } },
+      { body: 'hm...', headers: { 'X-RateLimit-Remaining' => '9' } }
+    )
     global = {}
     o = Fbe.octo(loog: Loog::NULL, options:, global:)
     Fbe.conclude(fb:, judge: 'boom', loog: Loog::NULL, options:, global:) do

data/test/fbe/test_octo.rb

@@ -133,7 +133,9 @@ class TestOcto < Fbe::Test
   def test_off_quota?
     WebMock.disable_net_connect!
     stub_request(:get, 'https://api.github.com/rate_limit').to_return(
-      body: '{}', headers: { 'X-RateLimit-Remaining' => '333' }
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '333' } },
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '333' } },
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '3' } }
     )
     stub_request(:get, 'https://api.github.com/user/42').to_return(
       body: '', headers: { 'X-RateLimit-Remaining' => '3' }
@@ -147,7 +149,11 @@ class TestOcto < Fbe::Test
   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' }
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '333' } },
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '333' } },
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '333' } },
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '5555' } },
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '5' } }
     )
     stub_request(:get, 'https://api.github.com/user/42').to_return(
       { body: '', headers: { 'X-RateLimit-Remaining' => '5555' } },
@@ -239,7 +245,9 @@ class TestOcto < Fbe::Test
   def test_pauses_when_quota_is_exceeded
     WebMock.disable_net_connect!
     stub_request(:get, 'https://api.github.com/rate_limit').to_return(
-      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } }
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } },
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '1' } },
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '10000' } }
     )
     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')
@@ -364,6 +372,8 @@ class TestOcto < Fbe::Test
     loog = Loog::Buffer.new
     WebMock.disable_net_connect!
     stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } },
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } },
       { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } }
     )
     stub_request(:get, 'https://api.github.com/user/123').to_return do
@@ -386,8 +396,9 @@ class TestOcto < Fbe::Test
     octo.repository('foo/bar')
     octo.print_trace!(all: true, max: 9_999)
     output = loog.to_s
-    assert_includes output, '3 URLs vs 4 requests'
+    assert_includes output, '3 URLs vs 6 requests'
     assert_includes output, '222 quota left'
+    assert_includes output, '/rate_limit: 3'
     assert_includes output, '/user/123: 1'
     assert_includes output, '/repos/foo/bar: 2'
     repo_index = output.index('/repos/foo/bar: 2')
@@ -524,4 +535,23 @@ class TestOcto < Fbe::Test
       end
     end
   end
+
+  def test_fetch_rate_limit_by_making_new_request
+    WebMock.disable_net_connect!
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '321' } }
+    ).to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '123' } }
+    ).to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '1' } }
+    ).to_raise(StandardError.new('no more requests to https://api.github.com/rate_limit'))
+    loog = Loog::Buffer.new
+    o = Fbe.octo(loog:, global: {}, options: Judges::Options.new)
+    refute_predicate(o, :off_quota?)
+    assert_match(/321 GitHub API quota left/, loog.to_s)
+    o.print_trace!(all: true)
+    assert_match(/123 quota left/, loog.to_s)
+    assert_predicate(o, :off_quota?)
+    assert_match(/1 GitHub API quota left/, loog.to_s)
+  end
 end

metadata

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