github_repo_statistics 2.3.6 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcd986a058fd4af9648d2900297d60aaf9a8f53d76f2a58c6a50adbfb40411d0
-  data.tar.gz: 4e3c39e106d2e4bd0776f4806c0329a49e7279798c48fce3561d342cd47306c8
+  metadata.gz: 45f9b41fdeece55840918ee51ada62d6c23509620e50c19e5a495df7bea0d0a8
+  data.tar.gz: 1a128c270392e20ed6b0d48db13cac15f3d1dfd41ab5b5f8b0f97d46c263df9b
 SHA512:
-  metadata.gz: 7fe19b7e6e44588af15ce682f7b2a0a0e3a219d5c4c4d7ba041e33ff57869adc1093f6219681329e16279680cd37913d3bb1815b00eebb97b16309c960cdc975
-  data.tar.gz: 5636c1a35d16b9cddcd0084bd41423833a3b607d9ebcad0338caa02e62e7a23e17a301e0a1b62ef3283612b75affcd4f113efec6bba8de333be0b0879547d575
+  metadata.gz: 00c4d3572b32f831af53cec591c415828f1326875794da0df1b1009880ffd90cd1c99c01e8a6cc56b8d40ccd113fae09ecbb65d826ab273e635d1e036d782d29
+  data.tar.gz: ceadd24b9ccc16eedaf41a99e9dc1ef7f7843994b162c0c4a89ba829528197f85715bc29305a0f6a3bbde6436f5aed7ef2ce7a716ff74168f2f72ef79e15554a

data/Gemfile.lock

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

data/bin/github_repo_statistics

@@ -78,6 +78,11 @@ OptionParser.new do |opts|
     options[:code_extension] = code_extension
   end
 
+  opts.on('--percentile STRING',
+          'The percentile of file changes that are considered to be hotspot [default: "100"]') do |percentile|
+    options[:percentile] = percentile
+  end
+
   opts.on('--team-to-focus STRING',
           'The team identifier to focus for the metric collection [default: ""]') do |team_to_focus|
     options[:team_to_focus] = team_to_focus
@@ -93,6 +98,11 @@ OptionParser.new do |opts|
     options[:file_output] = true
   end
 
+  opts.on('--hotspot-check',
+          'Enables a hotspot check [default:false]') do
+    options[:hotspot_check] = true
+  end
+
   opts.on('-v', '--version', 'Display the version of the gem') do
     puts "github_repo_statistics version #{GithubRepoStatistics::VERSION}"
     exit
@@ -124,6 +134,7 @@ EXCLUDED_FILES = options[:excluded_files]
 EXCLUDED_PRS = options[:excluded_prs]
 TEAM_TO_FOCUS = options[:team_to_focus]
 CODEOWNER_TO_FOCUS = options[:codeowner_to_focus]
+PERCENTILE = options[:percentile] || '100'
 
 unless CI
   puts "\nDirectory: #{REPO_PATH}\n"
@@ -142,8 +153,20 @@ unless CI
   puts "Debug mode is: #{options[:debug] ? 'on' : 'off'}\n\n"
 end
 
-system("git checkout #{DEFAULT_BRANCH}", [:out] => File::NULL)
-system('git pull', %i[out err] => File::NULL)
-
-GithubRepoStatistics.new(duration_in_days: options[:duration_in_days] || 30, directory_path: REPO_PATH,
-                         begin_time: DateTime.now, steps: options[:steps].to_i, debug: options[:debug]).contribution_message
+if options[:hotspot_check]
+  feature_branch = `git rev-parse --abbrev-ref HEAD`.chomp
+  changed_files = `git diff --name-only master...#{feature_branch} | grep #{REPO_PATH} | grep '\.swift'`.split
+  branch_hotspot_files = GithubRepoStatistics.new(duration_in_days: options[:duration_in_days] || 30, directory_path: REPO_PATH,
+                                                  begin_time: DateTime.now, steps: options[:steps].to_i, debug: options[:debug]).hotspot_check(files: changed_files, branch: feature_branch)
+  system("git checkout #{DEFAULT_BRANCH}", [:out] => File::NULL)
+  system('git pull', %i[out err] => File::NULL)
+  master_hotspot_files = GithubRepoStatistics.new(duration_in_days: options[:duration_in_days] || 30, directory_path: REPO_PATH,
+                                                  begin_time: DateTime.now, steps: options[:steps].to_i, debug: options[:debug]).hotspot_check(files: changed_files, branch: DEFAULT_BRANCH)
+
+  raise 'New hotspot was introduced, contact foundation to unblock the PR' if branch_hotspot_files > master_hotspot_files
+else
+  system("git checkout #{DEFAULT_BRANCH}", [:out] => File::NULL)
+  system('git pull', %i[out err] => File::NULL)
+  GithubRepoStatistics.new(duration_in_days: options[:duration_in_days] || 30, directory_path: REPO_PATH,
+                           begin_time: DateTime.now, steps: options[:steps].to_i, debug: options[:debug]).contribution_message
+end

data/bin/release_merge_report

@@ -7,7 +7,6 @@ require 'pry'
 require_relative '../lib/github_repo_statistics/version'
 require_relative '../lib/github_repo_statistics/release_merge_report'
 
-
 options = {}
 OptionParser.new do |opts|
   opts.banner = 'Usage: github_repo_statistics [options]'
@@ -54,4 +53,4 @@ raise 'Please provide GitHub token using --github-token flag' if options[:github
 raise 'Please provide GitHub repo name using --github-repo flag' if options[:github_repo].nil?
 raise 'Please provide default GitHub branch using --default-branch flag' if DEFAULT_BRANCH.nil?
 
-ReleaseMergeReport.new(token: options[:github_token], repo: options[:github_repo], branch_prefix: "release/").report
+ReleaseMergeReport.new(token: options[:github_token], repo: options[:github_repo], branch_prefix: 'release/').report

data/github_repo_statistics.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'date'
-  spec.add_dependency 'octokit'
-  spec.add_dependency 'pry'
   spec.add_dependency 'faraday-retry'
   spec.add_dependency 'google-cloud-bigquery'
+  spec.add_dependency 'octokit'
+  spec.add_dependency 'pry'
 end

data/lib/github_repo_statistics/force_merge_report.rb

@@ -22,9 +22,7 @@ class ForceMergeReport
     # Sort PRs into monthly chunks
     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
+    weekly_pull_requests[Time.now.strftime('%Y-%W')] = [] if weekly_pull_requests[Time.now.strftime('%Y-%W')].nil?
 
     # Initialize a hash to store monthly summaries
     weekly_summaries = Hash.new { |hash, key| hash[key] = { total: 0, failed: 0, workflows: Hash.new(0) } }
@@ -70,15 +68,15 @@ class ForceMergeReport
         # Print details of merged pull requests without meeting the required criteria for the last 6 months
         next if failed_checks.empty?
 
-        unless @ci
-          puts "PR ##{pr.number} - Merged at: #{pr.merged_at}"
-          puts 'Failed Checks:'
-          failed_checks.each do |check|
-            puts "- Workflow: #{check.name || check.context}, Conclusion: #{check.conclusion || check.state}"
-          end
-          puts '---'
-          puts
+        next if @ci
+
+        puts "PR ##{pr.number} - Merged at: #{pr.merged_at}"
+        puts 'Failed Checks:'
+        failed_checks.each do |check|
+          puts "- Workflow: #{check.name || check.context}, Conclusion: #{check.conclusion || check.state}"
         end
+        puts '---'
+        puts
       end
     end
 
@@ -93,43 +91,43 @@ class ForceMergeReport
 
       # ENV['BQ_CREDENTIALS'] = `cat /Users/serghei.moret/.config/gcloud/application_default_credentials.json`
 
-      if ENV['BQ_CREDENTIALS']
-        require "google/cloud/bigquery"
-        require "json"
-        creds = JSON.parse(ENV['BQ_CREDENTIALS'])
-        bigquery = Google::Cloud::Bigquery.new(
-          project_id: "hellofresh-android",
-          credentials: creds
-          )
-        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']
-        total_prs = summary[:total]
-
-        query = <<~SQL
-  MERGE INTO force_merges AS target
-  USING (SELECT '#{week}' AS calendar_week, '#{@repo}' AS platform) AS source
-  ON target.calendar_week = source.calendar_week AND target.platform = source.platform
-  WHEN MATCHED THEN
-    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},
-      target.total_prs = #{total_prs},
-      target.platform = '#{@repo}'
-  WHEN NOT MATCHED THEN
-    INSERT (calendar_week, force_merges_count, ui_tests_count, unit_tests_count, size_check_count, sonarqube_count, total_prs, platform)
-    VALUES ('#{week}', #{failed_count}, #{ui_tests_check}, #{unit_tests_check}, #{size_check}, #{sonarqube_check}, #{total_prs}, '#{@repo}');
-        SQL
-
-        dataset.query(query)
-      end
+      next unless ENV['BQ_CREDENTIALS']
+
+      require 'google/cloud/bigquery'
+      require 'json'
+      creds = JSON.parse(ENV['BQ_CREDENTIALS'])
+      bigquery = Google::Cloud::Bigquery.new(
+        project_id: 'hellofresh-android',
+        credentials: creds
+      )
+      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']
+      total_prs = summary[:total]
+
+      query = <<~SQL
+        MERGE INTO force_merges AS target
+        USING (SELECT '#{week}' AS calendar_week, '#{@repo}' AS platform) AS source
+        ON target.calendar_week = source.calendar_week AND target.platform = source.platform
+        WHEN MATCHED THEN
+          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},
+            target.total_prs = #{total_prs},
+            target.platform = '#{@repo}'
+        WHEN NOT MATCHED THEN
+          INSERT (calendar_week, force_merges_count, ui_tests_count, unit_tests_count, size_check_count, sonarqube_count, total_prs, platform)
+          VALUES ('#{week}', #{failed_count}, #{ui_tests_check}, #{unit_tests_check}, #{size_check}, #{sonarqube_check}, #{total_prs}, '#{@repo}');
+      SQL
+
+      dataset.query(query)
     end
   end
 end

data/lib/github_repo_statistics/github_repo_statistics.rb

@@ -183,23 +183,23 @@ class GithubRepoStatistics
     `git ls-tree -r --name-only $(git rev-list -1 HEAD) -- "#{directory_path}"`
   end
 
-  def files_with_changes(directory_path:, start_date:, end_date:)
-    `git log origin/master --name-only --pretty=format:"" --since="#{start_date}" --until="#{end_date}" "#{directory_path}"`
+  def files_with_changes(directory_path:, start_date:, end_date:, branch: DEFAULT_BRANCH)
+    `git log origin/#{branch} --name-only --pretty=format:"" --since="#{start_date}" --until="#{end_date}" "#{directory_path}"`
   end
 
-  def git_commit_count(file:, start_date:, end_date:)
-    `git log origin/master --since="#{start_date}" --until="#{end_date}" --follow -- "#{file}" | grep -c '^commit'`
+  def git_commit_count(file:, start_date:, end_date:, branch: DEFAULT_BRANCH)
+    `git log origin/#{branch} --since="#{start_date}" --until="#{end_date}" --follow -- "#{file}" | grep -c '^commit'`
   end
 
-  def git_commit_info(file:, start_date:, end_date:)
-    `git log origin/master --pretty=format:"%s" --since="#{start_date}" --until="#{end_date}" -- "#{file}"`
+  def git_commit_info(file:, start_date:, end_date:, branch: DEFAULT_BRANCH)
+    `git log origin/#{branch} --pretty=format:"%s" --since="#{start_date}" --until="#{end_date}" -- "#{file}"`
   end
 
   def new_changes?(file:)
-    git_commit_info(file:, start_date: DateTime.now - 7, end_date: DateTime.now) == "" ? false : true
+    git_commit_info(file:, start_date: DateTime.now - 7, end_date: DateTime.now) != ''
   end
 
-  def analyze_changed_files(uniq_code_files_with_changes:, start_date:, end_date:)
+  def analyze_changed_files(uniq_code_files_with_changes:, start_date:, end_date:, branch: DEFAULT_BRANCH)
     all_teams = []
     cross_teams_count = 0
     single_ownership_teams_count = 0
@@ -208,8 +208,8 @@ class GithubRepoStatistics
     file_team_map = {}
     uniq_code_files_with_changes.each do |file|
       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")
+      commit_count = git_commit_count(file:, start_date:, end_date:, branch:).to_i
+      git_log = git_commit_info(file:, start_date:, end_date:, branch:).split("\n")
 
       if EXCLUDED_PRS
         excluded_prs = EXCLUDED_PRS.split(',')
@@ -218,18 +218,17 @@ class GithubRepoStatistics
 
       prs = git_log.map do |pr|
         match = pr.match(/#(\d+)/)
-        if match
-          match[0]
-        end
+        match[0] if match
       end.uniq
 
       teams = git_log.map do |team|
         team.match(/#{TEAM_REGEX}/)[0].upcase
       end.reject { |e| EXCLUSIONS&.include?(e) }
 
+      teams = calculate_percentile(teams, PERCENTILE.to_i)
+
       total_changes += commit_count
       all_teams << teams
-      teams = teams.uniq
 
       if teams.count > 1
         files_changed_by_many_teams += 1
@@ -245,6 +244,30 @@ class GithubRepoStatistics
      file_team_map]
   end
 
+  def calculate_percentile(arr, percentile)
+    # Count occurrences of each unique element
+    counts = arr.each_with_object(Hash.new(0)) { |item, hash| hash[item] += 1 }
+
+    # Sort elements by their counts in descending order
+    sorted_counts = counts.sort_by { |_k, v| -v }.to_h
+
+    # Calculate the cut-off for the percentile
+    total_count = arr.size
+    cutoff = total_count * (percentile / 100.0)
+
+    # Select elements that meet the percentile criteria
+    selected_elements = []
+    cumulative_count = 0
+
+    sorted_counts.each do |item, count|
+      cumulative_count += count
+      selected_elements << item
+      break if cumulative_count >= cutoff
+    end
+
+    selected_elements
+  end
+
   def filter_files(file_team_map:, size: BIG_FILE_SIZE)
     file_team_map.select do |file_path|
       next unless File.exist?(file_path)
@@ -270,7 +293,7 @@ class GithubRepoStatistics
     occurrences = all_teams.flatten.compact.tally
     sorted_occurrences = occurrences.sort_by { |element, count| [-count, element] }
     contributors = Hash[sorted_occurrences]
-    churn_count = file_team_map.values.map { |value| value.last }.sum
+    churn_count = file_team_map.values.map(&:last).sum
     hotspot_changes_percentage = ((churn_count.to_f / total_changes) * 100).round(2)
     # Filter files based on extension, existence and size
     filtered_files = filter_files(file_team_map:)
@@ -283,14 +306,14 @@ class GithubRepoStatistics
     # ENV['BQ_CREDENTIALS'] = `cat /Users/serghei.moret/.config/gcloud/application_default_credentials.json`
 
     if ENV['BQ_CREDENTIALS']
-      require "google/cloud/bigquery"
-      require "json"
+      require 'google/cloud/bigquery'
+      require 'json'
       creds = JSON.parse(ENV['BQ_CREDENTIALS'])
       bigquery = Google::Cloud::Bigquery.new(
-        project_id: "hellofresh-android",
+        project_id: 'hellofresh-android',
         credentials: creds
       )
-      dataset = bigquery.dataset "github_data"
+      dataset = bigquery.dataset 'github_data'
 
       files_with_multiple_contributor = file_team_map.count
       big_files_with_multiple_contributors = filtered_top_touched_files.count
@@ -303,24 +326,24 @@ class GithubRepoStatistics
                  end
 
       query = <<~SQL
-    INSERT INTO modularization (date, platform, single_contributor_percentage, files_changed_by_many_teams, file_count, cross_teams_count, single_ownership_teams_count, hotspot_changes_percentage, churn_count, total_changes, files_with_multiple_contributor, big_files_with_multiple_contributors, total_files_changed, hotspot_lines, big_files_count)
-    VALUES ('#{@begin_time}', '#{platform}', #{files_with_single_contributor_percentage}, #{files_changed_by_many_teams}, #{file_count}, #{cross_teams_count}, #{single_ownership_teams_count}, #{hotspot_changes_percentage}, #{churn_count}, #{total_changes}, #{files_with_multiple_contributor}, #{big_files_with_multiple_contributors}, #{total_files_changed}, #{hotspot_lines}, #{big_files_count});
+        INSERT INTO modularization (date, platform, single_contributor_percentage, files_changed_by_many_teams, file_count, cross_teams_count, single_ownership_teams_count, hotspot_changes_percentage, churn_count, total_changes, files_with_multiple_contributor, big_files_with_multiple_contributors, total_files_changed, hotspot_lines, big_files_count)
+        VALUES ('#{@begin_time}', '#{platform}', #{files_with_single_contributor_percentage}, #{files_changed_by_many_teams}, #{file_count}, #{cross_teams_count}, #{single_ownership_teams_count}, #{hotspot_changes_percentage}, #{churn_count}, #{total_changes}, #{files_with_multiple_contributor}, #{big_files_with_multiple_contributors}, #{total_files_changed}, #{hotspot_lines}, #{big_files_count});
       SQL
 
       dataset.query(query)
 
-#       delete_query = <<~SQL
-# DELETE FROM modularization
-# WHERE CONCAT(DATE(date), ' ', TIME(date)) NOT IN (
-#     SELECT CONCAT(DATE(date), ' ', TIME(date))
-#     FROM modularization AS m1
-#     WHERE TIME(date) = (
-#         SELECT MAX(TIME(date))
-#         FROM modularization AS m2
-#         WHERE DATE(m1.date) = DATE(m2.date)
-#     )
-# );
-#       SQL
+      #       delete_query = <<~SQL
+      # DELETE FROM modularization
+      # WHERE CONCAT(DATE(date), ' ', TIME(date)) NOT IN (
+      #     SELECT CONCAT(DATE(date), ' ', TIME(date))
+      #     FROM modularization AS m1
+      #     WHERE TIME(date) = (
+      #         SELECT MAX(TIME(date))
+      #         FROM modularization AS m2
+      #         WHERE DATE(m1.date) = DATE(m2.date)
+      #     )
+      # );
+      #       SQL
 
       # dataset.query(delete_query)
     end
@@ -348,7 +371,7 @@ class GithubRepoStatistics
     if HOTSPOT
       hotspot_output = []
 
-      filter_files(file_team_map: file_team_map, size: 0).each do |line|
+      filter_files(file_team_map:, size: 0).each do |line|
         file = line.first
         contributors = line.last.first
         lines_of_code = count_lines_of_code(file)
@@ -388,4 +411,16 @@ class GithubRepoStatistics
     @begin_time -= duration_in_days
     contribution_message
   end
+
+  def hotspot_check(files:, branch:)
+    duration_in_days = @duration_in_days.to_i
+    start_date = @begin_time.to_time.to_i - duration_in_days * 86_400
+    end_date = @begin_time.to_time.to_i
+
+    _, _, _, files_changed_by_many_teams, = analyze_changed_files(
+      uniq_code_files_with_changes: files, start_date:, end_date:, branch:
+    )
+
+    files_changed_by_many_teams
+  end
 end

data/lib/github_repo_statistics/release_merge_report.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'octokit'
 require 'json'
 require 'google/cloud/bigquery'
@@ -34,7 +36,7 @@ class ReleaseMergeReport
     client.auto_paginate = true
 
     tags = client.tags(@repo)
-    branch_info = Hash.new { |hash, key| hash[key] = { count: 0, teams: [], tribes: []} }
+    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)\./)
@@ -47,7 +49,7 @@ class ReleaseMergeReport
 
       # Count merged pull requests associated with the branch
       pull_requests = client.pull_requests(@repo, state: 'closed', sort: 'updated', direction: 'desc', base: branch_name)
-                            .select { |pr| pr.merged_at }
+                            .select(&:merged_at)
 
       pull_requests.each do |pr|
         branch_info[branch_name][:count] += 1
@@ -65,8 +67,8 @@ class ReleaseMergeReport
   end
 
   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: []} }
+    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_info.each do |branch, info|
       major_minor_version, patch_version = branch.match(/^#{@branch_prefix}(\d+\.\d+)(?:\.(\d+))?/)&.captures
@@ -77,8 +79,7 @@ class ReleaseMergeReport
         patch_counts[major_minor_version][:teams] += info[:teams]
         patch_counts[major_minor_version][:tribes] += info[:tribes]
 
-
-      elsif info[:count] > 0
+      elsif (info[:count]).positive?
         # Branch is a hotfix version
         hotfix_counts[major_minor_version][:count] += info[:count]
         hotfix_counts[major_minor_version][:teams] += info[:teams]
@@ -95,14 +96,14 @@ class ReleaseMergeReport
   end
 
   def export_to_bigquery(branch_counts)
-    require "google/cloud/bigquery"
-    require "json"
+    require 'google/cloud/bigquery'
+    require 'json'
     creds = JSON.parse(ENV['BQ_CREDENTIALS'])
     bigquery = Google::Cloud::Bigquery.new(
-      project_id: "hellofresh-android",
+      project_id: 'hellofresh-android',
       credentials: creds
     )
-    dataset = bigquery.dataset "github_data"
+    dataset = bigquery.dataset 'github_data'
 
     date = DateTime.now
 
@@ -113,18 +114,18 @@ class ReleaseMergeReport
 
       # 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[: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}]);
+        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
@@ -141,17 +142,17 @@ class ReleaseMergeReport
 
       # 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}]);
+        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

data/lib/github_repo_statistics/review_report.rb

@@ -90,30 +90,30 @@ class ReviewReport
         # ENV['BQ_CREDENTIALS'] = `cat /Users/serghei.moret/.config/gcloud/application_default_credentials.json`
 
         if ENV['BQ_CREDENTIALS']
-          require "google/cloud/bigquery"
-          require "json"
+          require 'google/cloud/bigquery'
+          require 'json'
           creds = JSON.parse(ENV['BQ_CREDENTIALS'])
           bigquery = Google::Cloud::Bigquery.new(
-            project_id: "hellofresh-android",
+            project_id: 'hellofresh-android',
             credentials: creds
           )
-          dataset = bigquery.dataset "github_data"
+          dataset = bigquery.dataset 'github_data'
 
           query = <<~SQL
-    MERGE INTO pr_reviews AS target
-    USING (SELECT '#{week}' AS calendar_week, '#{@repo}' AS platform) AS source
-    ON target.calendar_week = source.calendar_week AND target.platform = source.platform
-    WHEN MATCHED THEN
-      UPDATE SET
-        target.change_requested_reviews = #{change_requested_reviews},
-        target.reviews_with_comments = #{reviews_with_comments},
-        target.total_reviews = #{total_reviews},
-        target.average_review_time_hours = #{average_time_hours.round(2)},
-        target.total_prs = #{total_count},
-        target.platform = '#{@repo}'
-    WHEN NOT MATCHED THEN
-      INSERT (calendar_week, total_prs, average_review_time_hours, total_reviews, reviews_with_comments, change_requested_reviews, platform)
-      VALUES ('#{week}', #{total_count}, #{average_time_hours.round(2)}, #{total_reviews}, #{reviews_with_comments}, #{change_requested_reviews}, '#{@repo}');
+            MERGE INTO pr_reviews AS target
+            USING (SELECT '#{week}' AS calendar_week, '#{@repo}' AS platform) AS source
+            ON target.calendar_week = source.calendar_week AND target.platform = source.platform
+            WHEN MATCHED THEN
+              UPDATE SET
+                target.change_requested_reviews = #{change_requested_reviews},
+                target.reviews_with_comments = #{reviews_with_comments},
+                target.total_reviews = #{total_reviews},
+                target.average_review_time_hours = #{average_time_hours.round(2)},
+                target.total_prs = #{total_count},
+                target.platform = '#{@repo}'
+            WHEN NOT MATCHED THEN
+              INSERT (calendar_week, total_prs, average_review_time_hours, total_reviews, reviews_with_comments, change_requested_reviews, platform)
+              VALUES ('#{week}', #{total_count}, #{average_time_hours.round(2)}, #{total_reviews}, #{reviews_with_comments}, #{change_requested_reviews}, '#{@repo}');
           SQL
 
           dataset.query(query)

data/lib/github_repo_statistics/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_repo_statistics
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.8
 platform: ruby
 authors:
 - Serghei Moret
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-28 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: date
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: octokit
+  name: faraday-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: google-cloud-bigquery
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday-retry
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: google-cloud-bigquery
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="