github_repo_statistics 2.2.28 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5ac1d146486a2054b687baa929f806e6ba28538ed754d519863225a333e25bb
-  data.tar.gz: 341a0815ee930eacc8a8907491fe0b97d85926e2253d911c2ea934c1f8aaad21
+  metadata.gz: 2992ae14c4b2bab0ffc8cdee2c5c2e33a0b7dcc08f2fdb62b194975e944dd625
+  data.tar.gz: 43837ce970edb37d1f52fc88a97a4799d7cf72d33057788d06e71bee9e90e4e7
 SHA512:
-  metadata.gz: ce70326d2860322b6cef2f0732c9decb713478f68b8d6277ac6f302db49e4ff491d159aebc3caeabe7918b9fd4d69ff3448b1b5ff9dca89782a3a2715ff0a82c
-  data.tar.gz: 9a199a3ea3b90f8a75880b0f71d9ca6e9a27df8d759734cf75751d83d30301047550545caf49877c7c7c59f8fc2dbd1bb6608ab0db5a7a46522701ebfbd4a988
+  metadata.gz: f1566d02371061b2a29bd5177438c5fc399c0e554144f110940b686b865c6f7959ca7f7bd54db700ae4745725d430457ec7508c8eb5be0ebf3cbd682c5efca3d
+  data.tar.gz: f13509d5a8de4daa42c02a5194b3814a75d2110b15ab63b0cfb503ac6d2a76aa75d9d1a496b613b723e6f3596ea0d113ba59577f738ae501a1b2d762161a03dd

data/lib/github_repo_statistics/github_repo_statistics.rb

@@ -181,6 +181,10 @@ class GithubRepoStatistics
     `git log origin/master --pretty=format:"%s" --since="#{start_date}" --until="#{end_date}" -- "#{file}"`
   end
 
+  def new_changes?(file:)
+    git_commit_info(file:, start_date: DateTime.now - 1, end_date: DateTime.now) == "" ? false : true
+  end
+
   def analyze_changed_files(uniq_code_files_with_changes:, start_date:, end_date:)
     all_teams = []
     cross_teams_count = 0
@@ -192,6 +196,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 +213,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
@@ -238,7 +249,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 +333,17 @@ class GithubRepoStatistics
         lines_of_code = count_lines_of_code(file)
         commits = line.last.last
         owner = find_owner(file:)
+        prs = line.last[1]
+        new_change = new_changes?(file:)
 
-        hotspot_output << [file.gsub(@directory_path, ''), contributors, lines_of_code, commits, owner]
+        hotspot_output << [file.gsub(@directory_path, ''), new_change, contributors, lines_of_code, commits, owner, prs]
       end
 
-      hotspot_output.sort_by! { |row| -row[2] }
+      hotspot_output.sort_by! { |row| -row[3] }
 
       if FILE_OUTPUT
         CSV.open('hotspot.csv', 'w') do |csv|
-          csv << ['File', 'Contributors', 'Lines', 'Commits', 'Owner']
+          csv << ['File', 'New change', 'Contributors', 'Lines', 'Commits', 'Owner', 'PRs']
           hotspot_output.each do |row|
             csv << row
           end
@@ -338,7 +351,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]} New change: #{row[2]} Lines: #{row[3]} Commits: #{row[4]} Owner: #{row[5]} PRs: #{row[6]}"
         end
       end
     end

data/lib/github_repo_statistics/version.rb

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

metadata

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