fbe 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edccc9ab59eb5ab03d811f50b8767dd78cceb04ae1f7100ff69087751c0a8a91
-  data.tar.gz: 381aa6f00db80c484e929aa139b252228fc932d96be2f0eab2d320e8e7066c0b
+  metadata.gz: a0081d0ed95bf4d88cc396b55651521cf252d5a7894c93e5942a4f44f902a3bd
+  data.tar.gz: b9624f277446d361ac46b2e89d04e4b8b4a20c93adfa8c2f5b0452febde43b7b
 SHA512:
-  metadata.gz: 45d8726787ae9bfdd718980a3cb43662a1e1accc166db30ea464f89328a676fa77fb7cbd7407fe65ff2ece0558aca8fdec8f06b6d0969f59cd2ce7ef88895d88
-  data.tar.gz: b03684b1597f8bbb7b80b28d67655c5a89e99afdbc6a9206b141a69a266065c5508ce7130ee073e09329f98eb717467c29ff9d7b3f97a76183dff50b4624e4e4
+  metadata.gz: 92fd51fff1c6f6347bfe1a89caa2e94bca3277c963ccaf4cce54b33144e1a38f6e060f771e8cab07503d064f1a1c4cbae47cbd5faca2ac338b6240e8308d3aff
+  data.tar.gz: 3e03f00ef4d1c127aa021c89a72ec3f8b273b43fe2bef85bc944063e52ae0fb77a4f93d8883b6c4855852b5f67c067ffd37be04bc7b1b73cc70b454d8e295a94

data/.rubocop.yml

@@ -40,10 +40,10 @@ Style/ClassAndModuleChildren:
   Enabled: false
 Layout/MultilineMethodCallIndentation:
   Enabled: false
+Metrics/BlockLength:
+  Enabled: false
 Metrics/AbcSize:
   Enabled: false
-Metrics/BlockLength:
-  Max: 30
 Metrics/CyclomaticComplexity:
   Max: 25
 Metrics/PerceivedComplexity:

data/Gemfile

@@ -28,7 +28,7 @@ gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '6.1.3', require: false
 gem 'rubocop', '1.64.1', require: false
 gem 'rubocop-performance', '1.21.1', require: false
-gem 'rubocop-rspec', '3.0.1', require: false
+gem 'rubocop-rspec', '3.0.2', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false
 gem 'yard', '0.9.36', require: false

data/Gemfile.lock

@@ -62,7 +62,7 @@ GEM
     erubi (1.13.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.0.58)
+    factbase (0.0.60)
       backtrace (~> 0.3)
       decoor (~> 0.0)
       json (~> 2.7)
@@ -94,7 +94,7 @@ GEM
       reline (>= 0.4.2)
     iri (0.8.0)
     json (2.7.2)
-    judges (0.15.0)
+    judges (0.15.3)
       backtrace (~> 0.3)
       concurrent-ruby (~> 1.2)
       factbase (~> 0.0)
@@ -139,7 +139,7 @@ GEM
       stringio
     public_suffix (6.0.0)
     racc (1.8.0)
-    rack (3.1.5)
+    rack (3.1.6)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -205,7 +205,7 @@ GEM
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.1)
+    rubocop-rspec (3.0.2)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     sawyer (0.9.2)
@@ -251,7 +251,7 @@ DEPENDENCIES
   rspec-rails (= 6.1.3)
   rubocop (= 1.64.1)
   rubocop-performance (= 1.21.1)
-  rubocop-rspec (= 3.0.1)
+  rubocop-rspec (= 3.0.2)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)
   yard (= 0.9.36)

data/lib/fbe/conclude.rb

@@ -44,7 +44,6 @@ class Fbe::Conclude
     @loog = loog
     @query = nil
     @follows = []
-    @threshold = 9999
     @quota_aware = false
   end
 
@@ -57,10 +56,6 @@ class Fbe::Conclude
     @query = query
   end
 
-  def threshold(max)
-    @threshold = max
-  end
-
   def follow(props)
     @follows = props.split
   end
@@ -96,7 +91,6 @@ class Fbe::Conclude
       @fb.txn do |fbt|
         fbt.query(@query).each do |a|
           throw :stop if @quota_aware && Fbe.octo(loog: @loog).off_quota
-          throw :stop if passed >= @threshold
           n = yield fbt, a
           @loog.info("#{n.what}: #{n.details}") unless n.nil?
           passed += 1

data/lib/fbe/fb.rb

@@ -29,18 +29,20 @@ require 'factbase/pre'
 require 'factbase/rules'
 require_relative '../fbe'
 
-def Fbe.fb
-  rules = Dir.glob(File.join('rules', '*.fe')).map { |f| File.read(f) }
-  fb = Factbase::Rules.new(
-    $fb,
-    "(and \n#{rules.join("\n")}\n)",
-    uid: '_id'
-  )
-  fb = Factbase::Pre.new(fb) do |f|
-    max = $fb.query('(eq _id (max _id))').each.to_a[0]
-    f._id = (max.nil? ? 0 : max._id) + 1
-    f._time = Time.now
-    f._version = "#{Factbase::VERSION}/#{Judges::VERSION}/#{$options.judges_action_version}"
+def Fbe.fb(global: $global)
+  global[:fb] ||= begin
+    rules = Dir.glob(File.join('rules', '*.fe')).map { |f| File.read(f) }
+    fb = Factbase::Rules.new(
+      $fb,
+      "(and \n#{rules.join("\n")}\n)",
+      uid: '_id'
+    )
+    fb = Factbase::Pre.new(fb) do |f|
+      max = $fb.query('(eq _id (max _id))').each.to_a.first
+      f._id = (max.nil? ? 0 : max._id) + 1
+      f._time = Time.now
+      f._version = "#{Factbase::VERSION}/#{Judges::VERSION}/#{$options.judges_action_version}"
+    end
+    Factbase::Looged.new(fb, Loog::NULL)
   end
-  Factbase::Looged.new(fb, Loog::NULL)
 end

data/lib/fbe/iterate.rb

@@ -78,7 +78,10 @@ class Fbe::Iterate
     loop do
       repos.each do |repo|
         seen[repo] = 0 if seen[repo].nil?
-        next if seen[repo] > @limit
+        if seen[repo] > @limit
+          @loog.debug("We've seen too many in the #{repo} repo, time to move to the next one")
+          next
+        end
         rid = oct.repo_id_by_name(repo)
         before = Fbe.fb.query(
           "(agg (and (eq what '#{@label}') (eq where 'github') (eq repository #{rid})) (first latest))"
@@ -86,21 +89,42 @@ class Fbe::Iterate
         Fbe.fb.query("(and (eq what '#{@label}') (eq where 'github') (eq repository #{rid}))").delete!
         before = before.nil? ? @since : before[0]
         nxt = Fbe.fb.query(@query).one(before:, repository: rid)
-        after = nxt.nil? ? @since : yield(rid, nxt)
+        after =
+          if nxt.nil?
+            @loog.debug("Next is nil, starting from the beginning at #{@since}")
+            @since
+          else
+            @loog.debug("Next is #{nxt}, starting from it...")
+            yield(rid, nxt)
+          end
         raise "Iterator must return an Integer, while #{after.class} returned" unless after.is_a?(Integer)
         f = Fbe.fb.insert
         f.where = 'github'
         f.repository = rid
-        f.latest = after.nil? ? nxt : after
+        f.latest =
+          if after.nil?
+            @loog.debug("After is nil, setting the `latest` to nxt: #{nxt}")
+            nxt
+          else
+            @loog.debug("After is #{after}, setting the `latest` to it")
+            after
+          end
         f.what = @label
         seen[repo] += 1
-        break if oct.off_quota
+        if oct.off_quota
+          @loog.debug('We are off GitHub quota, time to stop')
+          break
+        end
+      end
+      if oct.off_quota
+        @loog.debug('We are off GitHub quota, time to stop')
+        break
       end
-      break if oct.off_quota
       unless seen.values.any? { |v| v < @limit }
-        @loog.debug("Finished scanning #{repos.size} repos: #{seen.map { |k, v| "#{k}:#{v}" }.join(', ')}")
+        @loog.debug('No more repos to scan, quitting')
         break
       end
     end
+    @loog.debug("Finished scanning #{repos.size} repos: #{seen.map { |k, v| "#{k}:#{v}" }.join(', ')}")
   end
 end

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.5'
+  VERSION = '0.0.7'
 end

data/rules/basic.fe

@@ -29,13 +29,23 @@
   return r
   ')
 
+(explain (when
+  (exists _id)
+  (and
+    (unique _id)
+    (eq "Integer" (type _id))
+    (one _id))))
+
 (explain (when
   (exists what)
-  (matches what "^[a-z]+(-[a-z]+)*$")))
+  (and
+    (matches what "^[a-z]+(-[a-z]+)*$")
+    (one what))))
 
 (explain (when
   (exists details)
   (and
+    (one details)
     (not (matches details "  "))
     (not (matches details "^.{,80}$"))
     (not (matches details "[^.]$")))))
@@ -43,46 +53,54 @@
 (explain (when
   (exists where)
   (and
+    (one where)
     (eq "String" (type where))
     (eq "github" where))))
 
-(explain (when
-  (exists _id)
-  (eq "Integer" (type _id))))
-
 (explain (when
   (exists _time)
-  (eq "Time" (type _time))))
+  (and
+    (one _time)
+    (eq "Time" (type _time)))))
 
 (explain (when
   (exists _version)
-  (eq "String" (type _version))))
+  (and
+    (one _version)
+    (eq "String" (type _version)))))
 
 (explain (when
   (exists why)
-  (eq "String" (type why))))
+  (and
+    (one why)
+    (eq "String" (type why)))))
 
 (explain (when
   (exists issue)
   (and
+    (one issue)
     (eq "Integer" (type issue))
     (gt issue 0))))
 
 (explain (when
   (exists repository)
   (and
+    (one repository)
     (eq "Integer" (type repository))
     (gt repository 0))))
 
 (explain (when
   (exists who)
   (and
+    (one who)
     (eq "Integer" (type who))
     (gt who 0))))
 
 (explain (when
   (exists when)
-  (eq "Time" (type when))))
+  (and
+    (one when)
+    (eq "Time" (type when)))))
 
 (explain (when
   (exists issue)
@@ -95,6 +113,7 @@
 (explain (when
   (exists award)
   (and
+    (one award)
     (eq "Integer" (type award))
     (exists when)
     (exists who)

data/test/fbe/test_conclude.rb

@@ -37,6 +37,7 @@ require_relative '../../lib/fbe/fb'
 class TestConclude < Minitest::Test
   def test_with_defaults
     $fb = Factbase.new
+    $global = {}
     $options = Judges::Options.new
     $loog = Loog::NULL
     Fbe.conclude do
@@ -63,6 +64,7 @@ class TestConclude < Minitest::Test
 
   def test_maybe
     $fb = Factbase.new
+    $global = {}
     $options = Judges::Options.new
     $loog = Loog::NULL
     Fbe.fb.insert.foo = 1
@@ -84,6 +86,7 @@ class TestConclude < Minitest::Test
 
   def test_consider
     $fb = Factbase.new
+    $global = {}
     $options = Judges::Options.new
     $loog = Loog::NULL
     Fbe.fb.insert.foo = 1

data/test/fbe/test_fb.rb

@@ -35,6 +35,7 @@ require_relative '../../lib/fbe/fb'
 class TestFb < Minitest::Test
   def test_simple
     $fb = Factbase.new
+    $global = {}
     $options = Judges::Options.new
     Fbe.fb.insert.foo = 1
     Fbe.fb.insert.bar = 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace