gitdocs 0.4.9 → 0.4.10

data/CHANGELOG

@@ -1,4 +1,8 @@
-0.4.9 (12/29/2011)
+0.4.10 (12/30/2011)
+
+  * View revision history on the web front-end!
+
+0.4.9 (12/30/2011)
 
   * Adds configuration for web port in settings
   * Adds support for 'add' and 'remove' shares in settings

data/lib/gitdocs/public/js/app.js

@@ -42,12 +42,22 @@ GitDocs = {
     var el = $('.content').prepend('<div class="alert-message ' + result +
       '"><a class="close" href="#">×</a>' + body + '</div>');
     $('div.alert-message').alert();
+  },
+  // converts iso8601 dates tagged with .reldate to relative
+  convertRelativeTimes : function() {
+    $('.reldate').each(function(ind, el) {
+      if ($(el).data("iso")) return;
+      var iso = $(el).text();
+      $(el).data("iso", iso);
+      $(el).text(RelativeDate.time_ago_in_words(iso));
+    });
   }
 };
 
 $(document).ready(function() {
   GitDocs.linkBreadcrumbs();
   GitDocs.fillDirMeta();
+  GitDocs.convertRelativeTimes();
   StringFormatter.autoLink();
 });
 

data/lib/gitdocs/runner.rb

@@ -140,11 +140,15 @@ module Gitdocs
     end
 
     IGNORED_FILES = ['.gitignore']
+    # Returns the list of files in a given directory
     # dir_files("some/dir") => [<Docfile>, <Docfile>]
     def dir_files(dir_path)
       Dir[File.join(dir_path, "*")].to_a.map { |path| Docfile.new(path) }
     end
 
+    # Returns file meta data based on relative file path
+    # file_meta("path/to/file")
+    #  => { :author => "Nick", :size => 1000, :modified => ... }
     def file_meta(file)
       result = {}
       file = file.gsub(%r{^/}, '')
@@ -158,6 +162,28 @@ module Gitdocs
       result
     end
 
+    # Returns the revisions available for a particular file
+    # file_revisions("README")
+    def file_revisions(file)
+      file = file.gsub(%r{^/}, '')
+      output = sh_string("git log --format='%h|%s|%aN|%ai' -n100 #{ShellTools.escape(file)}")
+      output.to_s.split("\n").map do |log_result|
+        commit, subject, author, date = log_result.split("|")
+        date = Time.parse(date.sub(' ', 'T')).utc.iso8601
+        { :commit => commit, :subject => subject, :author => author, :date => date }
+      end
+    end
+
+    # Returns the temporary path of a particular revision of a file
+    # file_revision_at("README", "a4c56h") => "/tmp/some/path/README"
+    def file_revision_at(file, ref)
+      file = file.gsub(%r{^/}, '')
+      content = sh_string("git show #{ref}:#{ShellTools.escape(file)}")
+      tmp_path = File.expand_path(File.basename(file), Dir.tmpdir)
+      File.open(tmp_path, 'w') { |f| f.puts content }
+      tmp_path
+    end
+
     def valid?
       out, status = sh_with_code "git status"
       @root.present? && status.success?

data/lib/gitdocs/server.rb

@@ -90,6 +90,9 @@ module Gitdocs
               elsif File.directory?(expanded_path) # list directory
                 contents =  gd.dir_files(expanded_path)
                 render! "dir", :layout => 'app', :locals => locals.merge(:contents => contents)
+              elsif mode == "revisions" # list revisions
+                revisions = gd.file_revisions(file_path)
+                render! "revisions", :layout => 'app', :locals => locals.merge(:revisions => revisions)
               elsif mode == 'delete' # delete file
                 FileUtils.rm(expanded_path)
                 redirect! "/" + idx.to_s + parent
@@ -97,6 +100,8 @@ module Gitdocs
                 contents = File.read(expanded_path)
                 render! "edit", :layout => 'app', :locals => locals.merge(:contents => contents)
               elsif mode != 'raw' # render file
+                revision = request.params['revision']
+                expanded_path = gd.file_revision_at(file_path, revision) if revision
                 begin # attempting to render file
                   contents = '<div class="tilt">' + render(expanded_path) + '</div>'
                 rescue RuntimeError => e # not tilt supported

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = "0.4.9"
+  VERSION = "0.4.10"
 end

data/lib/gitdocs/views/_header.haml

@@ -3,4 +3,5 @@
   - if file
     %a{ :href => "?mode=raw" } (raw)
     %a{ :href => "?mode=edit" } (edit)
+    %a{ :href => "?mode=revisions" } (revisions)
     %a{ :href => "?mode=delete", :onclick => "javascript:return confirm('Are you sure?')" } (delete)

data/lib/gitdocs/views/revisions.haml

@@ -0,0 +1,25 @@
+- @title = root
+
+= partial("header", :locals => { :parent => parent, :file => true, :idx => idx  })
+
+- if revisions && revisions.any?
+  %table.condensed-table.zebra-striped
+    %thead
+      %tr
+        %th Commit
+        %th Subject
+        %th Author
+        %th Committed
+
+    %tbody
+      - revisions.each_with_index do |r, i|
+        %tr
+          %td.commit
+            %a{ :href => "?revision=#{r[:commit]}" }
+              = r[:commit]
+          %td.subject= r[:subject]
+          %td.author= r[:author]
+          %td.date.reldate= r[:date]
+
+- if revisions.empty?
+  %p No revisions for this file could be found.

metadata

@@ -2,7 +2,7 @@
 name: gitdocs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors: 
 - Josh Hull
@@ -322,6 +322,7 @@ files:
 - lib/gitdocs/views/edit.haml
 - lib/gitdocs/views/file.haml
 - lib/gitdocs/views/home.haml
+- lib/gitdocs/views/revisions.haml
 - lib/gitdocs/views/search.haml
 - lib/gitdocs/views/settings.haml
 - lib/img/icon.png