fbe 0.21.0 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae9a9de76ff2dba753f10923fb0f984acc0c0e2e4f2a626a15c0ae6622d64392
-  data.tar.gz: ceeef4187f94f32b39569cf7f1e98c1a25559b1730c742f8c01073520456afce
+  metadata.gz: f6593e4483941c4ff99de6f85aab33f62832d4293b1efb2a8e84d0b78ad79147
+  data.tar.gz: 134ceee60e4eb50c33b8c71194ffa0464c822e07884bd230776e5c59f025e2f7
 SHA512:
-  metadata.gz: c2cec9308283d6d2ced937184b6e62b09bee329a10b7d65d69d369002dfb797b7e2b513611d64911d09cbaa50b7c00aec6480040f5955510297a20128528b443
-  data.tar.gz: 4d901bf3b1a062683dd481398e4961447676af8ae97ef8d938b321c6b0774fdadde71ba69e4875859e138e1853be2f1a734db1bf0fbe72f5ea62695c67fb67e3
+  metadata.gz: a43a4fb0ef720d9e459d348437c7d3824625fae9aad064c768885fc945d25e0ba68b0034132c97dd0835bf93edbcd960d64d4aa9f9bbd31af5c5589f2121ef44
+  data.tar.gz: 5f76047d167636f220b5bcab707b2f69bbe47a471b5954a4dbe324055fb08556cec5470ac7d1d9bb22da436b91d69056b5205bf485b4ca3b63ea212eb0f649ad

data/Gemfile.lock

@@ -43,18 +43,18 @@ GEM
     ast (2.4.3)
     backtrace (0.4.1)
     base64 (0.3.0)
-    baza.rb (0.5.1)
-      backtrace (> 0)
-      elapsed (> 0)
-      faraday (> 0)
-      faraday-http-cache (> 0)
-      faraday-multipart (> 0)
-      faraday-retry (> 0)
-      iri (> 0)
-      loog (> 0)
-      retries (~> 0)
-      tago (~> 0)
-      typhoeus (~> 1.3)
+    baza.rb (0.9.5)
+      backtrace (~> 0.4)
+      elapsed (~> 0.0)
+      faraday (~> 2.13)
+      faraday-http-cache (~> 2.5)
+      faraday-multipart (~> 1.1)
+      faraday-retry (~> 2.3)
+      iri (~> 0.11)
+      loog (~> 0.6)
+      retries (~> 0.0)
+      tago (~> 0.0)
+      typhoeus (~> 1.4)
     benchmark (0.4.1)
     bigdecimal (3.2.2)
     builder (3.3.0)
@@ -87,11 +87,11 @@ GEM
       logger
     faraday-http-cache (2.5.1)
       faraday (>= 0.8)
-    faraday-multipart (1.1.0)
+    faraday-multipart (1.1.1)
       multipart-post (~> 2.0)
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
-    faraday-retry (2.3.1)
+    faraday-retry (2.3.2)
       faraday (~> 2.0)
     ffi (1.17.2-arm64-darwin)
     ffi (1.17.2-x64-mingw-ucrt)
@@ -112,7 +112,7 @@ GEM
       concurrent-ruby (~> 1.0)
     iri (0.11.2)
     json (2.12.2)
-    judges (0.46.0)
+    judges (0.50.3)
       backtrace (~> 0.4)
       baza.rb (~> 0.5)
       concurrent-ruby (~> 1.2)
@@ -131,7 +131,7 @@ GEM
       typhoeus (~> 1.3)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
-    liquid (5.8.6)
+    liquid (5.8.7)
       bigdecimal
       strscan (>= 3.1.1)
     logger (1.7.0)
@@ -161,8 +161,8 @@ GEM
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     os (1.1.4)
-    ostruct (0.6.1)
-    others (0.0.3)
+    ostruct (0.6.2)
+    others (0.1.1)
     parallel (1.27.0)
     parser (3.3.8.0)
       ast (~> 2.4.1)
@@ -180,7 +180,7 @@ GEM
     regexp_parser (2.10.0)
     retries (0.0.5)
     rexml (3.4.1)
-    rubocop (1.76.1)
+    rubocop (1.76.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -188,7 +188,7 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.0, < 2.0)
+      rubocop-ast (>= 1.45.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.45.1)
@@ -219,10 +219,10 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    sqlite3 (2.6.0-arm64-darwin)
-    sqlite3 (2.6.0-x64-mingw-ucrt)
-    sqlite3 (2.6.0-x86_64-darwin)
-    sqlite3 (2.6.0-x86_64-linux-gnu)
+    sqlite3 (2.7.0-arm64-darwin)
+    sqlite3 (2.7.0-x64-mingw-ucrt)
+    sqlite3 (2.7.0-x86_64-darwin)
+    sqlite3 (2.7.0-x86_64-linux-gnu)
     strscan (3.1.5)
     tago (0.1.0)
     timeout (0.4.3)

data/lib/fbe/if_absent.rb

@@ -51,7 +51,11 @@ def Fbe.if_absent(fb: Fbe.fb)
     others(map: attrs) do |*args|
       k = args[0]
       if k.end_with?('=')
-        @map[k[0..-2].to_sym] = args[1]
+        k = k[0..-2].to_sym
+        v = args[1]
+        raise "Can't set #{k} to nil" if v.nil?
+        raise "Can't set #{k} to empty string" if v.is_a?(String) && v.empty?
+        @map[k] = v
       else
         @map[k.to_sym]
       end

data/lib/fbe/middleware/sqlite_store.rb

@@ -126,17 +126,28 @@ class Fbe::Middleware::SqliteStore
     @db ||=
       SQLite3::Database.new(@path).tap do |d|
         d.transaction do |t|
-          t.execute <<~SQL
-            CREATE TABLE IF NOT EXISTS cache(
-              key TEXT UNIQUE NOT NULL, value TEXT, touched_at TEXT NOT NULL
-            );
-          SQL
+          t.execute 'CREATE TABLE IF NOT EXISTS cache(key TEXT UNIQUE NOT NULL, value TEXT);'
           t.execute 'CREATE INDEX IF NOT EXISTS cache_key_idx ON cache(key);'
-          t.execute 'CREATE INDEX IF NOT EXISTS cache_touched_at_idx ON cache(touched_at);'
           t.execute 'CREATE TABLE IF NOT EXISTS meta(key TEXT UNIQUE NOT NULL, value TEXT);'
           t.execute 'CREATE INDEX IF NOT EXISTS meta_key_idx ON meta(key);'
           t.execute "INSERT INTO meta(key, value) VALUES('version', ?) ON CONFLICT(key) DO NOTHING;", [@version]
         end
+        if d.execute("SELECT 1 FROM pragma_table_info('cache') WHERE name = 'touched_at';").dig(0, 0) != 1
+          d.transaction do |t|
+            t.execute 'ALTER TABLE cache ADD COLUMN touched_at TEXT;'
+            t.execute 'UPDATE cache set touched_at = ?;', [Time.now.utc.iso8601]
+            t.execute 'ALTER TABLE cache RENAME TO cache_old;'
+            t.execute <<~SQL
+              CREATE TABLE IF NOT EXISTS cache(
+                key TEXT UNIQUE NOT NULL, value TEXT, touched_at TEXT NOT NULL
+              );
+            SQL
+            t.execute 'INSERT INTO cache SELECT * FROM cache_old;'
+            t.execute 'DROP TABLE cache_old;'
+            t.execute 'CREATE INDEX IF NOT EXISTS cache_touched_at_idx ON cache(touched_at);'
+          end
+          d.execute 'VACUUM;'
+        end
         found = d.execute("SELECT value FROM meta WHERE key = 'version' LIMIT 1;").dig(0, 0)
         if found != @version
           @loog.info("Version mismatch in SQLite cache: stored '#{found}' != current '#{@version}', cleaning up")

data/lib/fbe/octo.rb

@@ -10,6 +10,7 @@ require 'faraday/retry'
 require 'loog'
 require 'obk'
 require 'octokit'
+require 'others'
 require 'uri'
 require 'verbose'
 require_relative '../fbe'
@@ -116,62 +117,69 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
         loog.debug('The connection to GitHub API is mocked')
         o = Fbe::FakeOctokit.new
       end
-      decoor(o, loog:, trace:) do
-        def print_trace!
-          if @trace.empty?
-            @loog.debug('GitHub API trace is empty')
-          else
-            grouped =
-              @trace.group_by do |entry|
-                uri = URI.parse(entry[:url])
-                "#{uri.scheme}://#{uri.host}#{uri.path}"
-              end
-            message = grouped
-              .sort_by { |_path, entries| -entries.count }
-              .map { |path, entries| "  #{path}: #{entries.count}" }
-              .join("\n")
-            @loog.info("GitHub API trace (#{grouped.count} URLs vs #{@trace.count} requests):\n#{message}")
-            @trace.clear
+      o =
+        decoor(o, loog:, trace:) do
+          def print_trace!
+            if @trace.empty?
+              @loog.debug('GitHub API trace is empty')
+            else
+              grouped =
+                @trace.group_by do |entry|
+                  uri = URI.parse(entry[:url])
+                  "#{uri.scheme}://#{uri.host}#{uri.path}"
+                end
+              message = grouped
+                .sort_by { |_path, entries| -entries.count }
+                .map { |path, entries| "  #{path}: #{entries.count}" }
+                .join("\n")
+              @loog.info("GitHub API trace (#{grouped.count} URLs vs #{@trace.count} requests):\n#{message}")
+              @trace.clear
+            end
           end
-        end
 
-        def off_quota?(threshold: 50)
-          left = @origin.rate_limit.remaining
-          if left < threshold
-            @loog.info("Too much GitHub API quota consumed already (#{left} < #{threshold}), stopping")
-            true
-          else
-            @loog.debug("Still #{left} GitHub API quota left (>#{threshold})")
-            false
+          def off_quota?(threshold: 50)
+            left = @origin.rate_limit.remaining
+            if left < threshold
+              @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
-        end
 
-        def user_name_by_id(id)
-          raise 'The ID of the user is nil' if id.nil?
-          raise 'The ID of the user must be an Integer' unless id.is_a?(Integer)
-          json = @origin.user(id)
-          name = json[:login].downcase
-          @loog.debug("GitHub user ##{id} has a name: @#{name}")
-          name
-        end
+          def user_name_by_id(id)
+            raise 'The ID of the user is nil' if id.nil?
+            raise 'The ID of the user must be an Integer' unless id.is_a?(Integer)
+            json = @origin.user(id)
+            name = json[:login].downcase
+            @loog.debug("GitHub user ##{id} has a name: @#{name}")
+            name
+          end
 
-        def repo_id_by_name(name)
-          raise 'The name of the repo is nil' if name.nil?
-          json = @origin.repository(name)
-          id = json[:id]
-          @loog.debug("GitHub repository #{name.inspect} has an ID: ##{id}")
-          id
-        end
+          def repo_id_by_name(name)
+            raise 'The name of the repo is nil' if name.nil?
+            json = @origin.repository(name)
+            id = json[:id]
+            @loog.debug("GitHub repository #{name.inspect} has an ID: ##{id}")
+            id
+          end
 
-        def repo_name_by_id(id)
-          raise 'The ID of the repo is nil' if id.nil?
-          raise 'The ID of the repo must be an Integer' unless id.is_a?(Integer)
-          json = @origin.repository(id)
-          name = json[:full_name].downcase
-          @loog.debug("GitHub repository ##{id} has a name: #{name}")
-          name
+          def repo_name_by_id(id)
+            raise 'The ID of the repo is nil' if id.nil?
+            raise 'The ID of the repo must be an Integer' unless id.is_a?(Integer)
+            json = @origin.repository(id)
+            name = json[:full_name].downcase
+            @loog.debug("GitHub repository ##{id} has a name: #{name}")
+            name
+          end
         end
-      end
+      o =
+        others(o:) do |*args|
+          raise "We are off-quota (remaining: #{@o.rate_limit.remaining})" if args.first != :off_quota? && @o.off_quota?
+          @o.__send__(*args)
+        end
+      o
     end
 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.21.0' unless const_defined?(:VERSION)
+  VERSION = '0.21.2' unless const_defined?(:VERSION)
 end

data/test/fbe/middleware/test_sqlite_store.rb

@@ -182,6 +182,26 @@ class SqliteStoreTest < Fbe::Test
     end
   end
 
+  def test_upgrade_sqlite_schema_for_add_touched_at_column
+    with_tmpfile('a.db') do |f|
+      SQLite3::Database.new(f).tap do |d|
+        d.execute 'CREATE TABLE IF NOT EXISTS cache(key TEXT UNIQUE NOT NULL, value TEXT);'
+        [
+          ['key1', JSON.dump('value1')],
+          ['key2', JSON.dump('value2')]
+        ].each { d.execute 'INSERT INTO cache(key, value) VALUES(?1, ?2);', _1 }
+        d.execute 'CREATE TABLE IF NOT EXISTS meta(key TEXT UNIQUE NOT NULL, value TEXT);'
+        d.execute "INSERT INTO meta(key, value) VALUES('version', ?);", ['0.0.1']
+      end
+      Fbe::Middleware::SqliteStore.new(f, '0.0.1').then do |store|
+        assert_equal('value1', store.read('key1'))
+        assert_equal('value2', store.read('key2'))
+      rescue SQLite3::SQLException => e
+        assert_nil(e)
+      end
+    end
+  end
+
   private
 
   def with_tmpfile(name = 'test.db', &)

data/test/fbe/test_if_absent.rb

@@ -24,6 +24,24 @@ class TestIfAbsent < Fbe::Test
     assert_nil(n)
   end
 
+  def test_raises_on_empty_value
+    assert_raises(StandardError) do
+      Fbe.if_absent(fb: Factbase.new) do |f|
+        f.foo = ''
+      end
+    end
+  end
+
+  def test_raises_on_nil
+    fb = Factbase.new
+    fb.insert.foo = 42
+    assert_raises(StandardError) do
+      Fbe.if_absent(fb: Factbase.new) do |f|
+        f.foo = nil
+      end
+    end
+  end
+
   def test_ignores_with_time
     fb = Factbase.new
     t = Time.now

data/test/fbe/test_octo.rb

@@ -53,6 +53,9 @@ class TestOcto < Fbe::Test
 
   def test_reads_nickname_by_id
     WebMock.disable_net_connect!
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } }
+    )
     global = {}
     o = Fbe.octo(loog: Loog::NULL, global:, options: Judges::Options.new)
     stub_request(:get, 'https://api.github.com/user/42').to_return(
@@ -64,6 +67,9 @@ class TestOcto < Fbe::Test
 
   def test_reads_repo_name_by_id
     WebMock.disable_net_connect!
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } }
+    )
     global = {}
     o = Fbe.octo(loog: Loog::NULL, global:, options: Judges::Options.new)
     stub_request(:get, 'https://api.github.com/repositories/42').to_return(
@@ -75,10 +81,16 @@ class TestOcto < Fbe::Test
 
   def test_caching
     WebMock.disable_net_connect!
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } }
+    )
     global = {}
     o = Fbe.octo(loog: Loog::NULL, global:, options: Judges::Options.new)
     stub_request(:get, 'https://api.github.com/users/yegor256')
-      .to_return(body: '{}', headers: { 'Cache-Control' => 'public, max-age=60', 'etag' => 'abc' })
+      .to_return(
+        body: '{}',
+        headers: { 'Cache-Control' => 'public, max-age=60', 'etag' => 'abc', 'x-ratelimit-remaining' => '10000' }
+      )
       .times(1)
       .then
       .to_raise('second request should be cached, not passed to GitHub API!')
@@ -144,6 +156,9 @@ class TestOcto < Fbe::Test
 
   def test_retrying
     WebMock.disable_net_connect!
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } }
+    )
     global = {}
     o = Fbe.octo(loog: Loog::NULL, global:, options: Judges::Options.new)
     stub_request(:get, 'https://api.github.com/users/yegor256')
@@ -156,6 +171,9 @@ class TestOcto < Fbe::Test
 
   def test_retrying_on_error_response
     WebMock.disable_net_connect!
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } }
+    )
     global = {}
     o = Fbe.octo(loog: Loog::NULL, global:, options: Judges::Options.new)
     stub_request(:get, 'https://api.github.com/users/yegor256')
@@ -203,6 +221,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' } }
+    )
     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(
@@ -215,8 +236,6 @@ class TestOcto < Fbe::Test
       )
     o.user('foo')
     assert_predicate(o, :off_quota?)
-    o.user('foo')
-    refute_predicate(o, :off_quota?)
   end
 
   def test_fetches_fake_check_runs_for_ref
@@ -327,13 +346,18 @@ class TestOcto < Fbe::Test
   def test_print_trace
     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' } }
+    )
     stub_request(:get, 'https://api.github.com/user/123').to_return(
       status: 200,
-      body: '{"id":123,"login":"test"}'
+      body: '{"id":123,"login":"test"}',
+      headers: { 'X-RateLimit-Remaining' => '222' }
     )
     stub_request(:get, 'https://api.github.com/repos/foo/bar').to_return(
       status: 200,
-      body: '{"id":456,"full_name":"foo/bar"}'
+      body: '{"id":456,"full_name":"foo/bar"}',
+      headers: { 'X-RateLimit-Remaining' => '222' }
     )
     octo = Fbe.octo(loog:, global: {}, options: Judges::Options.new)
     octo.user(123)
@@ -341,7 +365,7 @@ class TestOcto < Fbe::Test
     octo.repository('foo/bar')
     octo.print_trace!
     output = loog.to_s
-    assert_includes output, 'GitHub API trace (2 URLs vs 3 requests)'
+    assert_includes output, 'GitHub API trace (3 URLs vs 4 requests)'
     assert_includes output, 'https://api.github.com/user/123: 1'
     assert_includes output, 'https://api.github.com/repos/foo/bar: 2'
     repo_index = output.index('https://api.github.com/repos/foo/bar: 2')
@@ -351,9 +375,13 @@ class TestOcto < Fbe::Test
 
   def test_trace_gets_cleared_after_print
     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/456').to_return(
       status: 200,
-      body: '{"id":456,"login":"testuser"}'
+      body: '{"id":456,"login":"testuser"}',
+      headers: { 'X-RateLimit-Remaining' => '222' }
     )
     first_loog = Loog::Buffer.new
     octo = Fbe.octo(loog: first_loog, global: {}, options: Judges::Options.new)
@@ -361,15 +389,13 @@ class TestOcto < Fbe::Test
     octo.print_trace!
     first_output = first_loog.to_s
     assert_includes first_output, 'GitHub API trace'
-    second_loog = Loog::Buffer.new
-    octo.instance_variable_set(:@loog, second_loog)
-    octo.print_trace!
-    second_output = second_loog.to_s
-    assert_includes second_output, 'GitHub API trace is empty'
   end
 
   def test_works_via_sqlite_store
     WebMock.disable_net_connect!
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } }
+    )
     Dir.mktmpdir do |dir|
       global = {}
       sqlite_cache = File.expand_path('test.db', dir)
@@ -394,6 +420,9 @@ class TestOcto < Fbe::Test
 
   def test_through_sqlite_store_when_broken_token
     WebMock.disable_net_connect!
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } }
+    )
     Dir.mktmpdir do |dir|
       global = {}
       file = File.expand_path('test.db', dir)
@@ -408,6 +437,9 @@ class TestOcto < Fbe::Test
 
   def test_sqlite_store_for_use_in_different_versions
     WebMock.disable_net_connect!
+    stub_request(:get, 'https://api.github.com/rate_limit').to_return(
+      { body: '{}', headers: { 'X-RateLimit-Remaining' => '222' } }
+    )
     Dir.mktmpdir do |dir|
       global = {}
       stub =

metadata

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