cobench 0.0.21 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6117bbba07444b2da4210d173981f6199005ac182482fca43aa36c04d919ef1b
-  data.tar.gz: 38172dfd6d7cb9cb8604d051ca0cf82b53aebb89c604edf23ac1bcb12a6c5c86
+  metadata.gz: c88b2884af1c5f379f0ffc146188ae2b1c7ab4ffd1fa6690a1bebc1120b2f848
+  data.tar.gz: 4ccd4da7ea79c1f0b121c289a28def7b4decbb6b4792856f59bc0b4ca8cd87d9
 SHA512:
-  metadata.gz: f37e7867a1359bc99291f7607ec43f3c7ced2039fb46e2cefd8b50a2a3c1aeabaef18ac095a1579cc3a1e265a5132809a567504782211f593a1b79a72d8415e4
-  data.tar.gz: 36115b07683f34eed5ea446a455ec4ab7b8b18bd70bf27e860c281d4711ebcdf5b9221d7730da3a3b80355328585c316c1599162619d585dd9652f19d1bd5bf4
+  metadata.gz: 884a2cf5e5bff6d1050a94e2abc09ea4c4c96d45144a529ae7e7a9c4b86382ce8ec73841f6119a0c5a42b96896105658b1436e6204ffb99e9bf80733f49204da
+  data.tar.gz: 9a55303410d004305736bcafa56e61c10e323fe698f7c59b210dbb8135e9c5b21836ae9fc29057b26c31cb3761e0634f3fc94230da830ef2237598ad6a722843

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>
@@ -140,6 +159,12 @@ SOFTWARE.
                 <xsl:text> days</xsl:text>
               </b>
               <xsl:text>.</xsl:text>
+              <br/>
+              <xsl:text>The XML with the data </xsl:text>
+              <a href="index.xml">
+                <xsl:text>is here</xsl:text>
+              </a>
+              <xsl:text>.</xsl:text>
             </p>
           </footer>
         </section>
@@ -147,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>
@@ -175,10 +224,12 @@ SOFTWARE.
           <xsl:text>@</xsl:text>
           <xsl:value-of select="@id"/>
         </a>
-        <br/>
-        <span class="subtitle">
-          <xsl:value-of select="@details"/>
-        </span>
+        <xsl:if test="@details">
+          <br/>
+          <span class="subtitle">
+            <xsl:value-of select="@details"/>
+          </span>
+        </xsl:if>
       </td>
       <xsl:for-each select="metrics/m">
         <xsl:sort select="@id"/>
@@ -189,13 +240,13 @@ SOFTWARE.
   <xsl:template match="m">
     <xsl:variable name="body">
       <xsl:choose>
-        <xsl:when test="@href = ''">
-          <xsl:value-of select="."/>
-        </xsl:when>
-        <xsl:otherwise>
+        <xsl:when test="@href">
           <a href="{@href}">
             <xsl:value-of select="."/>
           </a>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="."/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
@@ -203,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

@@ -121,7 +121,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|
@@ -136,39 +136,75 @@ def build_xml(opts, loog)
   end
   weights = {
     'HoC' => 1,
-    'Pulls' => 200,
+    'Pulls' => 250,
     'Issues' => 50,
     'Commits' => 5,
-    'Reviews' => 75
+    'Reviews' => 150
   }
   data.each do |u, ms|
     score = ms.map do |t, h|
       raise "Unknown title '#{t}'" unless weights.key?(t)
       h[:total] * weights[t]
     end.inject(0, :+)
-    data[u]['Score'] = { total: score, href: '' }
+    data[u]['Score'] = { total: score }
+  end
+  averages = {
+    'HpP': {
+      f: lambda { |ms| ms['HoC'][:total] / ms['Pulls'][:total] },
+      title: 'HoC per Pull'
+    },
+    'HpC': {
+      f: lambda { |ms| 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.each do |t|
-          xml.title t
+        data.map { |_, ms| ms.keys }.flatten.uniq.each do |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(vals.inject(&:+) / vals.count)
           end
         end
       end
       xml.coders do
         data.each do |u, ms|
           xml.coder(id: u) do
-            xml.parent.set_attribute('details', api.user(u).name)
+            xml.parent.set_attribute('details', api.user(u).name) unless opts[:dry]
             xml.metrics do
               ms.each do |k, v|
-                xml.m(id: k, href: v[:href]) do
+                xml.m(id: k) do
                   xml.parent.set_attribute('actual', v[:actual]) unless v[:actual].nil?
                   xml.parent.set_attribute('href', v[:href]) unless v[:href].nil?
                   xml.text v[:total]

data/lib/cobench/metrics/commits.rb

@@ -57,8 +57,7 @@ class Cobench::Commits
       },
       {
         title: 'HoC',
-        total: hoc,
-        href: ''
+        total: hoc
       }
     ]
   end

data/lib/cobench/version.rb

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

metadata

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