fbe 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b13ad3c8a5578c4a9e248948cab63ae21caeea7052d96260f2be85a43ee6f3b8
-  data.tar.gz: 90f8b081a67be3fd2f94a92cea890abb9b93f9b4b11a37a7bc6502f704c16510
+  metadata.gz: 37b5cbcd563d2e31074d5f6625d32fd118a5302a4bcd021492639573e657b03e
+  data.tar.gz: 1045c3932e3952740ed611c42e0ed034de522281496cb7a5bc9953b1aa821eef
 SHA512:
-  metadata.gz: 9ea216f0e9be56b06ae8e350ea89b341f9d9fc230ca7785f5b0c0a494fcba3de913143e9c0c5d7074eea3ad368520bfaa462f891c5daf744b4ababbf05e600e8
-  data.tar.gz: 28c70598550a0e68ad1315fee0adce8ebeb31a7eb400f348181c0f916b3b5aac646a1d4f8d51d79f70e5553f3a4a88b33ba4afd67f2075a735cb578ea5312f0c
+  metadata.gz: 4fb03336064109e32074c267d9a21520e1e24e5b4ced00ab38f06df2b6f6d80f9d9c4cb899fb2e35cf3706d78f2d24b99351e6a096b0eafe00aced686b7bda31
+  data.tar.gz: 898b56d6e5ad162e52fa457582014106d9155499a10d5b8b5448f41bf8dc094cf16df3d2ef13d9601eec606b0293ca3f276fd750897069e0a1f4c383d26d1cc6

data/Gemfile

@@ -32,4 +32,5 @@ gem 'rubocop-performance', '1.21.1', require: false
 gem 'rubocop-rspec', '3.0.3', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false
+gem 'webmock', '3.23.1', require: false
 gem 'yard', '0.9.36', require: false

data/Gemfile.lock

@@ -55,6 +55,9 @@ GEM
     builder (3.3.0)
     concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
+    crack (1.0.0)
+      bigdecimal
+      rexml
     crass (1.0.6)
     decoor (0.0.1)
     diff-lcs (1.5.1)
@@ -87,7 +90,8 @@ GEM
     ffi (1.17.0-x64-mingw-ucrt)
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
-    gli (2.21.3)
+    gli (2.21.5)
+    hashdiff (1.1.0)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
@@ -241,6 +245,10 @@ GEM
     verbose (0.0.2)
       loog (~> 0.2)
       tago (~> 0.0)
+    webmock (3.23.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.8.1)
     yaml (0.3.0)
     yard (0.9.36)
@@ -263,6 +271,7 @@ DEPENDENCIES
   rubocop-rspec (= 3.0.3)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)
+  webmock (= 3.23.1)
   yard (= 0.9.36)
 
 BUNDLED WITH

data/lib/fbe/octo.rb

@@ -57,9 +57,14 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
         }
       }
       stack = Faraday::RackBuilder.new do |builder|
-        builder.use(Faraday::Retry::Middleware)
-        builder.use(Faraday::HttpCache, serializer: Marshal, shared_cache: false)
+        builder.use(
+          Faraday::Retry::Middleware,
+          exceptions: Faraday::Retry::Middleware::DEFAULT_EXCEPTIONS + [Octokit::TooManyRequests],
+          max: 5, interval: 1
+        )
+        builder.use(Faraday::HttpCache, serializer: Marshal, shared_cache: false, logger: Loog::NULL)
         builder.use(Octokit::Response::RaiseError)
+        builder.use(Faraday::Response::Logger, Loog::NULL)
         builder.adapter(Faraday.default_adapter)
       end
       o.middleware = stack

data/lib/fbe.rb

@@ -27,5 +27,5 @@
 # License:: MIT
 module Fbe
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.23'
+  VERSION = '0.0.24'
 end

data/test/fbe/test_octo.rb

@@ -24,6 +24,7 @@
 
 require 'minitest/autorun'
 require 'judges/options'
+require 'webmock/minitest'
 require 'loog'
 require_relative '../test__helper'
 require_relative '../../lib/fbe/octo'
@@ -54,8 +55,34 @@ class TestOcto < Minitest::Test
     assert_equal(100, o.rate_limit.remaining)
   end
 
+  def test_caching
+    WebMock.disable_net_connect!
+    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' })
+      .times(1)
+      .then
+      .to_raise('second request should be cached, not passed to GitHub API!')
+    o.user('yegor256')
+    o.user('yegor256')
+  end
+
+  def test_retrying
+    WebMock.disable_net_connect!
+    global = {}
+    o = Fbe.octo(loog: Loog::NULL, global:, options: Judges::Options.new)
+    stub_request(:get, 'https://api.github.com/users/yegor256')
+      .to_raise(Octokit::TooManyRequests.new)
+      .times(1)
+      .then
+      .to_return(status: 200, body: '{}')
+    o.user('yegor256')
+  end
+
   def test_with_broken_token
     skip # it's a "live" test, run it manually if you need it
+    WebMock.enable_net_connect!
     global = {}
     options = Judges::Options.new({ 'github_token' => 'incorrect-value' })
     o = Fbe.octo(loog: Loog::NULL, global:, options:)
@@ -64,6 +91,7 @@ class TestOcto < Minitest::Test
 
   def test_commit_pulls
     skip # it's a "live" test, run it manually if you need it
+    WebMock.enable_net_connect!
     o = Fbe.octo(loog: Loog::NULL, global: {}, options: Judges::Options.new)
     assert_equal(1, o.commit_pulls('zerocracy/fbe', '0b7d0699bd744b62c0731064c2adaad0c58e1416').size)
     assert_equal(0, o.commit_pulls('zerocracy/fbe', '16b3ea6b71c6e932ba7666c40ca846ecaa6d6f0d').size)

metadata

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