zitgit 0.0.2 → 0.1.0

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec
-gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: '42297cdcee16284d2e4eff23d41377f52fc28b9d'
 

data/README.md

@@ -6,17 +6,26 @@ Simple sinatra-based web-interface to view git repository history
 
 Add this line to your application's Gemfile:
 
-    gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: '42297cdcee16284d2e4eff23d41377f52fc28b9d'
     gem 'zitgit'
 
+or install from GitHub:
+
+    gem 'zitgit', git: 'https://github.com/rsludge/zitgit.git'
+
 And then execute:
 
     $ bundle install
 
-You can not just run gem install zitgit because it has dependencies from GitHub
+Or install with:
+
+    $ gem install zitgit
 
 ## Usage
 
 Just run `zitgit` from git repo folder and view your repository history on http://localhost:5555
 
 Or you can run it on different port with `zitgit -p <port_number>`
+
+## Develop
+
+Clone repository from GitHub and run `bundle install`. Launch guard to manage assets.

data/lib/grit/status.rb

@@ -0,0 +1,36 @@
+module Grit
+  class Status
+    class StatusFile
+      def diff_string
+        old = @base.object(self.sha_repo)
+        new = @base.object(self.sha_index)
+        data_old = old.content.split(/\n/).map! { |e| e.chomp }
+        data_new = new.content.split(/\n/).map! { |e| e.chomp }
+        diffs = Difference::LCS.diff(data_old, data_new)
+        file_length_difference = 0
+        lines = 3
+        oldhunk = hunk = nil
+        output = "--- a/#{self.path}\n+++ b/#{self.path}"
+        format = :unified
+        diffs.each do |piece|
+          begin
+            hunk = Difference::LCS::Hunk.new(data_old, data_new, piece, lines, file_length_difference)
+            file_length_difference = hunk.file_length_difference
+            next unless oldhunk
+            if lines > 0 && hunk.overlaps?(oldhunk)
+              hunk.unshift(oldhunk)
+            else
+              output << oldhunk.diff(format)
+            end
+          ensure
+            oldhunk = hunk
+            output << "\n"
+          end
+        end
+        output << oldhunk.diff(format)
+        output << "\n"
+        output
+      end
+    end
+  end
+end

data/lib/zitgit.rb

@@ -1,54 +1,44 @@
-require_relative "zitgit/version"
-require 'bundler'
-Dir.chdir(File.dirname(__FILE__)) do
-  Bundler.setup
-end
+require_relative 'zitgit/version'
+require_relative 'zitgit/helpers/views'
+require_relative 'zitgit/helpers/git'
+require_relative 'grit/status'
 require 'sinatra/base'
 require 'grit'
 require 'slim'
+require 'base64'
 
 module Zitgit
   class Zitgit < Sinatra::Base
     configure do
       set :root, File.expand_path('..', File.dirname(__FILE__))
     end
-
-    helpers do
-      def heads(commit)
-        repo = Grit::Repo.new('.')
-        repo.heads.select{|head| head.commit.id == commit.id}
-      end
-
-      def remotes(commit)
-        repo = Grit::Repo.new('.')
-        repo.remotes.select{|head| head.commit.id == commit.id}
-      end
-
-      def tags(commit)
-        repo = Grit::Repo.new('.')
-        repo.tags.select{|head| head.commit.id == commit.id}
-      end
-    end
+    helpers ViewsHelpers
+    helpers GitHelpers
 
     get '/' do
-      repo = Grit::Repo.new('.')
-      @current_branch = Grit::Head.current(repo)
-      @commits = repo.commits(@current_branch.name, 200)
+      @repo = Grit::Repo.new('.')
+      @current_branch = Grit::Head.current(@repo)
+      @commits = @repo.commits(@current_branch.name, 200)
       @last_commit = @commits[0]
-      @repo_name = File.basename(repo.working_dir)
-      @branches = repo.heads    
-      @remotes = repo.remotes
-      @tags = repo.tags
-      @index = repo.index
+      @repo_name = File.basename(@repo.working_dir)
+      @branches = @repo.heads    
+      @remotes = @repo.remotes
+      @tags = @repo.tags
+      @index = @repo.index
       slim :index
     end
 
     get "/ref/:ref_name" do |ref_name|
-      repo = Grit::Repo.new('')
-      commits = repo.commits(ref_name, 200)
+      @repo = Grit::Repo.new('.')
+      commits = @repo.commits(ref_name, 200)
       slim :branch, :locals => { commits: commits }, :layout => false
     end
 
+    get "/status/" do
+      @repo = Grit::Repo.new('.')
+      slim :'status/list', :locals => {repo: @repo}, :layout => false
+    end
+
     run! if app_file == $0
   end
 end

data/lib/zitgit/helpers/git.rb

@@ -0,0 +1,37 @@
+module GitHelpers
+  def heads(commit)
+    repo = Grit::Repo.new('.')
+    repo.heads.select{|head| head.commit.id == commit.id}
+  end
+
+  def remotes(commit)
+    repo = Grit::Repo.new('.')
+    repo.remotes.select{|head| head.commit.id == commit.id}
+  end
+
+  def tags(commit)
+    repo = Grit::Repo.new('.')
+    repo.tags.select{|head| head.commit.id == commit.id}
+  end
+
+  def merge_commit?(commit)
+    commit.parents.count > 1
+  end
+
+  def large_commit?(commit)
+    commit.diffs.count > 20
+  end
+
+  def large_diff?(diff)
+    diff.diff.lines.count > 200
+  end
+
+  def is_head_ref(ref)
+    ref.name.split('/').index('HEAD')
+  end
+
+  def is_image(diff)
+    image_exts = ['.jpg', '.jpeg', '.png', '.gif']
+    image_exts.include?(File.extname(diff.a_path)) or image_exts.include?(File.extname(diff.b_path))
+  end
+end

data/lib/zitgit/helpers/views.rb

@@ -0,0 +1,17 @@
+module ViewsHelpers
+  def strip_message(text, length)
+    text.length > length ? text[0, length] + '...' : text
+  end
+  
+  def summ_line(line)
+    line.match(/@@\s+-([^\s]+)\s+\+([^\s]+)\s+@@/)
+    [Regexp.last_match(1), Regexp.last_match(2)].map{|item|
+      parts = item.split(',')
+      if parts.count == 2
+        parts[0] + '-' + (parts[0].to_i + parts[1].to_i).to_s
+      else
+        item
+      end
+    }.join(' -> ')
+  end
+end

data/lib/zitgit/version.rb

@@ -1,3 +1,3 @@
 module Zitgit
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/public/coffee/application.coffee

@@ -1,43 +1,157 @@
 ChangeCommit = ($commit)->
-    $target_commit = $commit.clone()
-    $('.commits-table tr.selected').removeClass 'selected'
-    $commit.parents('tr').addClass 'selected'
-    $('.show_commit').html $target_commit
-    UpdateDiffsWidth()
+  $target_commit = $commit.clone()
+  $('.commits-table tr.selected').removeClass 'selected'
+  $('.status').removeClass 'selected'
+  $commit.parents('tr').addClass 'selected'
+  $('.show_commit').html $target_commit
+  $('.show_commit .diffs li').niceScroll({
+    cursorcolor: '#ccc',
+    cursorwidth: 14,
+  })
+  UpdateDiffsWidth()
+
+LoadStatus = ->
+  $('.commits-table tr.selected').removeClass 'selected'
+  $('.status').addClass 'selected'
+  $status_content = $('.status .status_content').clone()
+  $('.show_commit').html $status_content
+  $('.show_commit .diffs li').niceScroll({
+    cursorcolor: '#ccc',
+    cursorwidth: 14,
+  })
+  UpdateDiffsWidth()
 
 SetHeight = ->
   commit_offset = $('.show_commit').offset().top
   $('.show_commit').height(window.innerHeight - commit_offset)
   history_offset = $('.history').offset().top
   $('.history').height(window.innerHeight - history_offset)
-
     
 UpdateDiffsWidth = ->
-    $('.show_commit .diffs li').each (index)->
-        $(this).find('div').css('width', $(this)[0].scrollWidth)
+  $('.show_commit .diffs li').each (index)->
+    $(this).find('div').css('width', $(this)[0].scrollWidth)
 
-$ ->
+SelectDiff = ($diff) ->
+  $('.show_commit .diff-names .selected').removeClass('selected')
+  $diff.addClass('selected')
+  if $diff.hasClass('all')
+    $('.show_commit .diffs li').removeClass('hidden')
+  else
+    index = $diff.index() - 1
+    $('.show_commit .diffs li').addClass('hidden')
+    $('.show_commit .diffs li:eq('+index+')').removeClass('hidden')
+
+ChangeBranch = ($link)->
+  timeout = setTimeout ->
+    $('.loader').show()
+    $('.main').hide()
+  , 1500
+  $.get $link.attr('href'), (data)->
+    clearTimeout(timeout)
+    $('.loader').hide()
+    $('.current_branch').text ''
+    if $link.parents('.ref_label').length
+      list_class = $link.parents('.ref_label').attr('data-dropdown-name')
+      $('.dropdown.'+list_class+'').parent('.has-dropdown').find('.current_branch').text $link.text()
+    else
+      $link.parents('.has-dropdown').find('.current_branch').text $link.text()
+    $('.commits-table').replaceWith data
+    $('.main').show()
+    ChangeCommit $('.commits-table tbody tr:first .commit')
+
+SwitchBranch = ->
   $('.top-bar .dropdown li a').on 'click', (e) ->
     e.preventDefault()
-    $link = $(this)
-    timeout = setTimeout ->
-      $('.loader').show()
-      $('.main').hide()
-    , 1500
-    $.get $link.attr('href'), (data)->
-      clearTimeout(timeout)
-      $('.loader').hide()
-      $('.current_branch').text ''
-      $link.parents('.has-dropdown').find('.current_branch').text $link.text()
-      $('.commits-table').replaceWith data
-      $('.main').show()
-      ChangeCommit $('.commits-table tbody tr:first .commit')
+    ChangeBranch($(this))
+  $('body').on 'click', '.ref_label a', (e) ->
+    e.preventDefault()
+    ChangeBranch($(this))
+
+RefreshStatus = ->
+  $.get '/status/', (data)->
+    $('.status').replaceWith data
+
+RefreshContent = ->
+  RefreshStatus()
+  $('.current_branch').each (index)->
+    if $(this).text() != ''
+      branch_name = $(this).text()
+      $(this).parent('.has-dropdown').find('.dropdown li a').each (index)->
+        if $(this).text() == branch_name
+          ChangeBranch($(this))
+          return false
+      return false
+
+SelectRow = ($row) ->
+  if $row.offset().top < $('.history').offset().top
+    current_scroll = $('.history').scrollTop()
+    $('.history').scrollTop(current_scroll + $row.offset().top - $('.history').offset().top)
+  offset = $row.offset().top - $('.history').offset().top
+  if offset + $row.outerHeight() > $('.history').outerHeight()
+    current_scroll = $('.history').scrollTop()
+    $('.history').scrollTop(current_scroll + offset + $row.outerHeight() - $('.history').outerHeight())
+  ChangeCommit $row.find('.commit')
+
+TableArrows = ->
+  motions = [38, 40, 33, 34, 35, 36]
+  $('.history').on 'keydown', (e)->
+    if motions.indexOf(e.keyCode) == -1
+      return
+    e.preventDefault()
+    e.stopPropagation()
+    if e.keyCode == 38 #up
+      $next = $('.commits-table tr.selected').prev()
+    else if e.keyCode == 40 #down
+      $next = $('.commits-table tr.selected').next()
+    else if e.keyCode == 33 #page up
+      $next_rows = $('.commits-table tr.selected').prevAll()
+      if $next_rows.length >= 10
+        $next = $next_rows.eq(9)
+      else
+        $next = $next_rows.last()
+    else if e.keyCode == 34 #page down
+      $next_rows = $('.commits-table tr.selected').nextAll()
+      if $next_rows.length >= 10
+        $next = $next_rows.eq(9)
+      else
+        $next = $next_rows.last()
+    else if e.keyCode == 36 #home
+      $next = $('.commits-table tbody tr:first')
+    else if e.keyCode == 35 #end
+      $next = $('.commits-table tr:last')
+    if $next and $next.length > 0
+      SelectRow($next)
 
+CommitArrows = ->
+  motions = [38, 40]
+  $('.show_commit').on 'keydown', (e)->
+    if motions.indexOf(e.keyCode) == -1
+      return
+    e.preventDefault()
+    e.stopPropagation()
+    if e.keyCode == 38 #up
+      $next = $('.show_commit .diff-names li.selected').prev()
+    else if e.keyCode == 40 #down
+      $next = $('.show_commit .diff-names li.selected').next()
+    if $next and $next.length > 0
+      SelectDiff($next)
+
+$ ->
   $('.history').on 'click', '.commits-table tr', (e)->
     ChangeCommit $(this).find('.commit')
+  $('.history').on 'click', '.status-link', (e)->
+    e.preventDefault()
+    LoadStatus()
+  $('.refresh').on 'click', (e)->
+    e.preventDefault()
+    RefreshContent()
+  $('.show_commit').on 'click', '.diff-names li', (e)->
+    SelectDiff $(this)
 
-  UpdateDiffsWidth()
+  SwitchBranch()
   SetHeight()
+  TableArrows()
+  CommitArrows()
 
   $(window).resize ->
     SetHeight()
@@ -52,7 +166,8 @@ $ ->
     railalign: 'left',
     horizrailenabled: false
   })
-  $('.diffs li').niceScroll({
+  $('.show_commit .diffs li').niceScroll({
     cursorcolor: '#ccc',
     cursorwidth: 14,
   })
+  UpdateDiffsWidth()

data/public/css/app.css

@@ -3952,8 +3952,11 @@ a.th {
 
 .top-bar {
   z-index: 6; }
+  .top-bar .refresh img {
+    position: relative;
+    top: 8px; }
 
-.row .history.columns {
+.main .history.columns {
   padding: 0 0 0 15px; }
 
 .ref_label {
@@ -3962,15 +3965,26 @@ a.th {
   border-radius: 12px;
   padding: 2px 4px;
   float: left; }
+  .ref_label a {
+    color: #000; }
 
 .branch_label {
-  background: yellow; }
+  background: #ffeeee;
+  border-color: #581313; }
+  .branch_label a {
+    color: #581313; }
 
 .remote_label {
-  background: red; }
+  background: #ffe3e3;
+  border-color: #b32222; }
+  .remote_label a {
+    color: #b32222; }
 
 .tag_label {
-  background: #e77a1c; }
+  background: #ffe6bc;
+  border-color: #ff9800; }
+  .tag_label a {
+    color: #ff9800; }
 
 .commits-table {
   table-layout: fixed;
@@ -3988,9 +4002,16 @@ a.th {
     .commits-table .badges .ref_label {
       font-size: 12px;
       border-radius: 8px;
-      padding: 0 2px; }
+      padding: 0 2px;
+      max-width: 134px;
+      word-wrap: break-word;
+      text-align: center; }
+    .commits-table .badges .sha {
+      font-size: 10px; }
   .commits-table .author {
     width: 180px; }
+  .commits-table .message div {
+    max-height: 56px; }
   .commits-table tbody tr.selected {
     background: #c3e2ff; }
     .commits-table tbody tr.selected td {
@@ -4009,15 +4030,19 @@ a.th {
   padding-top: 14px;
   list-style-type: none; }
   .diff-names li {
-    margin-bottom: -8px; }
+    margin-bottom: -4px;
+    padding: 0 4px; }
     .diff-names li .new_file {
       color: green; }
     .diff-names li .deleted {
       color: red; }
+  .diff-names .selected {
+    background: #a7d5ff; }
 
 .diffs {
   background: #fff;
-  list-style-type: none; }
+  list-style-type: none;
+  font-family: monospace; }
   .diffs li {
     border-bottom: solid #ddd 8px;
     overflow-x: scroll; }
@@ -4026,20 +4051,26 @@ a.th {
       font-size: 14px; }
     .diffs li .diff-first-line {
       font-weight: bold;
-      background: #A7B5FF;
-      border-bottom: 1px solid black; }
+      background: #eee;
+      border-bottom: 1px solid #777; }
     .diffs li .diff-summ-line {
-      background: #A7B5FF;
+      background: #eee;
       font-weight: bold; }
     .diffs li .diff-added-line {
       color: #096707;
       background: #87f49f; }
+      .diffs li .diff-added-line .trailing {
+        background: #036420; }
     .diffs li .diff-removed-line {
       position: relative;
       left: 0;
       right: 0;
       color: #742b2b;
       background: #ffb1cb; }
+      .diffs li .diff-removed-line .trailing {
+        background: #c10000; }
+  .diffs img {
+    display: block; }
 
 .hidden {
   display: none; }
@@ -4049,19 +4080,30 @@ a.th {
   background: #ddd;
   border-radius: 16px; }
   .show_commit .commit .author_info {
-    /*width: 50%;*/
     float: left;
-    font-weight: bold; }
+    font-weight: bold;
+    clear: left;
+    color: #eee;
+    text-shadow: 1px 1px 0px #333, 1px -1px 0px #333, -1px 1px 0px #333, -1px -1px 0px #333; }
   .show_commit .commit .commit_sha {
     margin-bottom: 14px;
-    margin-top: -14px;
-    clear: left; }
-  .show_commit .commit .stats {
+    clear: left;
+    float: left; }
+  .show_commit .commit .commit_date {
+    margin-bottom: 14px;
     float: right; }
+  .show_commit .commit .stats {
+    float: right;
+    text-align: right; }
     .show_commit .commit .stats .additions {
       color: green; }
     .show_commit .commit .stats .deletions {
       color: red; }
+    .show_commit .commit .stats .merge_commit {
+      font-weight: bold;
+      position: relative;
+      top: 8px;
+      color: #0300ff; }
 
 .loader {
   margin: 0 auto;
@@ -4069,3 +4111,21 @@ a.th {
   height: 64px;
   background: url("/images/loader.gif") no-repeat;
   display: none; }
+
+.status {
+  margin-bottom: 8px;
+  padding: 4px 0; }
+  .status .status_content {
+    display: none; }
+  .status .status-link {
+    display: block;
+    font-weight: bold;
+    color: #000;
+    padding-left: 16px;
+    font-size: 20px; }
+  .status.selected {
+    background: #c3e2ff;
+    border-bottom: 2px solid #78c3ff;
+    border-top: 2px solid #78c3ff;
+    border-left: 1px solid #78c3ff;
+    border-right: 1px solid #78c3ff; }