fbe 0.24.0 → 0.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91db19b000a04e9305e13bac13ab0084db8c31950978554f59dbf2a8cd25a795
-  data.tar.gz: 80c536ab908b35b2d5acf3634560a14c3a352c8229a7a73f20690086d01261c5
+  metadata.gz: 1896cdb2e02c15259d12df1f1ecddb5049b902ff0b52dd67cb25a9c113606175
+  data.tar.gz: b3fdf07d9b80f1b7cffb9974f09296c8f1f33eb44d88f4faa54918f747fcd0cf
 SHA512:
-  metadata.gz: f0722eae0723bd98a0b34a0b5ba0674776450961420a5be71fbf65d6aa7f786df453c0c48789bdef2e70c967bda7c4a90d0f707e121ebbb5fb78937ad3272ecd
-  data.tar.gz: e991dad19e45b1cf67c514ca83e3bfcf3814e5477ce0c4cc0b6b4680f3286f239f96b337b07c5bd9b1e8148ea8f6930820743976df94463544bcecb17458345b
+  metadata.gz: bfa0a5da515f2054d9e22c7894ea329f70894a7751dc9879c77ba074fcc07df24d70a0332771381c9698b37b83a896bd88bccd40b49877a97d35a688e858af0b
+  data.tar.gz: f15e90b61d66b43e54bf44ecc767b7943ab5f22167203e1ea36900a1b29476a8208bbcece5f8d1c66eb9d5abf9d49d551d190fdcef7dc01c274ce749282cd218

data/Gemfile.lock

@@ -14,6 +14,7 @@ PATH
       filesize (~> 0.2)
       graphql-client (~> 0.26)
       intercepted (~> 0.2)
+      joined (~> 0.1)
       judges (~> 0.46)
       liquid (~> 5.5)
       loog (~> 0.6)
@@ -46,7 +47,7 @@ GEM
     ast (2.4.3)
     backtrace (0.4.1)
     base64 (0.3.0)
-    baza.rb (0.9.7)
+    baza.rb (0.9.8)
       backtrace (~> 0.4)
       elapsed (~> 0.0)
       faraday (~> 2.13)
@@ -86,7 +87,7 @@ GEM
       others (~> 0.0)
       tago (~> 0.0)
       yaml (~> 0.3)
-    faraday (2.13.1)
+    faraday (2.13.2)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -118,6 +119,7 @@ GEM
       concurrent-ruby (~> 1.0)
     intercepted (0.2.0)
     iri (0.11.2)
+    joined (0.3.0)
     json (2.12.2)
     judges (0.51.0)
       backtrace (~> 0.4)

data/fbe.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'filesize', '~>0.2'
   s.add_dependency 'graphql-client', '~>0.26'
   s.add_dependency 'intercepted', '~>0.2'
+  s.add_dependency 'joined', '~>0.1'
   s.add_dependency 'judges', '~>0.46'
   s.add_dependency 'liquid', '~>5.5'
   s.add_dependency 'loog', '~>0.6'

data/lib/fbe/award.rb

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 require 'factbase/syntax'
+require 'joined'
 require_relative 'fb'
 
 # A generator of awards.
@@ -146,7 +147,7 @@ class Fbe::Award
         any.calc(bill)
       elsif any.is_a?(Symbol)
         v = bill.vars[any]
-        raise "Unknown name #{any.inspect} among: #{bill.vars.keys.map(&:inspect).join(', ')}" if v.nil?
+        raise "Unknown name #{any.inspect} among: #{bill.vars.keys.map(&:inspect).joined}" if v.nil?
         v
       else
         any

data/lib/fbe/iterate.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
 # SPDX-License-Identifier: MIT
 
+require 'joined'
 require 'tago'
 require 'time'
 require_relative '../fbe'
@@ -270,6 +271,6 @@ class Fbe::Iterate
         break
       end
     end
-    @loog.debug("Finished scanning #{repos.size} repos in #{start.ago}: #{seen.map { |k, v| "#{k}:#{v}" }.join(', ')}")
+    @loog.debug("Finished scanning #{repos.size} repos in #{start.ago}: #{seen.map { |k, v| "#{k}:#{v}" }.joined}")
   end
 end

data/lib/fbe/middleware/sqlite_store.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
 # SPDX-License-Identifier: MIT
 
+require 'zlib'
 require 'filesize'
 require 'json'
 require 'loog'
@@ -73,7 +74,13 @@ class Fbe::Middleware::SqliteStore
       t.execute('UPDATE cache SET touched_at = ?2 WHERE key = ?1;', [key, Time.now.utc.iso8601])
       t.execute('SELECT value FROM cache WHERE key = ? LIMIT 1;', [key])
     end.dig(0, 0)
-    JSON.parse(value) if value
+    return unless value
+    begin
+      JSON.parse(Zlib::Inflate.inflate(value))
+    rescue Zlib::Error => e
+      @loog.info("Failed to decompress cached value for key: #{key}, error: #{e.message}, the key will be deleted")
+      delete(key)
+    end
   end
 
   # Delete a key from the cache.
@@ -95,7 +102,7 @@ class Fbe::Middleware::SqliteStore
       req = JSON.parse(vv[0])
       req['method'] != 'get'
     end
-    value = JSON.dump(value)
+    value = Zlib::Deflate.deflate(JSON.dump(value))
     return if value.bytesize > @maxvsize
     perform do |t|
       t.execute(<<~SQL, [key, value, Time.now.utc.iso8601])

data/lib/fbe/octo.rb

@@ -708,6 +708,7 @@ class Fbe::FakeOctokit
       repo: {
         full_name: repo
       },
+      state: 'closed',
       user: { login: 'yegor256', id: 526_301, type: 'User' },
       head: { ref: 'master', sha: '6dcb09b5b57875f334f61aebed695e2e4193db5e' },
       additions: 12,
@@ -715,7 +716,8 @@ class Fbe::FakeOctokit
       changed_files: 3,
       comments: 2,
       review_comments: 2,
-      created_at: Time.parse('2024-09-20 19:00:00 UTC')
+      merged_at: Time.parse('2024-12-20'),
+      created_at: Time.parse('2024-09-20')
     }
   end
 

data/lib/fbe/unmask_repos.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
 # SPDX-License-Identifier: MIT
 
+require 'joined'
 require_relative '../fbe'
 require_relative 'octo'
 
@@ -53,6 +54,8 @@ end
 # @note Exclusion patterns must start with '-' (e.g., '-org/pattern*')
 # @note Results are shuffled to distribute load when processing
 def Fbe.unmask_repos(options: $options, global: $global, loog: $loog)
+  raise 'Repositories mask is not specified' unless options.repositories
+  raise 'Repositories mask is empty' if options.repositories.empty?
   repos = []
   octo = Fbe.octo(loog:, global:, options:)
   masks = (options.repositories || '').split(',')
@@ -71,8 +74,8 @@ def Fbe.unmask_repos(options: $options, global: $global, loog: $loog)
     repos.reject! { |r| re.match?(r) }
   end
   repos.reject! { |repo| octo.repository(repo)[:archived] }
-  raise "No repos found matching: #{options.repositories}" if repos.empty?
+  raise "No repos found matching: #{options.repositories.inspect}" if repos.empty?
   repos.shuffle!
-  loog.debug("Scanning #{repos.size} repositories: #{repos.join(', ')}...")
+  loog.debug("Scanning #{repos.size} repositories: #{repos.joined}...")
   repos
 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.24.0' unless const_defined?(:VERSION)
+  VERSION = '0.24.2' unless const_defined?(:VERSION)
 end

data/test/fbe/middleware/test_sqlite_store.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024-2025 Zerocracy
 # SPDX-License-Identifier: MIT
 
+require 'securerandom'
 require 'qbash'
 require_relative '../../test__helper'
 require_relative '../../../lib/fbe/middleware'
@@ -141,8 +142,8 @@ class SqliteStoreTest < Fbe::Test
       Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
         store.write('a', 'a' * 9_997)
         store.write('b', 'b' * 9_998)
-        store.write('c', 'c' * 19_999)
-        store.write('d', 'd' * 30_000)
+        store.write('c', SecureRandom.alphanumeric((19_999 * 1.4).to_i))
+        store.write('d', SecureRandom.alphanumeric((30_000 * 1.4).to_i))
         assert_equal('a' * 9_997, store.read('a'))
         assert_equal('b' * 9_998, store.read('b'))
         assert_nil(store.read('c'))
@@ -155,7 +156,6 @@ class SqliteStoreTest < Fbe::Test
     with_tmpfile('large.db') do |f|
       Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
         key = 'aaa'
-        alpha = ('a'..'z').to_a
         store.write('a', 'aa')
         Time.stub(:now, (Time.now - (5 * 60 * 60)).round) do
           store.write('b', 'bb')
@@ -163,8 +163,8 @@ class SqliteStoreTest < Fbe::Test
         end
         assert_equal('cc', store.read('c'))
         Time.stub(:now, rand((Time.now - (5 * 60 * 60))..Time.now).round) do
+          value = SecureRandom.alphanumeric(2048)
           10_240.times do
-            value = alpha.sample * rand(1024..2048)
             store.write(key, value)
             key = key.next
           end
@@ -185,8 +185,8 @@ class SqliteStoreTest < Fbe::Test
       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')]
+          ['key1', Zlib::Deflate.deflate(JSON.dump('value1'))],
+          ['key2', Zlib::Deflate.deflate(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']
@@ -200,6 +200,43 @@ class SqliteStoreTest < Fbe::Test
     end
   end
 
+  def test_use_compress_for_stored_data
+    with_tmpfile('c.db') do |f|
+      Fbe::Middleware::SqliteStore.new(f, '0.0.1', loog: fake_loog).then do |store|
+        a = SecureRandom.alphanumeric(200)
+        store.write('a', a)
+        store.write('b', 'b' * 100_000)
+        assert_equal(a, store.read('a'))
+        assert_equal('b' * 100_000, store.read('b'))
+        store.all.each do |k, v|
+          case k
+          when 'a'
+            assert_operator(v.size, :<, a.size)
+          when 'b'
+            assert_operator(v.size, :<, 100_000)
+          end
+        end
+      end
+    end
+  end
+
+  def test_corrupted_compression_stored_data
+    with_tmpfile('c.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);'
+        [
+          ['my_key', JSON.dump('value1')]
+        ].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', loog: fake_loog).then do |store|
+        assert_nil(store.read('my_key'))
+        assert_predicate(store.all.count, :zero?)
+      end
+    end
+  end
+
   private
 
   def with_tmpfile(name = 'test.db', &)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.2
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -177,6 +177,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: joined
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: judges
   requirement: !ruby/object:Gem::Requirement