git-visualiser 0.0.1

data/lib/application/views/authors_list.haml

@@ -0,0 +1,11 @@
+#author-list
+  %h4 Top Authors
+  - @authors.each do |author|
+    - author = author.split(',')
+    .author-row.clearfix
+      .author-gravatar
+        =gravatar_image(author[2])
+      .author_details
+        %p.author-name= author[1]
+        %p.author-email= author[2]
+      %p.author-commits= "#{author[0]} commits"

data/lib/application/views/index.haml

@@ -0,0 +1,48 @@
+!!! 5
+%head
+  %link(rel="stylesheet" type="text/css" href="stylesheets/app.css")
+  %link(rel="stylesheet" type="text/css" href="stylesheets/flat_ui.css")
+  
+%body
+  #sidebar-branches.sidebar
+    %h1 Branches 
+    #branches-controls
+      %label{:for => "filter_merged"}
+        %input#filter_merged_checkbox{:name => "filter_merged", :type => "checkbox"}
+        Filter merged with master
+      %br
+      %label{:for => "filter_remotes"}
+        %input#filter_merged_checkbox{:name => "filter_remotes", :type => "checkbox"}
+        Filter remote branches
+      %input#filter_names_input{:name => "filter_names", :placeholder => "Filter branch names", :type => "text"}
+      %input#show_commit_input.commit_filters_input{:name => "show_commit", :placeholder => "Show commit", :type => "text"}
+      %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
+  #branches-display  
+    #vis-loading
+      %h4 Loading Repository Data...
+      %img{:alt => "Ajax-loader", :src => "images/ajax-loader.gif"}
+  #commits-toolbar{:style => "display: none"}
+    #commit-details
+      %h3{:id => "branch_name"}  
+      %a#back-to-branches-btn{:href => "#"}
+        Back to branches
+      %p{:id => "commit_sha"}
+      %p{:class => "small"}
+        %span{:id => "commit_author"}
+        %br
+        %span{:id => "commit_message"}
+    #history-graph
+      %a{:id => "clear_history_filters", :href => '#'} Clear filter
+  #commits-display
+
+%script(src="javascripts/jquery.min.js" type="text/javascript")
+%script(src="javascripts/d3.min.js" type="text/javascript")
+%script(src="javascripts/moment.min.js" type="text/javascript")
+%script(src="javascripts/namespace.js" type="text/javascript")
+%script(src="javascripts/common.js" type="text/javascript")
+%script(src="javascripts/data_convert.js" type="text/javascript")
+%script(src="javascripts/commit_graph.js" type="text/javascript")
+%script(src="javascripts/branch_graph.js" type="text/javascript")

data/lib/application/visualisation.rb

@@ -0,0 +1,156 @@
+module Visualisation
+  require 'csv'
+
+  def self.branches
+    branches_arr = [] 
+    total_additions = total_deletions = 0
+    remotes_arr = Visualisation.remotes
+    Visualisation.branches_with_remotes.each do |branch|
+      diff = Visualisation.branch_diff_size(branch)
+      head_commit = Visualisation.head_commit_sha(branch)
+      merged_with_master = Visualisation.branch_contains_commit("master", head_commit)
+      total_additions += diff.first
+      total_deletions += diff.last
+      remote = remotes_arr.include?(branch)
+      branches_arr << {:name => branch, :diff => {:add => diff.first, :del => diff.last}, 
+                    :merged_with_master => merged_with_master, :hidden => false, :remote => remote}
+    end
+    result = {:branches => branches_arr, :diff => {:add => total_additions, :del => total_deletions}}
+    result
+  end
+
+  def self.branches_with_remotes
+    `git branch -a`.split("\n").each { |b| b.gsub!(/[*]?\s/, '') and b.gsub!(/remotes\//, '') }
+  end
+
+  def self.remotes
+    `git branch -r`.split("\n").each { |b| b.gsub!(/[*]?\s/, '') }
+  end
+
+  def self.head_commit_sha(branch)
+    `git rev-parse #{branch}`
+  end
+
+  def self.branch_contains_commit(branch, commit_sha)
+    `git branch --contains #{commit_sha}`.split("\n").each {|b| b.gsub!(/[*]?\s/, '')}.include?(branch)
+  end
+
+  def self.branches_containing_commit(commit_sha, remotes = true)
+    if remotes 
+      return `git branch -a --contains #{commit_sha}`.split("\n").each { |b| b.gsub!(/[*]?\s/, '') and b.gsub!(/remotes\//, '') }
+    else 
+      return `git branch --contains #{commit_sha}`.split("\n").each { |b| b.gsub!(/[*]?\s/, '') }
+    end
+  end
+
+  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/, '') }
+    else
+      # TODO fix this
+      # return branches - `git branch --contains #{commit_sha}`.split("\n").each { |b| b.gsub!(/[*]?\s/, '') }
+    end
+  end
+
+  def self.branch_diff_number_commits(branch)
+    `git cherry master #{branch}`.split("\n").size
+  end 
+
+  def self.repo_branches_merged(show_remotes = true)
+    merged_branches = {}
+    compare_branches = branches_with_remotes
+    compare_branches.each do |b1|
+      b1_merges = {}
+      compare_branches.each do |b2|
+        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 = {}
+        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)
+      end
+      merged_branches.merge!(b1.to_sym => b1_merges)
+    end
+    merged_branches
+  end
+
+  def self.branch_merged_with_base?(base, branch, remotes)
+    if remotes 
+      `git branch -a --merged #{base} #{branch}`.length > 0
+    else
+      `git branch --merged #{base} #{branch}`.length > 0
+    end
+  end
+  
+  #printout merge commits between base and topic branch
+  #`git log #{branch} #{base} --oneline --date-order --merges --reverse -1`
+
+  def self.branch_diff_size(branch)
+    merge_base_commit = `git merge-base master #{branch}`.gsub("/\n/", '').strip!
+    raw_diff_stats = `git diff --numstat #{merge_base_commit} #{branch}`
+    diff_stats = raw_diff_stats.split(/\n/)
+    additions = deletions = 0
+    diff_stats.each do |line|
+      cols = line.split
+      additions += cols[0].to_i 
+      deletions += cols[1].to_i 
+    end
+
+    return additions, deletions
+  end
+
+  def self.commits_for_branch(branch_name)
+    commits = []
+    raw_log = `git log  master..#{branch_name} --max-count 15 --date=short --pretty="%H, %an, %ad, %s"`
+    commit_lines = CSV.parse(raw_log)
+    i = 1
+    last_date = nil
+    commit_lines.each_with_index do |commit, id|
+      sha1 = commit[0]
+      author = commit[1].strip!
+      commit_date = commit[2].strip!
+      message = commit.slice(3..commit.length-1).join(",").strip!
+      if !last_date.nil? && commit_date.to_date == last_date.to_date
+        i += 1
+      else
+        i = 1
+      end
+      last_date = commit_date
+      commit_stats = {:id => id, :date => commit_date, :num => i, :sha => sha1, 
+                      :author => author, :message => message}
+      commits << commit_stats
+      puts commits
+    end
+    commits
+  end
+
+  def self.merge_base_file_stats(branch_name)
+    `git log master..#{branch_name} --numstat --no-merges --format="%n"`
+  end
+
+  def self.commit_diff_stats(commit_sha)
+    `git show #{commit_sha} --numstat --no-merges --pretty="%n"`.strip!
+  end
+
+
+  def self.branch_diff_commit_files(commit_sha = nil)
+    merge_base_commit = `git merge-base master #{commit_sha}`.gsub("/\n/", '').strip!
+    diff_stats = `git diff --numstat #{merge_base_commit} #{commit_sha}`.split(/\n/)
+    files = {}
+    additions = deletions = 0
+    diff_stats.each do |line|
+      cols = line.split
+      additions += cols[0].to_i 
+      deletions += cols[1].to_i 
+      files.merge!(cols[2].to_sym => { :add => additions, :del => deletions })
+    end
+    files.merge!(:total => { :add => additions, :del => deletions })
+  end
+
+  def self.branch_author_stats(branch)
+    `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! }
+  end
+
+end

metadata

@@ -0,0 +1,87 @@
+--- !ruby/object:Gem::Specification
+name: git-visualiser
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+platform: ruby
+authors:
+- James McCann
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2013-05-18 00:00:00.000000000 Z
+dependencies: []
+description: A Sinatra app for loading D3-based visualisations of a local Git repository
+email: jmccnz@gmail.com
+executables:
+- git_vis
+extensions: []
+extra_rdoc_files: []
+files:
+- bin/git_vis
+- lib/application/application.rb
+- lib/application/coffee_engine.rb
+- 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/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
+homepage: http://rubygems.org/gems/git-visualiser
+licenses: []
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.0.3
+signing_key: 
+specification_version: 4
+summary: Sinatra app for Git Visualisation
+test_files: []