fbe 0.0.58 → 0.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 037e6b31b619e5a79f4f986f6be016c8cafed2fe3b7b000f0f02de5780052df1
-  data.tar.gz: 85134954a6f355895224da28d587adfad1bca6f0f41b2b3da3b7ae6757d8038f
+  metadata.gz: 4933facacd974e44985f3931125665ab4456062b0f4a45faf3bdc6a970e42c21
+  data.tar.gz: 53f0dde5e526aa66a703f8ee088ecd08e7aedb49d847b46c3b6a0080930509d6
 SHA512:
-  metadata.gz: efcd99caa7002a17af0330cc0b9ab64bf049fee54d11c72454e90f4a99fca8b739b2f5ad351caa525023eb0bea0f15a7e964949821c953e77e4a76ff247d929b
-  data.tar.gz: b5d1c69ca30a4973400ceb74c447aa90e909103ab6c73d7e4aefd8e254bbfd868daa1e215a8080bf7da6135f312077de6525437a7fb12da1bad3570d2cfc2fdd
+  metadata.gz: 17c95861794f3865ecd9e5e5f1afe3863a7194393dce7fa7d1bd479455595ca563868819f2e7e445590ddc819f09907411923a4c21c65a26e7201165809270c4
+  data.tar.gz: 2404df0f1d5514a696f8e6604fada7792f5ce8e605dec85f48938b831dc5cd833221137e5c907e233723b67d080d78d77a1bdbf38db37f4cbe06a54cb84e72f2

data/assets/bylaws/bad-branch-name-was-punished.liquid

@@ -1,7 +1,7 @@
 (award
   (explain "If a branch has a name that doesn\\\'t obey the convention, a penalty is given to the author")
   (aka
-    (let fee -12)
+    (let fee {{ -6 | times: anger }})
     (give fee "as a basis")
     "deduct ${fee} points")
   )

data/assets/bylaws/code-contribution-was-rewarded.liquid

@@ -11,7 +11,7 @@
 
   (aka
     (let hoc_k {{ 0.05 | times: love }})
-    (let hoc_threshold 200)
+    (let hoc_threshold {{ 400 | divided_by: paranoia }})
     (let hoc_max 16)
     (let hoc_min 5)
     (set bonus_for_hoc (if (lt hoc hoc_threshold) (times hoc hoc_k) 0))
@@ -30,7 +30,7 @@
 
   (aka
     (let many_hoc_fee2 {{ 8 | times: anger }})
-    (let hoc_threshold2 800)
+    (let hoc_threshold2 {{ 1600 | divided_by: paranoia }})
     (set penalty_for_hoc2 (if (gte hoc hoc_threshold2) (times -1 many_hoc_fee2) 0))
     (give penalty_for_hoc2 "for way too many hits-of-code (${hoc} >= ${hoc_threshold2})")
     "deduct ${many_hoc_fee2} points if more than ${hoc_threshold2}
@@ -53,7 +53,7 @@
 
   (aka
     (let few_comments_fee {{ 2 | times: anger }})
-    (let comments_needed 5)
+    (let comments_needed {{ 3 | times: paranoia }})
     (set penalty_for_few_comments (if (and (lt comments comments_needed) (not (eq comments 0))) (times -1 few_comments_fee) 0))
     (give penalty_for_few_comments "for very few (${comments}) comments")
     "deduct ${few_comments_fee} points if there were less than ${comments_needed} comments made during review")
@@ -66,7 +66,7 @@
 
   (aka
     (let few_hoc_fee {{ 4 | times: anger }})
-    (let hoc_needed 20)
+    (let hoc_needed {{ 10 | times: paranoia }})
     (set penalty_for_few_hoc (if (lt hoc hoc_needed) (times -1 few_hoc_fee) 0))
     (give penalty_for_few_hoc "for too few (${hoc}) hits-of-code")
     "deduct ${few_hoc_fee} points if you contribute less than ${hoc_needed} hits-of-code")

data/assets/bylaws/code-review-was-rewarded.liquid

@@ -29,7 +29,7 @@
 
   (aka
     (let few_comments_fee {{ 5 | times: anger }})
-    (let comments_needed 6)
+    (let comments_needed {{ 3 | times: paranoia }})
     (set penalty_for_few_comments (if (and (lt comments comments_needed) (not (eq comments 0))) (times -1 few_comments_fee) 0))
     (give penalty_for_few_comments "for very few (${comments}) comments")
     "deduct ${few_comments_fee} points if there were less than ${comments_needed} comments made during review")
@@ -52,7 +52,7 @@
 
   (aka
     (let hoc_fee {{ 4 | times: anger }})
-    (let hoc_needed 15)
+    (let hoc_needed {{ 8 | times: paranoia }})
     (set penalty_for_hoc (if (lt hoc hoc_needed) (times -1 hoc_fee) 0))
     (give penalty_for_hoc "for too few (${hoc}) hits-of-code")
     "deduct ${hoc_fee} points if there were less than ${hoc_needed} hits-of-code")

data/assets/bylaws/push-to-master-was-punished.liquid

@@ -1,7 +1,7 @@
 (award
   (explain "When someone pushes directly to the default branch, they get a penalty")
   (aka
-    (let fee -16)
+    (let fee {{ -8 | times: anger }})
     (give fee "as a basis")
     "${fee} points")
   )

data/assets/bylaws/resolved-bug-was-rewarded.liquid

@@ -10,7 +10,7 @@
 
   (aka
     (let b1 {{ 4 | times: love }})
-    (let hours_threshold 24)
+    (let hours_threshold {{ 48 | divided_by: paranoia }})
     (set b1 (if (lt hours hours_threshold) b1 0))
     (give b1 "for resolving it in less than ${hours_threshold} hours")
     "add ${b1} points if it was resolved in less than ${hours_threshold} hours")

data/lib/fbe/bylaws.rb

@@ -30,12 +30,15 @@ require_relative '../fbe'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
-def Fbe.bylaws(anger: 2, love: 2)
+def Fbe.bylaws(anger: 2, love: 2, paranoia: 2)
+  raise 'The "anger" must be in the [0..4] interval' unless !anger.negative? && anger < 5
+  raise 'The "lover" must be in the [0..4] interval' unless !love.negative? && love < 5
+  raise 'The "paranoia" must be in the [1..4] interval' unless paranoia.positive? && paranoia < 5
   home = File.join(__dir__, '../../assets/bylaws')
   raise "The directory with templates is absent '#{home}'" unless File.exist?(home)
   Dir[File.join(home, '*.liquid')].to_h do |f|
     formula = Liquid::Template.parse(File.read(f)).render(
-      'anger' => anger, 'love' => love
+      'anger' => anger, 'love' => love, 'paranoia' => paranoia
     )
     [File.basename(f).gsub(/\.liquid$/, ''), formula]
   end

data/lib/fbe/github_graph.rb

@@ -82,7 +82,9 @@ class Fbe::Graph
         }
       GRAPHQL
     )
-    result&.to_h&.dig('repository', 'pullRequest', 'reviewThreads', 'nodes') || []
+    result&.to_h&.dig('repository', 'pullRequest', 'reviewThreads', 'nodes')&.select do |thread|
+      thread['isResolved']
+    end || []
   end
 
   def total_commits(owner, name, branch)

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.58'
+  VERSION = '0.0.60'
 end

data/test/fbe/test_bylaws.rb

@@ -80,7 +80,7 @@ class TestBylaws < Minitest::Test
         { hoc: 50, comments: 15, reviews: 0 } => 5,
         { hoc: 50, comments: 25, reviews: 0 } => 4,
         { hoc: 180, comments: 7, reviews: 2 } => 32,
-        { hoc: 150, comments: 5, reviews: 1 } => 31,
+        { hoc: 150, comments: 5, reviews: 1 } => 27,
         { hoc: 500, comments: 25, reviews: 2 } => 4,
         { hoc: 99, comments: 6, reviews: 1 } => 26,
         { hoc: 1_500, comments: 3, reviews: 0 } => 4,
@@ -104,7 +104,7 @@ class TestBylaws < Minitest::Test
       assert(!formula.nil?, title)
       a = Fbe::Award.new(formula)
       help = [
-        "  #{title}: {\n    ",
+        "  '#{title.gsub('-', '_')}' => {\n    ",
         pairs.map do |args, _|
           [
             '{',

data/test/fbe/test_github_graph.rb

@@ -91,6 +91,14 @@ class TestGitHubGraph < Minitest::Test
     assert(0, result.count)
   end
 
+  def test_does_not_count_unresolved_conversations
+    skip # it's a "live" test, run it manually if you need it
+    WebMock.allow_net_connect!
+    g = Fbe.github_graph(options: Judges::Options.new, loog: Loog::NULL, global: {})
+    result = g.resolved_conversations('zerocracy', 'judges-action', 296)
+    assert_equal(0, result.count)
+  end
+
   def test_gets_total_commits_of_repo
     skip # it's a "live" test, run it manually if you need it
     WebMock.allow_net_connect!

metadata

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