fbe 0.0.20 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8edc085f571054934f0175c084473ad75477dc2c591a4dfbe20bd85bd00ab364
-  data.tar.gz: 1792731b5d49d6b1a4a2d0c5671cb9dca05843e4af8a7cc7df64bddeb97525bd
+  metadata.gz: '0049f50b79fc11504fa48a1b8bf6f3245ec73673068254b639a342996467d3ae'
+  data.tar.gz: dae993c649a54a5e8a653d4a55128482d1350bbf07a9942cc5bce674a92f85b8
 SHA512:
-  metadata.gz: 6eaee3b757f8140044a2162f936a92b5b0b259f2e3995fc3032c6a529a9e2d77021506c09ff7910b0272a70b520189ef9f651e0b630f3d63918d400ccb3a6f16
-  data.tar.gz: 62504126787332608ab3a5a178c3946f52bf184e2ff7de2c9fca0b74f208f56437d50c944ff71a67169a66d27d9544c298e322ad320591ddae34c65c76941c49
+  metadata.gz: b0b56a583dc6236fe4539192b10954cb5d16c3acad9f9193de6ed0d77fb14caab012fda9dbf25bfb416cd88ae601cdc710d28312f454ea93cb3144ee75cb3114
+  data.tar.gz: 1393af02f45e78b354d0bba98706427bba9c769ffa39f029973ef209e85b401ac9d021421af08ab9f5a3f997e51ce8b4f0861ca0ba42b2a184645671ae56143f

data/lib/fbe/award.rb

@@ -67,6 +67,12 @@ class Fbe::Award
         rescue StandardError => e
           raise "Failure in #{o}: #{e.message}"
         end
+      when :aka
+        @operands[0..-2].each do |o|
+          o.bill_to(bill)
+        rescue StandardError => e
+          raise "Failure in #{o}: #{e.message}"
+        end
       when :let, :set
         bill.set(@operands[0], to_val(@operands[1], bill))
       when :give
@@ -147,7 +153,7 @@ class Fbe::Award
       when :if
         "if #{to_p(@operands[0])} then #{to_p(@operands[1])} else #{to_p(@operands[2])}"
       when :eq
-        "#{to_p(@operands[0])} == #{to_p(@operands[1])}"
+        "#{to_p(@operands[0])} = #{to_p(@operands[1])}"
       when :lt
         "#{to_p(@operands[0])} < #{to_p(@operands[1])}"
       when :lte
@@ -183,12 +189,21 @@ class Fbe::Award
         rescue StandardError => e
           raise "Failure in #{o}: #{e.message}"
         end
+      when :aka
+        @operands[0..-2].each do |o|
+          o.publish_to(policy)
+        rescue StandardError => e
+          raise "Failure in #{o}: #{e.message}"
+        end
+        policy.revert(@operands.size - 1)
+        policy.line(to_p(@operands[@operands.size - 1]))
       when :explain
         policy.intro(to_p(@operands[0]))
       when :in
         policy.line("assume that #{to_p(@operands[0])} is #{to_p(@operands[1])}")
       when :let
         policy.line("let #{to_p(@operands[0])} be equal to #{to_p(@operands[1])}")
+        policy.let(@operands[0], @operands[1])
       when :set
         policy.line("set #{to_p(@operands[0])} to #{to_p(@operands[1])}")
       when :give
@@ -217,7 +232,7 @@ class Fbe::Award
           9 => '₉'
         }
         s.gsub!(/([a-z]+)([0-9])/) { |_| "#{Regexp.last_match[1]}#{subs[Regexp.last_match[2].to_i]}" }
-        "_#{s.gsub('_', '\\_')}_"
+        "_#{s.gsub('_', '-')}_"
       when Integer, Float
         "**#{any}**"
       else
@@ -262,6 +277,11 @@ class Fbe::Award
     def initialize
       @lines = []
       @intro = ''
+      @lets = {}
+    end
+
+    def revert(num)
+      @lines.slice!(-num, num)
     end
 
     def intro(text)
@@ -269,14 +289,23 @@ class Fbe::Award
     end
 
     def line(line)
+      line = line.gsub(/\$\{([a-z_0-9]+)\}/) { |_x| @lets[Regexp.last_match[1].to_sym] }
       @lines << line
     end
 
+    def let(key, value)
+      @lets[key] = value
+    end
+
     def markdown
       pars = []
       pars << "#{@intro}." unless @intro.empty?
       pars << 'Here is how it\'s calculated:'
-      pars += @lines.each_with_index.map { |t, i| "#{i.zero? ? 'First' : 'Then'}, #{t}." }
+      if @lines.size == 1
+        pars << "Just #{@lines.first}."
+      else
+        pars += @lines.each_with_index.map { |t, i| "#{i.zero? ? 'First' : 'Then'}, #{t}." }
+      end
       pars.join(' ').gsub('. Then, award ', ', and award ')
     end
   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.20'
+  VERSION = '0.0.22'
 end

data/test/fbe/test_award.rb

@@ -40,8 +40,11 @@ class TestAward < Minitest::Test
         (let max 36)
         (let basis 30)
         (give basis "as a basis")
-        (set b1 (if (lt hours max) 10 0))
-        (give b1 "for resolving the bug in ${hours} (<${max}) hours")
+        (let fee 10)
+        (aka
+          (set b1 (if (lt hours max) 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))
         (set b2 (times days -1))
         (let worst -20)
@@ -86,12 +89,10 @@ class TestAward < Minitest::Test
 
   def test_some_policies
     {
-      '(award (let x 25) (set z (plus x 1)) (give z "..."))' =>
-        'First, let _x_ be equal to **25**. Then, set _z_ to _x_ + **1**, and award _z_.'
-      # '(award (let x 25) (give x "..."))' =>
-      #   'The amount is **25**.',
-      # '(award (let x -5) (give x "..."))' =>
-      #   'The amount is **-5**.',
+      '(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'
     }.each do |q, t|
       md = Fbe::Award.new(q).policy.markdown
       assert(md.include?(t), md)

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

metadata

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