gitdocs 0.4.13 → 0.4.14

data/CHANGELOG

@@ -1,10 +1,22 @@
-0.4.12 (1/05/2011)
+0.4.14 (1/14/2012)
+
+  * Change file modes into tab style [thanks Kale Worsley]
+  * Add ability to revert a file to a previous revision  [thanks Kale Worsley]
+  * Add optional git commit message field to edit form [thanks Kale Worsley]
+
+0.4.13 (1/11/2012)
+
+  * Redirect to first share if there's only one
+  * Render inline README for a directory
+  * Front-end now lists folder sizes in directory listing [Thanks evan tatarka]
+
+0.4.12 (1/05/2012)
 
   * Fixes incorrect padding style on rendered code blocks (thanks chris kempson)
   * Fixes encoding issues in markdown files
   * Tag documents as utf-8 in meta for web frontend (thanks chris kempson)
 
-0.4.11 (1/04/2011)
+0.4.11 (1/04/2012)
 
   * Add line-height to code blocks in file displays
   * Fixes various browser inconsistencies (thanks evan tatarka)

data/README.md

@@ -170,7 +170,8 @@ Gitdocs was created at [Miso](http://engineering.gomiso.com) by [Joshua Hull](ht
 We also have had several contributors:
 
   * [Chris Kempson](https://github.com/ChrisKempson) - Encoding issues
-  * [Evan Tatarka](https://github.com/evant) - Browser fixes
+  * [Evan Tatarka](https://github.com/evant) - Front-end style fixes
+  * [Kale Worsley](https://github.com/kaleworsley) - Custom commit msgs, revert revisions, front-end cleanup
 
 Gitdocs is still a young project with a lot of opportunity for contributions. Patches welcome!
 

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

@@ -51,6 +51,13 @@ GitDocs = {
       $(el).data("iso", iso);
       $(el).text(RelativeDate.time_ago_in_words(iso));
     });
+  },
+  activateTabs : function() {
+    $('ul.tabs li a').each(function() {
+      if (($(this).attr('href') == location.pathname && location.search == '') || $(this).attr('href') == location.search) {
+        $(this).parent().addClass('active');
+      }
+    });
   }
 };
 
@@ -58,6 +65,7 @@ $(document).ready(function() {
   GitDocs.linkBreadcrumbs();
   GitDocs.fillDirMeta();
   GitDocs.convertRelativeTimes();
+  GitDocs.activateTabs();
   StringFormatter.autoLink();
 });
 
@@ -83,4 +91,4 @@ $('a[data-method]').live('click', function(e) {
   if (target) { form.attr('target', target); }
   form.hide().append(metadata_input).appendTo('body');
   form.submit();
-});
+});

data/lib/gitdocs/runner.rb

@@ -109,10 +109,16 @@ module Gitdocs
     end
 
     def push_changes
+      message_file = File.expand_path(".gitmessage~", @root)
+      if File.exist? message_file
+        message = File.read message_file
+        File.delete message_file
+      else
+        message = 'Auto-commit from gitdocs'
+      end
       sh 'find . -type d -regex ``./[^.].*'' -empty -exec touch \'{}/.gitignore\' \;'
       sh 'git add .'
-      # TODO make this message nicer
-      sh "git commit -a -m'Auto-commit from gitdocs'" unless sh("git status -s").strip.empty?
+      sh "git commit -a -m #{ShellTools.escape(message)}" unless sh("git status -s").strip.empty?
       if @current_revision.nil? || sh('git status')[/branch is ahead/]
         out, code = sh_with_code("git push #{@current_remote} #{@current_branch}")
         if code.success?
@@ -199,6 +205,16 @@ module Gitdocs
       tmp_path
     end
 
+    # Revert a file to a particular revision
+    def file_revert(file, ref)
+      if file_revisions(file).map {|r| r[:commit]}.include? ref
+        file = file.gsub(%r{^/}, '')
+        full_path = File.expand_path(file, @root)
+        content = File.read(file_revision_at(file, ref))
+        File.open(full_path, 'w') { |f| f.puts content }
+      end
+    end
+
     def valid?
       out, status = sh_with_code "git status"
       @root.present? && status.success?

data/lib/gitdocs/server.rb

@@ -72,6 +72,7 @@ module Gitdocs
               file_path = URI.unescape(request.path_info)
               file_ext  = File.extname(file_path)
               expanded_path = File.expand_path(".#{file_path}", gd.root)
+              message_file = File.expand_path(".gitmessage~", gd.root)
               halt 400 unless expanded_path[/^#{Regexp.quote(gd.root)}/]
               parent = File.dirname(file_path)
               parent = '' if parent == '/'
@@ -83,6 +84,7 @@ module Gitdocs
                 halt 200, { 'Content-Type' => 'application/json' }, [gd.file_meta(file_path).to_json]
               elsif mode == 'save' # Saving
                 File.open(expanded_path, 'w') { |f| f.print request.params['data'] }
+                File.open(message_file, 'w') { |f| f.print request.params['message'] } unless request.params['message'] == ''
                 redirect! "/" + idx.to_s + file_path
               elsif mode == 'upload'  # Uploading
                 halt 404 unless file = request.params['file']
@@ -101,6 +103,12 @@ module Gitdocs
               elsif mode == "revisions" # list revisions
                 revisions = gd.file_revisions(file_path)
                 render! "revisions", :layout => 'app', :locals => locals.merge(:revisions => revisions)
+              elsif mode == "revert" # revert file
+                if revision = request.params['revision']
+                  File.open(message_file, 'w') { |f| f.print "Reverting '#{file_path}' to #{revision}" }
+                  gd.file_revert(file_path, revision)
+                end
+                redirect! "/" + idx.to_s + file_path
               elsif mode == 'delete' # delete file
                 FileUtils.rm(expanded_path)
                 redirect! "/" + idx.to_s + parent

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = "0.4.13"
+  VERSION = "0.4.14"
 end

data/lib/gitdocs/views/_header.haml

@@ -1,7 +1,14 @@
 %h2.path
   %span.path= request.path_info.empty? ? '/' : request.path_info
-  - 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)
+- if file
+  %ul{ :class => "tabs" }
+    %li
+      %a{ :href => "#{request.path}" } View
+    %li
+      %a{ :href => "?mode=raw" } Raw
+    %li
+      %a{ :href => "?mode=edit" } Edit
+    %li
+      %a{ :href => "?mode=revisions" } Revisions
+    %li
+      %a{ :href => "?mode=delete", :onclick => "javascript:return confirm('Are you sure?')" } Delete

data/lib/gitdocs/views/dir.haml

@@ -2,10 +2,6 @@
 
 = partial("header", :locals => { :parent => parent, :file => false, :idx => idx })
 
-- if rendered_readme
-  .contents
-    = preserve rendered_readme
-
 - if contents && contents.any?
   %table#fileListing.condensed-table.zebra-striped
     %thead
@@ -40,3 +36,7 @@
       %p Add new file in this directory
       %input{:type => 'text', :name => "path", :class => "edit", :placeholder => "somefile.md" }
       %input{:type => 'submit', :value => "New file", :class => "btn secondary" }
+
+- if rendered_readme
+  .contents
+    = preserve rendered_readme

data/lib/gitdocs/views/edit.haml

@@ -5,6 +5,8 @@
 %form{ :class => "edit", :action => "/#{idx}#{request.path_info}?mode=save", :method => "post", :style => "display:none;" }
   #editor
   %textarea{ :id => 'data', :name => "data" }= preserve contents
+  .clearfix
+    %textarea{ :id => 'message', :name => 'message', :class => 'span16', :placeholder => 'Optional commit message.' }
   %input{ :type => 'submit', :value => "Save", :class => "btn primary" }
   %a{ :href => "/#{idx}#{request.path_info}", :class => "btn secondary" } Cancel
   %input{ :type => 'hidden', :class => 'filename', :value => request.path_info }

data/lib/gitdocs/views/revisions.haml

@@ -10,6 +10,7 @@
         %th Subject
         %th Author
         %th Committed
+        %th Revert
 
     %tbody
       - revisions.each_with_index do |r, i|
@@ -20,6 +21,8 @@
           %td.subject= r[:subject]
           %td.author= r[:author]
           %td.date.reldate= r[:date]
-
+          %td.revert
+            %a{ :href => "?mode=revert&revision=#{r[:commit]}", :onclick => "javascript:return confirm('Are you sure?')" }
+              = r[:commit]
 - if revisions.empty?
   %p No revisions for this file could be found.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitdocs
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 4
-  - 13
-  version: 0.4.13
+  - 14
+  version: 0.4.14
 platform: ruby
 authors: 
 - Josh Hull
@@ -16,10 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-11 00:00:00 Z
+date: 2012-01-14 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: joshbuddy-guard
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +33,12 @@ dependencies:
         - 10
         - 0
         version: 0.10.0
-  requirement: *id001
   type: :runtime
-  prerelease: false
-  name: joshbuddy-guard
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: thin
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +49,12 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  requirement: *id002
   type: :runtime
-  prerelease: false
-  name: thin
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: renee
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,12 +65,12 @@ dependencies:
         - 3
         - 7
         version: 0.3.7
-  requirement: *id003
   type: :runtime
-  prerelease: false
-  name: renee
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: redcarpet
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,12 +81,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id004
   type: :runtime
-  prerelease: false
-  name: redcarpet
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: thor
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +97,12 @@ dependencies:
         - 14
         - 6
         version: 0.14.6
-  requirement: *id005
   type: :runtime
-  prerelease: false
-  name: thor
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: coderay
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,12 +113,12 @@ dependencies:
         - 0
         - 4
         version: 1.0.4
-  requirement: *id006
   type: :runtime
-  prerelease: false
-  name: coderay
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: dante
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -126,12 +129,12 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  requirement: *id007
   type: :runtime
-  prerelease: false
-  name: dante
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: growl
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -142,12 +145,12 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
-  requirement: *id008
   type: :runtime
-  prerelease: false
-  name: growl
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -158,12 +161,12 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  requirement: *id009
   type: :runtime
-  prerelease: false
-  name: yajl-ruby
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: haml
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -174,12 +177,12 @@ dependencies:
         - 1
         - 4
         version: 3.1.4
-  requirement: *id010
   type: :runtime
-  prerelease: false
-  name: haml
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  name: sqlite3
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -190,12 +193,12 @@ dependencies:
         - 3
         - 4
         version: 1.3.4
-  requirement: *id011
   type: :runtime
-  prerelease: false
-  name: sqlite3
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  name: activerecord
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -206,12 +209,12 @@ dependencies:
         - 1
         - 0
         version: 3.1.0
-  requirement: *id012
   type: :runtime
-  prerelease: false
-  name: activerecord
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  name: grit
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -222,12 +225,12 @@ dependencies:
         - 4
         - 1
         version: 2.4.1
-  requirement: *id013
   type: :runtime
-  prerelease: false
-  name: grit
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  name: shell_tools
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -238,12 +241,12 @@ dependencies:
         - 1
         - 0
         version: 0.1.0
-  requirement: *id014
   type: :runtime
-  prerelease: false
-  name: shell_tools
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  name: mimetype-fu
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -254,12 +257,12 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  requirement: *id015
   type: :runtime
-  prerelease: false
-  name: mimetype-fu
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  name: eventmachine
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -272,12 +275,12 @@ dependencies:
         - beta
         - 3
         version: 1.0.0.beta.3
-  requirement: *id016
   type: :runtime
-  prerelease: false
-  name: eventmachine
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  name: minitest
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -288,12 +291,12 @@ dependencies:
         - 6
         - 1
         version: 2.6.1
-  requirement: *id017
   type: :development
-  prerelease: false
-  name: minitest
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -302,12 +305,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id018
   type: :development
-  prerelease: false
-  name: rake
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id019 !ruby/object:Gem::Requirement 
+  name: mocha
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -316,12 +319,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id019
   type: :development
-  prerelease: false
-  name: mocha
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id020 !ruby/object:Gem::Requirement 
+  name: fakeweb
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -330,10 +333,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id020
   type: :development
-  prerelease: false
-  name: fakeweb
+  version_requirements: *id020
 description: Open-source Dropbox using Ruby and Git.
 email: 
 - joshbuddy@gmail.com
@@ -430,6 +431,7 @@ files:
 - test/configuration_test.rb
 - test/runner_test.rb
 - test/test_helper.rb
+has_rdoc: true
 homepage: http://engineering.gomiso.com/2011/11/30/collaborate-and-track-tasks-with-ease-using-gitdocs/
 licenses: []
 
@@ -459,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gitdocs
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Open-source Dropbox using Ruby and Git