fbe 0.0.38 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69702483c25c55333a0391946414e8204e5116c47af9ce6c76736f30ac60e09
-  data.tar.gz: 5d868159c91bd6c58d6b6be8c5ba25c1138c0191cf5b915044a49b170342a36e
+  metadata.gz: 32f31aad59acf471e8f0075c5ed1d0449a2039fb7d13cd3e0b4c3804b6ef1271
+  data.tar.gz: 65356a4c23c7a6630a0c0387a511cd0d367c72eb2609cb3ded007f9efacbf6e9
 SHA512:
-  metadata.gz: 0c7ed04c82fe5f4c1fe28a127113ab65bc539db0079bb097ebb9979ba2cb521f37a4f5b6ee16aab51f8eac2e67e3da2bbba2f28372218a4a17de6c767514edf4
-  data.tar.gz: 4dc676859c6a144bd405808180a63c23bebd61423dc6d009a752a983c4267786b170e6d50758f98896adeb699d775ed75d9978dbf3dc90d0dbd56faee9502a15
+  metadata.gz: b50e3e2aaf0a16e640c8dc8068574fdb2dac380b767b00b2ae348c58a7ce0940b4db5dd85719aa263ee19ef5c2d402afef9a41cd31637f9a0e4418415a18ebc5
+  data.tar.gz: 732aedff1ade21b5db01cf591ad343889e234fd7e646d4012c399c9f053651fb220b5c9a746de63bff129efa37614d99c5ef9842fa688b4a7abda687d7c49d06

data/lib/fbe/regularly.rb

@@ -25,11 +25,9 @@
 require_relative '../fbe'
 require_relative 'fb'
 
-def Fbe.regularly(area, days, interval, fb: Fbe.fb, judge: $judge, loog: $loog, &)
-  pmp = fb.query("(and (eq what 'pmp') (eq area '#{area}') (exists #{days}))").each.to_a.first
-  days = pmp.nil? ? 28 : pmp[days].first
-  since = Time.now - (days * 24 * 60 * 60)
-  interval = pmp.nil? ? 7 : pmp[interval].first
+def Fbe.regularly(area, p_every_days, p_since_days = nil, fb: Fbe.fb, judge: $judge, loog: $loog, &)
+  pmp = fb.query("(and (eq what 'pmp') (eq area '#{area}') (exists #{p_every_days}))").each.to_a.first
+  interval = pmp.nil? ? 7 : pmp[p_every_days].first
   unless fb.query(
     "(and
       (eq what '#{judge}')
@@ -41,6 +39,10 @@ def Fbe.regularly(area, days, interval, fb: Fbe.fb, judge: $judge, loog: $loog,
   f = fb.insert
   f.what = judge
   f.when = Time.now
-  f.since = since
+  unless p_since_days.nil?
+    days = pmp.nil? ? 28 : pmp[p_since_days].first
+    since = Time.now - (days * 24 * 60 * 60)
+    f.since = since
+  end
   yield f
 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.38'
+  VERSION = '0.0.39'
 end

data/test/fbe/test_award.rb

@@ -23,6 +23,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'loog'
 require_relative '../test__helper'
 require_relative '../../lib/fbe/award'
 
@@ -58,7 +59,8 @@ class TestAward < Minitest::Test
         (set b2 (if (lt b2 at_least) b2 0))
         (set b2 (between b2 3 120))
         (give b2 "for holding the bug open for too long (${days} days)"))
-      '
+      ',
+      judge: '', global: {}, loog: Loog::NULL, options: nil
     )
     b = a.bill(hours: 10)
     assert(b.points <= 100)

data/test/fbe/test_regularly.rb

@@ -38,7 +38,7 @@ class TestRegularly < Minitest::Test
     loog = Loog::NULL
     judge = 'test'
     2.times do
-      Fbe.regularly('pmp', 'days', 'interval', fb:, loog:, judge:) do |f|
+      Fbe.regularly('pmp', 'interval', 'days', fb:, loog:, judge:) do |f|
         f.foo = 42
       end
     end

metadata

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