judges 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf26642d3989b5d0097e54b224bd8c8b431f5e488f04a6c6cc778f9a914e0ad6
-  data.tar.gz: 79974f0a047a19f499e8b9b69566ded6b9b78d3bf6f470bfc67e9aead9988dc9
+  metadata.gz: 9cdbff8b28d803f0ce0c0c8e8a934ea9af5b6d65b6396f04f94572bc21bb515e
+  data.tar.gz: 856504a44bf49b36ee64f3d304d14861965682df9257b6bbdb1284b71330d32d
 SHA512:
-  metadata.gz: f7af589ce71752db5991f3838ea4e6b0e13969f3caab954f21d991d692d75b592c5f3bbe5d42e26cdc9a5d2c68a8ed3fcbe87401c34b1d6daa92c380f6fc7688
-  data.tar.gz: 25a4cc8aa470fb2f457c9f00b1581d5e4c05ab07d8580da124fd59d92c768796b4548948cb03abfc88256936b3ad8a2ae2fa4dd0edd66a7f1ae69a8530176fcf
+  metadata.gz: ddb58a1c8443ed4d61c3f55d155c34f0ba9e164d731167e7069169ac3ee7dbe9734fd7c4bd5a9e90a98787136b43d44966a3662fe3d13014298dcf1e770dd5d4
+  data.tar.gz: 9c8fe18c4bebae1ceeb56611b71862d5cda792d292e6ba33f6f1e6b0700483ab385281d00e6ca1a5f3e134d644f065706e547cc3d9b56c4e634dd7c46afac0dd

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     judges (0.0.0)
       backtrace (~> 0.3)
-      factbase (~> 0.0.30)
+      factbase (~> 0.0.32)
       gli (~> 2.21)
       loog (~> 0.2)
       nokogiri (~> 1.10)
@@ -74,7 +74,7 @@ GEM
     docile (1.4.0)
     drb (2.2.1)
     erubi (1.12.0)
-    factbase (0.0.30)
+    factbase (0.0.32)
       json (~> 2.7)
       loog (~> 0.2)
       nokogiri (~> 1.10)

data/bin/judges

@@ -32,7 +32,7 @@ Encoding.default_internal = Encoding::UTF_8
 class App
   extend GLI::App
 
-  ver = '0.0.32'
+  ver = '0.0.33'
 
   loog = Loog::REGULAR
 
@@ -98,9 +98,7 @@ class App
   desc 'Remove the facts that are too old'
   command :trim do |c|
     c.desc 'Only the facts that match the expression are deleted'
-    c.flag([:query])
-    c.desc 'Remove facts that are older than X days'
-    c.flag([:days], type: Integer)
+    c.flag([:query], default_value: '(never)')
     c.action do |global, options, args|
       require_relative '../lib/judges/commands/trim'
       Judges::Trim.new(loog).run(options, args)
@@ -114,7 +112,7 @@ class App
     c.desc 'Generate output name of the file automatically'
     c.switch([:auto], default_value: false)
     c.desc 'Only the facts that match the expression are printed'
-    c.flag([:query], default_value: '()')
+    c.flag([:query], default_value: '(always)')
     c.desc 'Print even if target file already exists and is older than the factbase'
     c.switch([:force], default_value: false)
     c.action do |global, options, args|

data/features/trim.feature

@@ -1,17 +1,16 @@
 Feature: Trim
   I want to trim a factbase
 
-  Scenario: Simple trimming of a factbase
+  Scenario: Simple trimming of a factbase, with a query
     Given I make a temp directory
-    Then I run bin/judges with "--verbose eval simple.fb '$fb.insert.time = Time.now - 100 * 60 * 60 * 24'"
-    Then I run bin/judges with "--verbose update . simple.fb"
-    Given I run bin/judges with "trim --days 5 simple.fb"
+    Then I run bin/judges with "--verbose eval simple.fb '$fb.insert.foo = 42'"
+    Given I run bin/judges with "trim --query '(eq foo 42)' simple.fb"
     Then Stdout contains "1 fact(s) deleted"
     And Exit code is zero
 
-  Scenario: Simple trimming of a factbase, with a query
+  Scenario: Delete nothing by default
     Given I make a temp directory
     Then I run bin/judges with "--verbose eval simple.fb '$fb.insert.foo = 42'"
-    Given I run bin/judges with "trim --query '(eq foo 42)' simple.fb"
-    Then Stdout contains "1 fact(s) deleted"
+    Given I run bin/judges with "trim simple.fb"
+    Then Stdout contains "No facts deleted"
     And Exit code is zero

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.0.32'
+  s.version = '0.0.33'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description = '
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'backtrace', '~> 0.3'
-  s.add_runtime_dependency 'factbase', '~>0.0.30'
+  s.add_runtime_dependency 'factbase', '~>0.0.32'
   s.add_runtime_dependency 'gli', '~>2.21'
   s.add_runtime_dependency 'loog', '~>0.2'
   s.add_runtime_dependency 'nokogiri', '~> 1.10'

data/lib/judges/commands/trim.rb

@@ -38,17 +38,8 @@ class Judges::Trim
     raise 'Exactly one argument required' unless args.size == 1
     impex = Judges::Impex.new(@loog, args[0])
     fb = impex.import
-    query = opts['query']
-    if query.nil?
-      days = opts['days']
-      day = Time.now - (days * 60 * 60 * 24)
-      query = "(lt time #{day.utc.iso8601})"
-      @loog.info("Deleting facts that are older than #{days} days")
-    else
-      raise 'Specify either --days or --query' unless opts['days'].nil?
-    end
     elapsed(@loog) do
-      deleted = fb.query(query).delete!
+      deleted = fb.query(opts['query']).delete!
       throw :'No facts deleted' if deleted.zero?
       impex.export(fb)
       throw :"🗑 #{deleted} fact(s) deleted"

data/test/commands/test_trim.rb

@@ -39,7 +39,7 @@ class TestTrim < Minitest::Test
       before.insert.time = Time.now + 1
       before.insert.time = Time.now - (100 * 24 * 60 * 60)
       File.binwrite(file, before.export)
-      Judges::Trim.new(Loog::NULL).run({ 'days' => 10 }, [file])
+      Judges::Trim.new(Loog::NULL).run({ 'query' => "(lt time #{Time.now.utc.iso8601})" }, [file])
       after = Factbase.new
       after.import(File.binread(file))
       assert_equal(1, after.size)

data/test/fb/test_once.rb

@@ -34,7 +34,7 @@ class TestOnce < Minitest::Test
   def test_touch_once
     fb = once(Factbase.new, judge: 'something')
     fb.insert
-    fb.query('()').each { |f| f.foo = 42 }
-    assert(fb.query('()').extend(Enumerable).to_a.empty?)
+    fb.query('(always)').each { |f| f.foo = 42 }
+    assert(fb.query('(always)').extend(Enumerable).to_a.empty?)
   end
 end

data/test/test_pack.rb

@@ -104,7 +104,7 @@ class TestPack < Minitest::Test
       pack = Judges::Pack.new(dir, lib, Loog::NULL)
       fb = Factbase.new
       pack.run(fb, {}, {}, {})
-      assert_equal(42, fb.query('()').each.to_a.first.bar)
+      assert_equal(42, fb.query('(always)').each.to_a.first.bar)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-24 00:00:00.000000000 Z
+date: 2024-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.30
+        version: 0.0.32
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.30
+        version: 0.0.32
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement