judges 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63754c5826506b6066688aa2373dafcd87fc20cd193631c15ce67f1496dc361b
-  data.tar.gz: a7c70946e0c24bffc91849d81e15866335ef0ebeb64b7f1cefd2c3d6c2d48506
+  metadata.gz: f1b1028f7e8d932c33c2f0c761ede5fa5478a913d2292f56a70fe7ff0e8902aa
+  data.tar.gz: 0a48c55211f32ce7825a72f67c6c6f3757a3bdc6cf9067b1375712b6e5a3aba6
 SHA512:
-  metadata.gz: 6360db23fb5fc573d479a43d40b4c1d1e274bd21320cb4c2acba0e71a6ac8775c3398fef776dc1d7412ccd96782394e53d9631180c5a09314aab9e791738829a
-  data.tar.gz: e5b7a0c2460d589bf9cb69e42183585d13ac6ac1b400f338e3c73057be0d2fdb9c703bcc2896f73d8dbd5f850b22452d8f5a2b147e299a1ed9fd2b1aabe2f564
+  metadata.gz: e497c35fb9aee490a9c85c911a195414c3ad17a60b60b0b4be0851b6b68a857f879fe66e16b0603db26c8ee0a85af910a15b919e89b997935de5118f288ca180
+  data.tar.gz: 6894d6010bbbf1f99de4c721821a6d449ca4a15fed9602751b9fa857865c37d730014e9cca48460357c2e8754873077876ca7983ef013c93f78428d77b50ff49

data/bin/judges

@@ -35,7 +35,7 @@ loog = Loog::REGULAR
 
 program_desc('Automated executor of judges for a factbase')
 
-version('0.0.12')
+version('0.0.13')
 
 synopsis_format(:full)
 

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.12'
+  s.version = '0.0.13'
   s.license = 'MIT'
   s.summary = 'Command-Line Tool for a Factbase'
   s.description = '

data/lib/judges/commands/test.rb

@@ -40,13 +40,13 @@ class Judges::Test
   def run(_opts, args)
     raise 'Exactly one argument required' unless args.size == 1
     dir = args[0]
-    @loog.info("Testing judges in '#{dir.to_rel}'...")
+    @loog.info("Testing judges in #{dir.to_rel}...")
     errors = []
     done = Judges::Packs.new(dir, @loog).each_with_index do |p, i|
-      @loog.info("\n👉 Testing '#{p.script}' (##{i}) in '#{p.dir.to_rel}'...")
+      @loog.info("\n👉 Testing #{p.script} (##{i}) in #{p.dir.to_rel}...")
       p.tests.each do |f|
         yaml = YAML.load_file(f, permitted_classes: [Time])
-        @loog.info("Testing '#{f.to_rel}':")
+        @loog.info("Testing #{f.to_rel}:")
         begin
           test_one(p, yaml)
         rescue StandardError => e

data/lib/judges/commands/update.rb

@@ -45,11 +45,11 @@ class Judges::Update
     fb = Factbase.new
     if File.exist?(file)
       fb.import(File.read(file))
-      @loog.info("Factbase imported from '#{file.to_rel}' (#{File.size(file)} bytes)")
+      @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)")
+      @loog.info("There is no Factbase to import from #{file.to_rel} (file is absent)")
     end
-    options = Judges::Options.new(opts['options'])
+    options = Judges::Options.new(opts['option'])
     @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|
@@ -64,7 +64,7 @@ class Judges::Update
     @loog.info("#{done} judges processed (#{errors.size} errors)")
     FileUtils.mkdir_p(File.dirname(file))
     File.write(file, fb.export)
-    @loog.info("Factbase exported to '#{file.to_rel}' (#{File.size(file)} bytes)")
+    @loog.info("Factbase exported to #{file.to_rel} (#{File.size(file)} bytes)")
     raise "Failed to update correctly (#{errors.size} errors)" unless errors.empty?
   end
 end

data/lib/judges/options.rb

@@ -48,9 +48,13 @@ class Judges::Options
     @hash ||= begin
       pp = @pairs || []
       pp = @pairs.map { |k, v| "#{k}=#{v}" } if pp.is_a?(Hash)
+      pp = pp.split(',') if pp.is_a?(String)
       pp.to_h do |pair|
         p = pair.split('=', 2)
-        [p[0].to_sym, p[1].match?(/^[0-9]+$/) ? p[1].to_i : p[1]]
+        k = p[0].strip
+        v = p[1]
+        v = v.nil? ? 'true' : v.strip
+        [k.to_sym, v.match?(/^[0-9]+$/) ? v.to_i : v]
       end
     end
     k = args[0].downcase

data/lib/judges/to_rel.rb

@@ -31,10 +31,12 @@ class Object
   def to_rel
     s = File.absolute_path(to_s)
     p = Pathname.new(s).relative_path_from(Dir.getwd)
+    t = p.to_s
+    t = "\"#{t}\"" if t.include?(' ')
     if p.directory?
-      "#{p}/"
+      "#{t}/"
     else
-      p.to_s
+      t
     end
   end
 end

data/test/commands/test_update.rb

@@ -35,7 +35,7 @@ class TestUpdate < Minitest::Test
     Dir.mktmpdir do |d|
       File.write(File.join(d, 'foo.rb'), '$fb.insert.zzz = $options.foo_bar + 1')
       file = File.join(d, 'base.fb')
-      Judges::Update.new(Loog::VERBOSE).run({ 'options' => ['foo_bar=42'] }, [d, file])
+      Judges::Update.new(Loog::VERBOSE).run({ 'option' => ['foo_bar=42'] }, [d, file])
       fb = Factbase.new
       fb.import(File.read(file))
       xml = Nokogiri::XML.parse(fb.to_xml)

data/test/test_options.rb

@@ -35,11 +35,23 @@ class TestOptions < Minitest::Test
     assert_equal(42, opts.max)
   end
 
+  def test_stips_spaces
+    opts = Judges::Options.new(['  token=a77   ', 'max  =  42'])
+    assert_equal('a77', opts.token)
+    assert_equal(42, opts.max)
+  end
+
   def test_with_nil
     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)
+    assert_equal(42, opts.b)
+  end
+
   def test_with_hash
     opts = Judges::Options.new('foo' => 42, 'bar' => 'hello')
     assert_equal(42, opts.foo)

metadata

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