fbe 0.0.27 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b7ed70e3e3d37780d727b9c269cd27a86179da0df8b781eb2cc8a339e443ac5
-  data.tar.gz: 9635ce676a24efc7e63567d0b370588a4b8af12de34cbcc65bb5718991658c8e
+  metadata.gz: 3a53b788fa8aebdd8c99fafb67025447a67a8505a2d697fd13d1432ffd283dba
+  data.tar.gz: a69c498602b2b07157949b538260fbc2d0f2fc1d5f9071d979b9fc22c83f1ce3
 SHA512:
-  metadata.gz: 5dfd3ace2f914dc4fa31869a743b41fd56851419f32e2d0b1077b1517b9faa9e8829ecc2c545653162161c0722856019ea112411133ec7c79a065eb046f376b1
-  data.tar.gz: 87ffa308115144cf84cb725e084917473dce9ab3f73bca02dc2e231d160c74fb0a46cd4676791c0891d25b5406dc95f0313d08ffda13c8e6ff903fc625570798
+  metadata.gz: b47bdddfda8bd6d9c74280c51a9465f6924867c626ab44de5079c5e6ea5f2771385f23c9fa4f835eb122c77a407055583d6d82e50e045ef9c5e01514885ae2d0
+  data.tar.gz: cafad1b5e8ea0257f0ace46aa6782bfe9587d4a0fb06468554e569b5bd521f1e6ce01d1c65713428cd4918042cb38d2019b3cc56a3da05145f29d013788320cd

data/lib/fbe/award.rb

@@ -148,9 +148,10 @@ class Fbe::Award
         v = to_val(@operands[0], bill)
         a = to_val(@operands[1], bill)
         b = to_val(@operands[2], bill)
-        v = b if v > b
-        v = a if v < a
-        v
+        min, max = [a, b].minmax
+        return 0 if (v.positive? && v < min) || (v.negative? && v > max)
+
+        v.clamp(min, max)
       else
         raise "Unknown term '#{@op}'"
       end

data/lib/fbe/octo.rb

@@ -37,16 +37,24 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
     if options.testing.nil?
       o = Octokit::Client.new
       token = options.github_token
-      loog.debug("The 'github_token' option is not provided") if token.nil?
-      token = ENV.fetch('GITHUB_TOKEN', nil) if token.nil?
-      loog.debug("The 'GITHUB_TOKEN' environment variable is not set") if token.nil?
+      if token.nil?
+        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' 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)")
+        loog.info("Accessing GitHub API with a token (#{token.length} chars, ending by #{token[-4..]})")
       end
       o.auto_paginate = true
       o.per_page = 100
@@ -59,9 +67,11 @@ def Fbe.octo(options: $options, global: $global, loog: $loog)
       stack = Faraday::RackBuilder.new do |builder|
         builder.use(
           Faraday::Retry::Middleware,
-          exceptions: Faraday::Retry::Middleware::DEFAULT_EXCEPTIONS + [Octokit::Error],
-          max: 5,
-          interval: ENV['RACK_ENV'] == 'test' ? 0.1 : 10,
+          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
         )
@@ -138,9 +148,10 @@ class Fbe::FakeOctokit
   end
 
   def user(name)
+    name = name == 526_301 ? 'yegor256' : 'torvalds' if name.is_a?(Integer)
     {
       id: 444,
-      login: 'yegor256',
+      login: name,
       type: name == 29_139_614 ? 'Bot' : 'User'
     }
   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.27'
+  VERSION = '0.0.29'
 end

data/test/fbe/test_award.rb

@@ -79,7 +79,7 @@ class TestAward < Minitest::Test
       '(let x 25)' => 0,
       '(award (give 25 "for being a good boy"))' => 25,
       '(award (give (between 42 -10 -50) "empty"))' => -10,
-      '(award (give (between -3 -10 -50) "empty"))' => -10,
+      '(award (give (between -3 -10 -50) "empty"))' => 0,
       '(award (give (between -100 -50 -10) "empty"))' => -50
     }.each do |q, v|
       a = Fbe::Award.new(q)
@@ -87,6 +87,20 @@ class TestAward < Minitest::Test
     end
   end
 
+  def test_must_not_give_anything_when_too_small_value
+    {
+      '(award (give (between 13 5 20)))' => 13,
+      '(award (give (between 3 5 20)))' => 0,
+      '(award (give (between 25 5 20)))' => 20,
+      '(award (give (between -2 -10 -30)))' => 0,
+      '(award (give (between -15 -10 -30)))' => -15,
+      '(award (give (between -50 -10 -30)))' => -30
+    }.each do |q, v|
+      a = Fbe::Award.new(q)
+      assert_equal(v, a.bill.points, q)
+    end
+  end
+
   def test_some_policies
     {
       '(award (let x_a 25) (set z (plus x_a 1)) (give z "..."))' =>

data/test/fbe/test_who.rb

@@ -38,6 +38,6 @@ class TestWho < Minitest::Test
     f.who = 444
     global = {}
     options = Judges::Options.new({ 'testing' => true })
-    assert_equal('@yegor256', Fbe.who(f, global:, options:, loog: Loog::NULL))
+    assert_equal('@torvalds', Fbe.who(f, global:, options:, loog: Loog::NULL))
   end
 end

metadata

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