git-visualiser 0.0.7 → 0.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzIzNTRmMGVhN2U5ODNjZDEwZTQ5NGQyZjc1YmFiODM3YjZmZmUzYg==
+    NDA3MzNjOWEyYmJjN2E1MWI4OTYyOWI4OTI1OWIzMTFjMWU4NGZhOQ==
   data.tar.gz: !binary |-
-    ZDIxOTQxZjZjMTc4YTM5NGY0OWEyYjQyYmU5NjMzZDM3NDY2ODdhZQ==
+    M2ExMjAyMzA4OWMwMzViNTE1ZjZmOTA0MzhmMWVkMjYwNDIyYmQ2YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzhkM2ExYWFhNzBkZGI0YTZiYjdhNjc3MTUxZjc0NTE2ZDg0MWE0NDg1YjE4
-    OWVkNDY5N2JjYzlkMzIxMjBhODg0ZjVjZDBhYWE3Y2ZjYzg3ODNlMGZiY2Ix
-    MjZlZGEwY2ExYjg5YTFiYjkxOTkzNTBlNGZmZTZmNzliZGU5YTE=
+    ZGMzZTA4NzkzNGNhYTJmYWUxMzA0ZTM4MWI2YWJhNzFiNWQ2MmRiMGM2Nzli
+    MjQ2YmNmZDBmN2Y3MDkwOWM3M2QwNzMwZWVmODljYjM0MDMzNjQwMzk2NzZm
+    YTgyNGE5Y2MwNDEyZmUxZmFlMjY1NGZkZTJkNDRhOTFhMmI2YjQ=
   data.tar.gz: !binary |-
-    NjM3ODM5MmQ2MmIwNjQzYzU1ZTQ2ZTUxZDY0NTg3YjFlOTNmNTE1MTJmZGI4
-    MWIwNGY4ZTZlMjFmNTljMWFmNzZjMDczNTMwMDY0ZDgyMGMwYmI4MmMwMTY3
-    NjFiMDhmNWViNjRjMDI2NTRkZjY2YTU0OGVmN2E5NzE4ZWM1MTU=
+    YmJlODEzOGRjZjAzNTBhZDkwNWRjOWM5MjgzNTIxOTA0OTllNTgxZmI5MDc1
+    ZDZhYWY3ZjkwNjcwMzhiNmQ3NjY3YjFiMTZiYmUzMDE0NzJiNmFhZWIyZDRm
+    NTNkNTg3NjU3MzIxNzg3NDY3NWYwZWZiNjAwZTM0ZDYzNzc4Y2Y=

data/bin/git_vis

@@ -3,7 +3,7 @@
 
 begin
   require 'rubygems'
-  require 'sinatra'
+  require 'sinatra/base'
   require 'haml'
   require 'coffee-script'
   require 'sass'

data/lib/application/application.rb

@@ -1,10 +1,9 @@
-class GitVisualiser < Sinatra::Application
+class GitVisualiser < Sinatra::Base
 
     use SassEngine
     use CoffeeEngine
 
-    set :static, true                             
-    set :public_dir, File.expand_path('..', __FILE__) 
+    set :public_dir, File.expand_path('../public/', __FILE__) 
         
     set :views,  File.expand_path('../views', __FILE__) 
     set :haml, { :format => :html5 }                    
@@ -33,12 +32,14 @@ class GitVisualiser < Sinatra::Application
       branches_include = Visualisation.branches_containing_commit(include_commit_sha) if include_commit_sha != ''
       branches_exclude = Visualisation.branches_excluding_commit(exclude_commit_sha) if exclude_commit_sha != ''
 
-      if !branches_include == {}
-        branches = Hash[branches_include.to_a - branches_exclude.to_a]
+      if branches_include != []
+        branches = branches_include.to_a - branches_exclude.to_a
       else
-        branches = branches_exclude
+        branches = branches_exclude.to_a
       end
 
+      puts branches
+
       content_type :json
       branches.to_json
     end

data/lib/application/coffee_engine.rb

@@ -1,7 +1,6 @@
 class CoffeeEngine < Sinatra::Base
   
-  set :views,   File.dirname(__FILE__)    + '/javascripts'
-  set :public_dir, File.expand_path('..', __FILE__)
+  set :views,   File.dirname(__FILE__)    + '/public/javascripts'
 
   get "/javascripts/d3.min.js" do
   end

data/lib/application/{javascripts → public/javascripts}/branch_graph.coffee

@@ -228,28 +228,30 @@ class BranchGraph
       .style("stroke", (d) -> d3.rgb(branch_color(d)).darker().toString())
       .classed("reflexive", (d) -> d.reflexive)
       .on("mouseover", (d) ->
-        d3.selectAll("circle").filter((d2) -> d != d2).transition().style "opacity", "0.25"
-        d3.selectAll("text").filter((d2) -> d != d2).transition().style "opacity", "0.10"
-        d3.selectAll("path.link").filter((d2) -> d != d2).transition().style "opacity", "0.10"
+        vis.svg.selectAll("circle").filter((d2) -> d != d2).transition().style "opacity", "0.25"
+        vis.svg.selectAll("text").filter((d2) -> d != d2).transition().style "opacity", "0.10"
+        vis.svg.selectAll("path.link").filter((d2) -> d != d2).transition().style "opacity", "0.10"
+        vis.clearAuthorStats()
         vis.getAuthorStats(d.branch.name))
       .on("mouseout", (d) ->
-        d3.selectAll("circle").transition().style "opacity", "1"
-        d3.selectAll("text").transition().style "opacity", "1"
-        d3.selectAll("path").transition().style "opacity", "1"
+        vis.svg.selectAll("circle").transition().style "opacity", "1"
+        vis.svg.selectAll("text").transition().style "opacity", "1"
+        vis.svg.selectAll("path").transition().style "opacity", "1"
         vis.clearAuthorStats())
       .on("mousedown", (d) ->
         vis.mousedown_node = d
-        d3.selectAll("circle").filter((d2) -> 
+        vis.svg.selectAll("circle").filter((d2) -> 
           vis.neighbouring(vis.dom_node(d)[0].__data__.id, vis.dom_node(d2)[0].__data__.id)
           ).transition().style "opacity", "1"
-        d3.selectAll("text").filter((d2) -> 
+        vis.svg.selectAll("text").filter((d2) -> 
           vis.neighbouring(vis.dom_node(d)[0].__data__.id, vis.dom_node(d2)[0].__data__.id)
         ).transition().style "opacity", "1"
-        d3.selectAll("path.link").filter((d2) -> 
+        vis.svg.selectAll("path.link").filter((d2) -> 
           return false if d2 is undefined
           return true if d2.source == vis.mousedown_node || d2.target == vis.mousedown_node
         ).transition().style "opacity", "1")
       .on("dblclick", (d) ->
+        return if d.branch.diff.add == 0 && d.branch.diff.del == 0
         vis.commitGraph.load(d.branch.name) 
       )
       .call(@force.drag())
@@ -412,12 +414,15 @@ class BranchGraph
         node_id == other_id
 
   initAuthorStats: (data) ->
-    margin = {top: 10, right: 20, bottom: 30, left: 25}
+    console.log data
+
+    margin = {top: 10, right: 20, bottom: 30, left: 30}
     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])
+    y.domain([0, d3.sum data, (d) -> d.commits])
 
     colors = d3.scale.category10()
 
@@ -425,7 +430,7 @@ class BranchGraph
     yAxis = d3.svg.axis()
                   .scale(y)
                   .orient("left")
-                  .ticks(4)
+                  .tickValues([0, d3.sum(data, (d) -> d.commits)])
                   .tickFormat(d3.format("d"))
 
     @author_svg = d3.select("#authors-graph-chart")
@@ -439,13 +444,11 @@ class BranchGraph
     @y = y
     data.sort (a, b) -> b.commits - a.commits
 
-    y.domain([0, d3.sum data, (d) -> d.commits])
-    y.nice()
     ypos = 0
-
+    i = 0
     data.forEach((d) ->
-      d.coords = { y0: ypos, y1: ypos += d.commits }
-      d.color = colors(d.commits)
+      d.coords = { y0: ypos, y1: ypos += parseInt(d.commits) }
+      d.color = colors(i+=1)
     )
 
     @author_svg.append("g")
@@ -460,32 +463,57 @@ class BranchGraph
     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)
+
+    console.log "images"
+    
+    #if there is enough space we add in images/name/commits etc. 
+    g.filter((d, i) -> (y(d.coords.y0) - y(d.coords.y1)) >= 15)
+      .append("text")
+      .attr("x", (d) -> 
+        return 90 if (y(d.coords.y0) - y(d.coords.y1)) > 45
+        return 40
+      )
       .attr("y", (d) -> height - y(d.coords.y0) + 15)
       .text((d) -> d.name)
-    g.append("text")
-      .attr("x", 90)
+    g.filter((d, i) -> (y(d.coords.y0) - y(d.coords.y1)) > 25)
+      .append("text")
+      .attr("x", (d) -> 
+        return 90 if (y(d.coords.y0) - y(d.coords.y1)) > 45
+        return 40
+      )
       .attr("y", (d) -> height - y(d.coords.y0) + 30)
       .text((d) -> "#{d.commits} commits")
-    g.append("svg:image")
+    g.filter((d, i) -> (y(d.coords.y0) - y(d.coords.y1)) > 45)
+      .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")
 
+    #label the number of authors not shown
+    num_small_authors = g.filter((d, i) -> (y(d.coords.y0) - y(d.coords.y1) < 15))[0].length
+    if num_small_authors > 0
+      @author_svg
+        .append("text")
+        .attr("x", 40)
+        .attr("y", height)
+        .text("#{num_small_authors} more")
+
   getAuthorStats: (branch_name) ->
+    @clearAuthorStats()
     vis = @
     $.get "/author_stats.json", {ref: branch_name}, (author_data) ->
-      $("#authors-graph").show()
-      vis.initAuthorStats(author_data)
+      if author_data.length > 0
+        $("#authors-graph").show()
+        vis.initAuthorStats(author_data)
 
   clearAuthorStats: ->
     $("#authors-graph").hide()

data/lib/application/{stylesheets → public/stylesheets}/scss/app.scss

@@ -37,12 +37,18 @@ body,html { height: 100%; margin: 0px; }
       -webkit-margin-after: 0em;
     }
 
-    .author-row { clear: both; padding: 5px; display: block; margin-bottom: 10px; min-height: 48px; }
-
     .author-gravatar { float: left; margin-right: 15px; border: solid 1px #DDD; }
     .author-details { float: left; }
     .author-email { color: #999; text-decoration: underline; }
     .author-commits { float: left; }
+
+    .axis path, .axis line {
+      fill: none;
+      stroke: #000;
+      shape-rendering: crispEdges;
+    }
+
+    .x.axis path { display:none; }
   }
 }
 
@@ -115,16 +121,6 @@ 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/sass_engine.rb

@@ -1,6 +1,6 @@
 class SassEngine < Sinatra::Base
   
-  set :views,   File.dirname(__FILE__)    + '/stylesheets/scss'
+  set :views,   File.dirname(__FILE__)    + '/public/stylesheets/scss'
 
    get '/stylesheets/flat_ui.css' do
     sass 'flat_ui/flat-ui'.to_sym

data/lib/application/visualisation.rb

@@ -47,7 +47,7 @@ module Visualisation
 
   def self.branches_excluding_commit(commit_sha, remotes = true)
     if remotes
-      return branches_with_remotes - `git branch --contains #{commit_sha}`.split("\n").each { |b| b.gsub!(/[*]?\s/, '') }
+      return branches_with_remotes.to_a - branches_containing_commit(commit_sha, true) #`git branch -a --contains #{commit_sha}`.split("\n").each { |b| b.gsub!(/[*]?\s/, '') }
     else
       # TODO fix this
       # return branches - `git branch --contains #{commit_sha}`.split("\n").each { |b| b.gsub!(/[*]?\s/, '') }
@@ -154,7 +154,7 @@ module Visualisation
     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! }.slice(0, 3)
+      | sort -r`.split(/\n/).each { |c| c.strip! }
     raw_authors.each do |author|
       author = author.split(/,/)
       authors << {:name => author[1], :commits => author[0], :gravatar_url => gravatar_url(author[2])} 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-visualiser
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.11
 platform: ruby
 authors:
 - James McCann
@@ -105,44 +105,44 @@ files:
 - lib/application/application.rb
 - lib/application/coffee_engine.rb
 - lib/application/config.ru
-- lib/application/images/ajax-loader.gif
-- lib/application/javascripts/branch_graph.coffee
-- lib/application/javascripts/commit_graph.coffee
-- lib/application/javascripts/common.coffee
-- lib/application/javascripts/d3.min.js
-- lib/application/javascripts/data_convert.coffee
-- lib/application/javascripts/jquery.min.js
-- lib/application/javascripts/moment.min.js
-- lib/application/javascripts/namespace.coffee
+- lib/application/public/images/ajax-loader.gif
+- lib/application/public/javascripts/branch_graph.coffee
+- lib/application/public/javascripts/commit_graph.coffee
+- lib/application/public/javascripts/common.coffee
+- lib/application/public/javascripts/d3.min.js
+- lib/application/public/javascripts/data_convert.coffee
+- lib/application/public/javascripts/jquery.min.js
+- lib/application/public/javascripts/moment.min.js
+- lib/application/public/javascripts/namespace.coffee
+- lib/application/public/stylesheets/scss/app.scss
+- lib/application/public/stylesheets/scss/flat_ui/_config.sass
+- lib/application/public/stylesheets/scss/flat_ui/_icon-font-24.sass
+- lib/application/public/stylesheets/scss/flat_ui/_icon-font.sass
+- lib/application/public/stylesheets/scss/flat_ui/_mixins.sass
+- lib/application/public/stylesheets/scss/flat_ui/_spaces.sass
+- lib/application/public/stylesheets/scss/flat_ui/flat-ui.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_btn.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_checkbox-and-radio.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_demo.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_footer.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_input.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_login.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_navbar.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_pager.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_pagination.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_palette.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_progress.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_select.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_share.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_tagsinput.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_tile.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_todo.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_toggle.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_tooltip.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_type.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_ui-slider.sass
+- lib/application/public/stylesheets/scss/flat_ui/modules/_video.sass
 - lib/application/sass_engine.rb
-- lib/application/stylesheets/scss/app.scss
-- lib/application/stylesheets/scss/flat_ui/_config.sass
-- lib/application/stylesheets/scss/flat_ui/_icon-font-24.sass
-- lib/application/stylesheets/scss/flat_ui/_icon-font.sass
-- lib/application/stylesheets/scss/flat_ui/_mixins.sass
-- lib/application/stylesheets/scss/flat_ui/_spaces.sass
-- lib/application/stylesheets/scss/flat_ui/flat-ui.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_btn.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_checkbox-and-radio.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_demo.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_footer.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_input.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_login.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_navbar.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_pager.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_pagination.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_palette.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_progress.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_select.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_share.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_tagsinput.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_tile.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_todo.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_toggle.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_tooltip.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_type.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_ui-slider.sass
-- lib/application/stylesheets/scss/flat_ui/modules/_video.sass
 - lib/application/views/authors_list.haml
 - lib/application/views/index.haml
 - lib/application/visualisation.rb