cobench 0.0.33 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e826b27c5e0587f100676d206c255ab1a49dd031218a983949641434d742642b
-  data.tar.gz: 3f940d517efae58c02800681ce181fce837ea4d33bf6a6698833f808856bfa0a
+  metadata.gz: 96be8a2561b910ee67b624e728bf639f5c232ad76fb7773cb8575cb9e6581882
+  data.tar.gz: 19050e7f9ee743cab744e380abd704e16f47ee7f6aa21f31553f53522d56410c
 SHA512:
-  metadata.gz: 2f89fe625b2e9ad37e2f94ec370af8e45552dfcce768a1dea6b583714994ecd119493d7f65113c5cc8262f7e81ed86951ce49f06970929b0b611a7225ce98186
-  data.tar.gz: cb4a616c54c4fba0109a6bd36592f2377896793de5ff05b7ba1ea228d77b89eeccf39962d5ba09af5d94168fc25e103d4809344c1b747a9a96d673305779fc41
+  metadata.gz: 5589979370cf2ef019c57ecaf942ba1fab9992a5bc75736e4f681728bd6695864b8135475501ed0ee7e73fc68da8d3c1105ed3dea31eee283a9fdd2c3d1c1ab9
+  data.tar.gz: 852309017ddf77403244d73391d6b6c8b01fd11e25f9d328f0ff98283210d6d011e1d24f6fcfc89e3a84706b7b16c7049351b880b7b822b8dbc7eed6859008a7

data/assets/index.xsl

@@ -98,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;"/>
@@ -144,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>

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/issues.rb

@@ -37,13 +37,20 @@ class Cobench::Issues
     q = "in:comments type:issue author:#{@user} created:>#{from}"
     json = @api.search_issues(q)
     loog.debug("Found #{json.total_count} issues")
+    orgs = []
     total = json.items.count do |p|
       pr = p.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}")
+      orgs << p.repository_url.split('/')[-2]
     end
     [
+      {
+        meta: true,
+        title: 'Orgs',
+        list: orgs
+      },
       {
         title: 'Issues',
         total: total,

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.33'.freeze
+  VERSION = '0.0.36'.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobench
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.36
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -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