fbe 0.0.21 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a57f0e5f562ad6ac7400355614f0af933b2130470759a877d34ea35878a4e52c
-  data.tar.gz: 0c93b9b7d1de5cf6f2c5bac41f71b663e19d7c1af667f5e6a41c53a361392afc
+  metadata.gz: b13ad3c8a5578c4a9e248948cab63ae21caeea7052d96260f2be85a43ee6f3b8
+  data.tar.gz: 90f8b081a67be3fd2f94a92cea890abb9b93f9b4b11a37a7bc6502f704c16510
 SHA512:
-  metadata.gz: 1ec9cb12e7388c4260e9740255af73d8993e5b05abb0ee613bde3ee87e140a9b4b2bb1177c3dd14025e2a83c3eb3f87e8f5b84293f2b52256491860dd67b0807
-  data.tar.gz: e11c60c5bedc1abe4eb68702285c8a76f08c03e3b3e76a3dbf01f8ab514a1c024e1af0f1b38408cff5b5e7d370e011e5da1fee7d9c11e0be50d8e0ccd641de89
+  metadata.gz: 9ea216f0e9be56b06ae8e350ea89b341f9d9fc230ca7785f5b0c0a494fcba3de913143e9c0c5d7074eea3ad368520bfaa462f891c5daf744b4ababbf05e600e8
+  data.tar.gz: 28c70598550a0e68ad1315fee0adce8ebeb31a7eb400f348181c0f916b3b5aac646a1d4f8d51d79f70e5553f3a4a88b33ba4afd67f2075a735cb578ea5312f0c

data/README.md

@@ -1,4 +1,4 @@
-# FactBase Extended
+# FactBase Extended (FBE)
 
 [![DevOps By Rultor.com](http://www.rultor.com/b/zerocracy/fbe)](http://www.rultor.com/p/zerocracy/fbe)
 [![We recommend RubyMine](https://www.elegantobjects.org/rubymine.svg)](https://www.jetbrains.com/ruby/)
@@ -13,12 +13,14 @@
 
 It's a collection of tools for
 [zerocracy/judges-action](https://github.com/zerocracy/judges-action).
+You are not supposed to use it directly, but only in a combination
+with other tools of Zerocracy.
 
 ## How to contribute
 
 Read
 [these guidelines](https://www.yegor256.com/2014/04/15/github-guidelines.html).
-Make sure you build is green before you contribute
+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
 [Bundler](https://bundler.io/) installed. Then:

data/lib/fbe/award.rb

@@ -24,7 +24,25 @@
 
 require 'factbase/syntax'
 
-# Award generator.
+# A generator of awards.
+#
+# First, you should create a policy, using the same Lisp-ish syntax as
+# we use in queries to a Factbase, for example:
+#
+#  require 'fbe/award'
+#  a = Fbe::Award.new('(award (in loc "lines") (give (times loc 5) "for LoC"))')
+#
+# Then, you can either get a bill from it:
+#
+#  b = a.bill(loc: 345)
+#  puts b.points  # how many points to reward, a number
+#  puts b.greeting  # how to explain the reward, a text
+#
+# Or else, you can get a policy text:
+#
+#  p = a.policy
+#  puts p.markdown  # Markdown of the policy
+#
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
@@ -266,7 +284,14 @@ class Fbe::Award
 
     def greeting
       items = @lines.map { |l| "#{format('%+d', l[:v])} #{l[:t]}" }
-      "You've earned #{format('%+d', points)} points for this: #{items.join('; ')}. "
+      case items.size
+      when 0
+        "You've earned nothing. "
+      when 1
+        "You've earned #{format('%+d', points)} points. "
+      else
+        "You've earned #{format('%+d', points)} points for this: #{items.join('; ')}. "
+      end
     end
   end
 
@@ -289,7 +314,7 @@ class Fbe::Award
     end
 
     def line(line)
-      line = line.gsub(/\$\{([a-z_0-9]+)\}/) { |_x| @lets[Regexp.last_match[1].to_sym] }
+      line = line.gsub(/\$\{([a-z_0-9]+)\}/) { |_x| "**#{@lets[Regexp.last_match[1].to_sym]}**" }
       @lines << line
     end
 

data/lib/fbe/octo.rb

@@ -175,6 +175,22 @@ class Fbe::FakeOctokit
     }
   end
 
+  def commit_pulls(repo, _sha)
+    [
+      pull_request(repo, 42)
+    ]
+  end
+
+  def pull_request(repo, number)
+    {
+      id: 42,
+      number:,
+      repo: {
+        full_name: repo
+      }
+    }
+  end
+
   def add_comment(_repo, _issue, _text)
     {
       id: 42

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.21'
+  VERSION = '0.0.23'
 end

data/test/fbe/test_award.rb

@@ -92,10 +92,20 @@ class TestAward < Minitest::Test
       '(award (let x_a 25) (set z (plus x_a 1)) (give z "..."))' =>
         'First, let _x-a_ be equal to **25**. Then, set _z_ to _x-a_ + **1**, and award _z_.',
       '(award (aka (let x 17) (give x "hey") "add ${x} when necessary"))' =>
-        'Just add 17 when necessary'
+        'Just add **17** when necessary'
     }.each do |q, t|
       md = Fbe::Award.new(q).policy.markdown
       assert(md.include?(t), md)
     end
   end
+
+  def test_shorten_when_one_number
+    g = Fbe::Award.new('(award (give 23 "for love"))').bill.greeting
+    assert_equal('You\'ve earned +23 points. ', g, g)
+  end
+
+  def test_shorten_when_nothing
+    g = Fbe::Award.new('(award (give 0 "for none"))').bill.greeting
+    assert_equal('You\'ve earned nothing. ', g, g)
+  end
 end

data/test/fbe/test_fb.rb

@@ -39,9 +39,11 @@ class TestFb < Minitest::Test
     $fb = Factbase.new
     $global = {}
     $options = Judges::Options.new
-    $loog = Loog::NULL
+    $loog = Loog::Buffer.new
     Fbe.fb.insert.foo = 1
     Fbe.fb.insert.bar = 2
     assert_equal(1, Fbe.fb.query('(exists bar)').each.to_a.size)
+    stdout = $loog.to_s
+    assert(stdout.include?('Inserted new fact #1'), stdout)
   end
 end

data/test/fbe/test_octo.rb

@@ -38,6 +38,8 @@ class TestOcto < Minitest::Test
     options = Judges::Options.new({ 'testing' => true })
     o = Fbe.octo(loog: Loog::NULL, global:, options:)
     assert(!o.off_quota)
+    assert(!o.pull_request('foo/foo', 42).nil?)
+    assert(!o.commit_pulls('foo/foo', 'sha').nil?)
   end
 
   def test_post_comment
@@ -59,4 +61,11 @@ class TestOcto < Minitest::Test
     o = Fbe.octo(loog: Loog::NULL, global:, options:)
     assert_raises { o.repository('zerocracy/fbe') }
   end
+
+  def test_commit_pulls
+    skip # it's a "live" test, run it manually if you need it
+    o = Fbe.octo(loog: Loog::NULL, global: {}, options: Judges::Options.new)
+    assert_equal(1, o.commit_pulls('zerocracy/fbe', '0b7d0699bd744b62c0731064c2adaad0c58e1416').size)
+    assert_equal(0, o.commit_pulls('zerocracy/fbe', '16b3ea6b71c6e932ba7666c40ca846ecaa6d6f0d').size)
+  end
 end

data/test/test__helper.rb

@@ -22,6 +22,9 @@
 
 $stdout.sync = true
 
+require 'minitest/reporters'
+Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new]
+
 require 'simplecov'
 SimpleCov.start
 
@@ -29,6 +32,3 @@ require 'simplecov-cobertura'
 SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 
 require 'minitest/autorun'
-
-require 'minitest/reporters'
-Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new]

metadata

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