RubyGems - cobench - Versions diffs - 0.0.5 → 0.0.8 - Mend

cobench 0.0.5 → 0.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml +4 -4
data/assets/index.xsl +40 -26
data/bin/cobench +24 -15
data/cobench.gemspec +1 -1
data/lib/cobench/match.rb +43 -0
data/lib/cobench/metrics/issues.rb +10 -10
data/lib/cobench/metrics/pulls.rb +20 -11
data/lib/cobench/version.rb +1 -1
metadata +7 -6

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47e7e1808f7761b20075db8ed5d56d765bb0643b52f60c4a94af97b595ef86bb
-  data.tar.gz: bd364af5463eeef8e4327d43b691c30dd80254db6245c431c32f6bceaafa39ca
+  metadata.gz: 1eaf9208a53326a257503d91e54aae018b2dd0964c0ec11ddde8d8b392a036cc
+  data.tar.gz: 5b1d155907221ec14edfbd5ca674f345531303e383c2f13aae88335bdc35c1cd
 SHA512:
-  metadata.gz: 17c1b0fd543b056c280772aad49d82067cab4f359cff8c38f4044639d44567cc7d690b704807406f55b46bcaabec3cedbcea3912c9a30774a0f5f4444a359d81
-  data.tar.gz: 76f716fee9458c5a153f0c373fde11645005c1361492758bdd3e71f7b853e27ceccbf7c582756dfa9ccc2481a8c12fe9c57aab75f7cb9d68d95dcf993fbc7e64
+  metadata.gz: 8c155780a0a14a843daf36336d66e5a3216b9886b0da46503d0a44ad3994a7e71eb2d4ee15c7bc4edfe3c236591673c7339e918ce9afbe697f7ca5f4bb415614
+  data.tar.gz: 2e7ca41724d9768abfbad82c6cbd2bff175b30783644c4af24650183f5868e65050832d7a72d2f776aa080d30afdb2aaaa4a82d315c5279e8f61a350e7cca72f

data/assets/index.xsl CHANGED Viewed

@@ -23,8 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
-  <xsl:output encoding="UTF-8" method="xml"/>
-  <xsl:key name="metrics" match="/cobench/coders/coder/metrics/m" use="@id"/>
+  <xsl:output encoding="UTF-8" method="html"/>
   <xsl:template match="/">
     <html>
       <head>
@@ -35,15 +34,16 @@ SOFTWARE.
         <link rel="icon" href="https://raw.githubusercontent.com/yegor256/cobench/master/logo.svg" type="image/svg"/>
         <link href="https://cdn.jsdelivr.net/gh/yegor256/tacit@gh-pages/tacit-css.min.css" rel="stylesheet"/>
         <link href="https://cdn.jsdelivr.net/gh/yegor256/drops@gh-pages/drops.min.css" rel="stylesheet"/>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.31.3/js/jquery.tablesorter.min.js"></script>
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"/>
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.31.3/js/jquery.tablesorter.min.js"/>
         <script type="text/javascript">
           $(function() {
             $("#metrics").tablesorter();
           });
         </script>
         <style>
-          td, th { text-align: right; font-family: monospace; font-size: 18px; }
+          td, th { font-family: monospace; font-size: 18px; }
+          .num { text-align: right; }
           .left { border-bottom: 0; }
           header { text-align: center; }
           footer { text-align: center; font-size: 0.8em; }
@@ -59,7 +59,10 @@ SOFTWARE.
             </p>
           </header>
           <article>
-            <xsl:apply-templates select="cobench/coders"/>
+            <table id="metrics">
+              <xsl:apply-templates select="cobench/titles"/>
+              <xsl:apply-templates select="cobench/coders"/>
+            </table>
           </article>
           <footer>
             <p>
@@ -84,22 +87,23 @@ SOFTWARE.
       </body>
     </html>
   </xsl:template>
+  <xsl:template match="cobench/titles">
+    <thead>
+      <tr>
+        <th/>
+        <xsl:for-each select="title">
+          <xsl:sort select="."/>
+          <th class="sorter num">
+            <xsl:value-of select="."/>
+          </th>
+        </xsl:for-each>
+      </tr>
+    </thead>
+  </xsl:template>
   <xsl:template match="cobench/coders">
-    <table id="metrics">
-      <thead>
-        <tr>
-          <th/>
-          <xsl:for-each select="coder/metrics/m[generate-id() = generate-id(key('metrics', @id)[1])]">
-            <th class="sorter">
-              <xsl:value-of select="@id"/>
-            </th>
-          </xsl:for-each>
-        </tr>
-      </thead>
-      <tbody>
-        <xsl:apply-templates select="coder"/>
-      </tbody>
-    </table>
+    <tbody>
+      <xsl:apply-templates select="coder"/>
+    </tbody>
   </xsl:template>
   <xsl:template match="coder">
     <tr>
@@ -109,14 +113,24 @@ SOFTWARE.
           <xsl:value-of select="@id"/>
         </a>
       </td>
-      <xsl:apply-templates select="metrics/m"/>
+      <xsl:for-each select="metrics/m">
+        <xsl:sort select="@id"/>
+        <xsl:apply-templates select="."/>
+      </xsl:for-each>
     </tr>
   </xsl:template>
   <xsl:template match="m">
-    <td>
-      <a href="{@href}">
-        <xsl:value-of select="."/>
-      </a>
+    <td class="num">
+      <xsl:choose>
+        <xsl:when test="@href">
+          <a href="{@href}">
+            <xsl:value-of select="."/>
+          </a>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="."/>
+        </xsl:otherwise>
+      </xsl:choose>
     </td>
   </xsl:template>
   <xsl:template match="node()|@*">

data/bin/cobench CHANGED Viewed

@@ -91,6 +91,7 @@ begin
   end
   api.auto_paginate = true
   api = Obk.new(api, pause: 2000)
+  titles = {}
   opts[:coder].each do |u|
     loog.info("Scanning #{u}...")
     data[u] = {}
@@ -101,30 +102,38 @@ begin
       require_relative f
       m = type.split('::').reduce(Module, :const_get).new(api, u, opts)
       if opts.dry?
-        v, t = [42, 'https://github.com/']
+        measures = [{ title: 'Mock', total: Random.new.rand(100), href: 'https://github.com/' }]
       else
-        v, t = m.take(loog)
+        measures = m.take(loog)
+      end
+      measures.each do |d|
+        data[u][d[:title]] = { total: d[:total], href: d[:href] }
+        titles[d[:title]] = d[:title]
+        loog.info("The value of #{u}/#{d[:title]} is #{d[:total]}")
       end
-      data[u][name] = [v, t]
-      loog.info("The value of #{u}/#{name} is #{v}")
     end
   end
   builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
-    xml.cobench(time: Time.now, days: opts[:days]) {
-      xml.coders {
+    xml.cobench(time: Time.now, days: opts[:days]) do
+      xml.titles do
+        data.map { |_, ms| ms.keys }.flatten.each do |t|
+          xml.title t
+        end
+      end
+      xml.coders do
         data.each do |u, ms|
-          xml.coder(id: u) {
-            xml.metrics {
+          xml.coder(id: u) do
+            xml.metrics do
               ms.each do |k, v|
-                xml.m(id: k, href: v[1]) {
-                  xml.text v[0]
-                }
+                xml.m(id: k, href: v[:href]) do
+                  xml.text v[:total]
+                end
               end
-            }
-          }
+            end
+          end
         end
-      }
-    }
+      end
+    end
   end
   index = File.join(home, 'index.xml')
   xml = builder.to_xml

data/cobench.gemspec CHANGED Viewed

@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'iri', '~>0.5'
   s.add_runtime_dependency 'loog', '~>0.2'
   s.add_runtime_dependency 'nokogiri', '~>1.10'
-  s.add_runtime_dependency 'obk', '~>0.1'
+  s.add_runtime_dependency 'obk', '0.3.0'
   s.add_runtime_dependency 'octokit', '~>4.0'
   s.add_runtime_dependency 'rainbow', '~>3.0'
   s.add_runtime_dependency 'slop', '~>4.4'

data/lib/cobench/match.rb ADDED Viewed

@@ -0,0 +1,43 @@
+# 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_relative 'mask'
+# Match of masks.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2022 Yegor Bugayenko
+# License:: MIT
+class Cobench::Match
+  def initialize(opts)
+    @opts = opts
+  end
+  def matches?(repo)
+    if !@opts[:include].empty? && @opts[:include].none? { |m| Cobench::Mask.new(m).matches?(repo) }
+      loog.debug("Excluding #{repo}##{pr} due to lack of --include")
+      return false
+    end
+    if @opts[:exclude].any? { |m| Cobench::Mask.new(m).matches?(repo) }
+      loog.debug("Excluding #{repo}##{pr} due to --exclude")
+      return false
+    end
+    true
+  end
+end

data/lib/cobench/metrics/issues.rb CHANGED Viewed

@@ -19,7 +19,7 @@
 # SOFTWARE.
 require 'iri'
-require_relative '../mask'
+require_relative '../match'
 # Issues in GitHub API.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -36,19 +36,19 @@ class Cobench::Issues
     from = (Time.now - (60 * 60 * 24 * @opts[:days])).strftime('%Y-%m-%d')
     q = "#{@user} in:comments type:issue author:#{@user} created:>#{from}"
     json = @api.search_issues(q)
+    loog.debug("Found #{json.total_count} issues")
     total = json.items.count do |p|
       pr = p.url.split('/')[-1]
       repo = p.repository_url.split('/')[-2..-1].join('/')
-      if @opts[:include].none? { |m| Cobench::Mask.new(m).matches?(repo) }
-        loog.debug("Excluding #{repo}##{pr} due to lack of --include")
-        next
-      end
-      if @opts[:exclude].any? { |m| Cobench::Mask.new(m).matches?(repo) }
-        loog.debug("Excluding #{repo}##{pr} due to --exclude")
-        next
-      end
+      next unless Cobench::Match.new(@opts).matches?(repo)
       loog.debug("Including #{repo}#{pr}")
     end
-    [total, Iri.new('https://github.com/search').add(q: q)]
+    [
+      {
+        title: 'Issues',
+        total: total,
+        href: Iri.new('https://github.com/search').add(q: q)
+      }
+    ]
   end
 end

data/lib/cobench/metrics/pulls.rb CHANGED Viewed

@@ -19,7 +19,7 @@
 # SOFTWARE.
 require 'iri'
-require_relative '../mask'
+require_relative '../match'
 # Pulls in GitHub API.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -36,19 +36,28 @@ class Cobench::Pulls
     from = (Time.now - (60 * 60 * 24 * @opts[:days])).strftime('%Y-%m-%d')
     q = "#{@user} in:comments type:pr author:#{@user} is:merged closed:>#{from}"
     json = @api.search_issues(q)
+    loog.debug("Found #{json.total_count} pull requests")
+    hoc = 0
     total = json.items.count do |p|
       pr = p.pull_request.url.split('/')[-1]
       repo = p.repository_url.split('/')[-2..-1].join('/')
-      if @opts[:include].none? { |m| Cobench::Mask.new(m).matches?(repo) }
-        loog.debug("Excluding #{repo}##{pr} due to lack of --include")
-        next
-      end
-      if @opts[:exclude].any? { |m| Cobench::Mask.new(m).matches?(repo) }
-        loog.debug("Excluding #{repo}##{pr} due to --exclude")
-        next
-      end
-      loog.debug("Including #{repo}#{pr}")
+      next unless Cobench::Match.new(@opts).matches?(repo)
+      pr_json = @api.pull_request(repo, pr)
+      hocs = pr_json.additions + pr_json.deletions
+      hoc += hocs
+      loog.debug("Including #{repo}##{pr} with #{hocs}")
     end
-    [total, Iri.new('https://github.com/search').add(q: q)]
+    [
+      {
+        title: 'Pulls',
+        total: total,
+        href: Iri.new('https://github.com/search').add(q: q)
+      },
+      {
+        title: 'HoC',
+        total: hoc,
+        href: ''
+      }
+    ]
   end
 end

data/lib/cobench/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobench
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -70,16 +70,16 @@ dependencies:
   name: obk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +251,7 @@ files:
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - lib/cobench/mask.rb
+- lib/cobench/match.rb
 - lib/cobench/metrics/issues.rb
 - lib/cobench/metrics/pulls.rb
 - lib/cobench/version.rb