cobench 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b84694d76fb95dc4c62d1c4ba42d4d4bee5c8c193c33c241b02964d44816e91
-  data.tar.gz: a56793bef0c5d3bdda384ddd553a47cf135c51cead18e73ed984a7a5f4922077
+  metadata.gz: 5ebe9e177a3dbecdb610079242b819c7f35188a15ea362f9b14b2f3f4d5b7d87
+  data.tar.gz: b17a94e0a3ea2f9f57184860f7747ebe232b2ea7af19a42ebb81dea59d4b29c9
 SHA512:
-  metadata.gz: 4fee03b92b8a370f39bc207012bf777b54f459c903b08e25e75e469d98f458d599c85f2bccb51892c165b837192a3450da23d545f84c33263c07bf7469ed6261
-  data.tar.gz: 71bb57a42b734c46f865beda63815ad1984964bf96a690a4c94c9e67ca6eb32199a59c7efb12e0c5fa99423cd54f7087aa72c2443864ea96ad091fb2e7124bc3
+  metadata.gz: 8c891cf36011771f14f89c2b762ea57ce53d44af35d3fcbb8033fef402453ed1f7911ed191f243492c2ac4d83ae2e6c32079a3a454a35bdaaa5888fefbc20a08
+  data.tar.gz: 072a7bb771a409c753be6a1027f024d72cd887eddf3c5a6ec02c992e04ae4ce0dd7f39ef9b41437cc0bf607e49965748548edc39b92534fb1a06c37ff121b9e6

data/.rultor.yml

@@ -1,3 +1,5 @@
+docker:
+  image: yegor256/rultor-image:1.9.1
 assets:
   rubygems.yml: yegor256/home#assets/rubygems.yml
 install: |
@@ -16,7 +18,3 @@ release:
 merge:
   script: |-
     bundle exec rake
-deploy:
-  script: |-
-    echo "There is nothing to deploy"
-    exit -1

data/assets/index.xsl

@@ -82,11 +82,11 @@ SOFTWARE.
               <xsl:text> on </xsl:text>
               <xsl:value-of select="cobench/@time"/>
               <xsl:text>. </xsl:text>
-              <xsl:text>"Commits" is the total number of </xsl:text>
+              <xsl:text>"Commits" is the total number of non-merge </xsl:text>
               <a href="https://github.com/git-guides/git-commit">
                 <xsl:text>Git commits</xsl:text>
               </a>
-              <xsl:text> authored by the user. </xsl:text>
+              <xsl:text> to the default branch, authored by the user. </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>
@@ -104,11 +104,34 @@ SOFTWARE.
               <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 Review — 40 points, </xsl:text>
-              <xsl:text>one Commit — 5 points, </xsl:text>
-              <xsl:text>one HoC — just 1 point.</xsl:text>
+              <xsl:for-each select="cobench/weights/w">
+                <xsl:if test="position() &gt; 1">
+                  <xsl:text>, </xsl:text>
+                </xsl:if>
+                <xsl:text>one </xsl:text>
+                <xsl:choose>
+                  <xsl:when test="substring(@id, string-length(@id)) = 's'">
+                    <xsl:value-of select="substring(@id, 0, string-length(@id))"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:value-of select="@id"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+                <xsl:choose>
+                  <xsl:when test="position() = 1">
+                    <xsl:text> costs </xsl:text>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:text> — </xsl:text>
+                  </xsl:otherwise>
+                </xsl:choose>
+                <xsl:value-of select="text()"/>
+                <xsl:text> point</xsl:text>
+                <xsl:if test="text() != '1'">
+                  <xsl:text>s</xsl:text>
+                </xsl:if>
+              </xsl:for-each>
+              <xsl:text>.</xsl:text>
             </p>
             <p>
               <xsl:text>The numbers you see reflect the activity of the last </xsl:text>

data/bin/cobench

@@ -127,21 +127,17 @@ begin
       end
     end
   end
+  weights = {
+    'HoC' => 1,
+    'Pulls' => 200,
+    'Issues' => 50,
+    'Commits' => 5,
+    'Reviews' => 75
+  }
   data.each do |u, ms|
     score = ms.map do |t, h|
-      h[:total] * if t == 'HoC'
-        1
-      elsif t == 'Pulls'
-        100
-      elsif t == 'Issues'
-        50
-      elsif t == 'Commits'
-        5
-      elsif t == 'Reviews'
-        40
-      else
-        raise "Unknown title '#{t}'"
-      end
+      raise "Unknown title '#{t}'" unless weights.key?(t)
+      h[:total] * weights[t]
     end.inject(0, :+)
     data[u]['Score'] = { total: score, href: '' }
   end
@@ -152,6 +148,13 @@ begin
           xml.title t
         end
       end
+      xml.weights do
+        weights.each do |t, w|
+          xml.w(id: t) do
+            xml.text w
+          end
+        end
+      end
       xml.coders do
         data.each do |u, ms|
           xml.coder(id: u, details: api.user(u).name) do

data/lib/cobench/metrics/commits.rb

@@ -34,7 +34,7 @@ class Cobench::Commits
 
   def take(loog)
     from = (Time.now - (60 * 60 * 24 * @opts[:days])).strftime('%Y-%m-%d')
-    q = "author:#{@user} author-date:>#{from}"
+    q = "author:#{@user} author-date:>#{from} is:public merge:false"
     json = @api.search_commits(q)
     loog.debug("Found #{json.total_count} commits")
     hoc = 0
@@ -44,6 +44,7 @@ class Cobench::Commits
       next unless Cobench::Match.new(@opts, loog).matches?(repo)
       loog.debug("Including #{sha} in #{repo}")
       json = @api.commit(repo, sha)
+      next unless json
       hocs = json.stats.total
       loog.debug("Found #{hocs} HoC in #{sha}")
       hoc += hocs

data/lib/cobench/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobench
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace