github_repo_statistics 2.3.8 → 2.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45f9b41fdeece55840918ee51ada62d6c23509620e50c19e5a495df7bea0d0a8
-  data.tar.gz: 1a128c270392e20ed6b0d48db13cac15f3d1dfd41ab5b5f8b0f97d46c263df9b
+  metadata.gz: 7c221dd45188c7427ef07040ed9d69a208ef7f3100f2e8a8b4e4c686ca608603
+  data.tar.gz: e179325e508dfd11feffcced476f17b989e323fda894d6d83054e8edb3915b1b
 SHA512:
-  metadata.gz: 00c4d3572b32f831af53cec591c415828f1326875794da0df1b1009880ffd90cd1c99c01e8a6cc56b8d40ccd113fae09ecbb65d826ab273e635d1e036d782d29
-  data.tar.gz: ceadd24b9ccc16eedaf41a99e9dc1ef7f7843994b162c0c4a89ba829528197f85715bc29305a0f6a3bbde6436f5aed7ef2ce7a716ff74168f2f72ef79e15554a
+  metadata.gz: 5a00ebdd94689c5e8fafc490165cbd1f71b19f07ea2e1577f571fd8af838e14eb3f2bb4ca6c61c6bc306644abc7f26f0fef421383ec31cc6e5f538bcb689cc72
+  data.tar.gz: 1070bf3071ed94ac590e7cfa40866b0cead2a2d3c5a5950fe476b9c6d081344d443c11f23d6ac0d80befd5ea200a7fe2d5cf65203f4366c41c72068397deacb3

data/Gemfile.lock

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

data/bin/github_repo_statistics

@@ -155,15 +155,19 @@ end
 
 if options[:hotspot_check]
   feature_branch = `git rev-parse --abbrev-ref HEAD`.chomp
+  puts "Feature branch: #{feature_branch}"
   changed_files = `git diff --name-only master...#{feature_branch} | grep #{REPO_PATH} | grep '\.swift'`.split
+  puts "Changed files: #{changed_files}"
   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)
+  puts "branch_hotspot_files = #{branch_hotspot_files}"
   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)
+                                                  begin_time: DateTime.now, steps: options[:steps].to_i, debug: options[:debug]).hotspot_check(files: branch_hotspot_files, branch: DEFAULT_BRANCH)
+  puts "master_hotspot_files = #{master_hotspot_files}"
+  system('git pull', %i[out err] => File::NULL)
 
-  raise 'New hotspot was introduced, contact foundation to unblock the PR' if branch_hotspot_files > master_hotspot_files
+  raise 'New hotspot was introduced, contact foundation to unblock the PR' if branch_hotspot_files.count > master_hotspot_files.count
 else
   system("git checkout #{DEFAULT_BRANCH}", [:out] => File::NULL)
   system('git pull', %i[out err] => File::NULL)

data/lib/github_repo_statistics/github_repo_statistics.rb

@@ -211,7 +211,7 @@ class GithubRepoStatistics
       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
+      if EXCLUDED_PRS && branch != DEFAULT_BRANCH
         excluded_prs = EXCLUDED_PRS.split(',')
         git_log = git_log.reject { |c| excluded_prs.any? { |pr| c.include?(pr) } }
       end
@@ -417,10 +417,10 @@ class GithubRepoStatistics
     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(
+    resulting_files = analyze_changed_files(
       uniq_code_files_with_changes: files, start_date:, end_date:, branch:
-    )
+    ).last
 
-    files_changed_by_many_teams
+    resulting_files.filter { |f| resulting_files[f].first.count > 1 }.keys
   end
 end

data/lib/github_repo_statistics/version.rb

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

metadata

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