github_repo_statistics 2.2.19 → 2.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd943ea94b333a76e1f0996523684e8fb8120fb9a8843cc616507b0947abba5c
-  data.tar.gz: 82269628bf2e56aa72145843bd34f0cf70d9bc0084107f8504706a7af087d439
+  metadata.gz: 41a049be21c83dce57e60dc938dff6824d47a007a98a28292667ce56118450bc
+  data.tar.gz: a78b853dd82721c83dd10fe17db33f199f084143264c8f0fe991a252b645d7f3
 SHA512:
-  metadata.gz: 366fb57664251fe8aa708e6e2c1af6cebbab3299d0757a8e6a8bfd242d1e7421343dd3410efe124a88cc95a6060071c6430ca111382632d671c9fa6a4095f0cd
-  data.tar.gz: e1aec28c13d79b17da825803ea0d11875939d129fc475a004ab4b0e37edc1761bbbcc2f33006cc3b4685a9f82af95db6ae9186ea39505353d7fd6c22ef8afc7f
+  metadata.gz: 7296fd692ec8d1fca369a8b4eef1ef7839b1c5ba6ec1f924d7eca834df8ab01eb590223314669006c9bf00b55e99c35f2d7089bd70900108ab1a0f2c91de22b9
+  data.tar.gz: 5066e055e2ba835d681df98e3cf7e988c48c96480541c418e28ff97f6b7bea7a7194e873f6e8dd69da36e20244b8f5b54abdb724f909774edd8f574bf9feb704

data/Gemfile.lock

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

data/lib/github_repo_statistics/github_repo_statistics.rb

@@ -178,6 +178,7 @@ class GithubRepoStatistics
   end
 
   def git_commit_info(file:, start_date:, end_date:)
+    puts "File: #{file}, Start: #{start_date}, End: #{end_date}, Now: #{Time.now}" if @debug
     `git log --pretty=format:"%s" --since="#{start_date}" --until="#{end_date}" --follow -- "#{file}"`
   end
 
@@ -192,6 +193,7 @@ class GithubRepoStatistics
       filename = File.basename(file)
       commit_count = git_commit_count(file:, start_date:, end_date:).to_i
       git_log = git_commit_info(file:, start_date:, end_date:).split("\n")
+      puts git_log if @debug
       teams = git_log.map do |team|
         team.match(/#{TEAM_REGEX}/)[0].upcase
       end.reject { |e| EXCLUSIONS&.include?(e) }
@@ -349,9 +351,9 @@ class GithubRepoStatistics
 
     return unless @steps.positive?
 
-    system("git checkout `git rev-list -1 --before='#{(@begin_time - duration_in_days).strftime('%B %d %Y')}' HEAD`",
+    system("git checkout `git rev-list -1 --before='#{(@begin_time - 115).strftime('%B %d %Y')}' HEAD`",
            %i[out err] => File::NULL)
-    @begin_time -= duration_in_days
+    @begin_time -= 115
     contribution_message
   end
 end

data/lib/github_repo_statistics/release_merge_report.rb

@@ -12,16 +12,15 @@ class ReleaseMergeReport
   def report
     branch_counts = count_merged_pull_requests_per_branch
     grouped_branch_counts = group_branch_counts(branch_counts)
-    require 'pry'
-    binding.pry
-
+    # require 'pry'
+    # binding.pry
     # Print the grouped branch counts
     puts 'Branches with Merged Pull Requests:'
     grouped_branch_counts.each do |branch, count|
       puts "#{branch}: #{count}"
     end
 
-    ENV['BQ_CREDENTIALS'] = `cat /Users/serghei.moret/.config/gcloud/application_default_credentials.json`
+    # ENV['BQ_CREDENTIALS'] = `cat /Users/serghei.moret/.config/gcloud/application_default_credentials.json`
 
     export_to_bigquery(grouped_branch_counts) if ENV['BQ_CREDENTIALS']
 
@@ -35,7 +34,7 @@ class ReleaseMergeReport
     client.auto_paginate = true
 
     tags = client.tags(@repo)
-    branch_counts = Hash.new(0)
+    branch_info = Hash.new { |hash, key| hash[key] = { count: 0, teams: [], tribes: []} }
 
     tags.each do |tag|
       next if !tag.name.match?(/^(v23|v24)\./) && !tag.name.match?(/^(23|24)\./)
@@ -50,31 +49,46 @@ class ReleaseMergeReport
       pull_requests = client.pull_requests(@repo, state: 'closed', sort: 'updated', direction: 'desc', base: branch_name)
                             .select { |pr| pr.merged_at }
 
-      branch_counts[branch_name] = pull_requests.size
+      pull_requests.each do |pr|
+        branch_info[branch_name][:count] += 1
+
+        # Extract team identifiers from the pull request labels
+        teams = pr.labels.map { |label| label.name.match(/^squad:\s*(.*)$/i)&.captures }.compact.flatten
+        tribes = pr.labels.map { |label| label.name.match(/^tribe:\s*(.*)$/i)&.captures }.compact.flatten
+        branch_info[branch_name][:teams].push(teams)
+        branch_info[branch_name][:tribes].push(tribes)
+      end
+      branch_info[branch_name][:count] = 0 if branch_info[branch_name].nil?
     end
 
-    branch_counts
+    branch_info
   end
 
-  def group_branch_counts(branch_counts)
-    patch_counts = Hash.new(0)
-    hotfix_counts = Hash.new { |hash, key| hash[key] = Hash.new(0) }
+  def group_branch_counts(branch_info)
+    patch_counts = Hash.new { |hash, key| hash[key] = { count: 0, teams: [], tribes: []} }
+    hotfix_counts = Hash.new { |hash, key| hash[key] = { count: 0, teams: [], tribes: []} }
 
-    branch_counts.each do |branch, count|
+    branch_info.each do |branch, info|
       major_minor_version, patch_version = branch.match(/^#{@branch_prefix}(\d+\.\d+)(?:\.(\d+))?/)&.captures
 
       if patch_version.nil?
         # Branch is a patch version
-        patch_counts[major_minor_version] += count
-      elsif count > 0
+        patch_counts[major_minor_version][:count] += info[:count]
+        patch_counts[major_minor_version][:teams] += info[:teams]
+        patch_counts[major_minor_version][:tribes] += info[:tribes]
+
+
+      elsif info[:count] > 0
         # Branch is a hotfix version
-        hotfix_counts[major_minor_version][patch_version] += count
+        hotfix_counts[major_minor_version][:count] += info[:count]
+        hotfix_counts[major_minor_version][:teams] += info[:teams]
+        hotfix_counts[major_minor_version][:tribes] += info[:tribes]
       end
     end
 
     # Sum up the counts for hotfix versions within the same major and minor version
-    hotfix_counts.each do |major_minor_version, hotfixes|
-      hotfix_counts[major_minor_version] = hotfixes.values.sum
+    hotfix_counts.each do |major_minor_version, hotfix_info|
+      hotfix_counts[major_minor_version][:count] = hotfix_info[:count]
     end
 
     { patch_versions: patch_counts, hotfix_versions: hotfix_counts }
@@ -92,20 +106,55 @@ class ReleaseMergeReport
 
     date = DateTime.now
 
-    branch_counts.each do |branch, count|
+    branch_counts[:patch_versions].each do |branch, count|
+      # Construct JSON string for teams
+      teams_json = count[:teams].map { |team| "'#{team}'" }.join(',')
+      tribes_json = count[:tribes].map { |tribes| "'#{tribes}'" }.join(',')
+
+      # Construct the SQL query
       query = <<~SQL
-        MERGE INTO release_merges AS target
-        USING (SELECT '#{branch}' AS release, '#{@repo}' AS platform) AS source
-        ON target.release = source.release AND target.platform = source.platform
-        WHEN MATCHED THEN
-          UPDATE SET
-            target.merge_count = #{count},
-            target.timestamp = '#{date}'
-        WHEN NOT MATCHED THEN
-          INSERT (release, merge_count, platform, timestamp)
-          VALUES ('#{branch}', #{count}, '#{@repo}', '#{date}');
+    MERGE INTO release_merges AS target
+    USING (SELECT '#{branch}' AS release, '#{@repo}' AS platform) AS source
+    ON target.release = source.release AND target.platform = source.platform
+    WHEN MATCHED THEN
+      UPDATE SET
+        target.merge_count = #{count[:count]},
+        target.timestamp = '#{date}',
+        target.contributors = ARRAY[#{teams_json}],
+        target.contributors_tribe = ARRAY[#{tribes_json}]
+    WHEN NOT MATCHED THEN
+      INSERT (release, merge_count, platform, timestamp, contributors, contributors_tribe)
+      VALUES ('#{branch}', #{count[:count]}, '#{@repo}', '#{date}', ARRAY[#{teams_json}], ARRAY[#{tribes_json}]);
       SQL
+
+      # Execute the query
+      dataset.query(query)
+
+      # Update the date
       date -= 7
+    end
+
+    branch_counts[:hotfix_versions].each do |branch, count|
+      # Construct JSON string for teams
+      teams_json = count[:teams].map { |team| "'#{team}'" }.join(',')
+      tribes_json = count[:tribes].map { |tribes| "'#{tribes}'" }.join(',')
+
+      # Construct the SQL query
+      query = <<~SQL
+    MERGE INTO release_merges AS target
+    USING (SELECT '#{branch}' AS release, '#{@repo}' AS platform) AS source
+    ON target.release = source.release AND target.platform = source.platform
+    WHEN MATCHED THEN
+      UPDATE SET
+        target.hotfix_count = #{count[:count]},
+        target.contributors_hotfixes = ARRAY[#{teams_json}],
+        target.contributors_hotfixes_tribe = ARRAY[#{tribes_json}]
+    WHEN NOT MATCHED THEN
+      INSERT (release, hotfix_count, platform, contributors_hotfixes, contributors_hotfixes_tribe )
+      VALUES ('#{branch}', #{count[:count]}, '#{@repo}', ARRAY[#{teams_json}], ARRAY[#{tribes_json}]);
+      SQL
+
+      # Execute the query
       dataset.query(query)
     end
   end

data/lib/github_repo_statistics/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_repo_statistics
 version: !ruby/object:Gem::Version
-  version: 2.2.19
+  version: 2.2.20
 platform: ruby
 authors:
 - Serghei Moret
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-08 00:00:00.000000000 Z
+date: 2024-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: date