git-visualiser 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTU1YTFlNmRmZjg1ZDVlZjViODI3Nzk5YzM5NzAyZjFiYzY3YWMzNA==
+    ZmQ3NGYzMDhmMTZiYThiMWE0NWQ0ZTliNjRlMDQxZDRjYmQ2OWNhMA==
   data.tar.gz: !binary |-
-    NTliMWUzMTZkM2FhNzIwZTE1ZDUzZTI1ZDhkYjQ3ZDFkMmY2NzhjYw==
+    NzhlNmEyZjVlMzk5M2YwYWUyYWYxODI4YTFlOTI0YTBjNDAyZDYwYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDdiMWJjMzI4M2FkM2YzYmQxM2YxM2VjYmI0MTYxMGJhZTc1NDNkODY4NTg5
-    ZGE1ODA1NTY3NDQ0N2ZlNTlhNGY5ZGQ5NmVlMzZhOWNlMzA0Y2E0YjQ4MzQ4
-    NzhjMGY5ZjI1YzU3YzVmZDJmNGYwYjFlMmJiMzQzOWMwZWU4ZGQ=
+    MzEyMTlhYWIyYzhlNzU0ZjdmZGE5NjAzYzEyZTliZjg2OGViYTU1MTRmYzU3
+    ODEzNmUzNzAzNWMzZjk3OTljMmRjMTMzZjc3YTE2OTE4Y2Y3YWQ0NzI1NDJj
+    N2NjMGRmZmVkYzQ4N2U5ZjhiOGM4OTgxNjkxZTRlMTViZTRiNTk=
   data.tar.gz: !binary |-
-    N2Q4ZTlkNDc4NDJhYjQxNTBlZGU3ODViMTE3NjczNzI5ZDk5Mzk1NTFhZTFm
-    NjcyYzIzMzE0YzRjZWQxZTMzZDE2M2RkZWYzODRlN2UzNjQ3MmQzNjA3ZTBi
-    NzU1NmFmMjhjMmQzZmZmMGY5MjZkZDRmODNhMDJmYzRkZTU2MzE=
+    Mzg3ZjA2MDdiM2EzYjIwODY3MzcxYTJjNTA1OTQzZGZhZDFlOTU3MGQ3MDhl
+    OTFiYWFhYmRhYjY4MDFlM2ZmZjA4N2U3NzU5YzA0NDk3NGZhNDRlZDhmMDg5
+    MjhkYTRmMmY2Nzc3YTAxYTlhYjU3OTU4OWI1OTEzMDc2N2QyZDk=

data/lib/application/application.rb

@@ -46,10 +46,9 @@ class GitVisualiser < Sinatra::Base
     get '/author_stats.json' do
       ref = params[:ref]
 
-      @authors = Visualisation.branch_author_stats(ref)
-      @authors = @authors.slice(0, 3) #show a max of 3 authors
-
-      haml :'/authors_list' if @authors.length > 0
+      authors = Visualisation.branch_author_stats(ref)
+      content_type :json
+      authors.to_json
     end
 
     get '/commits.json' do
@@ -67,15 +66,7 @@ class GitVisualiser < Sinatra::Base
       content_type :json
       file_diff_stats.to_json
     end
-
-    helpers do 
-
-      def gravatar_image(email) 
-        hash = Digest::MD5.hexdigest(email).to_s
-        "<img src=\"http://www.gravatar.com/avatar/#{hash}?s=48\" />"
-      end
-
-    end
+      
 end
 
 puts "Running GitVisualiser"

data/lib/application/javascripts/branch_graph.coffee

@@ -411,12 +411,85 @@ class BranchGraph
       @linked_nodes[other_id + ", " + node_id] == 1 ||
         node_id == other_id
 
+  initAuthorStats: (data) ->
+    margin = {top: 10, right: 20, bottom: 30, left: 25}
+    width = $("#sidebar-branches").width() - 20 - margin.left - margin.right
+    height = 300 - margin.top - margin.bottom
+
+    x = d3.scale.ordinal().rangeRoundBands([0, width], .1)
+    y = d3.scale.linear().rangeRound([height, 0])
+
+    colors = d3.scale.category10()
+
+    xAxis = d3.svg.axis().scale(x).orient("bottom")
+    yAxis = d3.svg.axis()
+                  .scale(y)
+                  .orient("left")
+                  .ticks(4)
+                  .tickFormat(d3.format("d"))
+
+    @author_svg = d3.select("#authors-graph-chart")
+                    .append("svg")
+                      .style("background", d3.rgb("#EFEFEF"))
+                      .attr("width", width + margin.left + margin.right)
+                      .attr("height", height + margin.top + margin.bottom)
+                    .append("g")
+                      .attr("transform", "translate(" + margin.left + ", " + margin.top + ")")
+
+    @y = y
+    data.sort (a, b) -> b.commits - a.commits
+
+    y.domain([0, d3.sum data, (d) -> d.commits])
+    y.nice()
+    ypos = 0
+
+    data.forEach((d) ->
+      d.coords = { y0: ypos, y1: ypos += d.commits }
+      d.color = colors(d.commits)
+    )
+
+    @author_svg.append("g")
+      .attr("class", "x axis")
+      .attr("transform", "translate(0, " + height + ")")
+      .call(xAxis)
+
+    @author_svg.append("g")
+        .attr("class", "y axis")
+        .call(yAxis)
+
+    g = @author_svg.selectAll("rect").data(data)
+      .enter()
+      .append("g")
+    g.append("rect")
+      .attr("width", 30)
+      .attr("x", 5)
+      .attr("y", (d) -> height - y(d.coords.y0))
+      .attr("height", (d) -> y(d.coords.y0) - y(d.coords.y1))
+      .attr("fill", (d) -> d.color)
+    g.append("text")
+      .attr("x", 90)
+      .attr("y", (d) -> height - y(d.coords.y0) + 15)
+      .text((d) -> d.name)
+    g.append("text")
+      .attr("x", 90)
+      .attr("y", (d) -> height - y(d.coords.y0) + 30)
+      .text((d) -> "#{d.commits} commits")
+    g.append("svg:image")
+      .attr("xlink:href", (d) -> d.gravatar_url)
+      .attr("x", 40)
+      .attr("y", (d) -> height - y(d.coords.y0))
+      .attr("width", "40")
+      .attr("height", "40")
+
   getAuthorStats: (branch_name) ->
-    $.get "/author_stats.json", {ref: branch_name}, (data) ->
-      $("#authors-list").html(data)
+    vis = @
+    $.get "/author_stats.json", {ref: branch_name}, (author_data) ->
+      $("#authors-graph").show()
+      vis.initAuthorStats(author_data)
 
   clearAuthorStats: ->
-    $("#authors-list").empty()
+    $("#authors-graph").hide()
+    $("#authors-graph-chart").empty()
 
         
 

data/lib/application/stylesheets/scss/app.scss

@@ -29,7 +29,7 @@ body,html { height: 100%; margin: 0px; }
     margin-top: 20px;   
   }
 
-  #authors-list {
+  #authors-graph {
     padding: 10px; 
 
     p { 
@@ -115,6 +115,16 @@ body,html { height: 100%; margin: 0px; }
   img { float: left }
 }
 
+#authors-graph { 
+  .axis path, .axis line {
+    fill: none;
+    stroke: #000;
+    shape-rendering: crispEdges;
+  }
+
+  .x.axis path { display:none; }
+}
+
 svg {
   background-color: #FFF;
   cursor: default;

data/lib/application/views/index.haml

@@ -19,7 +19,9 @@
       %input#exclude_commit_input.commit_filters_input{:name => "exclude_commit", :placeholder => "Exclude commit", :type => "text"}
       %a#apply-filters-btn.btn.btn-large.btn-block.apply-btn{:href => "#"}
         Apply Filters
-    #authors-list
+    #authors-graph{style: "display: none"}
+      %h4 Top Authors By Commits
+      #authors-graph-chart
   #branches-display  
     #vis-loading
       %h4 Loading Repository Data...

data/lib/application/visualisation.rb

@@ -7,7 +7,6 @@ module Visualisation
     total_additions = total_deletions = 0
     remotes_arr = Visualisation.remotes
     Visualisation.branches_with_remotes.each do |branch|
-      puts "#{branch}"
       diff = Visualisation.branch_diff_size(branch)
       head_commit = Visualisation.head_commit_sha(branch)
       merged_with_master = Visualisation.branch_contains_commit("master", head_commit)
@@ -68,7 +67,6 @@ module Visualisation
         next if b1 == b2 || b2.split("/").last == b1 || 
             (merged_branches.has_key?(b2.to_sym) && merged_branches[b2.to_sym].has_key?(b1.to_sym))
         directions = {}
-        puts "comparing #{b1} with #{b2}"
         directions.merge!(:left => true) if branch_merged_with_base?(b1, b2, remotes)
         directions.merge!(:right => true) if right = branch_merged_with_base?(b2, b1, remotes)
         b1_merges.merge!(b2.to_sym => directions)
@@ -153,9 +151,20 @@ module Visualisation
   end
 
   def self.branch_author_stats(branch)
-    `git log master..#{branch} --pretty=format:%an,%ae \
+    authors = []
+    raw_authors = `git log master..#{branch} --pretty=format:%an,%ae \
       | awk '{ ++c[$0]; } END { for(cc in c) printf "%5d,%s\\n",c[cc],cc; }'\
-      | sort -r`.split(/\n/).each { |c| c.strip! }
+      | sort -r`.split(/\n/).each { |c| c.strip! }.slice(0, 3)
+    raw_authors.each do |author|
+      author = author.split(/,/)
+      authors << {:name => author[1], :commits => author[0], :gravatar_url => gravatar_url(author[2])} 
+    end
+    authors
+  end
+
+  def self.gravatar_url(email) 
+    hash = Digest::MD5.hexdigest(email).to_s
+    "http://www.gravatar.com/avatar/#{hash}?s=40"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-visualiser
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - James McCann
@@ -24,6 +24,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement