fief 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd7cfda79ea5621c170b61d14f8199b428edc5ce90616852dcb48922094a493d
-  data.tar.gz: 7ee986cdc8e252af997416c4ae8a25f82f9fae413334c570d4612a93112d832f
+  metadata.gz: 8283e5cbb1075fb17ae4ee598290b94836df887ef58f00f25a369128afd3f469
+  data.tar.gz: ed4fe0314ef1b4cc6bd591ad7eec31da037642dac59d5834c11fadd43900098e
 SHA512:
-  metadata.gz: 3a265b21ebbe73254a3f1f252237a9524e18dada7ccdf6a77eaa6574d9533e266378bfb7d7287e9e6f85c0a3d6b130eb83101e0be1f86cf11d13423f9f397ea9
-  data.tar.gz: 1a5db3381cc3bc6d2bf4594c10400b0a32c73b9bd9e2cd039fef934348ac679875ee0f3588a355fa8675fd641447bea2469c986837f1cbb7590dbf6bf68326c0
+  metadata.gz: 690bb54a315e20c3519411fabeb34aa0a49948a710e840c4b28c84d857b1148d52e022cf7433e6ab4262ed969c634f3701ede8c03a15761282b0b9ed2cfc54f9
+  data.tar.gz: bb116efa704b8e4f8eec845d84649eff42fec4582e93992c07756f6e79460634c3f935e17ccabccaf8772fa47d2cbede16aa461ddbf8f5a868f2565a0abd4a28

data/.github/workflows/cron.yml

@@ -2,7 +2,7 @@
 name: cron
 on:
   schedule:
-    - cron: "13 */4 * * *"
+    - cron: "13 4 * * 1,3,5"
 concurrency:
   group: cron
   cancel-in-progress: true
@@ -16,7 +16,7 @@ jobs:
           ruby-version: 2.7
       - run: bundle install
       - run: |
-          bin/fief --token ${{ secrets.TOKEN }} --delay 1000 \
+          bin/fief --token ${{ secrets.TOKEN }} --delay 1500 \
             --include jcabi/* \
             --include yegor256/* \
             --include sttc/* \
@@ -26,7 +26,9 @@ jobs:
             --include zold-io/* \
             --exclude jcabi/.github \
             --exclude yegor256/quiz \
-            --excluce yegor256/hangman \
+            --exclude yegor256/hangman \
+            --exclude objectionary/.github \
+            --exclude polystat/.github \
             --to gh-pages
       - run: mkdir -p gh-pages/$(date +'%Y/%m/%d')
       - run: cp gh-pages/index.xml gh-pages/$(date +'%Y/%m/%d')/index.xml

data/Gemfile

@@ -25,7 +25,7 @@ gem 'cucumber', '8.0.0', require: false
 gem 'minitest', '5.15.0', require: false
 gem 'rake', '13.0.6', require: false
 gem 'rdoc', '6.5.0', require: false
-gem 'rubocop', '1.52.0', require: false
+gem 'rubocop', '1.52.1', require: false
 gem 'rubocop-rspec', '2.22.0', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'xcop', '0.7.1', require: false

data/assets/index.xsl

@@ -110,7 +110,15 @@ SOFTWARE.
               </thead>
               <xsl:apply-templates select="fief/repositories"/>
               <tfoot>
-                <!-- nothing yet -->
+                <tr>
+                  <td>Total:</td>
+                  <xsl:for-each select="fief/titles/title">
+                    <xsl:variable name="title" select="."/>
+                    <td class="num">
+                      <xsl:value-of select="sum(//m[@id=$title])"/>
+                    </td>
+                  </xsl:for-each>
+                </tr>
               </tfoot>
             </table>
           </article>
@@ -131,6 +139,18 @@ SOFTWARE.
               </xsl:for-each>
               <xsl:text>.</xsl:text>
             </p>
+            <p>
+              <xsl:for-each select="fief/legend/column">
+                <xsl:if test="position() &gt; 1">
+                  <xsl:text>, </xsl:text>
+                </xsl:if>
+                <xsl:text>"</xsl:text>
+                <xsl:value-of select="@title"/>
+                <xsl:text>" is </xsl:text>
+                <xsl:value-of select="."/>
+              </xsl:for-each>
+              <xsl:text>.</xsl:text>
+            </p>
             <p>
               <xsl:text>The page was generated by </xsl:text>
               <a href="https://github.com/yegor256/fief">
@@ -143,7 +163,7 @@ SOFTWARE.
               <xsl:text>. </xsl:text>
               <br/>
               <xsl:text>It took </xsl:text>
-              <xsl:variable name="sec" select="round(fief/@msec) div 1000"/>
+              <xsl:variable name="sec" select="round(fief/@sec)"/>
               <xsl:choose>
                 <xsl:when test="$sec &lt; 60">
                   <xsl:value-of select="$sec"/>

data/bin/fief

@@ -57,7 +57,7 @@ opts = Slop.parse(args, strict: true, help: true) do |o|
   o.array '--exclude', 'Mask of GitHub repo to exclude'
 end
 
-if opts.help? || opts[:include].empty?
+if opts.help?
   puts opts
   exit
 end
@@ -89,6 +89,7 @@ def build_xml(opts, loog)
     repos = Fief::Repos.new(opts, api, loog).all
   end
   data = []
+  legend = {}
   repos.each do |repo|
     Dir[File.join(__dir__, '../lib/fief/metrics/*.rb')].each do |f|
       name = File::basename(f).split('.')[0]
@@ -101,18 +102,23 @@ def build_xml(opts, loog)
       require_relative f
       m = type.split('::').reduce(Module, :const_get).new(api, repo, opts)
       if opts.dry?
-        measures = [{ title: 'Open Pull Requests', value: 42 }, { title: 'Open Issues', value: 42 }]
+        measures = [{ title: 'Pulls+', value: 42, legend: 'Open pulls' }, { title: 'Issues', value: 42 }]
       else
         measures = m.take(loog)
       end
+      measures.each do |m|
+        legend[m[:title]] = m[:legend]
+      end
       if data.find { |d| d[:name] == repo }.nil?
         data << {name: repo, metrics: []}
       end
       data.find { |d| d[:name] == repo }[:metrics] += measures
+      loog.info("Read from '#{name}': #{measures.map { |m| "#{m[:title]}=#{m[:value]}" }.join(', ')}")
     end
   end
+  p data
   builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
-    xml.fief(time: Time.now, msec: Time.now - start) do
+    xml.fief(time: Time.now, sec: Time.now - start) do
       xml.titles do
         data.map { |r| r[:metrics].map { |ms| ms[:title] } }.flatten.uniq.each do |t|
           xml.title do
@@ -120,6 +126,13 @@ def build_xml(opts, loog)
           end
         end
       end
+      xml.legend do
+        legend.each do |t, text|
+          xml.column(title: t) do
+            xml.text text
+          end
+        end
+      end
       xml.repositories do
         data.each do |r|
           xml.repository(id: r[:name]) do
@@ -141,6 +154,7 @@ def build_xml(opts, loog)
   xml
 end
 begin
+  raise 'At least one --include is required' if opts[:include].empty?
   home = File.absolute_path(opts[:to])
   loog.debug("All files generated will be saved to #{home}")
   if File.exist?(home)

data/lib/fief/metrics/issues.rb

@@ -39,31 +39,44 @@ class Fief::Issues
     json.each do |issue|
       num = issue[:number]
       data = @api.issue(@repo, num)
-      if data[:created_at] < Time.now - (60 * 60 * 24 * 28)
+      if data[:created_at] < Time.now - (60 * 60 * 24 * old_days)
         loog.debug("Issue #{@repo}/##{num} is old")
         old += 1
       end
-      if data[:created_at] < Time.now - (60 * 60 * 24 * 112)
+      if data[:created_at] < Time.now - (60 * 60 * 24 * older_days)
         loog.debug("Issue #{@repo}/##{num} is very old")
         older += 1
       end
     end
     [
       {
-        title: 'Open Issues',
+        title: 'Issues',
         value: total,
-        alert: false
+        alert: false,
+        legend: 'сurrently unresolved issues'
       },
       {
-        title: 'Old Issues',
+        title: 'Issues+',
         value: old,
-        alert: older > total * 0.4
+        alert: older > total * 0.4,
+        legend: "issues unresolved for more than #{old_days} days"
       },
       {
-        title: 'Older Issues',
+        title: 'Issues++',
         value: older,
-        alert: older > total * 0.4
+        alert: older > total * 0.4,
+        legend: "issues unresolved for more than #{older_days} days"
       }
     ]
   end
+
+  private
+
+  def old_days
+    28
+  end
+
+  def older_days
+    112
+  end
 end

data/lib/fief/metrics/pulls.rb

@@ -38,31 +38,44 @@ class Fief::Pulls
     json.each do |pr|
       num = pr[:number]
       data = @api.pull_request(@repo, num)
-      if data[:created_at] < Time.now - (60 * 60 * 24 * 28)
+      if data[:created_at] < Time.now - (60 * 60 * 24 * old_days)
         loog.debug("PR #{@repo}/##{num} is old")
         old += 1
       end
-      if data[:created_at] < Time.now - (60 * 60 * 24 * 112)
+      if data[:created_at] < Time.now - (60 * 60 * 24 * older_days)
         loog.debug("PR #{@repo}/##{num} is very old")
         older += 1
       end
     end
     [
       {
-        title: 'Open PRs',
+        title: 'Pulls',
         value: total,
-        alert: false
+        alert: false,
+        legend: 'currently open pull requests'
       },
       {
-        title: 'Old PRs',
+        title: 'Pulls+',
         value: old,
-        alert: older > total * 0.4
+        alert: older > total * 0.4,
+        legend: "pull requests open for more than #{old_days} days"
       },
       {
-        title: 'Older PRs',
+        title: 'Pulls++',
         value: older,
-        alert: older > total * 0.2
+        alert: older > total * 0.2,
+        legend: "pull requests open for more than #{older_days} days"
       }
     ]
   end
+
+  private
+
+  def old_days
+    28
+  end
+
+  def older_days
+    112
+  end
 end

data/lib/fief/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2023 Yegor Bugayenko
 # License:: MIT
 module Fief
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

data/test/metrics/test_issues.rb

@@ -33,7 +33,6 @@ class TestIssues < Minitest::Test
     m = Fief::Issues.new(api, 'yegor256/fief', {})
     ms = m.take(Loog::VERBOSE)
     assert !ms.empty?
-    p ms
   rescue Octokit::TooManyRequests => e
     puts e.message
     skip

data/test/metrics/test_pulls.rb

@@ -33,7 +33,6 @@ class TestPulls < Minitest::Test
     m = Fief::Pulls.new(api, 'yegor256/fief', {})
     ms = m.take(Loog::VERBOSE)
     assert !ms.empty?
-    p ms
   rescue Octokit::TooManyRequests => e
     puts e.message
     skip

data/test/metrics/test_runs.rb

@@ -33,7 +33,6 @@ class TestRuns < Minitest::Test
     m = Fief::Runs.new(api, 'yegor256/debate', {})
     ms = m.take(Loog::VERBOSE)
     assert !ms.empty?
-    p ms
   rescue Octokit::TooManyRequests => e
     puts e.message
     skip

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fief
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace