gitalytics 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a98f4434c615280c091a34ec1fbc9ff2e7220a73
-  data.tar.gz: 7828f0c7488f17c081490db141351e2aeb3598da
+  metadata.gz: 0d1b786805cf13c4a8f17b163afa2af25c980532
+  data.tar.gz: d1d64351ecdc60d220c962826b615ccd446bda4d
 SHA512:
-  metadata.gz: a5aac6614367e91de9c5190feb90973903677f4c38e3ab8fa8c8f7d21cf9fa06983ca6ce4aabd83988c6a9f80e92c26edcc5ecc22847801710387db31bce06c7
-  data.tar.gz: d947ed9069ca67efab58e2c8f207f3860392034e66c95352dfa3d5ab000414b26a882e515451e4890fc3ef93131dea4f0260170b910a93cb5ae74c12b7e5880d
+  metadata.gz: 1e7ce84f9931831e5121757d9df55b0f6e7eea8412cb855ef2b62c06681d692439b756b011e1188284f12d5a7e049a3866ea3c125f772b45bf1c3ff85df182c9
+  data.tar.gz: 8fe319543970aed157f4003b2eabb4a544367b8123b086dc83e9795820fd98bebe0db642b27a35b51a37c996d78662cf2127bc70f1da525b070b3b58921cca15

data/assets/gitalytics.html.erb

@@ -130,13 +130,13 @@
             <div class="col-md-6">
                <div class="media">
                   <a class="pull-left" href="#">
-                      <img class="media-object dp img-circle" src="<%= "http://www.gravatar.com/avatar/#{user[:gravatar]}" %>" style="width: 100px; height:100px; border-color:<%= "##{user[:color]}" %>">
+                      <img class="media-object dp img-circle" src="<%= "http://www.gravatar.com/avatar/#{user.gravatar}" %>" style="width: 100px; height:100px; border-color:<%= "##{user.color}" %>">
                   </a>
                   <div class="media-body">
-                      <h4 class="media-heading"><%= user[:name] %><br><small><%= user[:email] %></small></h4>
+                      <h4 class="media-heading"><%= user.name %><br><small><%= user.email %></small></h4>
                       <hr style="margin:8px auto">
-                      <%= "#{user[:commits].count} commits between #{(user[:last_date] - user[:first_date]).to_i + 1} days." %>
-                      <%= "He did something useful on #{user[:working_days]} of those days." %>
+                      <%= "#{user.commits.count} commits between #{user.commits_period} days." %>
+                      <%= "He did something useful on #{user.working_days} of those days." %>
                   </div>
               </div>
             </div>
@@ -147,7 +147,7 @@
 
     <div id="footer">
       <div class="container">
-        <p class="text-muted">Gitalytics by <a href="http://gonzalo.robaina.me">Gonzalo Robaina</a></p>
+        <p class="text-muted">Gitalytics v<%= VERSION %> by <a href="http://gonzalo.robaina.me">Gonzalo Robaina</a></p>
       </div>
     </div>
 
@@ -159,7 +159,7 @@
     <script src="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
     <script src="http://cdnjs.cloudflare.com/ajax/libs/Chart.js/0.2.0/Chart.min.js"></script>
     <script>
-      var data = [<%= @data[:users].map{|d| "{ value: #{d[:commits].count}, color: '##{d[:color]}' }" }.join(',') %>];
+      var data = [<%= @data[:users].map{|d| "{ value: #{d.commits.count}, color: '##{d.color}' }" }.join(',') %>];
       var ctx = document.getElementById("myChart").getContext("2d");
       var myNewChart = new Chart(ctx).Pie(data);
     </script>

data/lib/gitalytics.rb

@@ -6,16 +6,16 @@ require 'digest/md5'
 
 class Gitalytics
 
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 
   attr_accessor :data
 
   def initialize
-    @data = {}
+    @data = { commits: [], users: [] }
   end
 
   def analyze(options)
-    log_to_hash
+    parse_git_log
     case options[:format]
     when 'html'
       output_html_report
@@ -25,22 +25,30 @@ class Gitalytics
   end
 
   private
-  def log_to_hash
-    lines   = []
-    command = "git log --pretty='%cn|%ce|%cd|%s' --reverse"
-    result  = `#{command}`
+  def parse_git_log
+    result  = `git log --stat`
 
     result.each_line do |line|
-      parts = line.split('|')
-      lines << { name: parts[0], email: parts[1], date: Date.parse(parts[2]), subject: parts[3]}
+      if match = line.match(/^commit ([0-9a-z]*)$/)
+        @data[:commits] << Commit.new(match[1])
+      elsif match = line.match(/^Author: ([\w ]*) <(.*)>$/)
+        user = get_user(match[1], match[2])
+        @data[:commits].last.author = user
+        user.commits << @data[:commits].last
+      elsif match = line.match(/^Date:   (.*)$/)
+        @data[:commits].last.date = Date.parse(match[1])
+      elsif match = line.match(/^    (.*)$/)
+        @data[:commits].last.subject = match[1]
+      elsif match = line.match(/^ ([^ ]+)[ ]+\|[ ]+([\d]+) ([\+]*)([-]*)$/)
+        @data[:commits].last.summary << { filename: match[1], changes: match[2], insertions: match[3], deletions: match[4] }
+      end
     end
 
-    @data[:users] = get_user_data(lines)
   end
 
   def output_cli_report
     @data[:users].each do |user|
-      puts "#{user[:name]} has made #{user[:commits].count} commits between #{(user[:last_date] - user[:first_date]).to_i + 1} days. He did something useful on #{user[:working_days]} of those days."
+      puts "#{user.name} has made #{user.commits.count} commits between #{user.commits_period} days. He did something useful on #{user.working_days} of those days."
     end
   end
 
@@ -50,23 +58,64 @@ class Gitalytics
     File.open("gitalytics_result.html", 'w+') { |file| file.write(erb.result(binding)) }
   end
 
-  def get_user_data(lines)
-    users = {}
-    lines.each{ |r| users[r[:email]] = r[:name] }
-    users.map{ |email, name|
-      commits = lines.select{ |r| r[:email] == email }
-      dates = commits.map{ |c| c[:date] }
-      {
-        name: name,
-        email: email,
-        gravatar: Digest::MD5.hexdigest(email),
-        color: "%06x" % (rand * 0xffffff),
-        commits: commits,
-        first_date: dates.min,
-        last_date: dates.max,
-        working_days: dates.uniq.count
-      }
-    }
+  def get_user(name, email)
+    @data[:users].each do |u|
+      return u if u.email == email
+    end
+    @data[:users] << new_user = User.new(name, email)
+    new_user
+  end
+
+end
+
+class User
+
+  attr_accessor :name, :email, :commits, :color
+
+  def initialize(name, email)
+    self.name = name
+    self.email = email
+    self.commits = []
+    self.color = "%06x" % (rand * 0xffffff)
+  end
+
+  def gravatar
+    Digest::MD5.hexdigest(email)
+  end
+
+  def first_commit
+    commits.min_by(&:date)
+  end
+
+  def last_commit
+    commits.max_by(&:date)
+  end
+
+  def commits_period
+    (last_commit.date - first_commit.date).to_i + 1
+  end
+
+  def working_days
+    commits.map(&:date).uniq.count
+  end
+
+end
+
+class Commit
+
+  attr_accessor :hash, :author, :date, :subject, :summary
+
+  def initialize(hash)
+    self.hash = hash
+    self.summary = []
+  end
+
+  def insertions
+    summary.map{ |s| s[:insertions].length }.inject(0){ |total, current| total + current }
+  end
+
+  def deletions
+    summary.map{ |s| s[:deletions].length }.inject(0){ |total, current| total + current }
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitalytics
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Gonzalo Robaina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies: []
 description: Get usefull analytics from your git log
 email: gonzalor@gmail.com