github_repo_statistics 2.2.27 → 2.2.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c499c4ae5fb475882539b924d59d507f5db8b45abb37e10cad753a4a15d51df2
-  data.tar.gz: 4fc45e6a83d203c7feab2c73dd50ff6e9de6eda62c2d4a18838ba504c48aef62
+  metadata.gz: 8841de37fee015b614072106fd7a7753f081744a54b86de099188127ecf509ab
+  data.tar.gz: 4193b4ba131d09344cc59918e3972883084ddd5ee3cb04caa01cdc35de966449
 SHA512:
-  metadata.gz: 5802184f8863d6cb31ff0cb625c84b9dfcd6fb4a73095eafeba769956f27c52b4148b8de9ae502dc16c495aaa2b0f7fbc630ebd0a1ae662a7fb85ba07964d419
-  data.tar.gz: 05a70ab1951a64b60a6e8b2a8f7f14a0021eef258441a77afec90b50ba07d08b32c5f2014526a59f3d36d81d7ca74b5f2f5156494834d5be53517789eaa0f6bf
+  metadata.gz: 43143569d88a3d8b666531ef76311c73d3801da1a830ed6c125398ef02c73ddfd54e6d8b90dfedc324eb21d77c6ceed646f20fda59f283be2c6c4e00f087cbc4
+  data.tar.gz: e57bff89312909805541d04d6c83ce657d06006f16bc7e199cdf51c2dec90183ee1eed5bffe7939d77c4bae24d4a26e797209256b8f594e69dc1660b27c4f966

data/lib/github_repo_statistics/github_repo_statistics.rb

@@ -192,6 +192,13 @@ 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")
+      prs = git_log.map do |pr|
+        match = pr.match(/#(\d+)/)
+        if match
+          match[0]
+        end
+      end.uniq
+
       teams = git_log.map do |team|
         team.match(/#{TEAM_REGEX}/)[0].upcase
       end.reject { |e| EXCLUSIONS&.include?(e) }
@@ -202,7 +209,7 @@ class GithubRepoStatistics
 
       if teams.count > 1
         files_changed_by_many_teams += 1
-        file_team_map.merge!(file.to_s => [teams, commit_count])
+        file_team_map.merge!(file.to_s => [teams, prs, commit_count])
         cross_teams_count += teams.count
       else
         single_ownership_teams_count += 1
@@ -225,8 +232,8 @@ class GithubRepoStatistics
 
   def contribution_message
     duration_in_days = @duration_in_days.to_i
-    start_date = @begin_time.to_time.to_i - duration_in_days * 86_400 - 30 * 86_400
-    end_date = @begin_time.to_time.to_i - 30 * 86_400
+    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
     all_files_with_changes = files_with_changes(directory_path: @directory_path, start_date:, end_date:).split.sort
@@ -238,7 +245,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[1] }.sum
+    churn_count = file_team_map.values.map { |value| value.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:)
@@ -322,15 +329,16 @@ class GithubRepoStatistics
         lines_of_code = count_lines_of_code(file)
         commits = line.last.last
         owner = find_owner(file:)
+        prs = line.last[1]
 
-        hotspot_output << [file.gsub(@directory_path, ''), contributors, lines_of_code, commits, owner]
+        hotspot_output << [file.gsub(@directory_path, ''), contributors, lines_of_code, commits, owner, prs]
       end
 
       hotspot_output.sort_by! { |row| -row[2] }
 
       if FILE_OUTPUT
         CSV.open('hotspot.csv', 'w') do |csv|
-          csv << ['File', 'Contributors', 'Lines', 'Commits', 'Owner']
+          csv << ['File', 'Contributors', 'Lines', 'Commits', 'Owner', 'PRs']
           hotspot_output.each do |row|
             csv << row
           end
@@ -338,7 +346,7 @@ class GithubRepoStatistics
       else
         puts "\n   *Hotspot files(#{filtered_top_touched_files.count}):*\n"
         hotspot_output.each do |row|
-          puts "     #{row[0]} Contributors: #{row[1]} Lines: #{row[2]} Commits: #{row[3]} Owner: #{row[4]}"
+          puts "     #{row[0]} Contributors: #{row[1]} Lines: #{row[2]} Commits: #{row[3]} Owner: #{row[4]} PRs: #{row[5]}"
         end
       end
     end

data/lib/github_repo_statistics/version.rb

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

metadata

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