github_repo_statistics 2.3.4 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48ce01a230f9ced8662708cdcb0cce31cdf18d5e7a27947fd39be3f3c60f7591
-  data.tar.gz: 40d40be9acc6963f80e4d6aa5391ae4736b73c736a7c1cbbc1b1bb77e62775cb
+  metadata.gz: bcd986a058fd4af9648d2900297d60aaf9a8f53d76f2a58c6a50adbfb40411d0
+  data.tar.gz: 4e3c39e106d2e4bd0776f4806c0329a49e7279798c48fce3561d342cd47306c8
 SHA512:
-  metadata.gz: 4f8d61c8f46cdd13f1e7a5bfa8a1cd5b955d3abdc3ad334b237447de8c66a535dc2e10a03468ead22c5b20fd753d45df02a487b9bd06e3c0846c4ceb7eb7e087
-  data.tar.gz: c970f9082411d85305559bea74b098e51b5c99ba41a1fc0767ac0228ec006c1e1e04016c34afc478135c671ef11156181cdc86a1bbead9293f7f6b58fcce6f17
+  metadata.gz: 7fe19b7e6e44588af15ce682f7b2a0a0e3a219d5c4c4d7ba041e33ff57869adc1093f6219681329e16279680cd37913d3bb1815b00eebb97b16309c960cdc975
+  data.tar.gz: 5636c1a35d16b9cddcd0084bd41423833a3b607d9ebcad0338caa02e62e7a23e17a301e0a1b62ef3283612b75affcd4f113efec6bba8de333be0b0879547d575

data/Gemfile.lock

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

data/bin/github_repo_statistics

@@ -78,6 +78,16 @@ OptionParser.new do |opts|
     options[:code_extension] = code_extension
   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
+  end
+
+  opts.on('--codeowner-to-focus STRING',
+          'The codeowner identifier to focus for the metric collection [default: ""]') do |codeowner_to_focus|
+    options[:codeowner_to_focus] = codeowner_to_focus
+  end
+
   opts.on('--output-to-files',
           'Puts the output for hotspot and codeowners into files instead of the STDOUT (useful for CI and big amount of data) [default:false]') do
     options[:file_output] = true
@@ -112,6 +122,8 @@ FILE_OUTPUT = options[:file_output] || false
 CODE_EXTENSIONS = options[:code_extension] ? options[:code_extension].split(',') : ['.swift', '.kt']
 EXCLUDED_FILES = options[:excluded_files]
 EXCLUDED_PRS = options[:excluded_prs]
+TEAM_TO_FOCUS = options[:team_to_focus]
+CODEOWNER_TO_FOCUS = options[:codeowner_to_focus]
 
 unless CI
   puts "\nDirectory: #{REPO_PATH}\n"

data/lib/github_repo_statistics/github_repo_statistics.rb

@@ -150,10 +150,24 @@ class GithubRepoStatistics
     File.foreach(file).reject { |line| line.match(%r{^\s*(//|/\*.*\*/|\s*$)}) }.count
   end
 
-  def filter_existing_code_files(files)
+  def filter_existing_code_files(files, start_date, end_date)
     files.select do |f|
       next unless File.exist?(f)
 
+      git_log = git_commit_info(file: f, start_date:, end_date:).split("\n")
+
+      teams = git_log.map do |team|
+        team.match(/#{TEAM_REGEX}/)[0].upcase
+      end.reject { |e| EXCLUSIONS&.include?(e) }
+
+      if TEAM_TO_FOCUS && CODEOWNER_TO_FOCUS
+        next if !teams.include?(TEAM_TO_FOCUS) && !find_owner(file: f).include?(CODEOWNER_TO_FOCUS)
+      elsif TEAM_TO_FOCUS
+        next unless teams.include?(TEAM_TO_FOCUS)
+      elsif CODEOWNER_TO_FOCUS
+        next unless find_owner(file: f).include?(CODEOWNER_TO_FOCUS)
+      end
+
       if EXCLUDED_FILES
         excluded_patterns = EXCLUDED_FILES.split(',')
         next if excluded_patterns.any? { |pattern| f.include?(pattern) }
@@ -198,7 +212,8 @@ class GithubRepoStatistics
       git_log = git_commit_info(file:, start_date:, end_date:).split("\n")
 
       if EXCLUDED_PRS
-        git_log = git_log.reject { |c| c.include?(EXCLUDED_PRS) }
+        excluded_prs = EXCLUDED_PRS.split(',')
+        git_log = git_log.reject { |c| excluded_prs.any? { |pr| c.include?(pr) } }
       end
 
       prs = git_log.map do |pr|
@@ -244,10 +259,11 @@ class GithubRepoStatistics
     start_date = @begin_time.to_time.to_i - duration_in_days * 86_400
     end_date = @begin_time.to_time.to_i
     git_ls = git_files(directory_path: @directory_path)
-    file_count = filter_existing_code_files(git_ls.split).count
+    file_count = filter_existing_code_files(git_ls.split, start_date, end_date).count
     all_files_with_changes = files_with_changes(directory_path: @directory_path, start_date:, end_date:).split.sort
-    code_files_with_changes = filter_existing_code_files(all_files_with_changes)
+    code_files_with_changes = filter_existing_code_files(all_files_with_changes, start_date, end_date)
     uniq_code_files_with_changes = code_files_with_changes.uniq
+
     all_teams, cross_teams_count, single_ownership_teams_count, files_changed_by_many_teams, total_changes, file_team_map = analyze_changed_files(
       uniq_code_files_with_changes:, start_date:, end_date:
     )

data/lib/github_repo_statistics/release_merge_report.rb

@@ -20,7 +20,7 @@ class ReleaseMergeReport
       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']
 

data/lib/github_repo_statistics/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_repo_statistics
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.6
 platform: ruby
 authors:
 - Serghei Moret
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-22 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: date