cobench 0.0.32 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 862a9495f75a20749f29e93af9d8019e0b388c1f1628bc7d59db8193d1473b21
-  data.tar.gz: 95772672a309295380adeb8a8f624edbf2353c2a96be28e8b7fc3f2e65cf31b5
+  metadata.gz: fdd68553eb250f70a8b28b55881595a6ca920b35451a76e7eaaefe963e5c81f4
+  data.tar.gz: bd69957900879988ccbc4194959d1ca27c55452a3f33f9a51bbcba4fe528e5da
 SHA512:
-  metadata.gz: 48710b9f7e18c421b95abe5efec899d7641fb3fd80fa706257cbd0d7ed3c752ab00e6d3a40372afe47ce083b8dc319c9190b242e95a81561e60f5cee82a078f6
-  data.tar.gz: 4a06820fe76ad19d10c5919b5fb8e23a3ab314fb5b4101079e740f706b0b190a105c247a4932617421b012ce7cc86a03750e4efbd2d5322b9710fa87dd5f9104
+  metadata.gz: f617125d6f05b54e008170fd5fa53fc5623a16a861bd044ab0c31421a7e6054a601f8fc0cfa3a68dc10c3a01b35a0393942485d69729d34b7f570399981f835d
+  data.tar.gz: 7579e8f69a4bb6d85d1b5a0aebce2223b4f95881f6a91122869f3b1b3a86b069a01be99725af4ffc960d56a9e416664ec856d0d6f3e38beec61aff579508af43

data/assets/index.xsl

@@ -58,7 +58,8 @@ SOFTWARE.
           });
         </script>
         <style>
-          td, th { font-family: monospace; font-size: 18px; }
+          td, th { font-family: monospace; font-size: 18px; line-height: 1em; }
+          td.top { vertical-align: middle; }
           .num { text-align: right; }
           .left { border-bottom: 0; }
           section { width: auto; }
@@ -97,6 +98,16 @@ SOFTWARE.
               <xsl:text> to see all.</xsl:text>
             </p>
             <table id="metrics">
+              <xsl:attribute name="data-sortlist">
+                <xsl:text>[[</xsl:text>
+                <xsl:for-each select="cobench/titles/title">
+                  <xsl:sort select="."/>
+                  <xsl:if test=". = 'Score'">
+                    <xsl:value-of select="position() + 2"/>
+                  </xsl:if>
+                </xsl:for-each>
+                <xsl:text>,1]]</xsl:text>
+              </xsl:attribute>
               <colgroup>
                 <col/>
                 <col style="width: 2.5em;"/>
@@ -143,6 +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>"Pulls" is the total number of </xsl:text>
               <a href="https://docs.github.com/en/pull-requests">
                 <xsl:text>pull requests</xsl:text>
@@ -265,9 +277,12 @@ SOFTWARE.
   </xsl:template>
   <xsl:template match="coder">
     <tr>
-      <td class="num">
+      <td class="num top">
         <xsl:variable name="score" select="metrics/m[@id='Score']"/>
-        <xsl:variable name="pos" select="count(/cobench/coders/coder[metrics/m[@id='Score'] &lt; $score]) + 1"/>
+        <xsl:variable name="pos" select="count(/cobench/coders/coder[metrics/m[@id='Score'] &gt; $score]) + 1"/>
+        <xsl:attribute name="title">
+          <xsl:value-of select="$pos"/>
+        </xsl:attribute>
         <xsl:if test="$pos &lt;= 8">
           <xsl:text>#</xsl:text>
           <xsl:value-of select="$pos"/>

data/bin/cobench

@@ -80,6 +80,7 @@ def div(a, b)
 end
 
 def actual(ms)
+  return 0 if ms.nil?
   return ms[:actual] if ms.key?(:actual)
   ms[:total]
 end
@@ -157,7 +158,8 @@ def build_xml(opts, loog)
     'Pulls' => 250,
     'Issues' => 50,
     'Commits' => 5,
-    'Reviews' => 150
+    'Reviews' => 150,
+    'Msgs' => 5
   }
   data.each do |u, ms|
     score = ms.map do |t, h|
@@ -169,11 +171,15 @@ def build_xml(opts, loog)
   averages = {
     'HpP': {
       f: lambda { |ms| div(actual(ms['HoC']), actual(ms['Pulls'])) },
-      title: 'HoC per Pull'
+      title: 'HoC per Pull Request'
     },
     'HpC': {
       f: lambda { |ms| div(actual(ms['HoC']), actual(ms['Commits'])) },
       title: 'HoC per Commit'
+    },
+    'MpP': {
+      f: lambda { |ms| div(actual(ms['Msgs']), actual(ms['Pulls'])) },
+      title: 'Messages per Pull Request'
     }
   }
   data.each do |u, ms|

data/lib/cobench/match.rb

@@ -31,11 +31,11 @@ class Cobench::Match
   end
 
   def matches?(repo)
-    if !@opts[:include].empty? && @opts[:include].none? { |m| Cobench::Mask.new(m).matches?(repo) }
+    if @opts[:include] && !@opts[:include].empty? && @opts[:include].none? { |m| Cobench::Mask.new(m).matches?(repo) }
       @loog.debug("Excluding #{repo} due to lack of --include")
       return false
     end
-    if @opts[:exclude].any? { |m| Cobench::Mask.new(m).matches?(repo) }
+    if @opts[:exclude] && @opts[:exclude].any? { |m| Cobench::Mask.new(m).matches?(repo) }
       @loog.debug("Excluding #{repo} due to --exclude")
       return false
     end

data/lib/cobench/metrics/reviews.rb

@@ -37,17 +37,25 @@ class Cobench::Reviews
     q = "reviewed-by:#{@user} merged:>#{from}"
     json = @api.search_issues(q)
     loog.debug("Found #{json.total_count} reviews")
+    msgs = 0
     total = json.items.count do |p|
       pr = p.pull_request.url.split('/')[-1]
       repo = p.repository_url.split('/')[-2..-1].join('/')
       next unless Cobench::Match.new(@opts, loog).matches?(repo)
-      loog.debug("Including #{repo}##{pr} reviewed by #{@user}")
+      loog.debug("Including #{repo}##{pr} reviewed by @#{@user}")
+      posted = @api.pull_request_comments(repo, pr).count { |c| c[:user][:login].downcase == @user }
+      loog.debug("#{posted} messages posted by @#{@user} to #{repo}##{pr}")
+      msgs += posted
     end
     [
       {
         title: 'Reviews',
         total: total,
         href: Iri.new('https://github.com/search').add(q: q)
+      },
+      {
+        title: 'Msgs',
+        total: msgs
       }
     ]
   end

data/lib/cobench/version.rb

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

data/test/metrics/test_reviews.rb

@@ -0,0 +1,37 @@
+# Copyright (c) 2022 Yegor Bugayenko
+#
+# 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 NONINFINGEMENT. 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.
+
+require 'minitest/autorun'
+require 'octokit'
+require 'loog'
+require_relative '../../lib/cobench/metrics/reviews'
+
+# Test for Reviews.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2022 Yegor Bugayenko
+# License:: MIT
+class TestReviews < Minitest::Test
+  def test_real
+    api = Octokit::Client.new
+    m = Cobench::Reviews.new(api, 'graur', { days: 2 })
+    ms = m.take(Loog::VERBOSE)
+    assert !ms.empty?
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cobench
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.35
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -272,6 +272,7 @@ files:
 - lib/cobench/metrics/reviews.rb
 - lib/cobench/version.rb
 - logo.svg
+- test/metrics/test_reviews.rb
 - test/test__helper.rb
 - test/test_mask.rb
 - test/test_match.rb