git_statistics 0.1.2 → 0.2.0

data/lib/git_statistics/commits.rb

@@ -1,112 +1,112 @@
 module GitStatistics
   class Commits < Hash
 
-    attr_accessor :author_list, :data_authors, :data_authors_email, :totals
+    attr_accessor :stats, :author_list, :language_list, :totals
 
     def initialize
       super
+      @stats = Hash.new(0)
+      @author_list = []
+      @language_list = []
+      @totals = Hash.new(0)
+      @totals[:languages] = {}
     end
 
-    def authors
-      author_list = []
+    def identify_authors
       self.each do |key,value|
-        if not author_list.include?(value[:author])
-          author_list << value[:author]
+        if not @author_list.include?(value[:author])
+          @author_list << value[:author]
         end
       end
-      return author_list
     end
 
-    def authors_email
-      author_list = []
+    def identify_authors_email
       self.each do |key,value|
-        if not author_list.include?(value[:author_email])
-          author_list << value[:author_email]
+        if not @author_list.include?(value[:author_email])
+          @author_list << value[:author_email]
         end
       end
-      return author_list
     end
 
-    def authors_statistics(email, merge)
+    def author_top_n_type(type, n=0)
+      n = 0 if n < 0
+      return nil if @stats == nil || !@stats.first[1].has_key?(type)
+      return @stats.sorted_hash {|a,b| b[1][type.to_sym] <=> a[1][type]}.to_a[0..n-1]
+    end
+
+    def calculate_statistics(email, merge)
 
       # Identify authors and author type
       if email
-        @author_list = authors_email
+        identify_authors_email
         type = :author_email
       else
-        @author_list = authors
+        identify_authors
         type = :author
       end
 
       # Initialize the stats hash
-      stats = Hash.new
       @author_list.each do |author|
-        stats[author] = Hash.new
-        stats[author][:commits] = 0
-        stats[author][:insertions] = 0
-        stats[author][:deletions] = 0
-        stats[author][:creates] = 0
-        stats[author][:deletes] = 0
-        stats[author][:renames] = 0
-        stats[author][:copies] = 0
-        stats[author][:merges] = 0
+        @stats[author] = Hash.new(0)
+        @stats[author][:languages] = {}
       end
 
-      # Collect the stats for each author
+      # Collect the stats from each commit
       self.each do |key,value|
         if not merge and value[:merge]
           next
         else
-          stats[value[type]][:merges] += 1 if value[:merge]
-          stats[value[type]][:commits] += 1
-          stats[value[type]][:insertions] += value[:insertions]
-          stats[value[type]][:deletions] += value[:deletions]
-          stats[value[type]][:creates] += value[:creates]
-          stats[value[type]][:deletes] += value[:deletes]
-          stats[value[type]][:renames] += value[:renames]
-          stats[value[type]][:copies] += value[:copies]
-        end
-      end
-      return stats
-    end
 
-    def author_top_n_type(email, type, n=0)
-      n = 0 if n < 0
+          author = (@stats[value[type]] ||= Hash.new(0))
 
-      if email
-        data = @data_authors_email
-      else
-        data = @data_authors
-      end
+          # Collect language stats
+          value[:files].each do |file|
 
-      return nil if data == nil || !data.first[1].has_key?(type)
-      return data.sorted_hash {|a,b| b[1][type.to_sym] <=> a[1][type]}.to_a[0..n-1]
-    end
+            # Add to author's languages
+            add_language_stats(author, file)
 
-    def calculate_statistics(email, merge)
+            # Add to repository's languages
+            add_language_stats(@totals, file)
 
-      # Calculate author statistics
-      @data_authors_email = authors_statistics(true, merge) if email
-      @data_authors = authors_statistics(false, merge) if not email
+            # Add language to language list if not encountered before
+            if not @language_list.include?(file[:language])
+              @language_list << file[:language]
+            end
+          end
 
-      # Calculate totals
-      @totals = Hash.new(0)
-      self.each do |key,value|
-        if not merge and value[:merge]
-          next
-        else
-          @totals[:merges] += 1 if value[:merge]
-          @totals[:commits] += 1
-          @totals[:insertions] += value[:insertions]
-          @totals[:deletions] += value[:deletions]
-          @totals[:creates] += value[:creates]
-          @totals[:deletes] += value[:deletes]
-          @totals[:renames] += value[:renames]
-          @totals[:copies] += value[:copies]
+          # Add commit stats to author
+          add_commit_stats(author, value)
+
+          # Add commit stats to repository
+          add_commit_stats(@totals, value)
         end
       end
     end
 
+    def add_language_stats(data, file)
+      # Add stats to data's languages
+      if data[:languages][file[:language].to_sym] == nil
+        data[:languages][file[:language].to_sym] = Hash.new(0)
+      end
+      data[:languages][file[:language].to_sym][:additions] += file[:additions]
+      data[:languages][file[:language].to_sym][:deletions] += file[:deletions]
+      if file[:status] != nil || file[:status] == "submodule"
+        data[:languages][file[:language].to_sym][file[:status].to_sym] += 1
+      end
+    end
+
+    def add_commit_stats(data, commit)
+      # Add commit stats to author
+      data[:merges] += 1 if commit[:merge]
+      data[:commits] += 1
+      data[:additions] += commit[:additions]
+      data[:deletions] += commit[:deletions]
+      data[:create] += commit[:create] if commit[:create] != nil
+      data[:delete] += commit[:delete] if commit[:delete] != nil
+      data[:rename] += commit[:rename] if commit[:rename] != nil
+      data[:copy] += commit[:copy] if commit[:copy] != nil
+    end
+
     def load(file)
       self.merge!(JSON.parse(File.read(file), :symbolize_names => true))
     end
@@ -121,7 +121,6 @@ module GitStatistics
   end
 
   class Hash < Hash
-
     def sorted_hash(&block)
       self.class[sort(&block)]
     end

data/lib/git_statistics/initialize.rb

@@ -1,3 +1,15 @@
 require 'json'
 require 'trollop'
+require 'grit'
+require 'linguist'
+require 'pathname'
+
+# Custom Blob for Grit to enable Linguist
+# This must load before other modules
+module Grit
+  class Blob
+    include Linguist::BlobHelper
+  end
+end
+
 Dir.glob(File.dirname(__FILE__) + '/*.rb') {|file| require file}

data/lib/git_statistics/version.rb

@@ -1,3 +1,3 @@
 module GitStatistics
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/git_statistics.rb

@@ -10,14 +10,15 @@ module GitStatistics
         opt :pretty, "Pretty print saved commits (larger file size)", :default => false
         opt :load, "Load commits.json instead of re-collecting data", :default => false
         opt :update, "Update commits.json with new data (same as save and load together)", :default => false
-        opt :sort, "Sort authors by {commits, insertions, deletions, creates, deletes, renames, copies, merges}", :default => "commits"
+        opt :sort, "Sort authors by {commits, additions, deletions, create, delete, rename, copy, merges}", :default => "commits"
         opt :top, "Show the top N authors in results", :default => 0
         opt :branch, "Use current branch for statistics (otherwise all branches)", :default => false
+        opt :verbose, "Verbose output (shows progress)", :default => false
       end
     end
 
     def execute
-      collector = Collector.new
+      collector = Collector.new(@opts[:verbose])
 
       # Collect commit data
       if @opts[:load] || @opts[:update]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_statistics
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &14258420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14258420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &14257940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +53,28 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14257940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: github-linguist
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: git_statistics is a gem that provides detailed git statistics
 email:
 - kevin.j.jalbert@gmail.com
@@ -51,15 +93,11 @@ files:
 - bin/git_statistics
 - git_statistics.gemspec
 - lib/git_statistics.rb
+- lib/git_statistics/blob.rb
 - lib/git_statistics/collector.rb
 - lib/git_statistics/commits.rb
 - lib/git_statistics/initialize.rb
 - lib/git_statistics/version.rb
-- spec/collector_spec.rb
-- spec/commits_spec.rb
-- spec/fixtures/many_authors.json
-- spec/fixtures/single_author.json
-- spec/fixtures/single_author_unpretty.json
 - spec/spec_helper.rb
 homepage: https://github.com/kevinjalbert/git_statistics
 licenses: []
@@ -79,19 +117,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1773514383536300330
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Gem that provides the ability to gather detailed git statistics
 test_files:
-- spec/collector_spec.rb
-- spec/commits_spec.rb
-- spec/fixtures/many_authors.json
-- spec/fixtures/single_author.json
-- spec/fixtures/single_author_unpretty.json
 - spec/spec_helper.rb

data/spec/collector_spec.rb

@@ -1,6 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-include GitStatistics
-
-describe Collector do
-
-end