RubyGems - cobench - Versions diffs - 0.0.28 → 0.0.31 - Mend

cobench 0.0.28 → 0.0.31

Files changed (8) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59a9eeca7f5fcb377fcd74fd3d61dba8e2e3a8f9d28b456a5395ae6bab04781c
-  data.tar.gz: 4a1437f4564485167e80c14e66bbfe525529a8ee19738e6ebbea65d614de3de1
+  metadata.gz: b950466b65dafeb1dc0ec2066fcd3a61e75d0470b2810944181a0a7704d8b2d6
+  data.tar.gz: cb692c9353443c05b1b4912a76305617212d532da458ff86ea1df12e2d11f406
 SHA512:
-  metadata.gz: 9a9050e83ed1b3dfb922f8664c1623b3aa6b4cb61bc659dfb49372023072cf6ec2d3d944a6a23990278afb8c87d551415b003277a2bb0c5e2846c1bfab6cc91b
-  data.tar.gz: d0298ae4bd39ac293a2dfd91d745546143778211c93e56f28f1bc8975661d78d3fd68d10a8e981eca8bc80bb50c7747d2f60caf73e1855c311f348bd0b649c5a
+  metadata.gz: 5bbbbe914c7a2a627d518d1eb5b5baf1466bd60d15252098fcf9d0e2b7a3b41c3ceaeed22df4603b7e8ae404dff45e155b876290866e6ade19dffa47673e70f0
+  data.tar.gz: 460efed0d36d92adbe5549cb3299cf0071aa299dadf98e45a964b6e79f75d838b4f44d74a7d24a4532b9cb3f3c96d0b5e4c4ec9d3ecb129d42a9e79039c463eb

data/Rakefile CHANGED Viewed

@@ -31,7 +31,7 @@ def version
   Gem::Specification.load(Dir['*.gemspec'].first).version
 end
-task default: %i[clean test features rubocop copyright]
+task default: %i[clean test features rubocop xcop copyright]
 require 'rake/testtask'
 desc 'Run all unit tests'
@@ -59,6 +59,13 @@ RuboCop::RakeTask.new(:rubocop) do |task|
   task.options = ['--display-cop-names']
 end
+require 'xcop/rake_task'
+Xcop::RakeTask.new(:xcop) do |task|
+  task.license = 'LICENSE.txt'
+  task.includes = ['**/*.xml', '**/*.xsl', '**/*.xsd', '**/*.html']
+  task.excludes = ['cobench/**', 'coverage/**']
+end
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:features) do
   Rake::Cleaner.cleanup_files(['coverage'])

data/assets/index.xsl CHANGED Viewed

@@ -23,7 +23,8 @@ 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:output method="xml" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes"/>
+  <xsl:strip-spaces select="*"/>
   <xsl:param name="version"/>
   <xsl:template match="/">
     <html>
@@ -35,23 +36,38 @@ 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 type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.31.3/js/jquery.tablesorter.min.js"/>
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js">
+          <xsl:text> </xsl:text>
+        </script>
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.31.3/js/jquery.tablesorter.min.js">
+          <xsl:text> </xsl:text>
+        </script>
         <script type="text/javascript">
           $(function() {
             $("#metrics").tablesorter();
           });
+          $(function() {
+            let params = (new URL(document.location)).searchParams;
+            let org = params.get('org');
+            if (org) {
+              $('#metrics tbody tr:not(:has(&gt;td.org-' + org + '))').hide();
+              $('#org').text('@' + org);
+              $('#org-head').css('visibility', 'visible');
+              console.log('Showing @' + org + ' org');
+            }
+          });
         </script>
         <style>
           td, th { font-family: monospace; font-size: 18px; }
           .num { text-align: right; }
           .left { border-bottom: 0; }
-          section { width: 100%; }
+          section { width: auto; }
           header { text-align: center; }
           footer { text-align: center; font-size: 0.8em; line-height: 1.2em; color: gray; }
           article { border: 0; }
           td.avatar { vertical-align: middle; text-align: center; }
-          td.avatar img { width: 1.5em; height: 1.5em; vertical-align: middle; }
+          td.avatar img,
+          td.orgs img { width: 1.5em; height: 1.5em; vertical-align: middle; }
           .subtitle { font-size: 0.8em; line-height: 1em; color: gray; }
           .sorter { cursor: pointer; }
         </style>
@@ -66,14 +82,30 @@ SOFTWARE.
             </p>
           </header>
           <article>
+            <p id="org-head" style="visibility: hidden;">
+              <xsl:text>You only see people who contributed to </xsl:text>
+              <strong>
+                <span id="org">
+                  <xsl:text>@???</xsl:text>
+                </span>
+              </strong>
+              <xsl:text>. </xsl:text>
+              <xsl:text>Click </xsl:text>
+              <a href="index.html">
+                <xsl:text>here</xsl:text>
+              </a>
+              <xsl:text> to see all.</xsl:text>
+            </p>
             <table id="metrics">
               <colgroup>
                 <col/>
+                <col style="width: 2.5em;"/>
                 <col/>
                 <xsl:for-each select="cobench/titles/title">
                   <xsl:sort select="."/>
                   <col/>
                 </xsl:for-each>
+                <col/>
               </colgroup>
               <thead>
                 <xsl:apply-templates select="cobench/titles"/>
@@ -81,7 +113,7 @@ SOFTWARE.
               <xsl:apply-templates select="cobench/coders"/>
               <tfoot>
                 <xsl:apply-templates select="cobench/totals"/>
-              <xsl:apply-templates select="cobench/averages"/>
+                <xsl:apply-templates select="cobench/averages"/>
               </tfoot>
             </table>
           </article>
@@ -181,19 +213,27 @@ SOFTWARE.
   </xsl:template>
   <xsl:template match="cobench/titles">
     <tr>
-      <th colspan="2"/>
+      <th class="sorter num">
+        <xsl:text>Top</xsl:text>
+      </th>
+      <th colspan="2">
+        <xsl:text>Programmer</xsl:text>
+      </th>
       <xsl:for-each select="title">
         <xsl:sort select="."/>
         <th class="sorter num">
           <xsl:value-of select="."/>
         </th>
       </xsl:for-each>
+      <th>
+        <xsl:text>Orgs</xsl:text>
+      </th>
     </tr>
   </xsl:template>
   <xsl:template match="cobench/totals">
     <xsl:variable name="totals" select="."/>
     <tr>
-      <td colspan="2" style="text-align:right">Total:</td>
+      <td colspan="3" style="text-align:right">Total:</td>
       <xsl:for-each select="/cobench/titles/title">
         <xsl:sort select="."/>
         <xsl:variable name="t" select="."/>
@@ -201,12 +241,13 @@ SOFTWARE.
           <xsl:value-of select="$totals/w[@id=$t]"/>
         </td>
       </xsl:for-each>
+      <td/>
     </tr>
   </xsl:template>
   <xsl:template match="cobench/averages">
     <xsl:variable name="averages" select="."/>
     <tr>
-      <td colspan="2" style="text-align:right">Average:</td>
+      <td colspan="3" style="text-align:right">Average:</td>
       <xsl:for-each select="/cobench/titles/title">
         <xsl:sort select="."/>
         <xsl:variable name="t" select="."/>
@@ -214,6 +255,7 @@ SOFTWARE.
           <xsl:value-of select="$averages/w[@id=$t]"/>
         </td>
       </xsl:for-each>
+      <td/>
     </tr>
   </xsl:template>
   <xsl:template match="cobench/coders">
@@ -223,6 +265,14 @@ SOFTWARE.
   </xsl:template>
   <xsl:template match="coder">
     <tr>
+      <td class="num">
+        <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:if test="$pos &lt;= 8">
+          <xsl:text>#</xsl:text>
+          <xsl:value-of select="$pos"/>
+        </xsl:if>
+      </td>
       <td class="avatar">
         <img src="https://socatar.com/github/{@id}/64-64"/>
       </td>
@@ -242,6 +292,27 @@ SOFTWARE.
         <xsl:sort select="@id"/>
         <xsl:apply-templates select="."/>
       </xsl:for-each>
+      <td class="orgs">
+        <xsl:attribute name="class">
+          <xsl:text>orgs</xsl:text>
+          <xsl:for-each select="orgs/org">
+            <xsl:text> org-</xsl:text>
+            <xsl:value-of select="."/>
+          </xsl:for-each>
+        </xsl:attribute>
+        <xsl:for-each select="orgs/org">
+          <xsl:sort select="."/>
+          <xsl:if test="position() &gt; 1">
+            <xsl:text> </xsl:text>
+          </xsl:if>
+          <a href="?org={.}" title="{.}">
+            <xsl:value-of select="substring(., 1, 2)"/>
+            <xsl:if test="string-length(.) &gt; 2">
+              <xsl:text>…</xsl:text>
+            </xsl:if>
+          </a>
+        </xsl:for-each>
+      </td>
     </tr>
   </xsl:template>
   <xsl:template match="m">

data/bin/cobench CHANGED Viewed

@@ -96,6 +96,7 @@ def build_xml(opts, loog)
   loog.info("Reading GitHub data for the last #{opts[:days]} days")
   titles = {}
   data = {}
+  orgs = {}
   opts[:coder].each do |u|
     user = u.downcase
     loog.info("Scanning #{user}...")
@@ -116,17 +117,24 @@ def build_xml(opts, loog)
           { title: 'Pulls', total: Random.new.rand(100) },
           { title: 'Commits', total: Random.new.rand(100) },
           { title: 'HoC', total: Random.new.rand(100) },
-          { title: 'HoC', total: Random.new.rand(100) }
+          { title: 'HoC', total: Random.new.rand(100) },
+          { meta: true, title: 'Orgs', list: ['objectionary', 'artipie'] },
         ]
       else
         measures = m.take(loog)
       end
-      measures.each do |d|
+      measures.reject {|ms| ms.key?(:meta)}.each do |ms|
         before = 0
-        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]}")
+        before += data[user][ms[:title]][:total] if data[user][ms[:title]] != nil
+        data[user][ms[:title]] = { total: ms[:total] + before, href: ms[:href] }
+        titles[ms[:title]] = ms[:title]
+        loog.info("The value of #{user}/#{ms[:title]} is #{ms[:total]}")
+      end
+      measures.select {|ms| ms.key?(:meta)}.each do |ms|
+        if ms[:title] == 'Orgs'
+          orgs[user] = [] unless orgs.key?(user)
+        end
+        orgs[user] += ms[:list]
       end
     end
   end
@@ -212,6 +220,13 @@ def build_xml(opts, loog)
         data.each do |u, ms|
           xml.coder(id: u) do
             xml.parent.set_attribute('details', api.user(u).name) unless opts[:dry]
+            if orgs.key?(u)
+              xml.orgs do
+                orgs[u].uniq.each do |o|
+                  xml.org o
+                end
+              end
+            end
             xml.metrics do
               ms.each do |k, v|
                 xml.m(id: k) do
@@ -251,7 +266,7 @@ begin
   html = xslt.transform(Nokogiri::XML(xml), 'version' => "'#{Cobench::VERSION}'")
   loog.debug(html)
   front = File.join(home, 'index.html')
-  File.write(front, html)
+  File.write(front, html.to_html(indent: 0).gsub("\n", ''))
   loog.debug("HTML saved to #{front} (#{File.size(front)} bytes)")
 rescue StandardError => e
   loog.error(Backtrace.new(e))

data/cobench.gemspec CHANGED Viewed

@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'octokit', '~>4.0'
   s.add_runtime_dependency 'rainbow', '~>3.0'
   s.add_runtime_dependency 'slop', '~>4.4'
+  s.add_runtime_dependency 'xcop', '~>0.6'
   s.add_development_dependency 'codecov', '0.6.0'
   s.add_development_dependency 'cucumber', '8.0.0'
   s.add_development_dependency 'minitest', '5.15.0'

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

@@ -38,16 +38,23 @@ class Cobench::Pulls
     json = @api.search_issues(q)
     loog.debug("Found #{json.total_count} pull requests")
     hoc = 0
+    orgs = []
     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)
+      orgs += p.repository_url.split('/')[-2]
       pr_json = @api.pull_request(repo, pr)
       hocs = pr_json.additions + pr_json.deletions
       hoc += hocs
       loog.debug("Including #{repo}##{pr} with #{hocs}")
     end
     [
+      {
+        meta: true,
+        title: 'Orgs',
+        list: orgs
+      },
       {
         title: 'Pulls',
         total: total,

data/lib/cobench/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobench
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.31
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.4'
+- !ruby/object:Gem::Dependency
+  name: xcop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement