gitdocs 0.3.6 → 0.4.0

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

@@ -11,16 +11,28 @@ GitDocs = {
       fullPath = fullPath.replace(subpath + "/", link);
     });
     $('span.path').html(fullPath);
+  },
+  // fills in directory meta author and modified for every file
+  fillDirMeta : function(){
+    $('table.listing tbody tr').each(function(i, e) {
+      var file = $(e).find('a').attr('href');
+      $.getJSON(file + "?mode=meta", function(data) {
+        $(e).find('td.author').html(data.author);
+        $(e).find('td.modified').html(RelativeDate.time_ago_in_words(data.modified));
+      });
+    });
   }
 };
 
 $(document).ready(function() {
   GitDocs.linkBreadcrumbs();
+  GitDocs.fillDirMeta();
 });
 
+// Redirect to edit page for new file when new file form is submitted
 $('form.add').live('submit', function(e){
   var docIdx = window.location.pathname.match(/(\d+)\//);
   var fullPath = $('span.path').text();
   window.location = "/" + docIdx[1] + fullPath + "/" + $(this).find('input.edit').val();
   e.preventDefault();
-});
+});

data/lib/gitdocs/public/js/util.js

@@ -14,4 +14,90 @@ Utils = {
     }
     return values;
   }
+};
+
+// DATES
+// RelativeDate.time_ago_in_words(date)
+var RelativeDate = {
+  time_ago_in_words: function(from) {
+          return RelativeDate.distance_of_time_in_words(new Date, RelativeDate.parseISO8601(from));
+
+  },
+  distance_of_time_in_words: function(to, from) {
+      var distance_in_seconds = ((to - from) / 1000);
+      var distance_in_minutes = Math.floor(distance_in_seconds / 60);
+
+      if (distance_in_minutes <= 0) { return 'less than a minute ago'; }
+      if (distance_in_minutes == 1) { return 'a minute ago'; }
+      if (distance_in_minutes < 45) { return distance_in_minutes + ' minutes ago'; }
+      if (distance_in_minutes < 120) { return '1 hour ago'; }
+      if (distance_in_minutes < 1440) { return Math.floor(distance_in_minutes / 60) + ' hours ago'; }
+      if (distance_in_minutes < 2880) { return '1 day ago'; }
+      if (distance_in_minutes < 43200) { return Math.floor(distance_in_minutes / 1440) + ' days ago'; }
+      if (distance_in_minutes < 86400) { return '1 month ago'; }
+      if (distance_in_minutes < 525960) { return Math.floor(distance_in_minutes / 43200) + ' months ago'; }
+      if (distance_in_minutes < 1051199) { return 'about 1 year ago'; }
+
+      return 'over ' + Math.floor(distance_in_minutes / 525960) + ' years ago';
+  },
+  parseISO8601 : function(str) {
+   // we assume str is a UTC date ending in 'Z'
+
+   var parts = str.split('T'),
+   dateParts = parts[0].split('-'),
+   timeParts = parts[1].split('Z'),
+   timeSubParts = timeParts[0].split(':'),
+   timeSecParts = timeSubParts[2].split('.'),
+   timeHours = Number(timeSubParts[0]),
+   _date = new Date;
+
+   _date.setUTCFullYear(Number(dateParts[0]));
+   _date.setUTCMonth(Number(dateParts[1])-1);
+   _date.setUTCDate(Number(dateParts[2]));
+   _date.setUTCHours(Number(timeHours));
+   _date.setUTCMinutes(Number(timeSubParts[1]));
+   _date.setUTCSeconds(Number(timeSecParts[0]));
+   if (timeSecParts[1]) _date.setUTCMilliseconds(Number(timeSecParts[1]));
+
+   // by using setUTC methods the date has already been converted to local time(?)
+   return _date;
+  },
+  humanize : function(str, shortened) {
+    var parts = str.split('T')[0].split('-')
+    var humDate = new Date;
+
+    humDate.setFullYear(Number(parts[0]));
+    humDate.setMonth(Number(parts[1])-1);
+    humDate.setDate(Number(parts[2]));
+
+    switch(humDate.getDay())
+    {
+    case 0:
+      var day = "Sunday";
+      break;
+    case 1:
+      var day = "Monday";
+      break;
+    case 2:
+      var day = "Tuesday";
+      break;
+    case 3:
+      var day = "Wednesday";
+      break;
+    case 4:
+      var day = "Thursday";
+      break;
+    case 5:
+      var day = "Friday";
+      break;
+    case 6:
+      var day = "Saturday";
+      break;
+    }
+    if(shortened) {
+      return humDate.toLocaleDateString();
+    } else {
+      return day + ', ' + humDate.toLocaleDateString();
+    }
+  }
 };

data/lib/gitdocs/runner.rb

@@ -18,29 +18,42 @@ module Gitdocs
       @current_remote   = @share.remote_name
       @current_branch   = @share.branch_name
       @current_revision = sh_string("git rev-parse HEAD")
+      mutex = Mutex.new
 
       info("Running gitdocs!", "Running gitdocs in `#{@root}'")
 
-      mutex = Mutex.new
       # Pull changes from remote repository
-      Thread.new do
-        loop do
+      syncer = proc do
+        EM.defer(proc do
           mutex.synchronize { sync_changes }
-          sleep @polling_interval
-        end
-      end.abort_on_exception = true
-
-      # Listen for changes in local repository
-      @listener = FSEvent.new
-      @listener.watch(@root) do |directories|
-        directories.uniq!
-        directories.delete_if {|d| d =~ /\/\.git/}
-        unless directories.empty?
-          mutex.synchronize { push_changes }
-        end
+        end, proc do
+          EM.add_timer(@polling_interval) {
+            syncer.call
+          }
+        end)
       end
-      at_exit { @listener.stop }
-      @listener.run
+      syncer.call
+      # Listen for changes in local repository
+
+      EM.defer(proc{
+        listener = Guard::Listener.select_and_init(@root, :watch_all_modifications => true)
+        listener.on_change { |directories|
+          directories.uniq!
+          directories.delete_if {|d| d =~ /\/\.git/}
+          unless directories.empty?
+            EM.next_tick do
+              EM.defer(proc {
+                mutex.synchronize { push_changes }
+              }, proc {} )
+            end
+          end
+        }
+        listener.start
+      }, proc{EM.stop_reactor})
+    end
+
+    def clear_state
+      @state = nil
     end
 
     def sync_changes
@@ -115,6 +128,28 @@ module Gitdocs
       end
     end
 
+    IGNORED_FILES = ['.gitignore']
+    # dir_files("some/dir") => [<Docfile>, <Docfile>]
+    def dir_files(dir)
+      dir_path = File.expand_path(dir, @root)
+      files = {}
+      ls_files = sh_string("git ls-files").split("\n").map { |f| Docfile.new(f) }
+      ls_files.select { |f| f.within?(dir, @root) }.each do |f|
+        path = File.expand_path(f.parent, root)
+        files[path] ||= Docdir.new(path)
+        files[path].files << f unless IGNORED_FILES.include?(f.name)
+      end
+      files.keys.each { |f| files[f].parent = files[File.dirname(f)] }
+      files[dir_path]
+    end
+
+    def file_meta(file)
+      file = file.gsub(%r{^/}, '')
+      author, modified = sh_string("git log --format='%aN|%ai' -n1 #{ShellTools.escape(file)}").split("|")
+      modified = Time.parse(modified.sub(' ', 'T')).utc.iso8601
+      { :author => author, :modified => modified }
+    end
+
     def valid?
       out, status = sh_with_code "git status"
       status.success?

data/lib/gitdocs/server.rb

@@ -2,6 +2,7 @@ require 'thin'
 require 'renee'
 require 'coderay'
 require 'uri'
+require 'haml'
 
 module Gitdocs
   class Server
@@ -17,10 +18,10 @@ module Gitdocs
         use Rack::Static, :urls => ['/css', '/js', '/img', '/doc'], :root => File.expand_path("../public", __FILE__)
         run Renee {
           if request.path_info == '/'
-            render! "home", :layout => 'app', :locals => {:gds => gds}
+            render! "home", :layout => 'app', :locals => {:conf => manager.config, :nav_state => "home" }
           else
             path 'settings' do
-              get.render! 'settings', :layout => 'app', :locals => {:conf => manager.config}
+              get.render! 'settings', :layout => 'app', :locals => {:conf => manager.config, :nav_state => "settings" }
               post do
                 shares = manager.config.shares
                 manager.config.global.update_attributes(request.POST['config'])
@@ -45,10 +46,11 @@ module Gitdocs
               parent = File.dirname(file_path)
               parent = '' if parent == '/'
               parent = nil if parent == '.'
-              locals = {:idx => idx, :parent => parent, :root => gd.root, :file_path => expanded_path}
+              locals = {:idx => idx, :parent => parent, :root => gd.root, :file_path => expanded_path, :nav_state => nil }
               mode, mime = request.params['mode'], `file -I #{ShellTools.escape(expanded_path)}`.strip
-              # puts "mode, mime: #{mode.inspect}, #{mime.inspect}"
-              if mode == 'save' # Saving
+              if mode == 'meta' # Meta
+                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'] }
                 redirect! "/" + idx.to_s + file_path
               elsif mode == 'upload'  # Uploading
@@ -58,8 +60,8 @@ module Gitdocs
                 redirect! "/" + idx.to_s + file_path + "/" + filename
               elsif !File.exist?(expanded_path) # edit for non-existent file
                 render! "edit", :layout => 'app', :locals => locals.merge(:contents => "")
-              elsif File.directory?(expanded_path)
-                contents = Dir[File.join(gd.root, request.path_info, '*')]
+              elsif File.directory?(expanded_path) # list directory
+                contents = gd.dir_files(expanded_path)
                 render! "dir", :layout => 'app', :locals => locals.merge(:contents => contents)
               elsif mode == 'delete' # delete file
                 FileUtils.rm(expanded_path)

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

data/lib/gitdocs/views/_header.haml

@@ -1,11 +1,4 @@
-- if parent
-  %a{ :href => parent.empty? ? "/#{idx}" : "/#{idx}#{parent}", :class => "parent" }
-    ↪ Back to parent
-- else
-  %a{ :href => "/", :class => "parent" }
-    ↪ Back to selection
-
-%h2
+%h2.path
   %span.path= request.path_info.empty? ? '/' : request.path_info
   - if file
     %a{ :href => "?mode=raw" } (raw)

data/lib/gitdocs/views/app.haml

@@ -2,7 +2,7 @@
 %html
   %head
     %title Gitdocs #{Gitdocs::VERSION}
-    %link{ :href => "/css/reset.css", :rel => "stylesheet" }
+    %link{ :href => "/css/bootstrap.css", :rel => "stylesheet"}
     %link{ :href => "/css/app.css", :rel => "stylesheet" }
     %link{ :href => "/css/tilt.css", :rel => "stylesheet" }
     %link{ :href => "/css/coderay.css", :rel => "stylesheet" }
@@ -10,14 +10,23 @@
     %script{ :src => "/js/jquery.js", :type => "text/javascript", :charset => "utf-8" }
     %script{ :src => "/js/app.js", :type => "text/javascript", :charset => "utf-8" }
   %body
-    .nav
-      %h1
-        %a{:href => '/'}
-          %img{ :src => "/img/git_logo.png", :width => 30, :height => 30}
-          Gitdocs
-          = Gitdocs::VERSION
-    .container
-      = preserve(yield)
+    #nav.topbar
+      .fill
+        .container
+          %a{:class => "brand", :href => "/"} Gitdocs
+          %ul(class="nav")
+            %li{ :class => ("active" if nav_state == "home") }
+              %a(href = "/") Home
+            %li{ :class => ("active" if nav_state == "settings") }
+              %a(href = "/settings") Settings
 
-    .menu
-      %a{:href => '/settings'} Settings
+    #main.container
+      .content
+        - if @title
+          .page-header
+            %h1= @title
+        .row
+          .span16= preserve(yield)
+
+      %footer
+        %p © Gitdocs v#{Gitdocs::VERSION}

data/lib/gitdocs/views/dir.haml

@@ -1,21 +1,31 @@
-%h1= root
+- @title = root
 
 = partial("header", :locals => { :parent => parent, :file => false, :idx => idx })
 
-%table
-  -contents.each_with_index do |f, i|
+%table.condensed-table.zebra-striped.listing
+  %thead
     %tr
-      %td
-        %a{ :href => "/#{idx}#{request.path_info}/#{File.basename(f)}" }
-          ="#{request.path_info}/#{File.basename(f)}"
+      %th File
+      %th Author
+      %th Last Modified
 
+  %tbody
+    - contents.items.each_with_index do |f, i|
+      %tr
+        %td
+          %a{ :href => "/#{idx}#{request.path_info}/#{f.name}" }
+            = f.name
+        %td.author
+        %td.modified
 
-%form.add
-  %p Add a file in this directory
-  %input{:type => 'text', :name => "path", :class => "edit" }
-  %input{:type => 'submit', :value => "New file" }
-
-%form.upload{ :method => "post", :enctype => "multipart/form-data", :action => "/#{idx}#{request.path_info}?mode=upload" }
-  %p Upload a file to this directory
-  %input{:type => 'file', :value => "Select a file", :name => "file", :class => "uploader" }
-  %input{:type => 'submit', :value => "Upload file"}
+.row
+  .span6
+    %form.add
+      %p Add a file in this directory
+      %input{:type => 'text', :name => "path", :class => "edit" }
+      %input{:type => 'submit', :value => "New file", :class => "btn secondary" }
+  .span6
+    %form.upload{ :method => "post", :enctype => "multipart/form-data", :action => "/#{idx}#{request.path_info}?mode=upload" }
+      %p Upload a file to this directory
+      %input{:type => 'file', :value => "Select a file", :name => "file", :class => "uploader" }
+      %input{:type => 'submit', :value => "Upload file", :class => "btn secondary" }

data/lib/gitdocs/views/edit.haml

@@ -1,12 +1,12 @@
-%h1= root
+- @title = root
 
 = partial("header", :locals => { :parent => parent, :file => true, :idx => idx  })
 
 %form{ :class => "edit", :action => "/#{idx}#{request.path_info}?mode=save", :method => "post", :style => "display:none;" }
   #editor
   %textarea{ :id => 'data', :name => "data" }= preserve contents
-  %input{ :type => 'submit', :value => "Save" }
-  %a{ :href => "/#{idx}#{request.path_info}" } Cancel
+  %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 }
 
 = partial("ace_scripts")

data/lib/gitdocs/views/file.haml

@@ -1,4 +1,4 @@
-%h1= root
+- @title = root
 
 = partial("header", :locals => { :parent => parent, :file => true, :idx => idx  })
 

data/lib/gitdocs/views/home.haml

@@ -1,6 +1,10 @@
+- @title = "Pick a Share"
+
+%p Select a share to browse:
+
 %table
-  - gds.each_with_index do |gd, idx|
+  - conf.shares.each_with_index do |share, idx|
     %tr
       %td
         %a{ :href => "/#{idx}" }
-          =gd.root
+          = share.path

data/lib/gitdocs/views/settings.haml

@@ -1,35 +1,33 @@
-%h1 Settings
+- @title = "Settings"
 
 %form{:method => 'POST', :action => '/settings'}
   %h2 Gitdocs
-  %div{:id => "config", :class => "config"}
-    %dl
-      %dt Open browser on startup?
-      %dd
-        %input{:type =>'hidden', :value => '0', :name=>"config[load_browser_on_startup]"}
-        %input{:type =>'checkbox', :value => '1', :name=>"config[load_browser_on_startup]", :checked => conf.global.load_browser_on_startup ? 'checked' : nil}
-
+  #config.field.config
+    %input{:type =>'hidden', :value => '0', :name=>"config[load_browser_on_startup]"}
+    %input{:type =>'checkbox', :value => '1', :name=>"config[load_browser_on_startup]", :checked => conf.global.load_browser_on_startup ? 'checked' : nil}
+    %span Open browser on startup?
 
   %h2 Shares
-  -conf.shares.each_with_index do |share, idx|
+  - conf.shares.each_with_index do |share, idx|
     %div{:id => "share-#{idx}", :class => "share #{idx % 2 == 0 ? 'even' : 'odd'}"}
       %dl
         %dt Path
         %dd
-          %input{:name=>"share[#{idx}][path]", :value => share.path}
+          %input{:name=>"share[#{idx}][path]", :value => share.path, :class => "path" }
       %dl
         %dt Polling interval
         %dd
           %input{:name=>"share[#{idx}][polling_interval]", :value => share.polling_interval}
-      -if share.available_remotes
+
+      - if share.available_remotes
         %dl
           %dt Remote
           %dd
             %select{:name=>"share[#{idx}][remote_branch]"}
-              -share.available_remotes.each do |remote|
+              - share.available_remotes.each do |remote|
                 %option{:value => remote, :selected => remote == "#{share.remote_name}/#{share.branch_name}" ? 'selected' : nil}
-                  =remote
-      -else
+                  = remote
+      - else
 
         %dl
           %dt Remote
@@ -39,14 +37,12 @@
           %dt Branch
           %dd
             %input{:name=>"share[#{idx}][branch_name]", :value => share.branch_name}
-      %dl
-        %dt Notifications?
-        %dd
-          %input{:type =>'hidden', :value => '0', :name=>"share[#{idx}][notification]"}
-          %input{:type =>'checkbox', :value => '1', :name=>"share[#{idx}][notification]", :checked => share.notification ? 'checked' : nil}
-      %dl.delete
-        %dt Delete
-        %dd
-          %input{:type =>'button', :value => "Delete"}
-          %input{:type =>'hidden', :name=>"share[#{idx}][delete]"}
-  %input{:value => 'Save', :type => 'submit'}
+      .notify.field
+        %input{:type =>'hidden', :value => '0', :name=>"share[#{idx}][notification]"}
+        %input{:type =>'checkbox', :value => '1', :name=>"share[#{idx}][notification]", :checked => share.notification ? 'checked' : nil}
+        %span Notifications?
+      .delete
+        %input{:type =>'button', :value => "Delete", :class => "btn danger"}
+        %input{:type =>'hidden', :name=>"share[#{idx}][delete]"}
+
+  %input{:value => 'Save', :type => 'submit', :class => "btn primary" }