github_repo_statistics 2.3.9 → 2.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecaa439bb6f1d7aa92d048d1240177ed96d0eadba836cd87ddd896c634919b3c
-  data.tar.gz: 14d7afae69b4d42f204f8ce03a39a0713fc735ca6a5aac4e327df231493b58c5
+  metadata.gz: 457f849fab6ab424a4079de9c938b8af018be4fa5f8cb36d7db8a5b778b65781
+  data.tar.gz: 3980125eac8f50a329e55a168d1fab47010ce0f4359afb7900b2cae7d92fb577
 SHA512:
-  metadata.gz: dda0b818b28d5ed849e02c81bcd185518fb73732cc9994479eb8a817ff1ab0ed77ec31df5dfd5f9c05844855d7a34ea7e042374887c0c39a1378d82357ef969e
-  data.tar.gz: e46f3f75c0393a3cad4443a992cd03d91f0ebbf905d01d3e2ccc41c3d2164e427e68bde73191525004371a23f5cff8d68a8dd7584e687d382d9936c24fc1df67
+  metadata.gz: 538eb468eeb7248876094bbfb1335cf6b0aeeca89a1119e4e1e8339d8171e70f3605510e91c866a27a90beaa3cd11c2e3979613f7eb9bb40f13408faa39c62a9
+  data.tar.gz: a9a1cb832f47d651049e6bb84dabd0758a283be329a4d0e713c4833104014edab051e62322d6858ee0f32f3bbb12253756bd9edb0bace209fe1b4ab43b219cc9

data/Gemfile.lock

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

data/bin/github_repo_statistics

@@ -158,14 +158,20 @@ if options[:hotspot_check]
   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}"
+  return if changed_files.empty?
+
   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}"
+  return if branch_hotspot_files.empty?
+
   system("git checkout #{DEFAULT_BRANCH}", [:out] => 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}"
-  raise 'New hotspot was introduced, contact foundation to unblock the PR' if branch_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.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.9'
+  VERSION = '2.3.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_repo_statistics
 version: !ruby/object:Gem::Version
-  version: 2.3.9
+  version: 2.3.11
 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