cobench 0.0.22 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ce5d4cd4b43c34d71d56b620f57447c720e5dff7bc282876d73584e8716b458
-  data.tar.gz: 70fa1c91c2c998c04c4789e5ba8162779c10b80abe3f9518f3638e90822b6bbb
+  metadata.gz: 8d819cbcfb4db70f384f27e82168b629ff4d5b1da9846edcbde2f2ebea965f86
+  data.tar.gz: 8fd71ec9c615bc21e6b33c6ee2b1b30d3e45f6e5c6ca3bcf64b04051861253d2
 SHA512:
-  metadata.gz: b849b0d6e71364f0aaeede0698382d4d4dd777013d2193d068cda6a2778a7457568c59c480e1e424ad8437c0106956a534d34bb196207513bb4f58b01706a3e4
-  data.tar.gz: 3b45652f5bb5104a0fbbbd4ba68e966184b0593f711febc21b394e1033fe4760c6793b0bfc14bcabc798908f7e97e3f22fa51d06e13da81a7ef7fabc94aaf247
+  metadata.gz: ebd6470d05c7883710c2d0b8197e559a9d2fb9c250b290ce6b7ba474b5363d129e67ae8a147f743324f6252d4d3d302e1acf4240cce5f2dbaca6d4397fe78b0d
+  data.tar.gz: c0675ef02071fb68f066e61c66184fcc4010685ce442b1345b7c9a16a40f9f187bc23428a689a4a41252dd2493df806d5eb782147c11c2c9fc1410537392f3af

data/assets/index.xsl

@@ -67,8 +67,14 @@ SOFTWARE.
           </header>
           <article>
             <table id="metrics">
-              <xsl:apply-templates select="cobench/titles"/>
+              <thead>
+                <xsl:apply-templates select="cobench/titles"/>
+              </thead>
               <xsl:apply-templates select="cobench/coders"/>
+              <tfoot>
+                <xsl:apply-templates select="cobench/totals"/>
+              <xsl:apply-templates select="cobench/averages"/>
+              </tfoot>
             </table>
           </article>
           <footer>
@@ -133,6 +139,19 @@ SOFTWARE.
               </xsl:for-each>
               <xsl:text>.</xsl:text>
             </p>
+            <p>
+              <xsl:for-each select="cobench/titles/title[@subtitle]">
+                <xsl:if test="position() &gt; 1">
+                  <xsl:text>, </xsl:text>
+                </xsl:if>
+                <xsl:text>"</xsl:text>
+                <xsl:value-of select="."/>
+                <xsl:text>"</xsl:text>
+                <xsl:text> stands for </xsl:text>
+                <xsl:value-of select="@subtitle"/>
+              </xsl:for-each>
+              <xsl:text>.</xsl:text>
+            </p>
             <p>
               <xsl:text>The numbers you see reflect the activity of the last </xsl:text>
               <b>
@@ -153,18 +172,42 @@ SOFTWARE.
     </html>
   </xsl:template>
   <xsl:template match="cobench/titles">
-    <thead>
-      <tr>
-        <th/>
-        <th/>
-        <xsl:for-each select="title[generate-id() = generate-id(key('titles', .)[1])]">
-          <xsl:sort select="."/>
-          <th class="sorter num">
-            <xsl:value-of select="."/>
-          </th>
-        </xsl:for-each>
-      </tr>
-    </thead>
+    <tr>
+      <th/>
+      <th/>
+      <xsl:for-each select="title[generate-id() = generate-id(key('titles', .)[1])]">
+        <xsl:sort select="."/>
+        <th class="sorter num">
+          <xsl:value-of select="."/>
+        </th>
+      </xsl:for-each>
+    </tr>
+  </xsl:template>
+  <xsl:template match="cobench/totals">
+    <xsl:variable name="totals" select="."/>
+    <tr>
+      <td colspan="2" style="text-align:right">Total:</td>
+      <xsl:for-each select="/cobench/titles/title[generate-id() = generate-id(key('titles', .)[1])]">
+        <xsl:sort select="."/>
+        <xsl:variable name="t" select="."/>
+        <td class="num">
+          <xsl:value-of select="$totals/w[@id=$t]"/>
+        </td>
+      </xsl:for-each>
+    </tr>
+  </xsl:template>
+  <xsl:template match="cobench/averages">
+    <xsl:variable name="averages" select="."/>
+    <tr>
+      <td colspan="2" style="text-align:right">Average:</td>
+      <xsl:for-each select="/cobench/titles/title[generate-id() = generate-id(key('titles', .)[1])]">
+        <xsl:sort select="."/>
+        <xsl:variable name="t" select="."/>
+        <td class="num">
+          <xsl:value-of select="$averages/w[@id=$t]"/>
+        </td>
+      </xsl:for-each>
+    </tr>
   </xsl:template>
   <xsl:template match="cobench/coders">
     <tbody>
@@ -211,11 +254,11 @@ SOFTWARE.
       <xsl:choose>
         <xsl:when test="@actual">
           <span class="firebrick">
-            <xsl:value-of select="$body"/>
+            <xsl:copy-of select="$body"/>
           </span>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="$body"/>
+          <xsl:copy-of select="$body"/>
         </xsl:otherwise>
       </xsl:choose>
       <xsl:if test="@actual">

data/bin/cobench

@@ -74,6 +74,11 @@ end
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
+def div(a, b)
+  return 0 if b == 0
+  a / b
+end
+
 def build_xml(opts, loog)
   if opts.token?
     api = Octokit::Client.new(:access_token => opts[:token])
@@ -121,7 +126,7 @@ def build_xml(opts, loog)
     end
   end
   caps = {
-    'HoC' => lambda { |ms| ms['Commits'][:total] * 512 },
+    'HoC' => lambda { |ms| ms['Pulls'][:total] * 1024 },
   }
   data.each do |u, ms|
     ms.map do |t, h|
@@ -148,17 +153,53 @@ def build_xml(opts, loog)
     end.inject(0, :+)
     data[u]['Score'] = { total: score }
   end
+  averages = {
+    'HpP': {
+      f: lambda { |ms| div(ms['HoC'][:total], ms['Pulls'][:total]) },
+      title: 'HoC per Pull'
+    },
+    'HpC': {
+      f: lambda { |ms| div(ms['HoC'][:total], ms['Commits'][:total]) },
+      title: 'HoC per Commit'
+    }
+  }
+  data.each do |u, ms|
+    averages.each do |k, a|
+      data[u][k] = { total: a[:f].call(ms) }
+    end
+  end
   builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
     xml.cobench(time: Time.now, days: opts[:days]) do
       xml.titles do
         data.map { |_, ms| ms.keys }.flatten.uniq.each do |t|
-          xml.title t
+          xml.title do
+            xml.parent.set_attribute('subtitle', averages[t][:title]) if averages.key?(t)
+            xml.text t
+          end
         end
       end
       xml.weights do
         weights.each do |t, w|
           xml.w(id: t) do
-            xml.text w
+            xml.text(w)
+          end
+        end
+      end
+      xml.totals do
+        data.map { |_, ms| ms.keys }.flatten.uniq.each do |t|
+          next if t == 'Score'
+          next if averages.key?(t)
+          xml.w(id: t) do
+            xml.text(data.values.map { |ms| ms[t][:total] }.inject(&:+))
+          end
+        end
+      end
+      xml.averages do
+        data.map { |_, ms| ms.keys }.flatten.uniq.each do |t|
+          next if t == 'Score'
+          xml.w(id: t) do
+            vals = data.values.map { |ms| ms[t][:total] }.select { |v| v > 0 }
+            xml.text(div(vals.inject(&:+), vals.count))
           end
         end
       end

data/lib/cobench/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2022 Yegor Bugayenko
 # License:: MIT
 module Cobench
-  VERSION = '0.0.22'.freeze
+  VERSION = '0.0.25'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobench
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.25
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace