fbe 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da39ba8923cf39a674a0d5d6b465354eec2dc918780a266c67aad40848a78780
-  data.tar.gz: e4a3182596fa8268796cd29a7aaeadc60b188d96cb8b9b79388a0b0bdee3dd67
+  metadata.gz: df35ffd71de34d881cd82c12282e4a27cf95b0ca4c409e8a4dd417aa15387d49
+  data.tar.gz: 0e499a83a4196d31c74b5b518f3f1c80c0319c08e09374c9fece8460c7a690ca
 SHA512:
-  metadata.gz: 4f901025cd88965a8b5a344a50ee7c44d92693c53104c125f8c540c64b49878d36866e07b4555c277958868db69cabc0a3ef0e9dd27634dcceae72b6b339402e
-  data.tar.gz: 06ed471547fcdec3c0fe2a09e5f268b67b7859a3a5edd91723da378ce758f01a08d4cb53dec82e4309069fb0b43618d945665afe5422228d6284b197206de87c
+  metadata.gz: 4caff409bad7c6c229b0148b5ae01e931cc925bad9c7f00ae355d64c328166ba8743a642f86fb58e8e7d190af2050f97e32060d31950fbc05f4b5d83dd181cd4
+  data.tar.gz: 45cfdb22a178282dc4597f5e282588fc4da46aea567b9b88900de2814a7577036c4431c97df6db05ce49dbe3ca03692241a2116687506856ba6b4a9a6ffd2433

data/.rubocop.yml

@@ -58,3 +58,7 @@ Layout/EndOfLine:
   EnforcedStyle: lf
 Security/MarshalLoad:
   Enabled: false
+Metrics/ParameterLists:
+  Enabled: false
+Layout/MultilineAssignmentLayout:
+  Enabled: true

data/Gemfile

@@ -27,7 +27,7 @@ gem 'minitest', '5.24.1', require: false
 gem 'minitest-reporters', '1.7.1', require: false
 gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '6.1.3', require: false
-gem 'rubocop', '1.65.0', require: false
+gem 'rubocop', '1.65.1', require: false
 gem 'rubocop-performance', '1.21.1', require: false
 gem 'rubocop-rspec', '3.0.3', require: false
 gem 'simplecov', '0.22.0', require: false

data/Gemfile.lock

@@ -150,7 +150,7 @@ GEM
     psych (5.1.2)
       stringio
     public_suffix (6.0.0)
-    racc (1.8.0)
+    racc (1.8.1)
     rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
@@ -182,7 +182,7 @@ GEM
     reline (0.5.9)
       io-console (~> 0.5)
     retries (0.0.5)
-    rexml (3.3.2)
+    rexml (3.3.4)
       strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
@@ -201,7 +201,7 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    rubocop (1.65.0)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -267,7 +267,7 @@ DEPENDENCIES
   minitest-reporters (= 1.7.1)
   rake (= 13.2.1)
   rspec-rails (= 6.1.3)
-  rubocop (= 1.65.0)
+  rubocop (= 1.65.1)
   rubocop-performance (= 1.21.1)
   rubocop-rspec (= 3.0.3)
   simplecov (= 0.22.0)

data/lib/fbe/award.rb

@@ -47,10 +47,17 @@ require 'factbase/syntax'
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 class Fbe::Award
-  def initialize(query = J.pmp.hr.send($judge.gsub('-', '_')))
+  # Ctor.
+  # @param [String] query The query with the policy
+  # @param [String] judge The name of the judge
+  def initialize(query = nil, judge: $judge, global: $global, options: $options, loog: $loog)
+    query = Fbe.pmp(fb: Fbe.fb, global:, options:, loog:).hr.send(judge.gsub('-', '_')) if query.nil?
     @query = query
   end
 
+  # Build a bill object from this award query.
+  # @param [Hash] vars Hash of variables
+  # @return [Fbe::Award::Bill] The bill
   def bill(vars = {})
     term = Factbase::Syntax.new(@query, term: Fbe::Award::BTerm).to_term
     bill = Bill.new
@@ -59,6 +66,8 @@ class Fbe::Award
     bill
   end
 
+  # Build a policy object from this award query.
+  # @return [Fbe::Award::Policy] The policy
   def policy
     term = Factbase::Syntax.new(@query, term: Fbe::Award::PTerm).to_term
     policy = Policy.new
@@ -122,6 +131,12 @@ class Fbe::Award
         bill.points
       when :if
         to_val(@operands[0], bill) ? to_val(@operands[1], bill) : to_val(@operands[2], bill)
+      when :and
+        @operands.all? { |o| to_val(o, bill) }
+      when :or
+        @operands.any? { |o| to_val(o, bill) }
+      when :not
+        !to_val(@operands[0], bill)
       when :eq
         to_val(@operands[0], bill) == to_val(@operands[1], bill)
       when :lt
@@ -150,7 +165,6 @@ class Fbe::Award
         b = to_val(@operands[2], bill)
         min, max = [a, b].minmax
         return 0 if (!v.negative? && v < min) || (!v.positive? && v > max)
-
         v.clamp(min, max)
       else
         raise "Unknown term '#{@op}'"
@@ -171,6 +185,12 @@ class Fbe::Award
         'total'
       when :if
         "if #{to_p(@operands[0])} then #{to_p(@operands[1])} else #{to_p(@operands[2])}"
+      when :and
+        @operands.map(&:to_s).join(' and ')
+      when :or
+        @operands.map(&:to_s).join(' or ')
+      when :not
+        "not #{@operands[0]}"
       when :eq
         "#{to_p(@operands[0])} = #{to_p(@operands[1])}"
       when :lt
@@ -332,7 +352,7 @@ class Fbe::Award
       else
         pars += @lines.each_with_index.map { |t, i| "#{i.zero? ? 'First' : 'Then'}, #{t}." }
       end
-      pars.join(' ').gsub('. Then, award ', ', and award ')
+      pars.join(' ').gsub('. Then, award ', ', and award ').gsub(/\s{2,}/, ' ')
     end
   end
 end

data/lib/fbe/fb.rb

@@ -31,19 +31,21 @@ require 'factbase/rules'
 require_relative '../fbe'
 
 def Fbe.fb(fb: $fb, global: $global, options: $options, loog: $loog)
-  global[:fb] ||= begin
-    rules = Dir.glob(File.join('rules', '*.fe')).map { |f| File.read(f) }
-    fbe = Factbase::Rules.new(
-      fb,
-      "(and \n#{rules.join("\n")}\n)",
-      uid: '_id'
-    )
-    fbe = Factbase::Pre.new(fbe) 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}"
+  global[:fb] ||=
+    begin
+      rules = Dir.glob(File.join('rules', '*.fe')).map { |f| File.read(f) }
+      fbe = Factbase::Rules.new(
+        fb,
+        "(and \n#{rules.join("\n")}\n)",
+        uid: '_id'
+      )
+      fbe =
+        Factbase::Pre.new(fbe) 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(fbe, loog)
     end
-    Factbase::Looged.new(fbe, loog)
-  end
 end

data/lib/fbe/if_absent.rb

@@ -30,14 +30,15 @@ require_relative 'fb'
 # Injects a fact if it's absent in the factbase.
 def Fbe.if_absent(fb: Fbe.fb)
   attrs = {}
-  f = others(map: attrs) do |*args|
-    k = args[0]
-    if k.end_with?('=')
-      @map[k[0..-2].to_sym] = args[1]
-    else
-      @map[k.to_sym]
+  f =
+    others(map: attrs) do |*args|
+      k = args[0]
+      if k.end_with?('=')
+        @map[k[0..-2].to_sym] = args[1]
+      else
+        @map[k.to_sym]
+      end
     end
-  end
   yield f
   q = attrs.except('_id', '_time', '_version').map do |k, v|
     vv = v.to_s

data/lib/fbe/octo.rb

@@ -35,97 +35,99 @@ require_relative 'middleware/quota'
 
 def Fbe.octo(options: $options, global: $global, loog: $loog)
   raise 'The $global is not set' if global.nil?
-  global[:octo] ||= begin
-    if options.testing.nil?
-      o = Octokit::Client.new
-      token = options.github_token
-      if token.nil?
-        loog.debug("The 'github_token' option is not provided")
-        token = ENV.fetch('GITHUB_TOKEN', nil)
+  global[:octo] ||=
+    begin
+      if options.testing.nil?
+        o = Octokit::Client.new
+        token = options.github_token
         if token.nil?
-          loog.debug("The 'GITHUB_TOKEN' environment variable is not set")
+          loog.debug("The 'github_token' option is not provided")
+          token = ENV.fetch('GITHUB_TOKEN', nil)
+          if token.nil?
+            loog.debug("The 'GITHUB_TOKEN' environment variable is not set")
+          else
+            loog.debug("The 'GITHUB_TOKEN' environment was provided")
+          end
         else
-          loog.debug("The 'GITHUB_TOKEN' environment was provided")
+          loog.debug("The 'github_token' option was provided")
         end
-      else
-        loog.debug("The 'github_token' option was provided")
-      end
-      if token.nil?
-        loog.warn('Accessing GitHub API without a token!')
-      elsif token.empty?
-        loog.warn('The GitHub API token is an empty string, won\'t use it')
-      else
-        o = Octokit::Client.new(access_token: token)
-        loog.info("Accessing GitHub API with a token (#{token.length} chars, ending by #{token[-4..]})")
-      end
-      o.auto_paginate = true
-      o.per_page = 100
-      o.connection_options = {
-        request: {
-          open_timeout: 15,
-          timeout: 15
-        }
-      }
-      stack = Faraday::RackBuilder.new do |builder|
-        builder.use(
-          Faraday::Retry::Middleware,
-          exceptions: Faraday::Retry::Middleware::DEFAULT_EXCEPTIONS + [
-            Octokit::TooManyRequests, Octokit::ServiceUnavailable
-          ],
-          max: 4,
-          interval: ENV['RACK_ENV'] == 'test' ? 0.01 : 4,
-          methods: [:get],
-          backoff_factor: 2
-        )
-        builder.use(
-          Fbe::Middleware::Quota,
-          logger: loog,
-          pause: options.github_api_pause
-        )
-        builder.use(Faraday::HttpCache, serializer: Marshal, shared_cache: false, logger: Loog::NULL)
-        builder.use(Octokit::Response::RaiseError)
-        builder.use(Faraday::Response::Logger, Loog::NULL)
-        builder.adapter(Faraday.default_adapter)
-      end
-      o.middleware = stack
-      o = Verbose.new(o, log: loog)
-    else
-      loog.debug('The connection to GitHub API is mocked')
-      o = Fbe::FakeOctokit.new
-    end
-    decoor(o, loog:) do
-      def off_quota
-        left = @origin.rate_limit.remaining
-        if left < 5
-          @loog.info("To much GitHub API quota consumed already (remaining=#{left}), stopping")
-          true
+        if token.nil?
+          loog.warn('Accessing GitHub API without a token!')
+        elsif token.empty?
+          loog.warn('The GitHub API token is an empty string, won\'t use it')
         else
-          false
+          o = Octokit::Client.new(access_token: token)
+          loog.info("Accessing GitHub API with a token (#{token.length} chars, ending by #{token[-4..]})")
         end
+        o.auto_paginate = true
+        o.per_page = 100
+        o.connection_options = {
+          request: {
+            open_timeout: 15,
+            timeout: 15
+          }
+        }
+        stack =
+          Faraday::RackBuilder.new do |builder|
+            builder.use(
+              Faraday::Retry::Middleware,
+              exceptions: Faraday::Retry::Middleware::DEFAULT_EXCEPTIONS + [
+                Octokit::TooManyRequests, Octokit::ServiceUnavailable
+              ],
+              max: 4,
+              interval: ENV['RACK_ENV'] == 'test' ? 0.01 : 4,
+              methods: [:get],
+              backoff_factor: 2
+            )
+            builder.use(
+              Fbe::Middleware::Quota,
+              logger: loog,
+              pause: options.github_api_pause
+            )
+            builder.use(Faraday::HttpCache, serializer: Marshal, shared_cache: false, logger: Loog::NULL)
+            builder.use(Octokit::Response::RaiseError)
+            builder.use(Faraday::Response::Logger, Loog::NULL)
+            builder.adapter(Faraday.default_adapter)
+          end
+        o.middleware = stack
+        o = Verbose.new(o, log: loog)
+      else
+        loog.debug('The connection to GitHub API is mocked')
+        o = Fbe::FakeOctokit.new
       end
+      decoor(o, loog:) do
+        def off_quota
+          left = @origin.rate_limit.remaining
+          if left < 5
+            @loog.info("To much GitHub API quota consumed already (remaining=#{left}), stopping")
+            true
+          else
+            false
+          end
+        end
 
-      def user_name_by_id(id)
-        json = @origin.user(id)
-        name = json[:login]
-        @loog.debug("GitHub user ##{id} has a name: @#{name}")
-        name
-      end
+        def user_name_by_id(id)
+          json = @origin.user(id)
+          name = json[:login]
+          @loog.debug("GitHub user ##{id} has a name: @#{name}")
+          name
+        end
 
-      def repo_id_by_name(name)
-        json = @origin.repository(name)
-        id = json[:id]
-        @loog.debug("GitHub repository #{name} has an ID: ##{id}")
-        id
-      end
+        def repo_id_by_name(name)
+          json = @origin.repository(name)
+          id = json[:id]
+          @loog.debug("GitHub repository #{name} has an ID: ##{id}")
+          id
+        end
 
-      def repo_name_by_id(id)
-        json = @origin.repository(id)
-        name = json[:full_name]
-        @loog.debug("GitHub repository ##{id} has a name: #{name}")
-        name
+        def repo_name_by_id(id)
+          json = @origin.repository(id)
+          name = json[:full_name]
+          @loog.debug("GitHub repository ##{id} has a name: #{name}")
+          name
+        end
       end
     end
-  end
 end
 
 # Fake GitHub client, for tests.

data/lib/fbe/pmp.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# MIT License
+#
+# Copyright (c) 2024 Zerocracy
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'others'
+require_relative 'fb'
+
+# Project management functions.
+module Fbe; end
+
+def Fbe.pmp(fb: Fbe.fb, global: $global, options: $options, loog: $loog)
+  others do |*args1|
+    area = args1.first
+    others do |*args2|
+      param = args2.first
+      f = Fbe.fb(global:, fb:, options:, loog:).query("(and (eq what 'pmp') (eq area '#{area}'))").each.to_a.first
+      raise "Unknown area '#{area}'" if f.nil?
+      r = f[param]
+      raise "Unknown property '#{param}' in the '#{area}' area" if r.nil?
+      r.first
+    end
+  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.35'
+  VERSION = '0.0.36'
 end

data/test/fbe/test_award.rb

@@ -42,7 +42,12 @@ class TestAward < Minitest::Test
         (give basis "as a basis")
         (let fee 10)
         (aka
-          (set b1 (if (lt hours max) fee 0))
+          (set b1
+            (if
+              (and
+                (lt hours max)
+                (not (eq hours 0)))
+              fee 0))
           (give b1 "for resolving the bug in ${hours} (<${max}) hours")
           "add ${+fee} if it was resolved in less than ${max} hours")
         (set days (div hours 24))

data/test/fbe/test_if_absent.rb

@@ -38,9 +38,10 @@ class TestIfAbsent < Minitest::Test
   def test_ignores
     fb = Factbase.new
     fb.insert.foo = 'hello dude'
-    n = Fbe.if_absent(fb:) do |f|
-      f.foo = 'hello dude'
-    end
+    n =
+      Fbe.if_absent(fb:) do |f|
+        f.foo = 'hello dude'
+      end
     assert(n.nil?)
   end
 
@@ -48,17 +49,19 @@ class TestIfAbsent < Minitest::Test
     fb = Factbase.new
     t = Time.now
     fb.insert.foo = t
-    n = Fbe.if_absent(fb:) do |f|
-      f.foo = t
-    end
+    n =
+      Fbe.if_absent(fb:) do |f|
+        f.foo = t
+      end
     assert(n.nil?)
   end
 
   def test_injects
     fb = Factbase.new
-    n = Fbe.if_absent(fb:) do |f|
-      f.foo = 42
-    end
+    n =
+      Fbe.if_absent(fb:) do |f|
+        f.foo = 42
+      end
     assert_equal(42, n.foo)
   end
 
@@ -77,12 +80,13 @@ class TestIfAbsent < Minitest::Test
     t = Time.now
     f1.z = t
     f1.bar = 3.14
-    n = Fbe.if_absent(fb:) do |f|
-      f.foo = 'hello, "dude"!'
-      f.abc = 42
-      f.z = t
-      f.bar = 3.14
-    end
+    n =
+      Fbe.if_absent(fb:) do |f|
+        f.foo = 'hello, "dude"!'
+        f.abc = 42
+        f.z = t
+        f.bar = 3.14
+      end
     assert(n.nil?)
   end
 
@@ -94,12 +98,13 @@ class TestIfAbsent < Minitest::Test
     t = Time.now
     f1.z = t
     f1.bar = 3.14
-    n = Fbe.if_absent(fb:) do |f|
-      f.foo = "hello, \\\"dude\\\" \\' \\' ( \n\n ) (!   '"
-      f.abc = 42
-      f.z = t + 1
-      f.bar = 3.15
-    end
+    n =
+      Fbe.if_absent(fb:) do |f|
+        f.foo = "hello, \\\"dude\\\" \\' \\' ( \n\n ) (!   '"
+        f.abc = 42
+        f.z = t + 1
+        f.bar = 3.15
+      end
     assert(!n.nil?)
   end
 end

data/test/fbe/test_pmp.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+# MIT License
+#
+# Copyright (c) 2024 Zerocracy
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require 'judges/options'
+require 'loog'
+require 'factbase'
+require_relative '../test__helper'
+require_relative '../../lib/fbe/pmp'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Zerocracy
+# License:: MIT
+class TestPmp < Minitest::Test
+  def test_defaults
+    $fb = Factbase.new
+    $global = {}
+    $options = Judges::Options.new
+    f = Fbe.fb(loog: Loog::NULL).insert
+    f.what = 'pmp'
+    f.area = 'hr'
+    f.days_to_reward = 55
+    $loog = Loog::NULL
+    assert_equal(55, Fbe.pmp(loog: Loog::NULL).hr.days_to_reward)
+  end
+
+  def test_fail_on_wrong_area
+    $global = {}
+    $loog = Loog::NULL
+    assert_raises { Fbe.pmp(Factbase.new, loog: Loog::NULL).something }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -233,6 +233,7 @@ files:
 - lib/fbe/middleware.rb
 - lib/fbe/middleware/quota.rb
 - lib/fbe/octo.rb
+- lib/fbe/pmp.rb
 - lib/fbe/sec.rb
 - lib/fbe/unmask_repos.rb
 - lib/fbe/who.rb
@@ -246,6 +247,7 @@ files:
 - test/fbe/test_issue.rb
 - test/fbe/test_iterate.rb
 - test/fbe/test_octo.rb
+- test/fbe/test_pmp.rb
 - test/fbe/test_sec.rb
 - test/fbe/test_unmask_repos.rb
 - test/fbe/test_who.rb