gitdocs 0.1.5 → 0.2.0

data/README.md

@@ -1,12 +1,47 @@
 # Gitdocs
 
-Collaborate on files and docs through a shared git repository. gitdocs will automatically push changes to the repo as well as pull in changes.
-This allows any git repo to be used as a collaborative task list or wiki for a team.
-You can also start a web front-end allowing the repo to be accessed through a browser.
+Open-source dropbox alternative powered by git. Collaborate on files and tasks without any extra hassle.
+gitdocs will automatically keep everyone's repos in sync by pushing and pulling changes.
+This allows any git repo to be used as a collaborative task list, file share, or wiki for a team.
+Supports a web front-end allowing each repo to be accessed through your browser.
+
+**Note:** Right now, gitdocs only supports Mac OSX using fsevent. Linux and windows support are coming very soon, so check back here again.
+
+## Why?
+
+Why should you use gitdocs for your file and doc sharing needs?
+
+ * **Open** - gitdocs is entirely open-source under the MIT license
+ * **Simple** - gitdocs is the simplest thing that works in both setup and usage
+ * **Secure** - gitdocs leverages git (and existing providers like github) to store your data safely.
+ * **Versatile** - share task lists, code snippets, images, files or just use it as a wiki (with our web front-end)
+ * **Portable** - access your files anywhere you can use git (with upcoming cross-platform support)
+
+The best part is that giving this a try is quick and easy.
+
+## Quick Start
+
+Gitdocs monitors any number of directories for changes and keeps them automatically synced. You can either add
+existing git directories to be watched or have gitdocs pull down a repository for you.
+
+There are plenty of great git hosting providers to safely store your data and you can trust the data is stored securely.
+If you want a private repo to use with gitdocs, we recommend you check out [BitBucket](https://bitbucket.org/) which
+provides free private git repos after registration.
+
+To get started with gitdocs and a secure private bitbucket repo:
+
+ - `gem install gitdocs`
+ - `gitdocs start`
+ - Login to [BitBucket](https://bitbucket.org/) and add a new private repo named 'docs'
+ - Setup your SSH Key under [Account](https://bitbucket.org/account/) for ssh access
+ - `gitdocs create ~/Documents/gitdocs git@bitbucket.org:username/docs.git`
+
+There you go! Now just start adding and editing files within the directory and they will be automatically
+synchronized across all gitdocs-enabled clients.
 
 ## Installation
 
-Install the gem:
+Requires ruby and rubygems. Install as a gem:
 
 ```
 gem install gitdocs
@@ -22,8 +57,7 @@ to enable Growl support (other platforms coming soon).
 
 ## Usage
 
-Gitdocs is centered around 'watching' any number of directories for changes and keeping them automatically synced. You can either add
-existing git directories for monitoring or have gitdocs pull down a repository to monitor.
+### Monitoring Repos
 
 You can add existing folders to watch:
 
@@ -44,6 +78,8 @@ gitdocs rm my/path/to/watch
 gitdocs clear
 ```
 
+### Starting Gitdocs
+
 You need to start gitdocs in order for the monitoring to work:
 
 ```
@@ -56,29 +92,33 @@ If the start command fails, you can run again with a debug flag:
 gitdocs start -D
 ```
 
-and gitdocs can be easily stopped and restarted:
+Once gitdocs has been started and is monitoring the correct directories, simply start editing or adding files to your
+designated git repos and changes will be automatically pushed. Gitdocs can be easily stopped or restarted:
 
 ```
 gitdocs stop
 gitdocs restart
 ```
 
+### Exploring Gitdocs
+
 For an overview of gitdocs current status, run:
 
 ```
 gitdocs status
 ```
 
-Once gitdocs has been started and is monitoring the correct directories, simply start editing or adding files to your
-designated git repos. Changes will be automatically pushed and pulled to your local repos.
+To explore the repos in your browser, simply visit `http://localhost:8888` for access to all your docs within the browser.
 
-To explore the repos in your browser, simply start the server:
+### Conflict Resolution
 
-```
-gitdocs serve
-```
+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?
 
-and then visit `http://localhost:8888` for access to all your docs in the browser.
+Don't worrry, gitdocs makes this easy. 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.
 
 ## Planned Features
 
@@ -87,7 +127,6 @@ 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.
- - Better conflict-resolution behavior on updates (maintain both versions of a file)
  - Support for linux and windows platforms (coming soon), and maybe android and iOS as well?
 
 ## Prior Projects
@@ -96,9 +135,11 @@ Gitdocs is a fresh project that we spiked on in a few days time. Our primary goa
 but provide the features that makes dropbox great. If you are interested in other Dropbox alternatives, be sure to checkout our notes below:
 
  * [SparkleShare](http://sparkleshare.org/) is an open source, self-hosted Dropbox alternative. Nice project and a great alternative but has a lot of dependencies,
-   more complex codebase, and lacks some of the features we have planned for gitdocs in the near future.
+   and lacks some of the features we have planned for gitdocs in the near future. More mature project, so be sure to take a look.
  * [DVCS-Autosync](http://mayrhofer.eu.org/dvcs-autosync) is a project to create an open source replacement for Dropbox based on distributed version control systems.
    Very similar project but again we have features planned that are out of scope (local tunnel file sharing, complete web ui for browsing, uploading and editing).
  * [Lipsync](https://github.com/philcryer/lipsync) is another similar project. We haven't looked at this too closely, but thought we would mention it in this list.
+ * [bitpocket](https://github.com/sickill/bitpocket) is a project that uses rsync to synchronize data. Interesting concept, but
+   lacks revision history, author tracking, etc and we have features planned that are out of scope for this project
 
 If any other open-source dropbox alternatives are available, we would love to hear about them so let us know!

data/gitdocs.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'dante', '~> 0.0.4'
   s.add_dependency 'growl', '~> 1.0.3'
   s.add_dependency 'yajl-ruby'
+  s.add_dependency 'haml'
 
   s.add_development_dependency 'minitest', "~> 2.6.1"
   s.add_development_dependency 'rake'

data/lib/gitdocs.rb

@@ -9,21 +9,37 @@ require 'growl'
 require 'yajl'
 require 'dante'
 
+
 module Gitdocs
-  def self.run(config_root = nil, debug=false)
+
+  DEBUG = ENV['DEBUG']
+
+  def self.run(config_root = nil, debug = DEBUG)
     loop do
-      @config = Configuration.new(config_root)
+      config = Configuration.new(config_root)
       puts "Gitdocs v#{VERSION}" if debug
-      puts "Using configuration root: '#{@config.config_root}'" if debug
-      puts "Watch paths: #{@config.paths.join(", ")}" if debug
-      @threads = @config.paths.map do |path|
-        t = Thread.new { Runner.new(path).run }
+      puts "Using configuration root: '#{config.config_root}'" if debug
+      puts "Watch paths: #{config.paths.join(", ")}" if debug
+      # Start the repo watchers
+      runners = []
+      threads = config.paths.map do |path|
+        t = Thread.new(runners) { |r|
+          runner = Runner.new(path)
+          r << runner
+          runner.run
+        }
         t.abort_on_exception = true
         t
       end
-      puts "Watch threads: #{@threads.map { |t| "Thread status: '#{t.status}', running: #{t.alive?}" }}" if debug
-      puts "Joined #{@threads.size} watch threads...running" if debug
-      @threads.each(&:join)
+      sleep 1
+      unless defined?(pid) && pid
+        # Start the web front-end
+        pid = fork { Server.new(*runners).start }
+        at_exit { Process.kill("KILL", pid) rescue nil }
+      end
+      puts "Watch threads: #{threads.map { |t| "Thread status: '#{t.status}', running: #{t.alive?}" }}" if debug
+      puts "Joined #{threads.size} watch threads...running" if debug
+      threads.each(&:join)
       sleep(60)
     end
   end

data/lib/gitdocs/cli.rb

@@ -75,12 +75,6 @@ module Gitdocs
       say self.config.paths.map { |p| "  - #{p}" }.join("\n")
     end
 
-    desc "serve", "Serves web frontend for files"
-    def serve
-      puts "Serving docs..."
-      Gitdocs::Server.new(*self.config.paths.map{|p| Gitdocs::Runner.new(p)}).start
-    end
-
     desc "config", "Configuration options for gitdocs"
     def config
       # TODO make this work

data/lib/gitdocs/public/css/app.css

@@ -0,0 +1,46 @@
+body {
+  margin-left: 20%;
+  margin-right: 20%;
+  font-family: Arial, Verdana;
+}
+
+body h1, h2 {
+  margin: 0;
+  padding-bottom: 0.8em;
+  font-weight: bold;
+}
+body h1 { font-size: 2em; }
+body h2 { font-size: 1.5em; margin-top: 0.2em; }
+
+body .container {
+  min-width: 500px;
+  background: #FCEA97;
+  border-style: solid;
+  border-width: 5px;
+  border-color: #FFC003;
+  border-radius: 15px;
+  padding: 2em;
+  margin-top: 1.2em;
+}
+
+body a { text-decoration: none; color: blue; }
+body a:hover { text-decoration: underline; }
+
+body .contents {
+  overflow: auto;
+  background-color: #F8F8F8;
+  border: 3px solid #EFEFEF;
+  padding: 1.2em;
+  margin: 0;
+  font-family: ;
+}
+
+body .contents h1 {
+  font-size: 2em;
+  padding-bottom: 0.8em;
+}
+
+body .contents h2 {
+  font-size: 1.4em;
+  padding-bottom: 0.6em;
+}

data/lib/gitdocs/public/css/reset.css

@@ -0,0 +1,59 @@
+/*
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.com/yui/license.html
+version: 3.1.1
+build: 47
+*/
+html {
+  color: #000;
+  background: #FFF; }
+
+body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, textarea, p, blockquote, th, td {
+  margin: 0;
+  padding: 0; }
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0; }
+
+fieldset, img {
+  border: 0; }
+
+address, caption, cite, code, dfn, em, strong, th, var {
+  font-style: normal;
+  font-weight: normal; }
+
+li {
+  list-style: none; }
+
+caption, th {
+  text-align: left; }
+
+h1, h2, h3, h4, h5, h6 {
+  font-size: 100%;
+  font-weight: normal; }
+
+q:before, q:after {
+  content: ''; }
+
+abbr, acronym {
+  border: 0;
+  font-variant: normal; }
+
+sup {
+  vertical-align: text-top; }
+
+sub {
+  vertical-align: text-bottom; }
+
+input, textarea, select {
+  font-family: inherit;
+  font-size: inherit;
+  font-weight: inherit; }
+
+input, textarea, select {
+  *font-size: 100%; }
+
+legend {
+  color: #000; }

data/lib/gitdocs/runner.rb

@@ -7,70 +7,88 @@ module Gitdocs
       out, status = sh_with_code "which growlnotify"
       @use_growl = opts && opts.key?(:growl) ? opts[:growl] : status.success?
       @polling_interval = opts && opts[:polling_interval] || 15
-      @icon = File.expand_path("../img/icon.png", __FILE__)
+      @icon = File.expand_path("../../img/icon.png", __FILE__)
     end
 
     def run
       info("Running gitdocs!", "Running gitdocs in `#{@root}'")
-      @current_remote   = sh_string("git config branch.`git branch | grep '^\*' | sed -e 's/\* //'`.remote", "origin")
-      @current_branch   = sh_string("git branch | grep '^\*' | sed -e 's/\* //'", "master")
-      @current_revision = sh("git rev-parse HEAD").strip rescue nil
+      @current_remote   = sh_string("git config branch.`git branch | grep '^\*' | sed -e 's/\* //'`.remote", 'origin')
+      @current_branch   = sh_string("git branch | grep '^\*' | sed -e 's/\* //'", 'master')
+      @current_revision = sh_string("git rev-parse HEAD")
+
       mutex = Mutex.new
+      # Pull changes from remote repository
       Thread.new do
         loop do
-          mutex.synchronize do
-            begin
-              out, status = sh_with_code("git fetch --all && git merge #{@current_remote}/#{@current_branch}")
-              if status.success?
-                changes = get_latest_changes
-                unless changes.empty?
-                  info("Updated with #{changes.size} change#{changes.size == 1 ? '' : 's'}", "`#{@root}' has been updated")
-                end
-              else
-                warn("Error attempting to pull", out)
-              end
-              push_changes
-            rescue Exception
-              error("There was an error", $!.message) rescue nil
-            end
-          end
+          mutex.synchronize { sync_changes }
           sleep @polling_interval
         end
-      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 do
-            push_changes
-          end
+          mutex.synchronize { push_changes }
         end
       end
       at_exit { listener.stop }
       listener.run
     end
 
+    def sync_changes
+      out, status = sh_with_code("git fetch --all && git merge #{@current_remote}/#{@current_branch}")
+      if status.success?
+        changes = get_latest_changes
+        unless changes.empty?
+          author_list = changes.inject(Hash.new{|h, k| h[k] = 0}) {|h, c| h[c['author']] += 1; h}.to_a.sort{|a,b| b[1] <=> a[1]}.map{|(name, count)| "* #{name} (#{count} change#{count == 1 ? '' : 's'})"}.join("\n")
+          info("Updated with #{changes.size} change#{changes.size == 1 ? '' : 's'}", "In `#{@root}':\n#{author_list}")
+        end
+        push_changes
+      elsif out[/CONFLICT/]
+        conflicted_files = sh("git ls-files -u --full-name -z").split("\0").
+          inject(Hash.new{|h, k| h[k] = []}) {|h, line|
+            parts = line.split(/\t/)
+            h[parts.last] << parts.first.split(/ /)
+            h
+          }
+        warn("There were some conflicts", "#{conflicted_files.keys.map{|f| "* #{f}"}.join("\n")}")
+        conflicted_files.each do |conflict, ids|
+          conflict_start, conflict_end = conflict.scan(/(.*?)(|\.[^\.]+)$/).first
+          puts "solving #{conflict} with #{ids.inspect}"
+          ids.each do |(mode, sha, id)|
+            author =  " original" if id == "1"
+            system("cd #{@root} && git show :#{id}:#{conflict} > '#{conflict_start} (#{sha[0..6]}#{author})#{conflict_end}'")
+          end
+          system("cd #{@root} && git rm #{conflict}") or raise
+        end
+        push_changes
+      elsif sh_string("git remote").nil? # no remote to pull from
+        # Do nothing, no remote repo yet
+      else
+        error("There was a problem synchronizing this gitdoc", "A problem occurred in #{@root}:\n#{out}")
+      end
+    end
+
     def push_changes
       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?
-      if @current_revision.nil?
+      if @current_revision.nil? || sh('git status')[/branch is ahead/]
         out, code = sh_with_code("git push #{@current_remote} #{@current_branch}")
         if code.success?
           changes = get_latest_changes
           info("Pushed #{changes.size} change#{changes.size == 1 ? '' : 's'}", "`#{@root}' has been pushed")
+        elsif @current_revision.nil?
+          # ignorable
+        elsif out[/\[rejected\]/]
+          warn("There was a conflict in #{@root}, retrying", "")
         else
-          error("Could not push changes", out)
-        end
-      elsif sh('git status')[/branch is ahead/]
-        out, code = sh_with_code("git push")
-        if code.success?
-          changes = get_latest_changes
-          info("Pushed #{changes.size} change#{changes.size == 1 ? '' : 's'}", "`#{@root}' has been pushed")
-        else
-          error("Could not push changes", out)
+          error("BAD Could not push changes in #{@root}", out)
+          exit
         end
       end
     end
@@ -115,11 +133,10 @@ module Gitdocs
       else
         Kernel.warn("#{title}: #{msg}")
       end
-      raise
     end
 
     # sh_string("git config branch.`git branch | grep '^\*' | sed -e 's/\* //'`.remote", "origin")
-    def sh_string(cmd, default)
+    def sh_string(cmd, default=nil)
       val = sh(cmd).strip rescue nil
       (val.nil? || val.empty?) ? default : val
     end

data/lib/gitdocs/server.rb

@@ -10,17 +10,10 @@ module Gitdocs
     def start(port = 8888)
       gds = @gitdocs
       Thin::Server.start('127.0.0.1', port) do
+        use Rack::Static, :urls => ['/css', '/img', '/doc'], :root => File.expand_path("../public", __FILE__)
         run Renee {
           if request.path_info == '/'
-            inline!(<<-EOT, :erb, :locals => {:gds => gds})
-            <html><body>
-            <table>
-            <% gds.each_with_index do |gd, idx| %>
-              <tr><a href="/<%=idx%>"><%=gd.root%></a></tr>
-            <% end %>
-            </table>
-            </body></html>
-            EOT
+            render! "home", :layout => 'app', :locals => {:gds => gds}
           else
             var :int do |idx|
               gd = gds[idx]
@@ -28,17 +21,23 @@ module Gitdocs
               expanded_path = File.expand_path(".#{request.path_info}", gd.root)
               halt 400 unless expanded_path[/^#{Regexp.quote(gd.root)}/]
               halt 404 unless File.exist?(expanded_path)
+              parent = File.dirname(request.path_info)
+              parent = '' if parent == '/'
+              parent = nil if parent == '.'
+              locals = {:idx => idx, :parent => parent, :root => gd.root, :file_path => expanded_path}
               if File.directory?(expanded_path)
-                run! Rack::Directory.new(gd.root)
-              else
-                begin
-                  render! expanded_path
-                rescue
-                  run! Rack::File.new(gd.root)
-                end
+                contents = Dir[File.join(gd.root, request.path_info, '*')]
+                render! "dir", :layout => 'app', :locals => locals.merge(:contents => contents)
+              elsif request.params['mode'] != 'raw' && `file -I #{expanded_path}`.strip.match(%r{text/}) # render file
+                contents = Tilt.new(expanded_path).render rescue "<pre>#{File.read(expanded_path)}</pre>"
+                render! "file", :layout => 'app', :locals => locals.merge(:contents => contents)
+              else # other file
+                run! Rack::File.new(gd.root)
               end
             end
           end
+        }.setup {
+          views_path File.expand_path("../views", __FILE__)
         }
       end
     end

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/lib/gitdocs/views/app.haml

@@ -0,0 +1,9 @@
+!!!
+%html
+  %head
+    %title Gitdocs #{Gitdocs::VERSION}
+    %link{ :href => "/css/reset.css", :rel => "stylesheet" }
+    %link{ :href => "/css/app.css", :rel => "stylesheet" }
+  %body
+    .container
+      = preserve(yield)

data/lib/gitdocs/views/dir.haml

@@ -0,0 +1,20 @@
+%h1
+  =root
+
+- if parent
+  %a{ :href => parent.empty? ? "/#{idx}" : "/#{idx}#{parent}", :class => "parent" }
+    ↪
+    = parent.empty? ? '/' : parent
+- else
+  %a{ :href => "/", :class => "parent" }
+    ↪ Back to selection
+
+%h2
+  =request.path_info.empty? ? '/' : request.path_info
+
+%table
+  -contents.each_with_index do |f, i|
+    %tr
+      %td
+        %a{ :href => "/#{idx}#{request.path_info}/#{File.basename(f)}" }
+          ="#{request.path_info}/#{File.basename(f)}"

data/lib/gitdocs/views/file.haml

@@ -0,0 +1,18 @@
+%h1
+  = root
+
+- if parent
+  %a{ :href => parent.empty? ? "/#{idx}" : "/#{idx}#{parent}", :class => "parent" }
+    ↪
+    = parent.empty? ? '/' : parent
+- else
+  %a{ :href => "/", :class => "parent" }
+    ↪ Back to selection
+
+%h2
+  = request.path_info.empty? ? '/' : request.path_info
+  %a{ :href => "?mode=raw" }
+    (raw)
+
+.contents
+  = preserve contents

data/lib/gitdocs/views/home.haml

@@ -0,0 +1,6 @@
+%table
+  -gds.each_with_index do |gd, idx|
+    %tr
+      %td
+        %a{ :href => "/#{idx}" }
+          =gd.root

data/test/runner_test.rb

@@ -4,10 +4,22 @@ describe "gitdocs runner" do
   it "should clone files" do
     with_clones(3) do |clone1, clone2, clone3|
       File.open(File.join(clone1, "test"), 'w') { |f| f << "testing" }
-      sleep 2
+      sleep 3
       assert_equal "testing", File.read(File.join(clone1, "test"))
       assert_equal "testing", File.read(File.join(clone2, "test"))
       assert_equal "testing", File.read(File.join(clone3, "test"))
     end
   end
+
+  it "should resolve conflicts files" do
+    with_clones(3) do |clone1, clone2, clone3|
+      File.open(File.join(clone1, "test.txt"), 'w') { |f| f << "testing" }
+      sleep 3
+      File.open(File.join(clone1, "test.txt"), 'w') { |f| f << "testing\n1" }
+      File.open(File.join(clone2, "test.txt"), 'w') { |f| f << "testing\n2" }
+      sleep 3
+      assert_includes 2..3, Dir[File.join(clone2, "*.txt")].to_a.size
+      assert_includes 2..3, Dir[File.join(clone3, "*.txt")].to_a.size
+    end
+  end
 end

data/test/test_helper.rb

@@ -15,20 +15,23 @@ module Kernel
   # Redirect standard out, standard error and the buffered logger for sprinkle to StringIO
   # capture_stdout { any_commands; you_want } => "all output from the commands"
   def capture_out
-    old_out, old_err = STDOUT.dup, STDERR.dup
-    stdout_read, stdout_write = IO.pipe
-    stderr_read, stderr_write = IO.pipe
-    $stdout.reopen(stdout_write)
-    $stderr.reopen(stderr_write)
-    yield
-    stdout_write.close
-    stderr_write.close
-    out = stdout_read.rewind && stdout_read.read rescue nil
-    err = stderr_read.rewind && stderr_read.read rescue nil
-    [out, err]
-  ensure
-    $stdout.reopen(old_out)
-    $stderr.reopen(old_err)
+    yield and return if ENV['DEBUG']
+    begin
+      old_out, old_err = STDOUT.dup, STDERR.dup
+      stdout_read, stdout_write = IO.pipe
+      stderr_read, stderr_write = IO.pipe
+      $stdout.reopen(stdout_write)
+      $stderr.reopen(stderr_write)
+      yield
+      stdout_write.close
+      stderr_write.close
+      out = stdout_read.rewind && stdout_read.read rescue nil
+      err = stderr_read.rewind && stderr_read.read rescue nil
+      [out, err]
+    ensure
+      $stdout.reopen(old_out)
+      $stderr.reopen(old_err)
+    end
   end
 end
 
@@ -43,10 +46,12 @@ class MiniTest::Spec
       "/tmp/gitdocs/#{c}"
     end
     pids = sub_paths.map { |path| fork do
-      STDOUT.reopen(File.open("/dev/null", 'w'))
-      STDERR.reopen(File.open("/dev/null", 'w'))
+      unless ENV['DEBUG']
+        STDOUT.reopen(File.open("/dev/null", 'w'))
+        STDERR.reopen(File.open("/dev/null", 'w'))
+      end
       begin
-        Gitdocs::Runner.new(path, :growl => false, :polling_interval => 0.1).run
+        Gitdocs::Runner.new(path, :growl => false, :polling_interval => 0.5).run
       rescue
         puts "RATHER BAD ~~~~~"
         puts $!.message
@@ -60,6 +65,6 @@ class MiniTest::Spec
       pids.each { |pid| Process.kill("INT", pid) rescue nil }
     end
   ensure
-    FileUtils.rm_rf("/tmp/gitdocs")
+    FileUtils.rm_rf("/tmp/gitdocs") unless ENV['DEBUG']
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: gitdocs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Josh Hull
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 -08:00
+date: 2011-12-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,49 +103,60 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: haml
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 2.6.1
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 description: Open-source Dropbox using Ruby and Git.
 email: 
 - joshbuddy@gmail.com
@@ -167,9 +178,15 @@ files:
 - lib/gitdocs.rb
 - lib/gitdocs/cli.rb
 - lib/gitdocs/configuration.rb
+- lib/gitdocs/public/css/app.css
+- lib/gitdocs/public/css/reset.css
 - lib/gitdocs/runner.rb
 - lib/gitdocs/server.rb
 - lib/gitdocs/version.rb
+- lib/gitdocs/views/app.haml
+- lib/gitdocs/views/dir.haml
+- lib/gitdocs/views/file.haml
+- lib/gitdocs/views/home.haml
 - lib/img/icon.png
 - test/configuration_test.rb
 - test/runner_test.rb