RubyGems - judges - Versions diffs - 0.13.3 → 0.14.0 - Mend

judges 0.13.3 → 0.14.0

Files changed (13) hide show

checksums.yaml +4 -4
data/Gemfile +1 -1
data/Gemfile.lock +3 -3
data/assets/index.xsl +222 -0
data/bin/judges +2 -0
data/features/print.feature +7 -0
data/features/test.feature +4 -2
data/judges.gemspec +1 -1
data/lib/judges/commands/print.rb +27 -3
data/lib/judges/commands/update.rb +1 -1
data/lib/judges.rb +1 -1
data/test/commands/test_print.rb +38 -3
metadata +3 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e76d1f282682fcc72f42108fbd6f74c8d8acd87961c3b5420bda5e44b0df1b3
-  data.tar.gz: dcb601124c359e0ede4dc01c6a5198237d311651401d9a39cb8eca4502146c01
+  metadata.gz: 4e0f862acb1777b529b8c2547dc093020b1a345a5346677c42da550ebc0a26f3
+  data.tar.gz: 112b3b28257d620993031f4a647a9b2665e425249fd4de92b05100e304aec20a
 SHA512:
-  metadata.gz: 357ce5e3ef1099f0da69cc72d3ac2ba98c5375d44033dbc681cdc239b69432191459f683aa382266595260478dd9bfbd307b52c1ded41a3a044d11fd76026ebc
-  data.tar.gz: ab21e5e0d38183581a9bc3aa17b33c977079958db68f5483b1a144c65e7d9b82d7ade9999c2089dcb87d4c03e334d91d01a9cc3859e8b371d257ab992c678fb6
+  metadata.gz: 427f79f2e3445a9bbb7ca02384ad3676f0a663cd428430ecbcf8f79f7d03496513c513960585a7a4d303a3cab756aca307d99a0209a256fb7baeb194bbd428ef
+  data.tar.gz: 8c38481a417786e9ddc516fa7b323433d481d827607bae63aedb47381ccb37ea9633fd5241002dd7b32abac4e6319b9fb808cee5c44f09b1a452682cf4e287d4

data/Gemfile CHANGED Viewed

@@ -24,7 +24,7 @@ source 'https://rubygems.org'
 gemspec
 gem 'cucumber', '9.2.0', require: false
-gem 'minitest', '5.24.0', require: false
+gem 'minitest', '5.24.1', require: false
 gem 'net-ping', '2.0.8', require: false
 gem 'rake', '13.2.1', require: false
 gem 'rspec-rails', '6.1.3', require: false

data/Gemfile.lock CHANGED Viewed

@@ -89,7 +89,7 @@ GEM
     erubi (1.13.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.0.56)
+    factbase (0.0.57)
       backtrace (~> 0.3)
       decoor (~> 0.0)
       json (~> 2.7)
@@ -121,7 +121,7 @@ GEM
       nokogiri (>= 1.12.0)
     loog (0.5.2)
     mini_mime (1.1.5)
-    minitest (5.24.0)
+    minitest (5.24.1)
     moments (0.3.0)
     multi_test (1.1.0)
     mutex_m (0.2.0)
@@ -259,7 +259,7 @@ PLATFORMS
 DEPENDENCIES
   cucumber (= 9.2.0)
   judges!
-  minitest (= 5.24.0)
+  minitest (= 5.24.1)
   net-ping (= 2.0.8)
   rake (= 13.2.1)
   rspec-rails (= 6.1.3)

data/assets/index.xsl ADDED Viewed

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+MIT License
+Copyright (c) 2024 Zerocracy
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+  <xsl:output method="xml" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes"/>
+  <xsl:param name="name"/>
+  <xsl:param name="date"/>
+  <xsl:param name="version"/>
+  <xsl:param name="columns"/>
+  <xsl:template name="javascript">
+    <xsl:param name="url"/>
+    <script type="text/javascript" src="{$url}">
+      <xsl:text> </xsl:text>
+    </script>
+  </xsl:template>
+  <xsl:template match="/">
+    <html>
+      <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <title>
+          <xsl:value-of select="$name"/>
+        </title>
+        <meta charset="UTF-8"/>
+        <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
+        <link rel="icon" href="https://www.zerocracy.com/svg/logo.svg" type="image/svg"/>
+        <link href="https://cdn.jsdelivr.net/gh/yegor256/tacit@gh-pages/tacit-css.min.css" rel="stylesheet"/>
+        <link href="https://cdn.jsdelivr.net/gh/yegor256/drops@gh-pages/drops.min.css" rel="stylesheet"/>
+        <xsl:call-template name="javascript">
+          <xsl:with-param name="url">https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="javascript">
+          <xsl:with-param name="url">https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.31.3/js/jquery.tablesorter.min.js</xsl:with-param>
+        </xsl:call-template>
+        <style>
+          * { font-family: monospace; }
+          section { width: 100%; }
+          article { border: none; }
+          header img { width: 3em; height: 3em; }
+          .sorter { cursor: pointer; }
+        </style>
+        <script type="text/javascript">
+          $(function() {
+            $("#facts").tablesorter();
+          });
+        </script>
+      </head>
+      <body>
+        <section>
+          <header>
+            <p>
+              <a href="https://www.zerocracy.com">
+                <img src="https://www.zerocracy.com/svg/logo.svg" alt="Zerocracy"/>
+              </a>
+            </p>
+          </header>
+          <article>
+            <xsl:apply-templates select="fb"/>
+          </article>
+          <footer class="smaller">
+            <p>
+              <xsl:text>The page was generated by the </xsl:text>
+              <a href="https://github.com/yegor256/judges">
+                <xsl:text>judges</xsl:text>
+              </a>
+              <xsl:text> tool (</xsl:text>
+              <xsl:value-of select="$version"/>
+              <xsl:text>) on </xsl:text>
+              <xsl:value-of select="$date"/>
+              <xsl:text>.</xsl:text>
+              <br/>
+              <a href="https://github.com/yegor256/factbase">
+                <xsl:text>Factbase</xsl:text>
+              </a>
+              <xsl:text>: </xsl:text>
+              <xsl:value-of select="count(fb/f)"/>
+              <xsl:text> fact</xsl:text>
+              <xsl:if test="count(fb/f) != 1">
+                <xsl:text>s</xsl:text>
+              </xsl:if>
+              <xsl:text>, </xsl:text>
+              <xsl:value-of select="fb/@size"/>
+              <xsl:text> bytes, version </xsl:text>
+              <xsl:value-of select="fb/@version"/>
+              <xsl:text>.</xsl:text>
+            </p>
+          </footer>
+        </section>
+      </body>
+    </html>
+  </xsl:template>
+  <xsl:template match="fb">
+    <table id="facts">
+      <thead>
+        <tr>
+          <xsl:call-template name="th">
+            <xsl:with-param name="cols" select="$columns"/>
+          </xsl:call-template>
+        </th>
+      </thead>
+      <tbody>
+        <xsl:apply-templates select="f"/>
+      </tbody>
+    </table>
+  </xsl:template>
+  <xsl:template match="f">
+    <tr>
+      <xsl:call-template name="td">
+        <xsl:with-param name="cols" select="$columns"/>
+        <xsl:with-param name="f" select="."/>
+      </xsl:call-template>
+    </tr>
+  </xsl:template>
+  <xsl:template name="th">
+    <xsl:param name="cols"/>
+    <xsl:choose>
+      <xsl:when test="string-length($cols) &gt; 0">
+        <th class="sorter">
+          <xsl:value-of select="substring-before(concat($cols, ','), ',')"/>
+        </th>
+        <xsl:call-template name="th">
+          <xsl:with-param name="cols" select="substring-after($cols, ',')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <th>
+          <xsl:text>&nbsp;</xsl:text>
+        </th>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template name="td">
+    <xsl:param name="cols"/>
+    <xsl:param name="f"/>
+    <xsl:choose>
+      <xsl:when test="string-length($cols) &gt; 0">
+        <td>
+          <xsl:variable name="c" select="substring-before(concat($cols, ','), ',')"/>
+          <xsl:call-template name="value">
+            <xsl:with-param name="v" select="$f/*[name()=$c]"/>
+          </xsl:call-template>
+        </td>
+        <xsl:call-template name="td">
+          <xsl:with-param name="cols" select="substring-after($cols, ',')"/>
+          <xsl:with-param name="f" select="$f"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <td>
+          <xsl:for-each select="$f/*">
+            <xsl:if test="string-length(substring-before(concat(',', $columns, ','), concat(name(), ','))) = 0">
+              <xsl:if test="position() &gt; 1">
+                <xsl:text>, </xsl:text>
+              </xsl:if>
+              <xsl:value-of select="name()"/>
+              <xsl:text>:</xsl:text>
+              <xsl:call-template name="value">
+                <xsl:with-param name="v" select="."/>
+              </xsl:call-template>
+            </xsl:if>
+          </xsl:for-each>
+        </td>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template name="value">
+    <xsl:param name="v"/>
+    <xsl:choose>
+      <xsl:when test="$v/v">
+        <xsl:text>[</xsl:text>
+        <xsl:for-each select="$v/v">
+          <xsl:if test="position() &gt; 1">
+            <xsl:text>, </xsl:text>
+          </xsl:if>
+          <xsl:call-template name="value">
+            <xsl:with-param name="v" select="."/>
+          </xsl:call-template>
+        </xsl:for-each>
+        <xsl:text>]</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <span>
+          <xsl:attribute name="style">
+            <xsl:text>color:</xsl:text>
+            <xsl:choose>
+              <xsl:when test="$v/@t = 'S'">
+                <xsl:text>#196F3D</xsl:text>
+              </xsl:when>
+              <xsl:when test="$v/@t = 'T'">
+                <xsl:text>#2471A3</xsl:text>
+              </xsl:when>
+              <xsl:when test="$v/@t = 'I'">
+                <xsl:text>#212F3C</xsl:text>
+              </xsl:when>
+            </xsl:choose>
+          </xsl:attribute>
+          <xsl:value-of select="$v"/>
+        </span>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+</xsl:stylesheet>

data/bin/judges CHANGED Viewed

@@ -117,6 +117,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: '(always)')
+    c.desc 'Comma separated list of columns to show in HTML output (no spaces!)'
+    c.flag([:columns], default_value: 'when,what')
     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/print.feature CHANGED Viewed

@@ -8,6 +8,13 @@ Feature: Print
     Then Stdout contains "printed"
     And Exit code is zero
+  Scenario: Simple print of a small factbase, to HTML
+    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 --format=html simple.fb simple.html"
+    Then Stdout contains "printed"
+    And Exit code is zero
   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'"

data/features/test.feature CHANGED Viewed

@@ -30,8 +30,10 @@ Feature: Test
     Given I make a temp directory
     Then I have a "myjudges/myjudge/simple_judge.rb" file with content:
     """
-      n = $fb.insert
-      n.foo = $foo
+      $valve.enter('boom') do
+        n = $fb.insert
+        n.foo = $foo
+      end
     """
     Then I have a "myjudges/myjudge/good.yml" file with content:
     """

data/judges.gemspec CHANGED Viewed

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

data/lib/judges/commands/print.rb CHANGED Viewed

@@ -20,8 +20,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
+require 'time'
 require 'fileutils'
 require 'factbase'
+require 'nokogiri'
 require_relative '../../judges'
 require_relative '../../judges/impex'
 require_relative '../../judges/elapsed'
@@ -41,10 +43,11 @@ class Judges::Print
     fb = Judges::Impex.new(@loog, f).import
     fb.query("(not #{opts['query']})").delete! unless opts['query'].nil?
     o = args[1]
+    fmt = opts['format']&.downcase
     if o.nil?
-      raise 'Either provide output file name or use --auto' unless opts[:auto]
+      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]}"
+      o = "#{o}.#{fmt}"
     end
     FileUtils.mkdir_p(File.dirname(o))
     if !opts['force'] && File.exist?(o)
@@ -56,7 +59,7 @@ class Judges::Print
     end
     elapsed(@loog) do
       output =
-        case opts[:format].downcase
+        case fmt
           when 'yaml'
             require 'factbase/to_yaml'
             Factbase::ToYAML.new(fb).yaml
@@ -66,9 +69,30 @@ class Judges::Print
           when 'xml'
             require 'factbase/to_xml'
             Factbase::ToXML.new(fb).xml
+          when 'html'
+            to_html(opts, fb)
+          else
+            raise "Unknown format '#{fmt}'"
         end
       File.binwrite(o, output)
       throw :"Factbase printed to #{o.to_rel} (#{File.size(o)} bytes)"
     end
   end
+  private
+  def to_html(opts, fb)
+    xslt = Nokogiri::XSLT(File.read(File.join(__dir__, '../../../assets/index.xsl')))
+    require 'factbase/to_xml'
+    xml = Factbase::ToXML.new(fb).xml
+    xslt.transform(
+      Nokogiri::XML(xml),
+      Nokogiri::XSLT.quote_params(
+        'name' => 'print',
+        'date' => Time.now.utc.iso8601,
+        'columns' => opts['columns'] || 'when,what',
+        'version' => Judges::VERSION
+      )
+    )
+  end
 end

data/lib/judges/commands/update.rb CHANGED Viewed

@@ -102,7 +102,7 @@ class Judges::Update
         elapsed(@loog) do
           c = one_judge(fb, p, global, options)
           churn += c
-          throw :"👍 The judge #{p.name} modified #{c.zero? ? 'no' : c} facts"
+          throw :"👍 The judge #{p.name} modified #{c} facts"
         end
       rescue StandardError, SyntaxError => e
         @loog.warn(Backtrace.new(e))

data/lib/judges.rb CHANGED Viewed

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

data/test/commands/test_print.rb CHANGED Viewed

@@ -24,6 +24,7 @@ require 'minitest/autorun'
 require 'loog'
 require 'factbase'
 require 'yaml'
+require 'securerandom'
 require_relative '../../lib/judges'
 require_relative '../../lib/judges/commands/print'
@@ -38,24 +39,58 @@ class TestPrint < Minitest::Test
       fb = Factbase.new
       fb.insert
       File.binwrite(f, fb.export)
-      Judges::Print.new(Loog::NULL).run({ format: 'yaml', auto: true }, [f])
+      Judges::Print.new(Loog::NULL).run({ 'format' => 'yaml', 'auto' => true }, [f])
       y = File.join(d, 'base.yaml')
       assert(File.exist?(y))
       assert_equal(1, YAML.load_file(y).size)
     end
   end
+  def test_print_to_html
+    fb = Factbase.new
+    10.times do
+      f = fb.insert
+      f.what = SecureRandom.hex(10)
+      f.when = Time.now
+      f.details = 'hey, друг'
+      f.ticket = 42
+      f.ticket = 55
+    end
+    Dir.mktmpdir do |d|
+      f = File.join(d, 'base.fb')
+      File.binwrite(f, fb.export)
+      Judges::Print.new(Loog::NULL).run(
+        { 'format' => 'html', 'columns' => 'what,when,ticket' },
+        [f, File.join(__dir__, '../../temp/base.html')]
+      )
+    end
+  end
+  def test_print_all_formats
+    %w[yaml html xml json].each do |fmt|
+      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' => fmt, 'auto' => true }, [f])
+        y = File.join(d, "base.#{fmt}")
+        assert(File.exist?(y))
+      end
+    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])
+      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])
+      Judges::Print.new(Loog::NULL).run({ 'format' => 'yaml', 'auto' => true }, [f])
       assert_equal(mtime, File.mtime(y))
     end
   end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-28 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -209,6 +209,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/index.xsl
 - bin/judges
 - features/gem_package.feature
 - features/import.feature