gitalytics 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 440abf11cbc39d3544a6d226527dd29dfb4d2adf
-  data.tar.gz: fc5393c1b3ea97dd5819f1d607b879d085a18fa5
+  metadata.gz: dfee4701c631f00b32ae513f27dd761e78bc90c9
+  data.tar.gz: 18dfec6a19254bd61de7ecb7a65b34b824f610f9
 SHA512:
-  metadata.gz: 56972f5d972a6d17f5bb46c234d27ffa6865dc2be24d636a0159147be2753726331113a725cbbee862d3a83e3a11c4bf0b93f0d506fc0eecdb2b2878ee33f6e9
-  data.tar.gz: 3e825ed9e7103ff3d543ce2c870d1ca153b7ba2389f6ae5047e3d124fc748bef25baca3199e4181acf19104251c04abc4474ff3756cb0be566d94b0fdec24688
+  metadata.gz: 22ab60c1cc856e08152c8893170c567b82831ff09910c7d4a7e7107cc06576042651ef0001a71a7533da5557b4d31a0ab3d515fe897fb07531e32b62ce1d45b1
+  data.tar.gz: f24764d467fd4e7df3f06a37804f3185d2e07157241e38764ff70c4e013ccef02c81377c1459998d1f75e1daf3f729d4c560d8395b8e26e8eff50f0a1c24b9b0

data/assets/gitalytics.html.erb

@@ -79,6 +79,18 @@
         /*-webkit-font-smoothing:antialiased;*/
       }
 
+      .dashboard-box {
+        background-color: #f3f3f3;
+        border-radius: 10px;
+        margin-bottom: 30px;
+        padding: 20px;
+        text-align: center;
+      }
+
+      .dashboard-box .glyphicon {
+        font-size: 48px;
+      }
+
     </style>
   </head>
 
@@ -101,9 +113,9 @@
           </div>
           <div class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
-              <li class="active"><a href="#">Users</a></li>
-              <!-- <li><a href="#about">About</a></li>
-              <li><a href="#contact">Contact</a></li> -->
+              <li class="active"><a href="#dashboard" data-toggle="tab">Dashboard</a></li>
+              <li><a href="#authors" data-toggle="tab">Authors</a></li>
+              <!-- <li><a href="#contact">Contact</a></li> -->
             </ul>
           </div><!--/.nav-collapse -->
         </div>
@@ -111,28 +123,84 @@
 
       <!-- Begin page content -->
       <div class="container">
-        <div class="page-header">
-          <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="row">
-          <div class="col-md-6">
-            <h2>Commits count per user</h2>
-            <canvas id="usersPieChart" width="550" height="400"></canvas>
+        <div class="tab-content">
+          <div class="tab-pane active" id="dashboard">
+            <div class="page-header">
+              <h1>Dashboard</h1>
+              <p class="lead">A quick overview of the activity on your git repository.</p>
+            </div>
+            <div class="row">
+              <div class="col-md-4">
+                <div class="dashboard-box">
+                  <span class="glyphicon glyphicon-user"></span><br>
+                  <%= @users.count %>
+                  authors
+                </div>
+              </div>
+              <div class="col-md-4">
+                <div class="dashboard-box">
+                  <span class="glyphicon glyphicon-list"></span><br>
+                  <%= @commits.count %>
+                  commits
+                </div>
+              </div>
+              <div class="col-md-4">
+                <div class="dashboard-box">
+                  <span class="glyphicon glyphicon-file"></span><br>
+                  <%= @commits.map{ |c| c.files_committed }.flatten.uniq.compact.count %>
+                  files committed
+                </div>
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-md-4">
+                <div class="dashboard-box">
+                  <span class="glyphicon glyphicon-plus"></span><br>
+                  <%= @commits.map{ |c| c.insertions }.inject(0){ |total, current| total + current } %>
+                  insertions
+                </div>
+              </div>
+              <div class="col-md-4">
+                <div class="dashboard-box">
+                  <span class="glyphicon glyphicon-minus"></span><br>
+                  <%= @commits.map{ |c| c.deletions }.inject(0){ |total, current| total + current } %>
+                  deletions
+                </div>
+              </div>
+              <div class="col-md-4">
+                <div class="dashboard-box">
+                  <span class="glyphicon glyphicon-calendar"></span><br>
+                  <%= (@commits.max_by(&:date).date - @commits.min_by(&:date).date).to_i + 1 %>
+                  days
+                </div>
+              </div>
+            </div>
           </div>
-          <div class="col-md-6">
-            <h2>Commits per weekday per user</h2>
-            <canvas id="usersRadarChart" width="550" height="400"></canvas>
+          <div class="tab-pane" id="authors">
+            <div class="page-header">
+              <h1>Authors</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>
+              <% @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="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>
-        <hr>
-          <h2>Insertions vs. Deletions</h2>
-          <canvas id="usersBarChart" width="1100" height="400"></canvas>
       </div>
     </div>
 
@@ -155,21 +223,21 @@
       });
 
       // Data for Users Pie Chart
-      var data = [<%= @data[:users].map{|d| "{ value: #{d.commits.count}, color: '#{d.rgba}' }" }.join(',') %>];
+      var 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(',') %>],
+        labels: [<%= @users.map{|d| "'#{d.name}'" }.join(',') %>],
         datasets: [
           {
-            data: [<%= @data[:users].map{|d| "#{d.total_insertions}" }.join(',') %>],
+            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(',') %>],
+            data: [<%= @users.map{|d| "#{d.total_deletions}" }.join(',') %>],
             fillColor: 'rgba(234, 80, 44, 0.5)',
             strokeColor: 'rgba(234, 80, 44, 1)'
           }
@@ -182,14 +250,14 @@
       var data = {
         labels: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
         datasets: [
-          <% @data[:users].each_with_index do |user, i| %>
+          <% @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 %>
+          }<%= ',' unless i + 1 == @users.count %>
           <% end %>
         ]
       };

data/bin/gitalytics

@@ -2,13 +2,15 @@
 # encoding: UTF-8
 
 Encoding.default_external = Encoding::UTF_8
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 
 require 'optparse'
-require File.expand_path("../../lib/gitalytics.rb", __FILE__)
+require 'gitalytics'
 
 options = {
   format: 'cli'
 }
+
 OptionParser.new do |opts|
   opts.banner = "Usage: gitalytics [options]"
 
@@ -17,8 +19,14 @@ OptionParser.new do |opts|
     exit
   end
 
-  opts.on("-h", "--html", "Outputs html report") do |v|
+  opts.on("-h", "--html", "Outputs html report and displays it in default web browser") do |v|
+    options[:format] = 'html'
+    options[:browser] = true
+  end
+
+  opts.on("-n", "--no-browser", "Do not open html report in browser") do |v|
     options[:format] = 'html'
+    options[:browser] = false
   end
 end.parse!
 

data/lib/gitalytics.rb

@@ -4,144 +4,54 @@ require 'date'
 require 'erb'
 require 'digest/md5'
 
-class Gitalytics
-
-  VERSION = '1.1.1'
+require 'gitlog'
+require 'user'
+require 'commit'
 
-  attr_accessor :data
+class Gitalytics
 
-  def initialize
-    @data = { commits: [], users: [] }
-  end
+  VERSION = '1.2.0'
 
   def analyze(options)
-    parse_git_log
+    data = GitLog.parse_git_log
+
     case options[:format]
     when 'html'
-      output_html_report
+      output_html_report(data, options[:browser])
     else
-      output_cli_report
+      output_cli_report(data[:users])
     end
   end
 
   private
-  def parse_git_log
-    result = `git log --stat --format=`
-
-    result.each_line do |line|
-      line.encode!('UTF-8', 'UTF8-MAC') if defined?(Encoding::UTF8_MAC)
 
-      if match = line.match(/^commit ([0-9a-z]*)$/)
-        @data[:commits] << Commit.new(match[1])
-      elsif match = line.match(/^Author: ([[:alpha:] ]*) <(.*)>$/)
-        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
-
-  end
-
-  def output_cli_report
-    @data[:users].each do |user|
+  def output_cli_report(users)
+    users.each do |user|
       puts user.summary
     end
   end
 
-  def output_html_report
+  def output_html_report(data, open_in_browser)
     template_file = File.read(File.join(File.dirname(__FILE__), "..", "assets", "gitalytics.html.erb"))
     erb = ERB.new(template_file)
-    File.open("gitalytics_result.html", 'w+') { |file| file.write(erb.result(binding)) }
-  end
-
-  def get_user(name, email)
-    @data[:users].each do |u|
-      return u if u.email == email
+    output_file = "gitalytics_result.html"
+    File.open(output_file, 'w+') do |file|
+      @users = data[:users]
+      @commits = data[:commits]
+      file.write(erb.result(binding))
     end
-    @data[:users] << new_user = User.new(name, email)
-    new_user
-  end
-
-end
-
-class User
-
-  attr_accessor :name, :email, :commits, :colors
-
-  def initialize(name, email)
-    self.name = name
-    self.email = email
-    self.commits = []
-    self.colors = [rand(255), rand(255), rand(255)].join(', ')
-  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
-
-  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 }
+    open_report_in_browser(output_file) if open_in_browser
   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
+  def open_report_in_browser(filename)
+    host = RbConfig::CONFIG['host_os']
+    if host =~ /mswin|mingw|cygwin/
+      system "start #{filename}"
+    elsif host =~ /darwin/
+      system "open #{filename}"
+    elsif host =~ /linux|bsd/
+      system "xdg-open #{filename}"
     end
-    days
-  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.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Gonzalo Robaina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies: []
 description: Get usefull analytics from your git log
 email: gonzalor@gmail.com