github_repo_statistics 2.2.6 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 959ee199b0ea42238f2694323f48877276f03828cb14ea10961f24ce7072c20f
-  data.tar.gz: 75096534af0a22946e376f6b9f9ac4763e58480e6f04e49c50c3bd2adb484ad0
+  metadata.gz: 9ef7c493b69d48cbb4e65fa99b8daeac622a6a8bcdf2c686a73102ddbdbdbab2
+  data.tar.gz: 62bf5ff22b128242b3cf5a2ffeb9bae13bd6b3b16b6026dbabb51e1e7ed9b609
 SHA512:
-  metadata.gz: f83c75ebd84a3cfbe794439e6574a55210417c50b576c5b8601c84854a3a597bf31f1077365bda35f9c103a4186a6ca61642cd4d3d43ddbacbe79e02e22ad899
-  data.tar.gz: 895557370c5ad8559bbe069e3d67099c2e982a555a012bafce3992f7a06ec138d56080f55adb97aaace459e6f6c34e3aa41a3ee659f59d1d937a73b6733b7e6e
+  metadata.gz: 43bb62af4096988880381c52661324e774717a0db51698f063d610bbab9f2988d94ffc4f1ae32e716eeede181923dc06cd0f8afde5a112e41a63c4cbc72850e5
+  data.tar.gz: 4cf1461f0388f4c57326999f9864644db68faa2d7a76b88ce2b4e35f00ee9991d4114ad67270aba6210e4b3b3c5a0fd2adf1977c201730642bd5d84f170bb051

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github_repo_statistics (2.1.0)
+    github_repo_statistics (2.2.7)
       date
       faraday-retry
       google-cloud-bigquery

data/lib/github_repo_statistics/force_merge_report.rb

@@ -20,7 +20,11 @@ class ForceMergeReport
     pull_requests = client.list_issues(@repo, state: 'closed', since: DateTime.now - @duration_in_days)
 
     # Sort PRs into monthly chunks
-    weekly_pull_requests = pull_requests.group_by { |pr| pr.closed_at.strftime('%Y-%U') }
+    weekly_pull_requests = pull_requests.group_by { |pr| pr.closed_at.strftime('%Y-%W') }
+
+    if weekly_pull_requests[Time.now.strftime('%Y-%W')].nil?
+      weekly_pull_requests[Time.now.strftime('%Y-%W')] = []
+    end
 
     # Initialize a hash to store monthly summaries
     weekly_summaries = Hash.new { |hash, key| hash[key] = { total: 0, failed: 0, workflows: Hash.new(0) } }
@@ -49,6 +53,10 @@ class ForceMergeReport
         # Filter checks without meeting the required status checks
         failed_checks = all_checks.reject { |check| check.conclusion == 'success' || check.state == 'success' }
 
+        failed_checks.select! do |check|
+          ['Mergeable: Size check', 'SonarQube Code Analysis', 'UI Tests', 'Unit Tests'].include?(check.name)
+        end
+
         # Update monthly summary
         weekly_summaries[month][:total] += 1
         weekly_summaries[month][:failed] += 1 unless failed_checks.empty?
@@ -82,6 +90,7 @@ class ForceMergeReport
       summary[:workflows].each do |workflow, count|
         puts "  - #{workflow}: #{count}"
       end
+
       if ENV['BQ_CREDENTIALS']
         require "google/cloud/bigquery"
         require "json"
@@ -93,15 +102,25 @@ class ForceMergeReport
         dataset = bigquery.dataset "github_data"
 
         failed_count = summary[:failed]
+        size_check = summary[:workflows]["Mergeable: Size check"]
+        sonarqube_check = summary[:workflows]['SonarQube Code Analysis']
+        ui_tests_check = summary[:workflows]['UI Tests']
+        unit_tests_check =  summary[:workflows]['Unit Tests']
 
         query = <<~SQL
   MERGE INTO force_merges AS target
   USING (SELECT '#{week}' AS calendar_week) AS source
   ON target.calendar_week = source.calendar_week
   WHEN MATCHED THEN
-    UPDATE SET target.force_merges_count = #{failed_count}
+    UPDATE SET
+      target.force_merges_count = #{failed_count},
+      target.ui_tests_count = #{ui_tests_check},
+      target.unit_tests_count = #{unit_tests_check},
+      target.size_check_count = #{size_check},
+      target.sonarqube_count = #{sonarqube_check}
   WHEN NOT MATCHED THEN
-    INSERT (calendar_week, force_merges_count) VALUES ('#{week}', #{failed_count});
+    INSERT (calendar_week, force_merges_count, ui_tests_count, unit_tests_count, size_check_count, sonarqube_count)
+    VALUES ('#{week}', #{failed_count}, #{ui_tests_check}, #{unit_tests_check}, #{size_check}, #{sonarqube_check});
         SQL
 
         dataset.query(query)

data/lib/github_repo_statistics/review_report.rb

@@ -28,7 +28,7 @@ class ReviewReport
     pull_requests = client.list_issues(@repo, state: 'closed', since: DateTime.now - @duration_in_days)
 
     # Group pull requests by week
-    pull_requests_by_week = pull_requests.group_by { |pr| pr[:closed_at].strftime('%Y-%U') }
+    pull_requests_by_week = pull_requests.group_by { |pr| pr[:closed_at].strftime('%Y-%W') }
 
     weeks = @duration_in_days / 7
 

data/lib/github_repo_statistics/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class GithubRepoStatistics
-  VERSION = '2.2.6'
+  VERSION = '2.2.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_repo_statistics
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.8
 platform: ruby
 authors:
 - Serghei Moret
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: date