judges 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a66536b050bc10aad0401eece9025c2cca7cc98862b18fd8fc31be03a390c8b9
-  data.tar.gz: 022e2a420efcfd08c7df9690f81dba7490fcbc1b9c16fe5991224140fa843d67
+  metadata.gz: fdaaebbfb61ca792443a79d06439a3946f92bf9fdeb46fdf89ab0f702f0a2176
+  data.tar.gz: 617dce64bda23eb2d4987ef45b60987766248d48ee5770b6c4f35964d4f73cdf
 SHA512:
-  metadata.gz: 928a033f2853602094977d119c30f0a64516f4548e4c776540b9861bcf1792b96100947d6d36d4e971468ce314434dd46c2e0e0ba033a11fed5fccb02f879928
-  data.tar.gz: 7a47a73a1627723225d93c98d1ba3391bb27c20322411ffe55dfc21f4ee176578fb42e8c62e47b1efa87faa1e5160df5a28fe52f046ecaf197458fa49208d6a7
+  metadata.gz: 8e0cfe9f3488ed3e67f687400a2d4ab7bd6ccae47985d0eec8681bca3aac61c9bdbef4025ca974adff07e7aadb9a6ab594bc1765f2fccaabc7fa23d0c250201e
+  data.tar.gz: 8148daa02d6d83ddcc6dcd6093108cbe051cd205876a924c65590a02b52e861b9d9517cef775e4e86e7ff007cc040379ce11d86c4e1b758a7a4eff6aa82ec327

data/Gemfile

@@ -24,12 +24,12 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'cucumber', '9.2.0', require: false
-gem 'minitest', '5.23.1', require: false
+gem 'minitest', '5.24.0', require: false
 gem 'net-ping', '2.0.8', require: false
 gem 'rake', '13.2.1', require: false
-gem 'rspec-rails', '6.1.2', require: false
+gem 'rspec-rails', '6.1.3', require: false
 gem 'rubocop', '1.64.1', require: false
-gem 'rubocop-performance', '1.21.0', require: false
+gem 'rubocop-performance', '1.21.1', require: false
 gem 'rubocop-rspec', '3.0.1', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'simplecov-cobertura', '2.1.0', require: false

data/Gemfile.lock

@@ -10,6 +10,7 @@ PATH
       loog (~> 0.2)
       moments (~> 0.3)
       nokogiri (~> 1.10)
+      others (~> 0.0)
       retries (~> 0.0)
       tago (~> 0.0)
       typhoeus (~> 1.3)
@@ -43,8 +44,8 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     backtrace (0.4.0)
     base64 (0.2.0)
@@ -77,20 +78,24 @@ GEM
       bigdecimal
     cucumber-gherkin (27.0.0)
       cucumber-messages (>= 19.1.4, < 23)
-    cucumber-html-formatter (21.3.1)
+    cucumber-html-formatter (21.4.0)
       cucumber-messages (> 19, < 25)
     cucumber-messages (22.0.0)
     cucumber-tag-expressions (6.1.0)
+    decoor (0.0.1)
     diff-lcs (1.5.1)
     docile (1.4.0)
     drb (2.2.1)
-    erubi (1.12.0)
+    erubi (1.13.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.0.50)
+    factbase (0.0.54)
+      backtrace (~> 0.3)
+      decoor (~> 0.0)
       json (~> 2.7)
       loog (~> 0.2)
       nokogiri (~> 1.10)
+      others (~> 0.0)
       tago (~> 0.0)
       yaml (~> 0.3)
     ffi (1.17.0-aarch64-linux-gnu)
@@ -105,7 +110,7 @@ GEM
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.13.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iri (0.8.0)
@@ -116,34 +121,35 @@ GEM
       nokogiri (>= 1.12.0)
     loog (0.5.1)
     mini_mime (1.1.5)
-    minitest (5.23.1)
+    minitest (5.24.0)
     moments (0.3.0)
     multi_test (1.1.0)
     mutex_m (0.2.0)
     net-ping (2.0.8)
-    nokogiri (1.16.5-aarch64-linux)
+    nokogiri (1.16.6-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-arm-linux)
+    nokogiri (1.16.6-arm-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x64-mingw-ucrt)
+    nokogiri (1.16.6-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86-linux)
+    nokogiri (1.16.6-x86-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.6-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
+    others (0.0.3)
     parallel (1.25.1)
     parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
       stringio
-    public_suffix (5.0.5)
+    public_suffix (6.0.0)
     racc (1.8.0)
-    rack (3.1.3)
+    rack (3.1.4)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -178,13 +184,13 @@ GEM
       strscan
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.2)
+    rspec-rails (6.1.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -206,7 +212,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-performance (1.21.0)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rspec (3.0.1)
@@ -221,7 +227,7 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strscan (3.1.0)
     sys-uname (1.3.0)
       ffi (~> 1.1)
@@ -239,7 +245,7 @@ GEM
     webrick (1.8.1)
     yaml (0.3.0)
     yard (0.9.36)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   aarch64-linux
@@ -253,12 +259,12 @@ PLATFORMS
 DEPENDENCIES
   cucumber (= 9.2.0)
   judges!
-  minitest (= 5.23.1)
+  minitest (= 5.24.0)
   net-ping (= 2.0.8)
   rake (= 13.2.1)
-  rspec-rails (= 6.1.2)
+  rspec-rails (= 6.1.3)
   rubocop (= 1.64.1)
-  rubocop-performance (= 1.21.0)
+  rubocop-performance (= 1.21.1)
   rubocop-rspec (= 3.0.1)
   simplecov (= 0.22.0)
   simplecov-cobertura (= 2.1.0)

data/bin/judges

@@ -50,8 +50,8 @@ class App
     if global[:verbose]
       loog = Loog::VERBOSE
     end
-    loog.debug("judges #{Judges::VERSION}")
-    loog.debug("facbase #{Factbase::VERSION}")
+    loog.debug("Judges #{Judges::VERSION}")
+    loog.debug("Factbase #{Factbase::VERSION}")
     true
   end
 
@@ -167,6 +167,8 @@ class App
     c.flag([:timeout], default_value: 30, type: Integer)
     c.desc 'Shall SSL be used?'
     c.switch([:ssl], default_value: true)
+    c.desc 'A unique name to use for a lock/unlock'
+    c.flag([:owner], default_value: 'default', type: String)
     c.action do |global, options, args|
       require_relative '../lib/judges/commands/push'
       Judges::Push.new(loog).run(options, args)
@@ -187,6 +189,8 @@ class App
     c.flag([:timeout], default_value: 30, type: Integer)
     c.desc 'Shall SSL be used?'
     c.switch([:ssl], default_value: true)
+    c.desc 'A unique name to use for a lock/unlock'
+    c.flag([:owner], default_value: 'default', type: String)
     c.action do |global, options, args|
       require_relative '../lib/judges/commands/pull'
       Judges::Pull.new(loog).run(options, args)

data/judges.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=3.2'
   s.name = 'judges'
-  s.version = '0.10.0'
+  s.version = '0.12.0'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description =
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'loog', '~>0.2'
   s.add_runtime_dependency 'moments', '~>0.3'
   s.add_runtime_dependency 'nokogiri', '~>1.10'
+  s.add_runtime_dependency 'others', '~>0.0'
   s.add_runtime_dependency 'retries', '~>0.0'
   s.add_runtime_dependency 'tago', '~>0.0'
   s.add_runtime_dependency 'typhoeus', '~>1.3'

data/lib/judges/baza.rb

@@ -110,6 +110,36 @@ class Judges::Baza
     finished
   end
 
+  # Lock the name.
+  def lock(name, owner)
+    elapsed(@loog) do
+      with_retries do
+        checked(
+          Typhoeus::Request.get(
+            home.append('lock').append(name).add(owner:).to_s,
+            headers:
+          ),
+          302
+        )
+      end
+    end
+  end
+
+  # Unlock the name.
+  def unlock(name, owner)
+    elapsed(@loog) do
+      with_retries do
+        checked(
+          Typhoeus::Request.get(
+            home.append('unlock').append(name).add(owner:).to_s,
+            headers:
+          ),
+          302
+        )
+      end
+    end
+  end
+
   def recent(name)
     job = 0
     elapsed(@loog) do

data/lib/judges/commands/pull.rb

@@ -47,6 +47,7 @@ class Judges::Pull
     name = args[0]
     elapsed(@loog) do
       if baza.name_exists?(name)
+        baza.lock(name, opts['owner'])
         fb.import(baza.pull(wait(baza, baza.recent(name), opts['wait'])))
         Judges::Impex.new(@loog, args[1]).export(fb)
         throw :"Pulled #{fb.size} facts by the name '#{name}'"

data/lib/judges/commands/push.rb

@@ -46,7 +46,9 @@ class Judges::Push
       loog: @loog
     )
     elapsed(@loog) do
+      baza.lock(name, opts['owner'])
       id = baza.push(name, fb.export)
+      baza.unlock(name, opts['owner'])
       throw :"Pushed #{fb.size} facts, job ID is #{id}"
     end
   end

data/lib/judges/commands/update.rb

@@ -84,7 +84,7 @@ class Judges::Update
     global = {}
     elapsed(@loog) do
       done = judges.each_with_index do |p, i|
-        @loog.info("\n\n👉 Running #{p.name} (##{i}) at #{p.dir.to_rel}...")
+        @loog.info("\n👉 Running #{p.name} (##{i}) at #{p.dir.to_rel}...")
         elapsed(@loog) do
           c = one_judge(fb, p, global, options)
           churn += c

data/lib/judges/options.rb

@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'others'
 require_relative '../judges'
 
 # Options for Ruby scripts in the judges.
@@ -54,7 +55,7 @@ class Judges::Options
   end
 
   # Get option by name.
-  def method_missing(*args)
+  others do |*args|
     @hash ||= begin
       pp = @pairs || []
       pp = @pairs.map { |k, v| "#{k}=#{v}" } if pp.is_a?(Hash)
@@ -72,14 +73,4 @@ class Judges::Options
     k = args[0].downcase
     @hash[k]
   end
-
-  # rubocop:disable Style/OptionalBooleanParameter
-  def respond_to?(_method, _include_private = false)
-    # rubocop:enable Style/OptionalBooleanParameter
-    true
-  end
-
-  def respond_to_missing?(_method, _include_private = false)
-    true
-  end
 end

data/lib/judges.rb

@@ -25,5 +25,5 @@
 # Copyright:: Copyright (c) 2024 Yegor Bugayenko
 # License:: MIT
 module Judges
-  VERSION = '0.10.0'
+  VERSION = '0.12.0'
 end

data/test/commands/test_pull.rb

@@ -34,6 +34,7 @@ require_relative '../../lib/judges/commands/pull'
 class TestPull < Minitest::Test
   def test_pull_simple_factbase
     WebMock.disable_net_connect!
+    stub_request(:get, 'http://example.org/lock/foo?owner=none').to_return(status: 302)
     stub_request(:get, 'http://example.org/exists/foo').to_return(body: 'yes')
     stub_request(:get, 'http://example.org/recent/foo.txt').to_return(body: '42')
     stub_request(:get, 'http://example.org/finished/42').to_return(body: 'yes')
@@ -48,7 +49,8 @@ class TestPull < Minitest::Test
           'host' => 'example.org',
           'port' => 80,
           'ssl' => false,
-          'wait' => 10
+          'wait' => 10,
+          'owner' => 'none'
         },
         ['foo', file]
       )

data/test/commands/test_push.rb

@@ -33,6 +33,8 @@ require_relative '../../lib/judges/commands/push'
 class TestPush < Minitest::Test
   def test_push_simple_factbase
     WebMock.disable_net_connect!
+    stub_request(:get, 'https://example.org/lock/foo?owner=none').to_return(status: 302)
+    stub_request(:get, 'https://example.org/unlock/foo?owner=none').to_return(status: 302)
     stub_request(:put, 'https://example.org/push/foo').to_return(
       status: 200, body: '42'
     )
@@ -46,7 +48,8 @@ class TestPush < Minitest::Test
           'token' => '000',
           'host' => 'example.org',
           'port' => 443,
-          'ssl' => true
+          'ssl' => true,
+          'owner' => 'none'
         },
         ['foo', file]
       )
@@ -55,6 +58,7 @@ class TestPush < Minitest::Test
 
   def test_fails_on_http_error
     WebMock.disable_net_connect!
+    stub_request(:get, 'http://example.org/lock/foo?owner=none').to_return(status: 302)
     stub_request(:put, 'http://example.org/push/foo').to_return(status: 500)
     Dir.mktmpdir do |d|
       file = File.join(d, 'base.fb')
@@ -67,7 +71,8 @@ class TestPush < Minitest::Test
             'token' => '000',
             'host' => 'example.org',
             'port' => 80,
-            'ssl' => false
+            'ssl' => false,
+            'owner' => 'none'
           },
           ['foo', file]
         )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: others
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: retries
   requirement: !ruby/object:Gem::Requirement