judges 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1b1028f7e8d932c33c2f0c761ede5fa5478a913d2292f56a70fe7ff0e8902aa
-  data.tar.gz: 0a48c55211f32ce7825a72f67c6c6f3757a3bdc6cf9067b1375712b6e5a3aba6
+  metadata.gz: 921a2ee75d8305caea875d0ed79fcbd6b45edc165a7ddb6d8f049a66c489146e
+  data.tar.gz: 73176a8f9b99a4aad3ab987f611468b3ca26b47bcc7a9048c4890a76f22e0d7b
 SHA512:
-  metadata.gz: e497c35fb9aee490a9c85c911a195414c3ad17a60b60b0b4be0851b6b68a857f879fe66e16b0603db26c8ee0a85af910a15b919e89b997935de5118f288ca180
-  data.tar.gz: 6894d6010bbbf1f99de4c721821a6d449ca4a15fed9602751b9fa857865c37d730014e9cca48460357c2e8754873077876ca7983ef013c93f78428d77b50ff49
+  metadata.gz: 567a566e23353d7cf625b117f733379543a24725456f13c0f5aa680abfc08732c7074e2159368ecf4a7c90e2615a0a72a32e88819f195bea9f2bc93ed9ed80cb
+  data.tar.gz: 1294c1cd68138b2e39a632b51e913ac0cb1e8e539f32f7ea3067339a946ce93ea6c27356d45ea375d8fd8d42b396f24a4ca2b868d05707c4140d5d4c47a4b866

data/bin/judges

@@ -29,13 +29,15 @@ require 'factbase'
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
+ver = '0.0.15'
+
 include GLI::App
 
 loog = Loog::REGULAR
 
 program_desc('Automated executor of judges for a factbase')
 
-version('0.0.13')
+version(ver)
 
 synopsis_format(:full)
 
@@ -48,13 +50,14 @@ pre do |global, command, options, args|
   if global[:verbose]
     loog = Loog::VERBOSE
   end
+  loog.debug("judges #{ver}")
   true
 end
 
 desc 'Update the factbase by passing all judges one by one'
 command :update do |c|
   c.desc 'Options to pass to every judge'
-  c.flag([:o, :option], default_value: 'yes', type: Array, arg_name: '<key=value>')
+  c.flag([:o, :option], multiple: true, arg_name: '<key=value>')
   c.action do |global, options, args|
     require_relative '../lib/judges/commands/update'
     Judges::Update.new(loog).run(options, args)

data/features/cli.feature

@@ -19,7 +19,9 @@ Feature: Simple Run
         n.kind = 'yes!'
       end
     """
-    Then I run bin/judges with "update . simple.fb"
+    Then I run bin/judges with "--verbose update -o foo=1 -o bar=2 . simple.fb"
+    Then Stdout contains "foo → "
+    Then Stdout contains "bar → "
     Then Stdout contains "1 judges processed"
     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.13'
+  s.version = '0.0.15'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description = '

data/lib/judges/commands/join.rb

@@ -43,11 +43,11 @@ class Judges::Join
     slave = args[1]
     raise "The slave factbase is absent: #{slave.to_rel}" unless File.exist?(slave)
     fb = Factbase.new
-    fb.import(File.read(master))
+    fb.import(File.binread(master))
     @loog.info("Master factbase imported from #{master.to_rel} (#{File.size(master)} bytes)")
-    fb.import(File.read(slave))
+    fb.import(File.binread(slave))
     @loog.info("Slave factbase imported from #{slave.to_rel} (#{File.size(slave)} bytes)")
-    File.write(master, fb.export)
+    File.binwrite(master, fb.export)
     @loog.info("Master factbase exported to #{master.to_rel} (#{File.size(master)} bytes)")
   end
 end

data/lib/judges/commands/print.rb

@@ -46,7 +46,7 @@ class Judges::Print
       o = "#{o}.#{opts[:format]}"
     end
     fb = Factbase.new
-    fb.import(File.read(f))
+    fb.import(File.binread(f))
     @loog.info("Factbase imported from #{f.to_rel} (#{File.size(f)} bytes)")
     FileUtils.mkdir_p(File.dirname(o))
     output =
@@ -58,7 +58,7 @@ class Judges::Print
         when 'xml'
           fb.to_xml
       end
-    File.write(o, output)
+    File.binwrite(o, output)
     @loog.info("Factbase printed to #{o.to_rel} (#{File.size(o)} bytes)")
   end
 end

data/lib/judges/commands/update.rb

@@ -40,11 +40,11 @@ class Judges::Update
   def run(opts, args)
     raise 'Exactly two arguments required' unless args.size == 2
     dir = args[0]
-    raise "The directory is absent: #{dir}" unless File.exist?(dir)
+    raise "The directory is absent: #{dir.to_rel}" unless File.exist?(dir)
     file = args[1]
     fb = Factbase.new
     if File.exist?(file)
-      fb.import(File.read(file))
+      fb.import(File.binread(file))
       @loog.info("Factbase imported from #{file.to_rel} (#{File.size(file)} bytes)")
     else
       @loog.info("There is no Factbase to import from #{file.to_rel} (file is absent)")
@@ -53,17 +53,20 @@ class Judges::Update
     @loog.debug("The following options provided:\n\t#{options.to_s.gsub("\n", "\n\t")}")
     errors = []
     done = Judges::Packs.new(dir, @loog).each_with_index do |p, i|
-      @loog.info("Pack ##{i} found in #{p.dir.to_rel}")
+      @loog.info("Running #{p.dir.to_rel} (##{i})...")
+      before = fb.size
       begin
         p.run(fb, options)
       rescue StandardError => e
         @loog.warn(Backtrace.new(e))
         errors << p.script
       end
+      after = fb.size
+      @loog.info("Pack #{p.dir.to_rel} added #{after - before} facts") if after > before
     end
     @loog.info("#{done} judges processed (#{errors.size} errors)")
     FileUtils.mkdir_p(File.dirname(file))
-    File.write(file, fb.export)
+    File.binwrite(file, fb.export)
     @loog.info("Factbase exported to #{file.to_rel} (#{File.size(file)} bytes)")
     raise "Failed to update correctly (#{errors.size} errors)" unless errors.empty?
   end

data/lib/judges/options.rb

@@ -39,7 +39,7 @@ class Judges::Options
     @hash.map do |k, v|
       v = v.to_s
       v = "#{v[0..3]}#{'*' * (v.length - 4)}" if v.length > 8
-      "#{k}=#{v}"
+      "#{k} → \"#{v}\""
     end.join("\n")
   end
 
@@ -49,6 +49,8 @@ class Judges::Options
       pp = @pairs || []
       pp = @pairs.map { |k, v| "#{k}=#{v}" } if pp.is_a?(Hash)
       pp = pp.split(',') if pp.is_a?(String)
+      pp.compact!
+      pp.reject!(&:empty?)
       pp.to_h do |pair|
         p = pair.split('=', 2)
         k = p[0].strip

data/lib/judges/to_rel.rb

@@ -32,6 +32,7 @@ class Object
     s = File.absolute_path(to_s)
     p = Pathname.new(s).relative_path_from(Dir.getwd)
     t = p.to_s
+    t = s if t.length > s.length
     t = "\"#{t}\"" if t.include?(' ')
     if p.directory?
       "#{t}/"

data/test/commands/test_join.rb

@@ -36,14 +36,14 @@ class TestJoin < Minitest::Test
       master = File.join(d, 'master.fb')
       fb1 = Factbase.new
       fb1.insert.zz = 5
-      File.write(master, fb1.export)
+      File.binwrite(master, fb1.export)
       slave = File.join(d, 'slave.fb')
       fb2 = Factbase.new
       fb2.insert.foo_bar = 42
-      File.write(slave, fb2.export)
+      File.binwrite(slave, fb2.export)
       Judges::Join.new(Loog::VERBOSE).run({}, [master, slave])
       fb = Factbase.new
-      fb.import(File.read(master))
+      fb.import(File.binread(master))
       xml = Nokogiri::XML.parse(fb.to_xml)
       assert(!xml.xpath('/fb/f[zz="5"]').empty?, fb.to_xml)
       assert(!xml.xpath('/fb/f[foo_bar="42"]').empty?, fb.to_xml)

data/test/commands/test_print.rb

@@ -37,7 +37,7 @@ class TestPrint < Minitest::Test
       f = File.join(d, 'base.fb')
       fb = Factbase.new
       fb.insert
-      File.write(f, fb.export)
+      File.binwrite(f, fb.export)
       Judges::Print.new(Loog::VERBOSE).run({ format: 'yaml', auto: true }, [f])
       y = File.join(d, 'base.yaml')
       assert(File.exist?(y))

data/test/commands/test_update.rb

@@ -37,7 +37,7 @@ class TestUpdate < Minitest::Test
       file = File.join(d, 'base.fb')
       Judges::Update.new(Loog::VERBOSE).run({ 'option' => ['foo_bar=42'] }, [d, file])
       fb = Factbase.new
-      fb.import(File.read(file))
+      fb.import(File.binread(file))
       xml = Nokogiri::XML.parse(fb.to_xml)
       assert(!xml.xpath('/fb/f[zzz="43"]').empty?)
     end
@@ -48,11 +48,11 @@ class TestUpdate < Minitest::Test
       file = File.join(d, 'base.fb')
       fb = Factbase.new
       fb.insert.foo_bar = 42
-      File.write(file, fb.export)
+      File.binwrite(file, fb.export)
       File.write(File.join(d, 'foo.rb'), '$fb.insert.tt = 4')
       Judges::Update.new(Loog::VERBOSE).run({}, [d, file])
       fb = Factbase.new
-      fb.import(File.read(file))
+      fb.import(File.binread(file))
       xml = Nokogiri::XML.parse(fb.to_xml)
       assert(!xml.xpath('/fb/f[tt="4"]').empty?)
       assert(!xml.xpath('/fb/f[foo_bar="42"]').empty?)

data/test/test_options.rb

@@ -46,6 +46,16 @@ class TestOptions < Minitest::Test
     assert(opts.foo.nil?)
   end
 
+  def test_with_empty_string
+    opts = Judges::Options.new('   ')
+    assert(opts.foo.nil?)
+  end
+
+  def test_with_empty_strings
+    opts = Judges::Options.new(['', nil])
+    assert(opts.foo.nil?)
+  end
+
   def test_with_string
     opts = Judges::Options.new('a=1,b=42')
     assert_equal(1, opts.a)
@@ -61,6 +71,8 @@ class TestOptions < Minitest::Test
 
   def test_converts_to_string
     opts = Judges::Options.new('foo' => 44, 'bar' => 'long-string-maybe-secret')
-    assert_equal("foo=44\nbar=long********************", opts.to_s)
+    s = opts.to_s
+    assert(s.include?('foo → "44"'))
+    assert(s.include?('"long********************"'))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Yegor Bugayenko