fbe 0.0.26 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7de59c3d4c2fe3034012a32d6eba737085e5c2a8f0c477055605c6f3a542a95e
-  data.tar.gz: a66cc8b96ec1fdc7c39bffcac90e59903674f2fa6de2ceb71d29da4cfaf6c438
+  metadata.gz: bd990128519eca8f209d125189adf9c6478747eacf3f1c38b78453a41b6fc743
+  data.tar.gz: d19077d3747061780cb14f45efbbc8ab84399e8c959d11c2bfaf197ce215b1d0
 SHA512:
-  metadata.gz: 629021282244947306fa767d0d878a4be481e5e2275ad309ac4aad89b399d8a54f840a5a90d42b4bb56443d11a7e7864ba0bb25a17b94ca22b00cd34befd38e1
-  data.tar.gz: cc5cfedac75b55de32bb7231242f5090fcf207ce656945be4d8aff7821f594047b6df329d8911a5fc02f377001097509d4a410fe206e5a5ea4f4ebe925d01e4c
+  metadata.gz: 74f4e2a03f13db7d934e29ebbee0357796b6c192401a65ac3bdeb01422a920b80c4e24c70191bf4ffb2ffb482131026cac0c43fdfbff1bd5d448e8df1368fb83
+  data.tar.gz: 5918f4ea19d6b979411cae675a37f290894ac139fef72a4c021222001f96a52963150e0ae362b4bbb5d24d09b46694491f4d64efb4edc89224cb0396ef9350be

data/Rakefile

@@ -32,6 +32,8 @@ def version
   Gem::Specification.load(Dir['*.gemspec'].first).version
 end
 
+ENV['RACK_ENV'] = 'test'
+
 task default: %i[clean test rubocop yard copyright]
 
 require 'rake/testtask'

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[-(token.size - 4)..]})")
       end
       o.auto_paginate = true
       o.per_page = 100
@@ -59,8 +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::TooManyRequests],
-          max: 5, interval: 1
+          exceptions: Faraday::Retry::Middleware::DEFAULT_EXCEPTIONS + [Octokit::Error],
+          max: 5,
+          interval: ENV['RACK_ENV'] == 'test' ? 0.1 : 10,
+          methods: [:get],
+          backoff_factor: 2
         )
         builder.use(Faraday::HttpCache, serializer: Marshal, shared_cache: false, logger: Loog::NULL)
         builder.use(Octokit::Response::RaiseError)

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.26'
+  VERSION = '0.0.28'
 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_octo.rb

@@ -80,6 +80,18 @@ class TestOcto < Minitest::Test
     o.user('yegor256')
   end
 
+  def test_retrying_on_error_response
+    WebMock.disable_net_connect!
+    global = {}
+    o = Fbe.octo(loog: Loog::NULL, global:, options: Judges::Options.new)
+    stub_request(:get, 'https://api.github.com/users/yegor256')
+      .to_return(status: 503)
+      .times(1)
+      .then
+      .to_return(status: 200, body: '{}')
+    o.user('yegor256')
+  end
+
   def test_with_broken_token
     skip # it's a "live" test, run it manually if you need it
     WebMock.enable_net_connect!

metadata

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