fbe 0.0.44 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e48e27db602678e608a7b2301e9a70e801c4651fef5cbca3c9f0e17082109572
-  data.tar.gz: ca468197e588f5267e7d9c33c169a0e156bed76d71a6bd0f03d7125e341f08c1
+  metadata.gz: 2431cb14f0a8b96e3c7c1478004756c89c736c41e30a83908955883f677f223f
+  data.tar.gz: a60cfd3c3083d2e9b89de82992981737ab6d375c920fa10de7413ba584ec36f0
 SHA512:
-  metadata.gz: d2efed7f06e47435b287774682305f856194426271dc6afe5e2c2763877066f2e0c389812ff6ee1d8ff19addb51f71c6d127e42509728107e01d45a3511762d1
-  data.tar.gz: d23a168fcbaeec4ac9e8541f25d3ac212b65c0f92f968926942fa4dc593d7a52635945b67592e0f59745ca2f131702b6951716573c4982eb42d52840b94cfab1
+  metadata.gz: ae5a89b06a88acfbde4e41601faad9df89d3155f09f545e8564d2944a18da7c1dfb27a928edfb79beaee51b357cc433bd4fb404542d3e3592305441c2e01a676
+  data.tar.gz: ffc6494268796dbe1edb4da92163bf107e84e422944000e233f419adc59842ddf0842012da4b43cd2a7ad6080fa1f0150bcde81c894c78e6fc0188bba80458e7

data/Gemfile.lock

@@ -19,41 +19,54 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.3.4)
-      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionpack (7.2.0)
+      actionview (= 7.2.0)
+      activesupport (= 7.2.0)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
+      useragent (~> 0.16)
+    actionview (7.2.0)
+      activesupport (= 7.2.0)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.4)
+    activesupport (7.2.0)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ansi (1.5.0)
     ast (2.4.2)
     backtrace (0.4.0)
     base64 (0.2.0)
+    baza.rb (0.0.4)
+      backtrace (> 0)
+      faraday (> 0)
+      faraday-http-cache (> 0)
+      faraday-multipart (> 0)
+      faraday-retry (> 0)
+      iri (> 0)
+      loog (> 0)
+      retries (~> 0)
+      tago (~> 0)
+      typhoeus (~> 1.3)
     bigdecimal (3.1.8)
     builder (3.3.0)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crack (1.0.0)
       bigdecimal
@@ -66,7 +79,7 @@ GEM
     erubi (1.13.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.2.1)
+    factbase (0.3.0)
       backtrace (> 0)
       decoor (> 0)
       json (~> 2.7)
@@ -100,8 +113,9 @@ GEM
       reline (>= 0.4.2)
     iri (0.8.0)
     json (2.7.2)
-    judges (0.22.1)
+    judges (0.25.0)
       backtrace (~> 0)
+      baza.rb (~> 0)
       concurrent-ruby (~> 1.2)
       factbase (~> 0)
       gli (~> 2.21)
@@ -127,7 +141,6 @@ GEM
       ruby-progressbar
     moments (0.3.0)
     multipart-post (2.4.1)
-    mutex_m (0.2.0)
     net-http (0.4.1)
       uri
     nokogiri (1.16.7-arm64-darwin)
@@ -143,8 +156,8 @@ GEM
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     others (0.0.3)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (1.26.2)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
@@ -166,10 +179,10 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      irb
+    railties (7.2.0)
+      actionpack (= 7.2.0)
+      activesupport (= 7.2.0)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
@@ -182,7 +195,7 @@ GEM
     reline (0.5.9)
       io-console (~> 0.5)
     retries (0.0.5)
-    rexml (3.3.4)
+    rexml (3.3.5)
       strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
@@ -223,6 +236,7 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
+    securerandom (0.3.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -242,6 +256,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     uri (0.13.0)
+    useragent (0.16.10)
     verbose (0.0.2)
       loog (~> 0.2)
       tago (~> 0.0)

data/lib/fbe/overwrite.rb

@@ -39,6 +39,8 @@ require_relative 'fb'
 # @param [Any] vqlue The value to set
 def Fbe.overwrite(fact, property, value, fb: Fbe.fb)
   raise 'The fact is nil' if fact.nil?
+  raise "The property is not a String but #{property.class} (#{property})" unless property.is_a?(String)
+  return if !fact[property].nil? && fact[property].size == 1 && fact[property].first == value
   before = {}
   fact.all_properties.each do |prop|
     before[prop.to_s] = fact[prop]

data/lib/fbe/repeatedly.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+# MIT License
+#
+# Copyright (c) 2024 Zerocracy
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative '../fbe'
+require_relative 'fb'
+
+# Run the block provided every X hours.
+#
+# @param [String] area The name of the PMP area
+# @param [Integer] p_every_hours How frequently to run, every X hours
+def Fbe.repeatedly(area, p_every_hours, fb: Fbe.fb, judge: $judge, loog: $loog, &)
+  pmp = fb.query("(and (eq what 'pmp') (eq area '#{area}') (exists #{p_every_hours}))").each.to_a.first
+  hours = pmp.nil? ? 24 : pmp[p_every_hours].first
+  unless fb.query(
+    "(and
+      (eq what '#{judge}')
+      (gt when (minus (to_time (env 'TODAY' '#{Time.now.utc.iso8601}')) '#{hours} hours')))"
+  ).each.to_a.empty?
+    loog.debug("#{$judge} have recently been executed, skipping now")
+    return
+  end
+  f = fb.query("(and (eq what '#{judge}'))").each.to_a.first
+  if f.nil?
+    f = fb.insert
+    f.what = judge
+  end
+  Fbe.overwrite(f, 'when', Time.now)
+  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.44'
+  VERSION = '0.0.46'
 end

data/test/fbe/middleware/test_quota.rb

@@ -45,7 +45,7 @@ class QuotaTest < Minitest::Test
 
   def test_quota_middleware_pauses_when_quota_low
     loog = Loog::NULL
-    pause = 1
+    pause = 0.1
     app = FakeApp.new
     middleware = Fbe::Middleware::Quota.new(app, loog:, pause:)
     start_time = Time.now
@@ -62,7 +62,7 @@ class QuotaTest < Minitest::Test
   end
 
   def test_quota_middleware_logs_when_quota_low
-    pause = 1
+    pause = 0.1
     log_output = StringIO.new
     loog = Logger.new(log_output)
     app = FakeApp.new

data/test/fbe/test_octo.rb

@@ -139,7 +139,7 @@ class TestOcto < Minitest::Test
   def test_pauses_when_quota_is_exceeded
     WebMock.disable_net_connect!
     global = {}
-    pause = 1
+    pause = 0.1
     o = Fbe.octo(loog: Loog::NULL, global:, options: Judges::Options.new({ 'github_api_pause' => pause }))
     limit = 100
     start_time = Time.now

data/test/fbe/test_overwrite.rb

@@ -40,17 +40,27 @@ class TestOverwrite < Minitest::Test
     f.bar = 'hey you друг'
     f.many = 3
     f.many = 3.14
-    Fbe.overwrite(f, :foo, 55, fb:)
+    Fbe.overwrite(f, 'foo', 55, fb:)
     assert_equal(55, fb.query('(always)').each.to_a.first['foo'].first)
     assert_equal('hey you друг', fb.query('(always)').each.to_a.first['bar'].first)
     assert_equal(2, fb.query('(always)').each.to_a.first['many'].size)
   end
 
+  def test_no_need_to_overwrite
+    fb = Factbase.new
+    f = fb.insert
+    f._id = 1
+    f.foo = 42
+    fb.insert._id = 2
+    Fbe.overwrite(f, 'foo', 42, fb:)
+    assert_equal(1, fb.query('(always)').each.to_a.first._id)
+  end
+
   def test_simple_insert
     fb = Factbase.new
     f = fb.insert
     f._id = 1
-    Fbe.overwrite(f, :foo, 42, fb:)
+    Fbe.overwrite(f, 'foo', 42, fb:)
     assert_equal(42, fb.query('(always)').each.to_a.first['foo'].first)
   end
 
@@ -58,7 +68,7 @@ class TestOverwrite < Minitest::Test
     fb = Factbase.new
     f = fb.insert
     assert_raises do
-      Fbe.overwrite(f, :foo, 42, fb:)
+      Fbe.overwrite(f, 'foo', 42, fb:)
     end
   end
 
@@ -71,7 +81,7 @@ class TestOverwrite < Minitest::Test
     f2._id = 2
     f3 = fb.insert
     f3._id = 1
-    Fbe.overwrite(f3, :foo, 42, fb:)
+    Fbe.overwrite(f3, 'foo', 42, fb:)
     assert_equal(3, fb.size)
   end
 end

data/test/fbe/test_repeatedly.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# MIT License
+#
+# Copyright (c) 2024 Zerocracy
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require 'loog'
+require 'factbase'
+require_relative '../test__helper'
+require_relative '../../lib/fbe/repeatedly'
+
+# Test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2024 Zerocracy
+# License:: MIT
+class TestRepeatedly < Minitest::Test
+  def test_simple
+    $fb = Factbase.new
+    loog = Loog::NULL
+    judge = 'test'
+    $global = {}
+    3.times do
+      Fbe.repeatedly('pmp', 'every_x_hours', loog:, judge:) do |f|
+        f.foo = 42
+      end
+    end
+    assert_equal(1, $fb.size)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.46
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-11 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -237,6 +237,7 @@ files:
 - lib/fbe/overwrite.rb
 - lib/fbe/pmp.rb
 - lib/fbe/regularly.rb
+- lib/fbe/repeatedly.rb
 - lib/fbe/sec.rb
 - lib/fbe/unmask_repos.rb
 - lib/fbe/who.rb
@@ -254,6 +255,7 @@ files:
 - test/fbe/test_overwrite.rb
 - test/fbe/test_pmp.rb
 - test/fbe/test_regularly.rb
+- test/fbe/test_repeatedly.rb
 - test/fbe/test_sec.rb
 - test/fbe/test_unmask_repos.rb
 - test/fbe/test_who.rb