gitdocs 0.3.4 → 0.3.5

data/README.md

@@ -100,31 +100,40 @@ gitdocs stop
 gitdocs restart
 ```
 
-### Exploring Gitdocs
-
 For an overview of gitdocs current status, run:
 
 ```
 gitdocs status
 ```
-
-To explore the repos in your browser, simply visit `http://localhost:8888` for access to all your docs within the browser.
-
 ### Conflict Resolution
 
 Proper conflict resolution is an important part of any good doc and file collaboration tool.
 In most cases, git does a good job of handling file merges for you. Still, what about cases where the conflict cannot be
 resolved automatically?
 
-Don't worrry, gitdocs makes this easy. In the event of a conflict, **all the different versions
+Don't worry, gitdocs makes handling this simple. In the event of a conflict, **all the different versions
 of a document are stored** in the repo tagged with the **git sha** for the commit for each variation. The members
 of the repo can then compare all versions and resolve the conflict.
 
+### Web Front-end
+
+Gitdocs come with a handy web front-end that is available. This browser front-end supports the following features:
+
+ * Explore all repos and directories
+ * View source files in your repos with smart syntax highlighting (ruby, python, js, etc)
+ * View text files in your repos with smart formatting (markdown, textile)
+ * View any file in your repos that can be embedded in the browser
+ * Edit and update text files with rich text editor (ace editor)
+ * Upload or create new files in your repos
+ * Manage path settings and other configuration options
+
+To check out the front-end, simply visit `http://localhost:8888` whenever gitdocs is running. Yes, we know
+this currently looks (design-wise) like hot garbage. We will get to the aesthetics but patches and help welcome.
+
 ## Planned Features
 
 Gitdocs is a young project but we have big plans for it including:
 
- - A web front-end UI for file uploading and editing of files (with rich text editor and syntax highlighting)
  - Local-area peer-to-peer syncing, avoid 'polling' in cases where we can using a messaging protocol.
  - Click-to-share instant access granting file access to users using a local tunnel or other means.
  - Support for linux and windows platforms (coming soon), and maybe android and iOS as well?

data/gitdocs.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rb-fsevent',   '~> 0.4.3.1'
   s.add_dependency 'thin'
-  s.add_dependency 'renee', '~> 0.3.6'
+  s.add_dependency 'renee', '~> 0.3.7'
   s.add_dependency 'redcarpet'
   s.add_dependency 'thor'
   s.add_dependency 'coderay'

data/lib/gitdocs/server.rb

@@ -47,7 +47,7 @@ module Gitdocs
               parent = nil if parent == '.'
               locals = {:idx => idx, :parent => parent, :root => gd.root, :file_path => expanded_path}
               mode, mime = request.params['mode'], `file -I #{ShellTools.escape(expanded_path)}`.strip
-              puts "mode, mime: #{mode.inspect}, #{mime.inspect}"
+              # puts "mode, mime: #{mode.inspect}, #{mime.inspect}"
               if mode == 'save' # Saving
                 File.open(expanded_path, 'w') { |f| f.print request.params['data'] }
                 redirect! "/" + idx.to_s + file_path

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/gitdocs/views/_ace_scripts.erb

@@ -0,0 +1,8 @@
+<script src="/js/ace/ace.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/ace/theme-tomorrow_night.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/ace/mode-css.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/ace/mode-html.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/ace/mode-markdown.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/ace/mode-javascript.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/ace/mode-ruby.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/edit.js" type="text/javascript" charset="utf-8"></script>

data/lib/gitdocs/views/_header.haml

@@ -0,0 +1,13 @@
+- if parent
+  %a{ :href => parent.empty? ? "/#{idx}" : "/#{idx}#{parent}", :class => "parent" }
+    ↪ Back to parent
+- else
+  %a{ :href => "/", :class => "parent" }
+    ↪ Back to selection
+
+%h2
+  %span.path= request.path_info.empty? ? '/' : request.path_info
+  - if file
+    %a{ :href => "?mode=raw" } (raw)
+    %a{ :href => "?mode=edit" } (edit)
+    %a{ :href => "?mode=delete", :onclick => "javascript:return confirm('Are you sure?')" } (delete)

data/lib/gitdocs/views/app.haml

@@ -15,7 +15,7 @@
         %a{:href => '/'}
           %img{ :src => "/img/git_logo.png", :width => 30, :height => 30}
           Gitdocs
-          =Gitdocs::VERSION
+          = Gitdocs::VERSION
     .container
       = preserve(yield)
 

data/lib/gitdocs/views/dir.haml

@@ -1,14 +1,6 @@
 %h1= root
 
-- if parent
-  %a{ :href => parent.empty? ? "/#{idx}" : "/#{idx}#{parent}", :class => "parent" }
-    ↪ Back to parent
-- else
-  %a{ :href => "/", :class => "parent" }
-    ↪ Back to selection
-
-%h2
-  %span.path= request.path_info.empty? ? '/' : request.path_info
+= partial("header", :locals => { :parent => parent, :file => false, :idx => idx })
 
 %table
   -contents.each_with_index do |f, i|

data/lib/gitdocs/views/edit.haml

@@ -1,17 +1,6 @@
 %h1= root
 
-- if parent
-  %a{ :href => parent.empty? ? "/#{idx}" : "/#{idx}#{parent}", :class => "parent" }
-    ↪ Back to parent
-- else
-  %a{ :href => "/", :class => "parent" }
-    ↪ Back to selection
-
-%h2
-  %span.path= request.path_info.empty? ? '/' : request.path_info
-  %a{ :href => "?mode=raw" } (raw)
-  %a{ :href => "?mode=edit" } (edit)
-  %a{ :href => "?mode=delete", :onclick => "javascript:return confirm('Are you sure?')" } (delete)
+= 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
@@ -20,13 +9,5 @@
   %a{ :href => "/#{idx}#{request.path_info}" } Cancel
   %input{ :type => 'hidden', :class => 'filename', :value => request.path_info }
 
-<script src="/js/ace/ace.js" type="text/javascript" charset="utf-8"></script>
-<script src="/js/ace/theme-tomorrow_night.js" type="text/javascript" charset="utf-8"></script>
-<script src="/js/ace/mode-css.js" type="text/javascript" charset="utf-8"></script>
-<script src="/js/ace/mode-html.js" type="text/javascript" charset="utf-8"></script>
-<script src="/js/ace/mode-markdown.js" type="text/javascript" charset="utf-8"></script>
-<script src="/js/ace/mode-javascript.js" type="text/javascript" charset="utf-8"></script>
-<script src="/js/ace/mode-ruby.js" type="text/javascript" charset="utf-8"></script>
-<script src="/js/edit.js" type="text/javascript" charset="utf-8"></script>
-
+= partial("ace_scripts")
 

data/lib/gitdocs/views/file.haml

@@ -1,17 +1,6 @@
 %h1= root
 
-- if parent
-  %a{ :href => parent.empty? ? "/#{idx}" : "/#{idx}#{parent}", :class => "parent" }
-    ↪ Back to parent
-- else
-  %a{ :href => "/", :class => "parent" }
-    ↪ Back to selection
-
-%h2
-  %span.path= request.path_info.empty? ? '/' : request.path_info
-  %a{ :href => "?mode=raw" } (raw)
-  %a{ :href => "?mode=edit" } (edit)
-  %a{ :href => "?mode=delete", :onclick => "javascript:return confirm('Are you sure?')" } (delete)
+= partial("header", :locals => { :parent => parent, :file => true, :idx => idx  })
 
 .contents
   = preserve contents

data/lib/gitdocs/views/settings.haml

@@ -30,6 +30,7 @@
                 %option{:value => remote, :selected => remote == "#{share.remote_name}/#{share.branch_name}" ? 'selected' : nil}
                   =remote
       -else
+
         %dl
           %dt Remote
           %dd

metadata

@@ -2,7 +2,7 @@
 name: gitdocs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Josh Hull
@@ -44,7 +44,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.3.6
+        version: 0.3.7
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -279,6 +279,8 @@ files:
 - lib/gitdocs/runner.rb
 - lib/gitdocs/server.rb
 - lib/gitdocs/version.rb
+- lib/gitdocs/views/_ace_scripts.erb
+- lib/gitdocs/views/_header.haml
 - lib/gitdocs/views/app.haml
 - lib/gitdocs/views/dir.haml
 - lib/gitdocs/views/edit.haml