judges 0.0.28 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3d395cb5c5d1116843533c8a8d8576e346c8426ef1da8524d11c2fb00a65430
-  data.tar.gz: 648cb80dae16df946aec75075d3458b4fafaf04531e2cf2fe8bfa225353b4e3f
+  metadata.gz: 2966161948e1ac2ed8c36b5f0e515183a9f8ea02d6ddabf396e7bd5db98ca787
+  data.tar.gz: 227712553b74473211e835d5c1df9afbf03e00d8942639d137fea6d98d40a236
 SHA512:
-  metadata.gz: 99f24ae2112c3e60ac802a82f7ba0f5b8c2f582fcbdf9fc8d92d89c2c8f52476c4566b67bd4996b06c0c3aa550573fc79ecfec534493a0a7f3c71fe9c247cc4d
-  data.tar.gz: 53d1db75b34ae7d2536bd9ef5787d5fa52d5cd16debb199702c15381a8d20de0a8a06359b3482b2ba9d48990cc4ceba4d73d93f8a9b6969b22dc7122b0c18ef3
+  metadata.gz: 120d2cec10fbca12aa6a9107ea348236dd44e999a8499dbef93952cb2fb313ea11bb67c658d0ebb6b6ee4f002383d2f8177d75d06bd8cb01d547032222e6b9aa
+  data.tar.gz: 3cf907ef01704e0e11ffa8313226420536436571ab11ea9a25cf4d8c7cbc98e334cbb7e193ea5994910c36c20dcf29d0ae1d1fee040cefca9c7b5d2c0ec91a33

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     judges (0.0.0)
       backtrace (~> 0.3)
-      factbase (~> 0.0.28)
+      factbase (~> 0.0.29)
       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.28)
+    factbase (0.0.29)
       json (~> 2.7)
       loog (~> 0.2)
       nokogiri (~> 1.10)

data/Rakefile

@@ -69,6 +69,7 @@ end
 task :copyright do
   sh "grep -q -r '#{Date.today.strftime('%Y')}' \
     --include '*.rb' \
+    --include '*.yml' \
     --include '*.txt' \
     --include 'Rakefile' \
     ."

data/bin/judges

@@ -32,7 +32,7 @@ Encoding.default_internal = Encoding::UTF_8
 class App
   extend GLI::App
 
-  ver = '0.0.28'
+  ver = '0.0.30'
 
   loog = Loog::REGULAR
 
@@ -87,6 +87,14 @@ class App
     end
   end
 
+  desc 'Import YAML into a factbase'
+  command :import do |c|
+    c.action do |global, options, args|
+      require_relative '../lib/judges/commands/import'
+      Judges::Import.new(loog).run(options, args)
+    end
+  end
+
   desc 'Remove the facts that are too old'
   command :trim do |c|
     c.desc 'Only the facts that match the expression are deleted'
@@ -107,6 +115,8 @@ class App
     c.switch([:auto], default_value: false)
     c.desc 'Only the facts that match the expression are printed'
     c.flag([:query], default_value: '()')
+    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|
       require_relative '../lib/judges/commands/print'
       Judges::Print.new(loog).run(options, args)

data/features/import.feature

@@ -0,0 +1,17 @@
+Feature: Import
+  I want to import YAML into a factbase
+
+  Scenario: Simple import of a small YAML
+    Given I make a temp directory
+    Then I have a "simple.yaml" file with content:
+    """
+    -
+      foo: 42
+      bar: 2024-03-04T22:22:22Z
+      t: Hello, world!
+    -
+      z: 3.14
+    """
+    Then I run bin/judges with "--verbose import simple.yaml simple.fb"
+    Then Stdout contains "Import finished"
+    And Exit code is zero

data/features/print.feature

@@ -4,7 +4,6 @@ Feature: Print
   Scenario: Simple print of a small factbase, to YAML
     Given I make a temp directory
     Then I run bin/judges with "--verbose eval simple.fb '$fb.insert.foo = 42'"
-    Then I run bin/judges with "update . simple.fb"
     Then I run bin/judges with "print --format=yaml simple.fb simple.yml"
     Then Stdout contains "printed"
     And Exit code is zero
@@ -12,7 +11,6 @@ Feature: Print
   Scenario: Simple print of a small factbase, to JSON
     Given I make a temp directory
     Then I run bin/judges with "--verbose eval simple.fb '$fb.insert.foo = 42'"
-    Then I run bin/judges with "update . simple.fb"
     Then I run bin/judges with "print --format=json simple.fb simple.json"
     Then Stdout contains "printed"
     And Exit code is zero
@@ -20,7 +18,6 @@ Feature: Print
   Scenario: Simple print of a small factbase, to XML
     Given I make a temp directory
     Then I run bin/judges with "--verbose eval simple.fb '$fb.insert.foo = 42'"
-    Then I run bin/judges with "update . simple.fb"
     Then I run bin/judges with "print --format=xml --auto simple.fb"
     Then Stdout contains "printed"
     And Exit code is zero
@@ -29,7 +26,15 @@ Feature: Print
     Given I make a temp directory
     Then I run bin/judges with "--verbose eval simple.fb '$fb.insert.foo = 42'"
     Then I run bin/judges with "--verbose eval simple.fb '$fb.insert.foo = 43'"
-    Then I run bin/judges with "update . simple.fb"
     Then I run bin/judges with "print '--query=(eq foo 43)' --auto simple.fb"
     Then Stdout contains "printed"
     And Exit code is zero
+
+  Scenario: Print twice, without --force
+    Given I make a temp directory
+    Then I run bin/judges with "--verbose eval simple.fb '$fb.insert.foo = 42'"
+    Then I run bin/judges with "print --auto simple.fb"
+    Then Stdout contains "printed"
+    Then I run bin/judges with "print --auto simple.fb"
+    Then Stdout contains "No need to print"
+    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.28'
+  s.version = '0.0.30'
   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.28'
+  s.add_runtime_dependency 'factbase', '~>0.0.29'
   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/import.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'time'
+require 'factbase/looged'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 require_relative '../../judges/to_rel'
@@ -39,6 +40,7 @@ class Judges::Import
     raise "File not found #{args[0].to_rel}" unless File.exist?(args[0])
     start = Time.now
     yaml = YAML.load_file(args[0], permitted_classes: [Time])
+    @loog.info("YAML loaded from #{args[0].to_rel} (#{yaml.size} facts)")
     impex = Judges::Impex.new(@loog, args[1])
     fb = impex.import(strict: false)
     fb = Factbase::Looged.new(fb, @loog)

data/lib/judges/commands/print.rb

@@ -36,16 +36,24 @@ class Judges::Print
 
   def run(opts, args)
     raise 'At lease one argument required' if args.empty?
-    o = args[1]
     f = args[0]
     fb = Judges::Impex.new(@loog, f).import
     fb.query("(not #{opts['query']})").delete! unless opts['query'].nil?
+    o = args[1]
     if o.nil?
       raise 'Either provide output file name or use --auto' unless opts[:auto]
       o = File.join(File.dirname(f), File.basename(f).gsub(/\.[^.]*$/, ''))
       o = "#{o}.#{opts[:format]}"
     end
     FileUtils.mkdir_p(File.dirname(o))
+    if !opts['force'] && File.exist?(o)
+      if File.mtime(f) < File.mtime(o)
+        @loog.info("No need to print to #{o.to_rel}, since it's up to date (#{File.size(o)} bytes)")
+        return
+      end
+      @loog.debug("The factbase #{f.to_rel} is younger than the target #{o.to_rel}, need to print")
+    end
+    start = Time.now
     output =
       case opts[:format].downcase
         when 'yaml'
@@ -59,6 +67,6 @@ class Judges::Print
           Factbase::ToXML.new(fb).xml
       end
     File.binwrite(o, output)
-    @loog.info("Factbase printed to #{o.to_rel} (#{File.size(o)} bytes)")
+    @loog.info("Factbase printed to #{o.to_rel} (#{File.size(o)} bytes) in #{format('%.02f', Time.now - start)}s")
   end
 end

data/test/commands/test_print.rb

@@ -44,4 +44,19 @@ class TestPrint < Minitest::Test
       assert_equal(1, YAML.load_file(y)['facts'].size)
     end
   end
+
+  def test_print_twice
+    Dir.mktmpdir do |d|
+      f = File.join(d, 'base.fb')
+      fb = Factbase.new
+      fb.insert
+      File.binwrite(f, fb.export)
+      Judges::Print.new(Loog::NULL).run({ format: 'yaml', auto: true }, [f])
+      y = File.join(d, 'base.yaml')
+      assert(File.exist?(y))
+      mtime = File.mtime(y)
+      Judges::Print.new(Loog::NULL).run({ format: 'yaml', auto: true }, [f])
+      assert_equal(mtime, File.mtime(y))
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.30
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-19 00:00:00.000000000 Z
+date: 2024-05-21 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.28
+        version: 0.0.29
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.28
+        version: 0.0.29
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +113,7 @@ files:
 - Rakefile
 - bin/judges
 - features/gem_package.feature
+- features/import.feature
 - features/inspect.feature
 - features/join.feature
 - features/misc.feature