fbe 0.23.1 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afcbfa40757e9ab45bbae7c083105904ebb9079aa821c256c68969c19e3e4e25
-  data.tar.gz: 0416c452b5e217f0fe35ed76676960e751f31229fdca52b5225f7d072c0f5350
+  metadata.gz: 8c12118d96ea30271b8b724c90d498eb3cc34a679bbef6be04153a53eec96e8e
+  data.tar.gz: 45363b59481ccff7b37d367acbabba81e7bddf0a649c204ac4e87559d9622729
 SHA512:
-  metadata.gz: 3fa6f95c316fabbdfe259ef0b49622dbc8480125e3d3c280ef55878148a4b97646d7857f91c447fd592d46a09a59622347e1157c6193d513b820add777abfd78
-  data.tar.gz: 03d2f412f3983ce6e759d40858b2a03d7ba70de2907f6990bcd66d4bc86df77defc65e46e977e9830ba633281c5680a0276a7a8b4a24e59e48c4b33a2efffbe2
+  metadata.gz: 04f4c500161bbb87de44b25e1c160c2c03276c4f4737589dea8691c76f0a4a24824b74d4b278db5ac777e306d8c01b7879434ced44ee28b9efcd0cf96c4b0ea9
+  data.tar.gz: 1f75a0011d1be3518a72b99d8ffd5e6e4746b4a0a130d3e6507c145b389197419e788a2b0eb7e09fce0ba913ef0621be2754fcfa2000babb03bf58d0250b9748

data/Gemfile.lock

@@ -5,6 +5,7 @@ PATH
       backtrace (~> 0.4)
       baza.rb (~> 0.5)
       decoor (~> 0.0)
+      ellipsized (~> 0.3)
       factbase (~> 0.11)
       faraday (~> 2.0)
       faraday-http-cache (~> 2.5)
@@ -12,6 +13,7 @@ PATH
       faraday-retry (~> 2.3)
       filesize (~> 0.2)
       graphql-client (~> 0.26)
+      intercepted (~> 0.2)
       judges (~> 0.46)
       liquid (~> 5.5)
       loog (~> 0.6)
@@ -114,6 +116,7 @@ GEM
     hashdiff (1.2.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
+    intercepted (0.2.0)
     iri (0.11.2)
     json (2.12.2)
     judges (0.50.5)

data/fbe.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'backtrace', '~>0.4'
   s.add_dependency 'baza.rb', '~>0.5'
   s.add_dependency 'decoor', '~>0.0'
+  s.add_dependency 'ellipsized', '~>0.3'
   s.add_dependency 'factbase', '~>0.11'
   s.add_dependency 'faraday', '~>2.0'
   s.add_dependency 'faraday-http-cache', '~>2.5'
@@ -32,6 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday-retry', '~>2.3'
   s.add_dependency 'filesize', '~>0.2'
   s.add_dependency 'graphql-client', '~>0.26'
+  s.add_dependency 'intercepted', '~>0.2'
   s.add_dependency 'judges', '~>0.46'
   s.add_dependency 'liquid', '~>5.5'
   s.add_dependency 'loog', '~>0.6'

data/lib/fbe/middleware/trace.rb

@@ -31,11 +31,9 @@ class Fbe::Middleware::Trace < Faraday::Middleware
   #
   # @param [Object] app The next middleware in the stack
   # @param [Array] trace The array to store trace entries
-  # @param [Boolean] all Print ALL requests, even very fast?
-  def initialize(app, trace, all: true)
+  def initialize(app, trace)
     super(app)
     @trace = trace
-    @all = all
   end
 
   # Processes the HTTP request and records trace information.
@@ -51,12 +49,10 @@ class Fbe::Middleware::Trace < Faraday::Middleware
     @app.call(env).on_complete do |response_env|
       finished = Time.now
       duration = finished - entry[:started_at]
-      if duration > 0.01 || @all
-        entry[:status] = response_env.status
-        entry[:finished_at] = finished
-        entry[:duration] = duration
-        @trace << entry
-      end
+      entry[:status] = response_env.status
+      entry[:finished_at] = finished
+      entry[:duration] = duration
+      @trace << entry
     end
   end
 end

data/lib/fbe/octo.rb

@@ -3,22 +3,25 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
 # SPDX-License-Identifier: MIT
 
-require 'json'
 require 'decoor'
+require 'ellipsized'
 require 'faraday/http_cache'
 require 'faraday/retry'
 require 'filesize'
+require 'intercepted'
+require 'json'
 require 'loog'
 require 'obk'
 require 'octokit'
 require 'others'
+require 'tago'
 require 'uri'
 require 'verbose'
 require_relative '../fbe'
 require_relative 'middleware'
 require_relative 'middleware/formatter'
-require_relative 'middleware/trace'
 require_relative 'middleware/sqlite_store'
+require_relative 'middleware/trace'
 
 # Makes a call to the GitHub API.
 #
@@ -104,7 +107,7 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
             end
             builder.use(Octokit::Response::RaiseError)
             builder.use(Faraday::Response::Logger, loog, formatter: Fbe::Middleware::Formatter)
-            builder.use(Fbe::Middleware::Trace, trace, all: false)
+            builder.use(Fbe::Middleware::Trace, trace)
             builder.adapter(Faraday.default_adapter)
           end
         o.middleware = stack
@@ -121,18 +124,29 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
       end
       o =
         decoor(o, loog:, trace:) do
-          def print_trace!
+          def print_trace!(all: false, max: 5)
             if @trace.empty?
               @loog.debug('GitHub API trace is empty')
             else
               grouped =
-                @trace.group_by do |entry|
+                @trace.select { |e| e[:duration] > 0.05 || all }.group_by do |entry|
                   uri = URI.parse(entry[:url])
-                  "#{uri.scheme}://#{uri.host}#{uri.path}"
+                  query = uri.query
+                  query = "?#{query.ellipsized(40)}" if query
+                  "#{uri.scheme}://#{uri.host}#{uri.path}#{query}"
                 end
               message = grouped
                 .sort_by { |_path, entries| -entries.count }
-                .map { |path, entries| "  #{path.gsub(%r{^https://api.github.com/}, '/')}: #{entries.count}" }
+                .map do |path, entries|
+                  [
+                    '  ',
+                    path.gsub(%r{^https://api.github.com/}, '/'),
+                    ': ',
+                    entries.count,
+                    " (#{entries.sum { |e| e[:duration] }.seconds})"
+                  ].join
+                end
+                .take(max)
                 .join("\n")
               @loog.info(
                 "GitHub API trace (#{grouped.count} URLs vs #{@trace.count} requests, " \
@@ -180,11 +194,10 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
           end
         end
       o =
-        others(o:) do |*args|
-          if args.first != :off_quota? && args.first != :print_trace! && @o.off_quota?
-            raise "We are off-quota (remaining: #{@o.rate_limit.remaining})"
+        intercepted(o) do |e, m, _args, _r|
+          if e == :before && m != :off_quota? && m != :print_trace! && m != :rate_limit && o.off_quota?
+            raise "We are off-quota (remaining: #{o.rate_limit.remaining}), can't do #{name}()"
           end
-          @o.__send__(*args)
         end
       o
     end
@@ -692,10 +705,14 @@ class Fbe::FakeOctokit
       repo: {
         full_name: repo
       },
+      user: { login: 'yegor256', id: 526_301, type: 'User' },
+      head: { ref: 'master', sha: '6dcb09b5b57875f334f61aebed695e2e4193db5e' },
       additions: 12,
       deletions: 5,
       changed_files: 3,
-      review_comments: 2
+      comments: 2,
+      review_comments: 2,
+      created_at: Time.parse('2024-09-20 19:00:00 UTC')
     }
   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.23.1' unless const_defined?(:VERSION)
+  VERSION = '0.23.3' unless const_defined?(:VERSION)
 end

data/test/fbe/test_octo.rb

@@ -367,7 +367,6 @@ class TestOcto < Fbe::Test
       { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } }
     )
     stub_request(:get, 'https://api.github.com/user/123').to_return do
-      sleep(0.02)
       {
         status: 200,
         body: '{"id":123,"login":"test"}',
@@ -375,7 +374,6 @@ class TestOcto < Fbe::Test
       }
     end
     stub_request(:get, 'https://api.github.com/repos/foo/bar').to_return do
-      sleep(0.02)
       {
         status: 200,
         body: '{"id":456,"full_name":"foo/bar"}',
@@ -386,9 +384,9 @@ class TestOcto < Fbe::Test
     octo.user(123)
     octo.repository('foo/bar')
     octo.repository('foo/bar')
-    octo.print_trace!
+    octo.print_trace!(all: true, max: 9_999)
     output = loog.to_s
-    assert_includes output, '2 URLs vs 3 requests'
+    assert_includes output, '3 URLs vs 4 requests'
     assert_includes output, '222 quota left'
     assert_includes output, '/user/123: 1'
     assert_includes output, '/repos/foo/bar: 2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.23.3
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -51,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: ellipsized
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: factbase
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +163,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.26'
+- !ruby/object:Gem::Dependency
+  name: intercepted
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: judges
   requirement: !ruby/object:Gem::Requirement