cobench 0.0.38 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 581c5998a978db8683fa8e675b8e293aa5b66f75a37ec52e72fabc92994c4e8b
-  data.tar.gz: 76b7dd517e81bdd4011d294f3a325e4b9bc271a6130fedb8c3d36c97aac49f5e
+  metadata.gz: e8dad898dc02a5e517e24c6fe0b0a8e3ff7d4e06de2e0f732956bb350bc1ea26
+  data.tar.gz: 4e1a29fc050bafb9d3a8c203fce03a58cfbb4687f9c2b4034faddcc33f8357de
 SHA512:
-  metadata.gz: 85618ec2a17dc04c0d6fadc20547468432fff9daa79e8cf58929a0ad81790328fc9533a8d015010ab164f05b59f23098a795e30c4a8ca14de64f3b39dbdfb901
-  data.tar.gz: 295d72ce7a9cd87396066e8d0f6831b1bd5830f9ad3311b86723eb1377dd4bb8772bd9bd4f48a3b6789f208313360cc549d6c88cc3c3281e7cf87ce2f4dcaf04
+  metadata.gz: 42b9c779e397ce17698bd5285ce8f687834fe757cc2b615148e481bac0157110d9dfd30afb912452cd2dd4339b57f1511260fb0667e78ffdf829fe896bb7f95e
+  data.tar.gz: 072c0c7d39ecd51754ae545dfc426a8a8e054cde1fdef7d202859ffd0c858208e9ce00ae0b173f631ca50914ec257990a15b6d8c279efcdf4311d2bc101eb3b6

data/assets/index.xsl

@@ -154,7 +154,7 @@ SOFTWARE.
                 <xsl:text>issues</xsl:text>
               </a>
               <xsl:text>. </xsl:text>
-              <xsl:text>"Msgs" is the total number of messages posted as a reviewer in pull requests. </xsl:text>
+              <xsl:text>"Msgs" is the total number of messages posted in pull requests where the user was a reviewer. </xsl:text>
               <xsl:text>"Pulls" is the total number of </xsl:text>
               <a href="https://docs.github.com/en/pull-requests">
                 <xsl:text>pull requests</xsl:text>
@@ -199,7 +199,10 @@ SOFTWARE.
                 <xsl:text>"</xsl:text>
                 <xsl:value-of select="."/>
                 <xsl:text>"</xsl:text>
-                <xsl:text> stands for </xsl:text>
+                <xsl:if test="position() = 1">
+                  <xsl:text> stands</xsl:text>
+                </xsl:if>
+                <xsl:text> for </xsl:text>
                 <xsl:value-of select="@subtitle"/>
               </xsl:for-each>
               <xsl:text>.</xsl:text>
@@ -331,15 +334,25 @@ SOFTWARE.
     </tr>
   </xsl:template>
   <xsl:template match="m">
+    <xsl:variable name="value">
+      <xsl:choose>
+        <xsl:when test="@hideZero and .='0'">
+          <!-- nothing -->
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="."/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
     <xsl:variable name="body">
       <xsl:choose>
         <xsl:when test="@href">
           <a href="{@href}">
-            <xsl:value-of select="."/>
+            <xsl:value-of select="$value"/>
           </a>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="."/>
+          <xsl:value-of select="$value"/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>

data/bin/cobench

@@ -80,8 +80,14 @@ def div(a, b)
   a / b
 end
 
+def zero?(ms)
+  return true if ms.nil?
+  return true if ms.key?(:actual) == 0
+  false
+end
+
 def actual(ms)
-  return 0 if ms.nil?
+  return 0 if zero?(ms)
   return ms[:actual] if ms.key?(:actual)
   ms[:total]
 end
@@ -172,24 +178,31 @@ def build_xml(opts, loog)
   averages = {
     'CpP': {
       f: lambda { |ms| div(actual(ms['Commits']), actual(ms['Pulls'])) },
-      title: 'Commits per Pull Request'
+      title: 'Commits per Pull Request',
+      hideZero: lambda { |ms| zero?(ms['Commits']) || zero?(ms['Pulls']) }
     },
     'HpP': {
       f: lambda { |ms| div(actual(ms['HoC']), actual(ms['Pulls'])) },
-      title: 'HoC per Pull Request'
+      title: 'HoC per Pull Request',
+      hideZero: lambda { |ms| zero?(ms['HoC']) || zero?(ms['Pulls']) }
     },
     'HpC': {
       f: lambda { |ms| div(actual(ms['HoC']), actual(ms['Commits'])) },
-      title: 'HoC per Commit'
+      title: 'HoC per Commit',
+      hideZero: lambda { |ms| zero?(ms['HoC']) || zero?(ms['Commits']) }
     },
     'MpRP': {
       f: lambda { |ms| div(actual(ms['Msgs']), actual(ms['Reviews']) + actual(ms['Pulls'])) },
-      title: 'Messages per Review+Pulls'
+      title: 'Messages per Review+Pulls',
+      hideZero: lambda { |ms| zero?(ms['Msgs']) || (zero?(ms['Reviews']) && zero?(ms['Pulls'])) }
     }
   }
   data.each do |u, ms|
     averages.each do |k, a|
-      data[u][k] = { total: a[:f].call(ms) }
+      data[u][k] = {
+        total: a[:f].call(ms),
+        hideZero: a[:hideZero].call(ms),
+      }
     end
   end
   builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
@@ -243,6 +256,7 @@ def build_xml(opts, loog)
                 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.parent.set_attribute('hideZero', 'yes') unless v[:hideZero].nil? || !v[:hideZero]
                   xml.text v[:total]
                 end
               end

data/lib/cobench/metrics/reviews.rb

@@ -44,6 +44,7 @@ class Cobench::Reviews
       next unless Cobench::Match.new(@opts, loog).matches?(repo)
       loog.debug("Including #{repo}##{pr} reviewed by @#{@user}")
       posted = @api.pull_request_comments(repo, pr).count { |c| c[:user][:login].downcase == @user }
+      posted += @api.issue_comments(repo, pr).count { |c| c[:user][:login].downcase == @user }
       loog.debug("#{posted} messages posted by @#{@user} to #{repo}##{pr}")
       msgs += posted
     end

data/lib/cobench/version.rb

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

metadata

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