cobench 0.0.31 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b950466b65dafeb1dc0ec2066fcd3a61e75d0470b2810944181a0a7704d8b2d6
-  data.tar.gz: cb692c9353443c05b1b4912a76305617212d532da458ff86ea1df12e2d11f406
+  metadata.gz: bde636a5d9fea9b6b334d82f9333608b806bfe9479b16bddf742e8718e6c5e4a
+  data.tar.gz: 2cd0411ce9b5d13016e81998fb971da4c7eb6975c69f74758b0400c727f1be5b
 SHA512:
-  metadata.gz: 5bbbbe914c7a2a627d518d1eb5b5baf1466bd60d15252098fcf9d0e2b7a3b41c3ceaeed22df4603b7e8ae404dff45e155b876290866e6ade19dffa47673e70f0
-  data.tar.gz: 460efed0d36d92adbe5549cb3299cf0071aa299dadf98e45a964b6e79f75d838b4f44d74a7d24a4532b9cb3f3c96d0b5e4c4ec9d3ecb129d42a9e79039c463eb
+  metadata.gz: 29ab01d89a72192c4b0e20e8e0ae6239fc65268ad18c65c593a74f8646eef0d9e1802d74b87b77389322a029087d794fff9917a4a35a166d0c2bfe7e13938d0e
+  data.tar.gz: ad5f1d829346f084a69efb40b77841173128121f4f62cf5f98f2951235fb9bbe5f95db1574ec82b1599a18b7c74cde659e45958b2f92132963082cd53f5d9821

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; }
@@ -143,6 +144,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 +267,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/features/cli.feature

@@ -15,6 +15,11 @@ Feature: Simple Reporting
     Then Stdout contains "XML saved to"
     And Exit code is zero
 
+  Scenario: Simple report through real GitHub API
+    When I run bin/cobench with "--coder=yegor256 --include=*/* --days=1 --verbose"
+    Then Stdout contains "XML saved to"
+    And Exit code is zero
+
   Scenario: Simple report with defaults
     Given I have a ".cobench" file with content:
     """

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

@@ -43,7 +43,7 @@ class Cobench::Pulls
       pr = p.pull_request.url.split('/')[-1]
       repo = p.repository_url.split('/')[-2..-1].join('/')
       next unless Cobench::Match.new(@opts, loog).matches?(repo)
-      orgs += p.repository_url.split('/')[-2]
+      orgs << p.repository_url.split('/')[-2]
       pr_json = @api.pull_request(repo, pr)
       hocs = pr_json.additions + pr_json.deletions
       hoc += hocs

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.31'.freeze
+  VERSION = '0.0.34'.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.31
+  version: 0.0.34
 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