cobench 0.0.14 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a36f769e2bd7c22261752671935908e1e9776228406eab462a80e14ec47f5888
-  data.tar.gz: 528467b0d08b48aa958d2bc5eb5d075322f55af081834982a2fc06c02e5c0919
+  metadata.gz: 4b84694d76fb95dc4c62d1c4ba42d4d4bee5c8c193c33c241b02964d44816e91
+  data.tar.gz: a56793bef0c5d3bdda384ddd553a47cf135c51cead18e73ed984a7a5f4922077
 SHA512:
-  metadata.gz: ce12d12d53b6cda30c247125455e7b5b7f9cd256a05df04a99e9871606e6a862436ac802057848068c5d9cd88165baa326d79ebbaee8b1455c124f96e2cbe6fd
-  data.tar.gz: '059a36cb0f76dbfa525a87ac56b38cd1816eedeabeb89389cdd5048ba2ac1d35488655b0adfc7dd01bc4b86abfa78ab55fea4b54a7794db8150b4804eb5fc868'
+  metadata.gz: 4fee03b92b8a370f39bc207012bf777b54f459c903b08e25e75e469d98f458d599c85f2bccb51892c165b837192a3450da23d545f84c33263c07bf7469ed6261
+  data.tar.gz: 71bb57a42b734c46f865beda63815ad1984964bf96a690a4c94c9e67ca6eb32199a59c7efb12e0c5fa99423cd54f7087aa72c2443864ea96ad091fb2e7124bc3

data/assets/index.xsl

@@ -50,6 +50,9 @@ SOFTWARE.
           header { text-align: center; }
           footer { text-align: center; font-size: 0.8em; line-height: 1.2em; color: gray; }
           article { width: 60em; border: 0; }
+          td.avatar { vertical-align: middle; text-align: center; }
+          td.avatar img { width: 1.5em; height: 1.5em; vertical-align: middle; }
+          .subtitle { font-size: 0.8em; line-height: 1em; color: gray; }
           .sorter { cursor: pointer; }
         </style>
       </head>
@@ -57,7 +60,9 @@ SOFTWARE.
         <section>
           <header>
             <p>
-              <img src="https://raw.githubusercontent.com/yegor256/cobench/master/logo.svg" style="width:64px"/>
+              <a href="">
+                <img src="https://raw.githubusercontent.com/yegor256/cobench/master/logo.svg" style="width:64px"/>
+              </a>
             </p>
           </header>
           <article>
@@ -82,12 +87,12 @@ SOFTWARE.
                 <xsl:text>Git commits</xsl:text>
               </a>
               <xsl:text> authored by the user. </xsl:text>
-              <xsl:text>"HoC" is the total number of user's hits of code. </xsl:text>
+              <xsl:text>"HoC" is the total number of user's </xsl:text>
               <a href="https://www.yegor256.com/2014/11/14/hits-of-code.html">
                 <xsl:text>hits of code</xsl:text>
               </a>
               <xsl:text>. </xsl:text>
-              <xsl:text>"Issues" is the total number of issues. </xsl:text>
+              <xsl:text>"Issues" is the total number of issues submitted by the user. </xsl:text>
               <a href="https://docs.github.com/en/issues">
                 <xsl:text>issues</xsl:text>
               </a>
@@ -96,12 +101,14 @@ SOFTWARE.
               <a href="https://docs.github.com/en/pull-requests">
                 <xsl:text>pull requests</xsl:text>
               </a>
-              <xsl:text> created by the user and merged. </xsl:text>
-              <xsl:text>"Score" is an arithmetic summary of all other numbers with multipliers: </xsl:text>
+              <xsl:text> created by the user and already merged. </xsl:text>
+              <xsl:text>"Reviews" is the total number of merged pull requests that were reviewed by the user. </xsl:text>
+              <xsl:text>"Score" is an arithmetic summary of all metrics with multipliers: </xsl:text>
               <xsl:text>one Pull costs 100 points, </xsl:text>
-              <xsl:text>one Issue 50 points, </xsl:text>
-              <xsl:text>one Commit 5 points, </xsl:text>
-              <xsl:text>one HoC 1 point.</xsl:text>
+              <xsl:text>one Issue — 50 points, </xsl:text>
+              <xsl:text>one Review — 40 points, </xsl:text>
+              <xsl:text>one Commit — 5 points, </xsl:text>
+              <xsl:text>one HoC — just 1 point.</xsl:text>
             </p>
             <p>
               <xsl:text>The numbers you see reflect the activity of the last </xsl:text>
@@ -119,6 +126,7 @@ SOFTWARE.
   <xsl:template match="cobench/titles">
     <thead>
       <tr>
+        <th/>
         <th/>
         <xsl:for-each select="title[generate-id() = generate-id(key('titles', .)[1])]">
           <xsl:sort select="."/>
@@ -136,11 +144,18 @@ SOFTWARE.
   </xsl:template>
   <xsl:template match="coder">
     <tr>
+      <td class="avatar">
+        <img src="https://socatar.com/github/{@id}/64-64"/>
+      </td>
       <td>
         <a href="https://github.com/{@id}">
           <xsl:text>@</xsl:text>
           <xsl:value-of select="@id"/>
         </a>
+        <br/>
+        <span class="subtitle">
+          <xsl:value-of select="@details"/>
+        </span>
       </td>
       <xsl:for-each select="metrics/m">
         <xsl:sort select="@id"/>

data/bin/cobench

@@ -107,7 +107,7 @@ begin
       type = "Cobench::#{name.capitalize}"
       loog.info("Reading #{user}/#{name}...")
       require_relative f
-      m = type.split('::').reduce(Module, :const_get).new(api, u, opts)
+      m = type.split('::').reduce(Module, :const_get).new(api, user, opts)
       if opts.dry?
         measures = [
           { title: 'Issues', total: Random.new.rand(100), href: 'https://github.com/' },
@@ -120,8 +120,8 @@ begin
       end
       measures.each do |d|
         before = 0
-        before += data[u][d[:title]][:total] if data[u][d[:title]] != nil
-        data[u][d[:title]] = { total: d[:total] + before, href: d[:href] }
+        before += data[user][d[:title]][:total] if data[user][d[:title]] != nil
+        data[user][d[:title]] = { total: d[:total] + before, href: d[:href] }
         titles[d[:title]] = d[:title]
         loog.info("The value of #{user}/#{d[:title]} is #{d[:total]}")
       end
@@ -137,6 +137,8 @@ begin
         50
       elsif t == 'Commits'
         5
+      elsif t == 'Reviews'
+        40
       else
         raise "Unknown title '#{t}'"
       end
@@ -152,7 +154,7 @@ begin
       end
       xml.coders do
         data.each do |u, ms|
-          xml.coder(id: u) do
+          xml.coder(id: u, details: api.user(u).name) do
             xml.metrics do
               ms.each do |k, v|
                 xml.m(id: k, href: v[:href]) do

data/features/cli.feature

@@ -11,7 +11,18 @@ Feature: Simple Reporting
     Then Exit code is zero
 
   Scenario: Simple report
-    When I run bin/cobench with "--coder yegor256 --verbose --dry --to foo"
+    When I run bin/cobench with "--coder yegor256 --coder John --verbose --dry --to foo"
+    Then Stdout contains "XML saved to"
+    And Exit code is zero
+
+  Scenario: Simple report with defaults
+    Given I have a ".cobench" file with content:
+    """
+    --verbose
+
+    --coder=john
+    """
+    When I run bin/cobench with "--dry"
     Then Stdout contains "XML saved to"
     And Exit code is zero
 

data/lib/cobench/metrics/pulls.rb

@@ -34,7 +34,7 @@ class Cobench::Pulls
 
   def take(loog)
     from = (Time.now - (60 * 60 * 24 * @opts[:days])).strftime('%Y-%m-%d')
-    q = "in:comments type:pr author:#{@user} is:merged closed:>#{from}"
+    q = "in:comments type:pr author:#{@user} is:merged merged:>#{from}"
     json = @api.search_issues(q)
     loog.debug("Found #{json.total_count} pull requests")
     hoc = 0

data/lib/cobench/metrics/reviews.rb

@@ -0,0 +1,54 @@
+# 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 'iri'
+require_relative '../match'
+
+# Reviews in GitHub API.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2022 Yegor Bugayenko
+# License:: MIT
+class Cobench::Reviews
+  def initialize(api, user, opts)
+    @api = api
+    @user = user
+    @opts = opts
+  end
+
+  def take(loog)
+    from = (Time.now - (60 * 60 * 24 * @opts[:days])).strftime('%Y-%m-%d')
+    q = "reviewed-by:#{@user} merged:>#{from}"
+    json = @api.search_issues(q)
+    loog.debug("Found #{json.total_count} reviews")
+    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}")
+    end
+    [
+      {
+        title: 'Reviews',
+        total: total,
+        href: Iri.new('https://github.com/search').add(q: q)
+      }
+    ]
+  end
+end

data/lib/cobench/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobench
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.17
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -255,6 +255,7 @@ files:
 - lib/cobench/metrics/commits.rb
 - lib/cobench/metrics/issues.rb
 - lib/cobench/metrics/pulls.rb
+- lib/cobench/metrics/reviews.rb
 - lib/cobench/version.rb
 - logo.svg
 - test/test__helper.rb