fbe 0.48.5 → 0.48.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e54b9ecd59fd5bf0087090ec4d320a09e4468fd1d30c943968255992d37af3a9
-  data.tar.gz: d309db436c5f4902e1bfb50f6c32fbc93a5aeed57aa47653d60828079cb5540e
+  metadata.gz: cc71748bcfb59be79127dfc1373ee3dfe84e14e9843583322d89f95bef91969f
+  data.tar.gz: 26450c3e7d5e30e7e745464ef6b478fe99dbef34484401d6ca6fffabeb1bc5f0
 SHA512:
-  metadata.gz: c0131eae4897865be58003cda673768124456e990e74be4650d671bb2038fb71fcf58fec08d7f2c922c3e694875abfbfc52f2a9584a3a54e4a9ca7a5ef5c2076
-  data.tar.gz: c68253c55d621d3ce8d7da0721f7e330532fe4b8eec18ef641acb801b57098c884307782fa31c2d403781a5b38afbbcaddb5574505eb6da4ab8be6587614a1ca
+  metadata.gz: 979762592673b5f9ea6136185c339a5be403e164d5f7d614fdd2d2bdec646e69f274325fc2991b5085bbc3e7017329a5e3be96925dc7d2d65efe64b0813428e7
+  data.tar.gz: d8103526278d4b6c6e1c84b34ef358d310b02add12c5ee001223568dd65626c122ba1440074dcc8a043922ff19fd8458747119c41cb699c0229b33bf780e0c59

data/.github/workflows/actionlint.yml

@@ -16,10 +16,4 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v6
-      - name: Download actionlint
-        id: get_actionlint
-        run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
-        shell: bash
-      - name: Check workflow files
-        run: ${{ steps.get_actionlint.outputs.executable }} -color
-        shell: bash
+      - uses: reviewdog/action-actionlint@v1.72.0

data/.github/workflows/codecov.yml

@@ -15,11 +15,11 @@ jobs:
       - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 4.0.3
+          ruby-version: .ruby-version
           bundler-cache: true
       - run: bundle config set --global path "$(pwd)/vendor/bundle"
       - run: bundle install --no-color
       - run: bundle exec rake
-      - uses: codecov/codecov-action@v6
+      - uses: codecov/codecov-action@v7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

data/.github/workflows/markdown-lint.yml

@@ -20,4 +20,4 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v6
-      - uses: DavidAnson/markdownlint-cli2-action@v23.2.0
+      - uses: DavidAnson/markdownlint-cli2-action@v24.0.0

data/.github/workflows/rake.yml

@@ -15,13 +15,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-24.04, macos-15]
-        ruby: [3.3]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: .ruby-version
           bundler-cache: true
       - run: bundle config set --global path "$(pwd)/vendor/bundle"
       - run: bundle install --no-color

data/.github/workflows/typos.yml

@@ -16,6 +16,6 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v6
-      - uses: crate-ci/typos@v1.46.0
+      - uses: crate-ci/typos@v1.48.0
         with:
           config: .github/.typos.toml

data/.gitignore

@@ -9,3 +9,5 @@ node_modules/
 rdoc/
 vendor/
 .claude/
+.opencode/
+.vscode/

data/.rubocop.yml

@@ -7,7 +7,7 @@ AllCops:
     - 'assets/**/*'
     - 'vendor/**/**'
   DisplayCopNames: true
-  TargetRubyVersion: 3.2
+  TargetRubyVersion: 3.3
   SuggestExtensions: false
   NewCops: enable
 plugins:
@@ -19,7 +19,22 @@ Style/GlobalVars:
   Enabled: false
 Style/TopLevelMethodDefinition:
   Enabled: false
+Elegant/NoRedundantVariable:
+  Enabled: false
+Elegant/NoNilReturn:
+  Enabled: false
+Elegant/IndentationLadder:
+  Enabled: false
+Elegant/NoClassInModule:
+  Exclude:
+    - 'lib/fbe.rb'
+Elegant/ClassInModule:
+  Exclude:
+    - 'lib/**/*'
+    - 'test/**/*'
 Elegant/GoodMethodName:
+  Exclude:
+    - 'test/**/*'
   AllowedNames:
     - accept_repository_invitation
     - add_comment
@@ -34,6 +49,7 @@ Elegant/GoodMethodName:
     - delete_one
     - dump_headers
     - extract_remaining_count
+    - extract_search_remaining_count
     - faraday_value
     - github_graph
     - handle_rate_limit_request
@@ -53,6 +69,7 @@ Elegant/GoodMethodName:
     - off_quota?
     - organization_memberships
     - organization_repositories
+    - patched_body
     - print_trace!
     - publish_to
     - pull_request
@@ -85,7 +102,6 @@ Elegant/GoodMethodName:
     - track_request
     - unmask_repos
     - update_organization_membership
-    - update_remaining_count
     - user_name_by_id
     - user_repository_invitations
     - with_disable_auto_paginate

data/.ruby-version

@@ -0,0 +1 @@
+4.0.5

data/Gemfile

@@ -13,7 +13,7 @@ gem 'minitest-stub-const', '~>0.6', require: false
 gem 'os', '~>1.1', require: false
 gem 'qbash', '~>0.4', require: false
 gem 'rake', '13.4.2', require: false
-gem 'rdoc', '~>7.0', require: false
+gem 'rdoc', '~>8.0', require: false
 gem 'rubocop', '~>1.75', require: false
 gem 'rubocop-elegant', '~>0.0', require: false
 gem 'rubocop-minitest', '~>0.38', require: false

data/Gemfile.lock

@@ -48,7 +48,7 @@ GEM
     ast (2.4.3)
     backtrace (0.4.1)
     base64 (0.3.0)
-    baza.rb (0.14.3)
+    baza.rb (0.14.4)
       backtrace (~> 0.4)
       elapsed (~> 0.2)
       faraday (~> 2.13)
@@ -60,14 +60,13 @@ GEM
       retries (~> 0.0)
       tago (~> 0.2)
       typhoeus (~> 1.4)
-    bigdecimal (4.1.1)
+    bigdecimal (4.1.2)
     builder (3.3.0)
     concurrent-ruby (1.3.6)
     connection_pool (3.0.2)
     crack (1.0.1)
       bigdecimal
       rexml
-    date (3.5.1)
     decoor (0.1.0)
     docile (1.4.1)
     drb (2.2.3)
@@ -75,11 +74,11 @@ GEM
       loog (~> 0.6)
       tago (~> 0.1)
     ellipsized (0.3.0)
-    erb (6.0.3)
+    erb (6.0.4)
     ethon (0.18.0)
       ffi (>= 1.15.0)
       logger
-    factbase (0.19.9)
+    factbase (0.19.11)
       backtrace (~> 0.4)
       decoor (~> 0.1)
       ellipsized (~> 0.3)
@@ -90,7 +89,7 @@ GEM
       others (~> 0.1)
       tago (~> 0.1)
       yaml (~> 0.3)
-    faraday (2.14.1)
+    faraday (2.14.2)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -98,7 +97,7 @@ GEM
       faraday (>= 0.8)
     faraday-multipart (1.2.0)
       multipart-post (~> 2.0)
-    faraday-net_http (3.4.2)
+    faraday-net_http (3.4.3)
       net-http (~> 0.5)
     faraday-retry (2.4.0)
       faraday (~> 2.0)
@@ -110,7 +109,7 @@ GEM
     filesize (0.2.0)
     gli (2.22.2)
       ostruct
-    graphql (2.5.23)
+    graphql (2.6.3)
       base64
       fiber-storage
       logger
@@ -123,8 +122,8 @@ GEM
     intercepted (0.2.0)
     iri (0.11.8)
     joined (0.4.0)
-    json (2.19.3)
-    judges (0.60.2)
+    json (2.20.0)
+    judges (0.60.3)
       backtrace (~> 0.4)
       baza.rb (~> 0.10)
       concurrent-ruby (~> 1.2)
@@ -166,13 +165,13 @@ GEM
     multipart-post (2.4.1)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    nokogiri (1.19.2-arm64-darwin)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.2-x64-mingw-ucrt)
+    nokogiri (1.19.3-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-darwin)
+    nokogiri (1.19.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-gnu)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
     obk (0.3.2)
     octokit (10.0.0)
@@ -181,16 +180,13 @@ GEM
     os (1.1.4)
     ostruct (0.6.3)
     others (0.1.1)
-    parallel (2.0.1)
+    parallel (2.1.0)
     parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     prism (1.9.0)
-    psych (5.3.1)
-      date
-      stringio
     public_suffix (7.0.5)
-    qbash (0.8.3)
+    qbash (0.8.4)
       backtrace (> 0)
       elapsed (> 0)
       loog (> 0)
@@ -198,14 +194,19 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rdoc (7.2.0)
+    rbs (4.0.3)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.0.0)
       erb
-      psych (>= 4.0.0)
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
       tsort
     regexp_parser (2.12.0)
     retries (0.0.5)
     rexml (3.4.4)
-    rubocop (1.86.1)
+    rubocop (1.88.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -219,7 +220,7 @@ GEM
     rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-elegant (0.0.16)
+    rubocop-elegant (0.5.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.75)
     rubocop-minitest (0.39.1)
@@ -242,16 +243,15 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-cobertura (3.1.0)
+    simplecov-cobertura (3.2.0)
       rexml
       simplecov (~> 0.19)
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    sqlite3 (2.9.3-arm64-darwin)
-    sqlite3 (2.9.3-x64-mingw-ucrt)
-    sqlite3 (2.9.3-x86_64-darwin)
-    sqlite3 (2.9.3-x86_64-linux-gnu)
-    stringio (3.2.0)
+    sqlite3 (2.9.4-arm64-darwin)
+    sqlite3 (2.9.4-x64-mingw-ucrt)
+    sqlite3 (2.9.4-x86_64-darwin)
+    sqlite3 (2.9.4-x86_64-linux-gnu)
     strscan (3.1.8)
     tago (0.7.0)
     timeout (0.6.1)
@@ -274,7 +274,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     yaml (0.4.0)
-    yard (0.9.43)
+    yard (0.9.44)
 
 PLATFORMS
   arm64-darwin-22
@@ -295,7 +295,7 @@ DEPENDENCIES
   os (~> 1.1)
   qbash (~> 0.4)
   rake (= 13.4.2)
-  rdoc (~> 7.0)
+  rdoc (~> 8.0)
   rubocop (~> 1.75)
   rubocop-elegant (~> 0.0)
   rubocop-minitest (~> 0.38)

data/README.md

@@ -52,7 +52,7 @@ Read
 [these guidelines](https://www.yegor256.com/2014/04/15/github-guidelines.html).
 Make sure your build is green before you contribute
 your pull request. You will need to have
-[Ruby](https://www.ruby-lang.org/en/) 3.2+ and
+[Ruby](https://www.ruby-lang.org/en/) 3.3+ and
 [Bundler](https://bundler.io/) installed. Then:
 
 ```bash

data/REUSE.toml

@@ -8,6 +8,7 @@ path = [
     ".gitattributes",
     ".gitignore",
     ".pdd",
+    ".ruby-version",
     "**.json",
     "**.md",
     "**.png",

data/fbe.gemspec

@@ -8,7 +8,7 @@ require_relative 'lib/fbe'
 
 Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to?(:required_rubygems_version=)
-  s.required_ruby_version = '>=3.2'
+  s.required_ruby_version = '>=3.3'
   s.name = 'fbe'
   s.version = Fbe::VERSION
   s.license = 'MIT'

data/lib/fbe/award.rb

@@ -253,7 +253,7 @@ class Fbe::Award
       when :min
         "minimum of #{to_p(@operands[0])} and #{to_p(@operands[1])}"
       when :between
-        "at least #{to_p(@operands[0])} and at most #{to_p(@operands[1])}"
+        "#{to_p(@operands[0])} clamped between #{to_p(@operands[1])} and #{to_p(@operands[2])}"
       else
         raise(Fbe::Error, "Unknown term '#{@op}'")
       end

data/lib/fbe/conclude.rb

@@ -123,6 +123,7 @@ class Fbe::Conclude
   # @param [Array<String>] props List of property names
   # @return [nil] Nothing
   def follow(props)
+    raise(Fbe::Error, 'Follow is already set') unless @follows.empty?
     @follows = props.strip.split.compact
   end
 
@@ -230,6 +231,13 @@ class Fbe::Conclude
   # calls the provided block for custom processing, and sets metadata
   # on the new fact.
   #
+  # A property that is absent on the previous fact is skipped (its "[]"
+  # accessor returns nil). Factbase's "(as new old)" rewrite is only visible
+  # through method access (prev.new), while "[]" returns the raw stored value
+  # (see #595); when such a rewrite is in effect the method accessor returns
+  # the rewritten value, so we honor it. All values are still copied for
+  # genuinely multi-valued properties (see #520).
+  #
   # @param [Factbase::Fact] fact The fact to populate
   # @param [Factbase::Fact] prev The previous fact to copy from
   # @yield [Factbase::Fact, Factbase::Fact] New fact and the previous fact
@@ -247,8 +255,14 @@ class Fbe::Conclude
   #   end
   def fill(fact, prev)
     @follows.each do |follow|
-      v = prev.public_send(follow)
-      fact.public_send(:"#{follow}=", v)
+      key = follow.to_s
+      values = prev[key]
+      next if values.nil?
+      rewritten = prev.public_send(follow)
+      values = [rewritten] unless values.first == rewritten
+      values.each do |v|
+        fact.public_send(:"#{follow}=", v)
+      end
     end
     r = yield(fact, prev)
     return unless r.is_a?(String)

data/lib/fbe/consider.rb

@@ -17,17 +17,21 @@ require_relative 'fb'
 # @param [Loog] loog The logging facility
 # @param [Time] epoch When the entire update started
 # @param [Time] kickoff When the particular judge started
+# @param [Boolean] lifetime_aware Check lifetime limitations (default: true)
+# @param [Boolean] timeout_aware Check timeout limitations (default: true)
+# @param [Boolean] quota_aware Check GitHub API quota (default: true)
 # @yield [Factbase::Fact] The fact
 def Fbe.consider(
   query,
   fb: Fbe.fb, judge: $judge, loog: $loog, options: $options, global: $global,
   epoch: $epoch || Time.now, kickoff: $kickoff || Time.now,
-  lifetime_aware: true, timeout_aware: true, &
+  lifetime_aware: true, timeout_aware: true, quota_aware: true, &
 )
   Fbe.conclude(fb:, judge:, loog:, options:, global:, epoch:, kickoff:) do
     on(query)
     timeout_unaware unless timeout_aware
     lifetime_unaware unless lifetime_aware
+    quota_unaware unless quota_aware
     consider(&)
   end
 end

data/lib/fbe/delete.rb

@@ -33,10 +33,16 @@ def Fbe.delete(fact, *props, fb: Fbe.fb, id: '_id')
     next if props.include?(k)
     before[k] = fact[k]
   end
-  before.delete(id)
   fb.query("(eq #{id} #{i})").delete!
   fb.txn do |fbt|
     c = fbt.insert
+    f = c
+    while f.instance_variable_defined?(:@fact) || f.instance_variable_defined?(:@origin)
+      iv = f.instance_variable_defined?(:@fact) ? :@fact : :@origin
+      f = f.instance_variable_get(iv)
+    end
+    map = f.instance_variable_get(:@map)
+    %w[_id _time _version _job].each { |k| map.delete(k) if before.key?(k) }
     before.each do |k, vv|
       next unless c[k].nil?
       vv.each do |v|

data/lib/fbe/delete_one.rb

@@ -28,11 +28,20 @@ def Fbe.delete_one(fact, prop, value, fb: Fbe.fb, id: '_id')
     before[k] = fact[k]
   end
   return unless before[prop]
-  before[prop] = before[prop] - [value]
-  before.delete(prop) if before[prop].empty?
+  nv = before[prop] - [value]
+  return if nv == before[prop]
+  before[prop] = nv
+  before.delete(prop) if nv.empty?
   fb.query("(eq #{id} #{i})").delete!
   fb.txn do |fbt|
     c = fbt.insert
+    f = c
+    while f.instance_variable_defined?(:@fact) || f.instance_variable_defined?(:@origin)
+      iv = f.instance_variable_defined?(:@fact) ? :@fact : :@origin
+      f = f.instance_variable_get(iv)
+    end
+    map = f.instance_variable_get(:@map)
+    %w[_id _time _version _job].each { |k| map.delete(k) if before.key?(k) }
     before.each do |k, vv|
       next unless c[k].nil?
       vv.each do |v|