gitalytics 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d1b786805cf13c4a8f17b163afa2af25c980532
-  data.tar.gz: d1d64351ecdc60d220c962826b615ccd446bda4d
+  metadata.gz: b4fb17f1fd09ae86b6c93b3c7283a1a755a7031e
+  data.tar.gz: 6b4a2d91bab135ba263a64421427a36cfdfe9044
 SHA512:
-  metadata.gz: 1e7ce84f9931831e5121757d9df55b0f6e7eea8412cb855ef2b62c06681d692439b756b011e1188284f12d5a7e049a3866ea3c125f772b45bf1c3ff85df182c9
-  data.tar.gz: 8fe319543970aed157f4003b2eabb4a544367b8123b086dc83e9795820fd98bebe0db642b27a35b51a37c996d78662cf2127bc70f1da525b070b3b58921cca15
+  metadata.gz: 7c3f613d51e99d4286500f8287af6c18e0adb2ae2af34830e9cb990006340daf8f6dac5b3ab1552db7a9ab0e458ad0e2ad95db530ec77f99c1cff34ac5bab7a2
+  data.tar.gz: c415721c1b02fa62343fb3b036a7ee1bc15790c2c28940711ea4315a8ea5be34e0f2ce4222622b16dc6c540f5a20e920bc1668176870b50365148490dbf8da62

data/assets/gitalytics.html.erb

@@ -61,14 +61,8 @@
         padding-right: 15px;
       }
 
-      .media {
-        height: 125px;
-        margin-bottom: 20px;
-      }
-
-      .media-body {
-        color: #444;
-        font-size: 12px;
+      .user-avatar {
+        margin: 0 10px 10px 0;
       }
 
       .dp {
@@ -118,30 +112,27 @@
       <!-- Begin page content -->
       <div class="container">
         <div class="page-header">
-          <h1>User stats</h1>
+          <h1>Users</h1>
           <p class="lead">Compare the quantity of commits made by each of your repository contributors.<br/> Check who is writing most of the code of your project and maybe give him/her a prize! ;)</p>
+          <% @data[:users].each do |user| %>
+            <a href="#" title="<%= user.name %> <small><%= user.email %></small>" class="user-avatar" data-content="<%= user.summary %>">
+              <img class="dp img-circle" src="<%= "http://www.gravatar.com/avatar/#{user.gravatar}" %>" style="width: 100px; height:100px; border-color:<%= user.rgba %>"></a>
+          <% end %>
         </div>
 
-        <div class="col-md-5">
-          <canvas id="myChart" width="400" height="400"></canvas>
-        </div>
-        <div class="col-md-7">
-          <% @data[:users].each_with_index do |user, i| %>
-            <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}" %>">
-                  </a>
-                  <div class="media-body">
-                      <h4 class="media-heading"><%= user.name %><br><small><%= user.email %></small></h4>
-                      <hr style="margin:8px auto">
-                      <%= "#{user.commits.count} commits between #{user.commits_period} days." %>
-                      <%= "He did something useful on #{user.working_days} of those days." %>
-                  </div>
-              </div>
-            </div>
-          <% end %>
+        <div class="row">
+          <div class="col-md-6">
+            <h2>Commits count per user</h2>
+            <canvas id="usersPieChart" width="550" height="400"></canvas>
+          </div>
+          <div class="col-md-6">
+            <h2>Commits per weekday per user</h2>
+            <canvas id="usersRadarChart" width="550" height="400"></canvas>
+          </div>
         </div>
+        <hr>
+          <h2>Insertions vs. Deletions</h2>
+          <canvas id="usersBarChart" width="1100" height="400"></canvas>
       </div>
     </div>
 
@@ -159,9 +150,51 @@
     <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 ctx = document.getElementById("myChart").getContext("2d");
-      var myNewChart = new Chart(ctx).Pie(data);
+      $('.user-avatar').popover({ trigger: 'hover', html: true }).click(function(e){
+        e.preventDefault();
+      });
+
+      // Data for Users Pie Chart
+      var data = [<%= @data[:users].map{|d| "{ value: #{d.commits.count}, color: '#{d.rgba}' }" }.join(',') %>];
+      var ctx = document.getElementById("usersPieChart").getContext("2d");
+      var usersPieChart = new Chart(ctx).Pie(data);
+
+      // Data for Insertions vs. Deletions Bar Chart
+      var data = {
+        labels: [<%= @data[:users].map{|d| "'#{d.name}'" }.join(',') %>],
+        datasets: [
+          {
+            data: [<%= @data[:users].map{|d| "#{d.total_insertions}" }.join(',') %>],
+            fillColor: 'rgba(196, 234, 44, 0.5)',
+            strokeColor: 'rgba(196, 234, 44, 1)'
+          },
+          {
+            data: [<%= @data[:users].map{|d| "#{d.total_deletions}" }.join(',') %>],
+            fillColor: 'rgba(234, 80, 44, 0.5)',
+            strokeColor: 'rgba(234, 80, 44, 1)'
+          }
+        ]
+      };
+      var ctx = document.getElementById("usersBarChart").getContext("2d");
+      var usersBarChart = new Chart(ctx).Bar(data);
+
+      // Data for Weekday commits per user
+      var data = {
+        labels: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+        datasets: [
+          <% @data[:users].each_with_index do |user, i| %>
+          {
+            fillColor : "<%= user.rgba('0.5') %>",
+            strokeColor : "<%= user.rgba %>",
+            pointColor : "<%= user.rgba %>",
+            pointStrokeColor : "#fff",
+            data : [<%= user.weekday_commits.join(', ') %>]
+          }<%= ',' unless i + 1 == @data[:users].count %>
+          <% end %>
+        ]
+      };
+      var ctx = document.getElementById("usersRadarChart").getContext("2d");
+      var usersRadarChart = new Chart(ctx).Radar(data);
     </script>
   </body>
 </html>

data/lib/gitalytics.rb

@@ -6,7 +6,7 @@ require 'digest/md5'
 
 class Gitalytics
 
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
 
   attr_accessor :data
 
@@ -26,7 +26,7 @@ class Gitalytics
 
   private
   def parse_git_log
-    result  = `git log --stat`
+    result = `git log --stat`
 
     result.each_line do |line|
       if match = line.match(/^commit ([0-9a-z]*)$/)
@@ -48,7 +48,7 @@ class Gitalytics
 
   def output_cli_report
     @data[:users].each do |user|
-      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."
+      puts user.summary
     end
   end
 
@@ -70,13 +70,13 @@ end
 
 class User
 
-  attr_accessor :name, :email, :commits, :color
+  attr_accessor :name, :email, :commits, :colors
 
   def initialize(name, email)
     self.name = name
     self.email = email
     self.commits = []
-    self.color = "%06x" % (rand * 0xffffff)
+    self.colors = [rand(255), rand(255), rand(255)].join(', ')
   end
 
   def gravatar
@@ -99,6 +99,30 @@ class User
     commits.map(&:date).uniq.count
   end
 
+  def total_insertions
+    commits.map(&:insertions).inject(0) { |total, current| total + current }
+  end
+
+  def total_deletions
+    commits.map(&:deletions).inject(0) { |total, current| total + current }
+  end
+
+  def summary
+    "#{name} has made #{commits.count} commits between #{commits_period} days. He/she did something useful on #{working_days} of those days."
+  end
+
+  def rgba(opacity = 1)
+    "rgba(#{colors}, #{opacity})"
+  end
+
+  def weekday_commits
+    days = Array.new(7) {0}
+    commits.each do |c|
+      days[c.date.wday] += 1
+    end
+    days
+  end
+
 end
 
 class Commit

metadata

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