git-commits-analyzer 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32b24ca5fb34f38bbbe7457470d6e0a1095170d2
-  data.tar.gz: 3d70d001c83a376a0ab7bbddbfc2caf93e5f3d2b
+  metadata.gz: b3d25118787113278e054fb55fde763528447016
+  data.tar.gz: c318ffc90587c4409fbbc0adcf04877dda5beabf
 SHA512:
-  metadata.gz: 510ec2f13df1fbf487830fb44df3f1762b38140caabe477a63661ba71451224de0f6c33c3d7b20be6c2c35921299e7a2fab789ea790b049abd488152d53cdc18
-  data.tar.gz: b0b954e67fb375a60695a1240fc409002931531182ffa5707e95a54beb7cc7faeedb90a5f6a66b7114ede58fae23268fd72d6c233026d77f62b6df6dd982d8a9
+  metadata.gz: 547d7c8c36f0a7edc6ce5cd9acd85616e5024b51626506302294ee4d3c53e68aa9cad248fd2cdbe37854484d1e52c5409ed731bf7aaa2e690c9c2b3cc4a9b472
+  data.tar.gz: 1ed0646e196acf3bf0a52e21ab2cc947b79f4fd0e9e90fa3e9b52ea029e1e474563a37cf1de1167c94b7092ea8daf1d581d0ba5e2f1f6008df61a446b0340e9b

data/lib/git-commits-analyzer.rb

@@ -29,6 +29,9 @@ class GitCommitsAnalyzer
   # Public: Returns the tally of commits broken down by weekday and hour.
   attr_reader :commit_weekdays_hours
 
+  # Public: Returns the lines added/changed by month.
+  attr_reader :lines_by_month
+
   # Public: Initialize new GitParser object.
   #
   # logger - A logger object to display git errors/warnings.
@@ -51,6 +54,37 @@ class GitCommitsAnalyzer
         @commit_weekdays_hours[weekday][hour] = 0
       end
     end
+    @lines_by_month = {}
+  end
+
+  # Public: Determine if the file is a common library that shouldn't get
+  # counted towards contributions.
+  #
+  # filename - The name of the file to analyze.
+  #
+  # Returns a boolean indicating if the file is a common library.
+  #
+  def self.is_library(filename:)
+    case filename
+    when /jquery-ui-\d+\.\d+\.\d+\.custom(?:\.min)?\.js$/
+      return true
+    when /jquery-\d+\.\d+\.\d+(?:\.min)?\.js$/
+      return true
+    when /jquery\.datepick(?:\.min)?\.js$/
+      return true
+    when /chart\.min\.js$/
+      return true
+    when /jquery\.js$/
+      return true
+    when /jquery-loader\.js$/
+      return true
+    when /qunit\.js$/
+      return true
+    when /d3\.v3(?:\.min)?\.js$/
+      return true
+    else
+      return false
+    end
   end
 
   # Public: Determine the type of a file at the given revision of a repo.
@@ -158,12 +192,17 @@ class GitCommitsAnalyzer
       commit_weekday = commit_datetime.strftime('%a')
       @commit_weekdays_hours[commit_weekday][commit_hour] += 1
 
+      # Note: months are zero-padded to allow easy sorting, even if it's more
+      # work for formatting later on.
+      commit_month = commit.date.strftime("%Y-%m")
+
       # Parse diff and analyze patches to detect language.
       diff = git_repo.show(commit.sha)
       diff.encode!('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
 
       file_properties = git_repo.ls_tree(['-r', commit.sha])
 
+      languages_in_commit = {}
       patches = GitDiffParser.parse(diff)
       patches.each do |patch|
         # Skip submodules.
@@ -173,30 +212,45 @@ class GitCommitsAnalyzer
         next if file_properties['blob'].has_key?(patch.file) &&
           (file_properties['blob'][patch.file][:mode] == '120000')
 
+        # Skip libraries.
+        next if self.class.is_library(filename: patch.file)
+
         body = patch.instance_variable_get :@body
         language = self.class.determine_language(filename: patch.file, sha: commit.sha, git_repo: git_repo)
         next if language.nil?
         @lines_by_language[language] ||=
         {
           'added'   => 0,
-          'deleted' => 0
+          'deleted' => 0,
+          'commits' => 0,
+        }
+        languages_in_commit[language] = true
+
+        @lines_by_month[commit_month] ||=
+        {
+          'added'   => 0,
+          'deleted' => 0,
         }
 
         body.split(/\n/).each do |content|
           if (/^[+-]/.match(content) && !/^[+-]\s+$/.match(content))
             if (/^\+/.match(content))
               @lines_by_language[language]['added'] += 1
+              @lines_by_month[commit_month]['added'] += 1
             elsif (/^\-/.match(content))
               @lines_by_language[language]['deleted'] += 1
+              @lines_by_month[commit_month]['deleted'] += 1
             end
           end
         end
       end
 
+      languages_in_commit.keys.each do |language|
+        @lines_by_language[language]['commits'] += 1
+      end
+
       # Add to stats for monthly commit count.
-      # Note: months are zero-padded to allow easy sorting, even if it's more
-      # work for formatting later on.
-      @commits_by_month[commit.date.strftime("%Y-%m")] += 1
+      @commits_by_month[commit_month] += 1
 
       # Add to stats for total commits count.
       @commits_total += 1
@@ -228,12 +282,29 @@ class GitCommitsAnalyzer
   #
   def to_json(pretty: true)
     formatted_commits_by_month = []
+    formatted_lines_by_month = []
     month_names = Date::ABBR_MONTHNAMES
     self.get_month_scale.each do |frame|
       display_key = month_names[frame[1]] + '-' + frame[0].to_s
       data_key = sprintf('%s-%02d', frame[0], frame[1])
+
       count = @commits_by_month[data_key]
-      formatted_commits_by_month << { month: display_key, commits: count.to_i }
+      formatted_commits_by_month << {
+        month: display_key,
+        commits: count.to_i,
+      }
+
+      month_added_lines = 0
+      month_deleted_lines = 0
+      if @lines_by_month.key?(data_key)
+        month_added_lines = @lines_by_month[data_key]['added'].to_i
+        month_deleted_lines = @lines_by_month[data_key]['deleted'].to_i
+      end
+      formatted_lines_by_month << {
+        month: display_key,
+        added: month_added_lines,
+        deleted: month_deleted_lines,
+      }
     end
 
     data =
@@ -243,7 +314,8 @@ class GitCommitsAnalyzer
         commits_by_hour: @commit_hours,
         commits_by_day: @commit_days,
         commit_by_weekday_hour: @commit_weekdays_hours,
-        lines_by_language: @lines_by_language
+        lines_by_language: @lines_by_language,
+        lines_by_month: formatted_lines_by_month,
       }
 
     if pretty

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-commits-analyzer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Guillaume Aubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies: []
 description: Parse git repos and collect commit statistics/data for a given author.
 email: aubertg@cpan.org
@@ -22,7 +22,7 @@ files:
 - lib/git-commits-analyzer/utils.rb
 homepage: http://rubygems.org/gems/
 licenses:
-- GPLv3
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []