dolt 0.27.0 → 0.28.0

data/.travis.yml

@@ -4,3 +4,5 @@ rvm:
   - rbx-19mode
   - 1.8.7
   - ree
+before_install:
+  - sudo apt-get install -y libicu-dev

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dolt (0.27.0)
+    dolt (0.28.0)
       json (~> 1.5)
-      libdolt (~> 0.26)
+      libdolt (~> 0.27)
       sinatra (~> 1.0)
       thin (~> 1.4)
       tiltout (~> 1.4)
@@ -27,7 +27,7 @@ GEM
     github-markup (0.7.5)
     htmlentities (4.3.1)
     json (1.8.0)
-    libdolt (0.26.0)
+    libdolt (0.27.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
       makeup (~> 0.4)

data/Readme.md

@@ -0,0 +1,194 @@
+# Dolt
+
+<a href="http://travis-ci.org/cjohansen/dolt" class="travis">
+  <img src="https://secure.travis-ci.org/cjohansen/dolt.png">
+</a>
+
+Dolt is a stand-alone Git repository browser. It can be used to explore
+repositories in your browser of choice, and features syntax highlighting with
+[http://pygments.org/](Pygments) and various markdown formats (see below). In
+addition to offering tree and blob browsing, Dolt also supports rendering the
+commit log and blame.
+
+## Installation
+
+To install `dolt` you need Ruby, [http://www.rubygems.org/](RubyGems) and
+Python development files. The Python development files are required to support
+Pygments syntax highlighting.
+
+### Systems using apt (Debian/Ubuntu, others)
+
+```sh
+# 1) Install Ruby and RubyGems
+sudo apt-get install -y ruby rubygems
+
+# 2) Install Python development files and unicode tools
+sudo apt-get install -y python-dev libicu-dev
+
+# 3) Install dolt. This may or may not require the use of sudo, depending on
+#    how you installed Ruby.
+gem install dolt
+```
+
+### Systems using yum (Fedora/CentOS/RedHat, others)
+
+```sh
+# 1) Install Ruby and RubyGems
+sudo yum install -y ruby rubygems
+
+# 2) Install Python development files and unicode tools
+sudo yum install -y python-devel libicu-devel
+
+# 3) Install dolt. This may or may not require the use of sudo, depending on
+#    how you installed Ruby.
+gem install dolt
+```
+
+## The `dolt` Command Line Interface
+
+Dolt installs a binary, aptly named `dolt` on your system. This binary has only
+one required argument, the directory to serve repositories from. To try it out,
+simply enter a git repository from your terminal and enter
+
+```sh
+dolt .
+```
+
+This will start a dolt instance serving your current repository on
+[http://localhost:3000/](port 3000).
+
+Dolt will serve either a single repository, like above, or a directory of git
+repositories. Let's say you have a directory `/home/dolt/repositories`
+containing a collection of bare Git repositories you push your work to over SSH.
+To serve all of these over the web, simply:
+
+```sh
+cd /home/dolt/repositories
+dolt .
+```
+
+And you'll be presented with a list of the repositories you can browse.
+
+The `dolt` binary supports a number of options, which can be listed using the
+`--help` switch. The following options are currently supported:
+
+* `--socket` lets you specify a UNIX socket to listen to instead of a port.
+     Enter the path to a socket.
+* `--port` lets you specify a different port than 3000. Also supported through
+     the environment variable `PORT`.
+* `--bind` lets you bind to a different IP address than `0.0.0.0`. Also
+     supported through the environment variable `IP`.
+* `--tabwidth` lets you specify how many spaces to use when rendering a tab in a
+     source file
+* `--pidfile` lets you specify the path to a pid file. Entering this option will
+     daemonize the dolt process.
+* `--logfile` lets you specify the path to a log file when running daemonized.
+
+Please note that some of the options allowed can also be specified using
+environment variables. If no option is given to the CLI, the environment
+variable will be used if available, otherwise a default will be used.
+
+To stop a running Dolt server, you'll need to do a little manual work:
+
+```sh
+kill `cat /path/to/dolt.pid`
+```
+
+A future version of Dolt/Gitorious will support stopping a running dolt server.
+
+## Deploying under "a real" web server
+
+To make your repositories publicly available you could specify `port` as 80.
+However, to do this you need to be root on the machine, and it won't work if
+you're already running a web server on your computer.
+
+A more practical solution is to have dolt listening on a socket (or port for
+that matter), daemonize it, and use your web server as a proxy in front of dolt.
+
+A minimal nginx configuration which lets you do this could look like this
+(replace `server_name` with the host name you'll be using):
+
+```conf
+upstream dolt {
+  server unix://tmp/dolt.sock fail_timeout=30s;
+}
+
+server {
+  server_name git.zmalltalker.com;
+  location / {
+    proxy_pass http://dolt;
+    proxy_redirect off;
+  }
+}
+```
+
+On Debian/Ubuntu, add this to `/etc/nginx/sites-available/dolt`, symlink this to
+`/etc/nginx/sites-enabled/dolt` and reload nginx:
+
+```sh
+service nginx reload
+```
+
+On CentOS, add the same contents to `/etc/nginx/conf.d/dolt.conf` and reload
+nginx:
+
+```sh
+service nginx reload
+```
+
+## Rendering markup
+
+Dolt uses [https://github.com/github/markup](GitHub Markup) to render
+different markup formats. In order to have Dolt render these, you need to
+install some different Ruby gems. These gems are not required to install Dolt,
+so you'll have to install the ones you need separately.
+
+### Markdown
+
+To render files with suffixes `.markdown`, `.mdown` and `md`, install the
+`redcarpet` gem.
+
+```sh
+gem install redcarpet
+```
+
+### Org-mode
+
+To render [http://org-mode.org/](org-mode) files with a `.org` suffix, you'll
+need the `org-ruby` gem installed on your system.
+
+```sh
+gem install org-ruby
+```
+
+### Textile
+
+Rendering `.textile` files requires the `RedCloth` gem installed on your system.
+
+```sh
+gem install RedCloth
+```
+
+### Other formats
+
+To render other markup formats, have a look at the
+[https://github.com/github/markup](GitHub Markup) page.
+
+## Why dolt?
+
+Dolt is an extraction of the new code browser in
+[https://gitorious.org/gitorious/mainline](Gitorious). Setting up a full-blown
+Git repository hosting site just to make it possible to show your source code to
+the world feels like way too much work with the current situation. You could use
+`git instaweb`, but that's ridiculously ugly and only allows serving up a single
+repository.
+
+Dolt uses [http://libgit2.github.com](libgit2) for most git operations, and
+should perform a lot better than implementations primarily using the git command
+line tools to integrate with Git.
+
+## License
+
+Dolt is free software licensed under the
+[http://www.gnu.org/licenses/agpl-3.0.html](GNU Affero General Public License
+(AGPL)). Dolt is developed as part of the Gitorious project.

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.27.0"
+  s.version     = "0.28.0"
   s.authors     = ["Christian Johansen"]
   s.email       = ["christian@gitorious.org"]
   s.homepage    = "http://gitorious.org/gitorious/dolt"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "dolt"
 
-  s.add_dependency "libdolt", "~>0.26"
+  s.add_dependency "libdolt", "~>0.27"
   s.add_dependency "thin", "~>1.4"
   s.add_dependency "sinatra", "~>1.0"
   s.add_dependency "tiltout", "~>1.4"

data/lib/dolt/sinatra/actions.rb

@@ -18,175 +18,36 @@
 require "json"
 require "time"
 require "cgi"
+require "libdolt/controller_actions"
 
 module Dolt
   module Sinatra
     class Actions
       def initialize(app, lookup, renderer)
         @app = app
-        @lookup = lookup
-        @renderer = renderer
+        @dolt = Dolt::ControllerActions.new(app, lookup, renderer)
       end
 
-      def redirect(url, status = 302)
-        app.response.status = status
-        app.response["Location"] = url
-        app.body("")
+      def respond_to?(method)
+        dolt.respond_to?(method)
       end
 
-      def render_error(error, repo, ref, data = {})
-        $stderr.puts(error.message)
-        $stderr.puts(error.backtrace)
-
-        if error.class.to_s == "Rugged::ReferenceError" && ref == "HEAD"
-          return app.body(renderer.render("empty", {
-                :repository => repo,
-                :ref => ref
-              }.merge(data)))
-        end
-        template = error.class.to_s == "Rugged::IndexerError" ? :"404" : :"500"
-        add_headers(app.response)
-        app.body(renderer.render(template, {
-              :error => error,
-              :repository_slug => repo,
-              :ref => ref
-            }.merge(data)))
-      rescue Exception => err
-        err_backtrace = err.backtrace.map { |s| "<li>#{s}</li>" }
-        error_backtrace = error.backtrace.map { |s| "<li>#{s}</li>" }
-
-        app.body(<<-HTML)
-        <h1>Fatal Dolt Error</h1>
-        <p>
-          Dolt encountered an exception, and additionally
-          triggered another exception trying to render the error.
-        </p>
-        <p>Tried to render the #{template} template with the following data:</p>
-        <dl>
-          <dt>Repository</dt>
-          <dd>#{repo}</dd>
-          <dt>Ref</dt>
-          <dd>#{ref}</dd>
-        </dl>
-        <h2>Error: #{err.class} #{err.message}</h2>
-        <ul>#{err_backtrace.join()}</ul>
-        <h2>Original error: #{error.class} #{error.message}</h2>
-        <ul>#{error_backtrace.join()}</ul>
-        HTML
-      end
-
-      def raw(repo, ref, path, custom_data = {})
-        if oid = lookup_ref_oid(repo, ref)
-          redirect(app.raw_url(repo, oid, path), 307) and return
-        end
-
-        blob(repo, ref, path, custom_data, {
-            :template => :raw,
-            :content_type => "text/plain",
-            :template_options => { :layout => nil }
-          })
-      end
-
-      def blob(repo, ref, path, custom_data = {}, options = { :template => :blob })
-        if oid = lookup_ref_oid(repo, ref)
-          redirect(app.blob_url(repo, oid, path), 307) and return
-        end
-
-        data = (custom_data || {}).merge(lookup.blob(repo, u(ref), path))
-        blob = data[:blob]
-        return redirect(app.tree_url(repo, ref, path)) if blob.class.to_s !~ /\bBlob/
-        add_headers(app.response, options.merge(:ref => ref))
-        tpl_options = options[:template_options] || {}
-        app.body(renderer.render(options[:template], data, tpl_options))
-      end
-
-      def tree(repo, ref, path, custom_data = {})
-        if oid = lookup_ref_oid(repo, ref)
-          redirect(app.tree_url(repo, oid, path), 307) and return
-        end
-
-        data = (custom_data || {}).merge(lookup.tree(repo, u(ref), path))
-        tree = data[:tree]
-        return redirect(app.blob_url(repo, ref, path)) if tree.class.to_s !~ /\bTree/
-        add_headers(app.response, :ref => ref)
-        app.body(renderer.render(:tree, data))
-      end
-
-      def tree_entry(repo, ref, path, custom_data = {})
-        if oid = lookup_ref_oid(repo, ref)
-          redirect(app.tree_entry_url(repo, oid, path), 307) and return
+      def method_missing(method, *args, &block)
+        if dolt.respond_to?(method)
+          return respond(dolt.send(method, *args, &block))
         end
-
-        data = (custom_data || {}).merge(lookup.tree_entry(repo, u(ref), path))
-        add_headers(app.response, :ref => ref)
-        app.body(renderer.render(data.key?(:tree) ? :tree : :blob, data))
-      end
-
-      def blame(repo, ref, path, custom_data = {})
-        if oid = lookup_ref_oid(repo, ref)
-          redirect(app.blame_url(repo, oid, path), 307) and return
-        end
-
-        data = (custom_data || {}).merge(lookup.blame(repo, u(ref), path))
-        add_headers(app.response, :ref => ref)
-        app.body(renderer.render(:blame, data))
-      end
-
-      def history(repo, ref, path, count, custom_data = {})
-        if oid = lookup_ref_oid(repo, ref)
-          redirect(app.history_url(repo, oid, path), 307) and return
-        end
-
-        data = (custom_data || {}).merge(lookup.history(repo, u(ref), path, count))
-        add_headers(app.response, :ref => ref)
-        app.body(renderer.render(:commits, data))
-      end
-
-      def refs(repo, custom_data = {})
-        data = (custom_data || {}).merge(lookup.refs(repo))
-        add_headers(app.response, :content_type => "application/json")
-        app.body(renderer.render(:refs, data, :layout => nil))
-      end
-
-      def tree_history(repo, ref, path, count = 1, custom_data = {})
-        if oid = lookup_ref_oid(repo, ref)
-          redirect(app.tree_history_url(repo, oid, path), 307) and return
-        end
-
-        data = (custom_data || {}).merge(lookup.tree_history(repo, u(ref), path, count))
-        add_headers(app.response, :content_type => "application/json", :ref => ref)
-        app.body(renderer.render(:tree_history, data, :layout => nil))
-      end
-
-      def resolve_repository(repo)
-        @cache ||= {}
-        @cache[repo] ||= lookup.resolve_repository(repo)
-      end
-
-      def lookup_ref_oid(repo, ref)
-        return if !app.respond_to?(:redirect_refs?) || !app.redirect_refs? || ref.length == 40
-        lookup.rev_parse_oid(repo, ref)
+        super
       end
 
       private
-      attr_reader :app, :lookup, :renderer
-
-      def u(str)
-        # Temporarily swap the + out with a magic byte, so
-        # filenames/branches with +'s won't get unescaped to a space
-        CGI.unescape(str.gsub("+", "\001")).gsub("\001", '+')
-      end
-
-      def add_headers(response, headers = {})
-        default_ct = "text/html; charset=utf-8"
-        app.response["Content-Type"] = headers[:content_type] || default_ct
-        app.response["X-UA-Compatible"] = "IE=edge"
+      attr_reader :app, :dolt
 
-        if headers[:ref] && headers[:ref].length == 40
-          app.response["Cache-Control"] = "max-age=315360000, public"
-          year = 60*60*24*365
-          app.response["Expires"] = (Time.now + year).httpdate
+      def respond(response)
+        app.response.status = response[0]
+        response[1].keys.each do |header|
+          app.response[header] = response[1][header]
         end
+        app.body(response[2].join("\n"))
       end
     end
   end

data/test/dolt/sinatra/actions_test.rb

@@ -20,17 +20,6 @@ require "dolt/sinatra/actions"
 
 describe Dolt::Sinatra::Actions do
   describe "#blob" do
-    it "delegates to lookup" do
-      lookup = Test::Lookup.new(Stub::Blob.new)
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new)
-
-      dolt.blob("gitorious", "master", "app/models/repository.rb")
-
-      assert_equal "gitorious", lookup.repo
-      assert_equal "master", lookup.ref
-      assert_equal "app/models/repository.rb", lookup.path
-    end
-
     it "renders the blob template as html" do
       app = Test::App.new
       dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
@@ -40,72 +29,9 @@ describe Dolt::Sinatra::Actions do
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "blob:Blob", app.body
     end
-
-    it "renders the blob template with custom data" do
-      renderer = Test::Renderer.new("Blob")
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Blob.new), renderer)
-
-      dolt.blob("gitorious", "master", "app/models/repository.rb", { :who => 42 })
-
-      assert_equal 42, renderer.data[:who]
-    end
-
-    it "redirects tree views to tree action" do
-      app = Test::App.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-
-      dolt.blob("gitorious", "master", "app/models")
-
-      assert_equal 302, app.response.status
-      assert_equal "/gitorious/tree/master:app/models", app.response["Location"]
-      assert_equal "", app.body
-    end
-
-    it "unescapes ref" do
-      lookup = Test::Lookup.new(Stub::Blob.new)
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Blob"))
-
-      dolt.blob("gitorious", "issue-%23221", "app/my documents")
-
-      assert_equal "issue-#221", lookup.ref
-    end
-
-    it "does not redirect ref to oid by default" do
-      app = Test::App.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-
-      dolt.blob("gitorious", "master", "lib/gitorious.rb")
-
-      location = app.response["Location"]
-      refute_equal 302, app.response.status
-      refute_equal 307, app.response.status
-    end
-
-    it "redirects ref to oid if configured so" do
-      app = Test::RedirectingApp.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-
-      dolt.blob("gitorious", "master", "lib/gitorious.rb")
-
-      location = app.response["Location"]
-      assert_equal 307, app.response.status
-      assert_equal "/gitorious/blob/#{'a' * 40}:lib/gitorious.rb", location
-      assert_equal "", app.body
-    end
   end
 
   describe "#tree" do
-    it "delegates to actions" do
-      lookup = Test::Lookup.new(Stub::Tree.new)
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new)
-
-      dolt.tree("gitorious", "master", "app/models")
-
-      assert_equal "gitorious", lookup.repo
-      assert_equal "master", lookup.ref
-      assert_equal "app/models", lookup.path
-    end
-
     it "renders the tree template as html" do
       app = Test::App.new
       dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
@@ -115,74 +41,6 @@ describe Dolt::Sinatra::Actions do
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "tree:Tree", app.body
     end
-
-    it "renders template with custom data" do
-      renderer = Test::Renderer.new("Tree")
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Tree.new), renderer)
-
-      dolt.tree("gitorious", "master", "app/models", { :who => 42 })
-
-      assert_equal 42, renderer.data[:who]
-    end
-
-    it "redirects blob views to blob action" do
-      app = Test::App.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Tree"))
-
-      dolt.tree("gitorious", "master", "app/models/repository.rb")
-
-      location = app.response["Location"]
-      assert_equal 302, app.response.status
-      assert_equal "/gitorious/blob/master:app/models/repository.rb", location
-      assert_equal "", app.body
-    end
-
-    it "sets X-UA-Compatible header" do
-      app = Test::App.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-
-      dolt.tree("gitorious", "master", "app/models")
-
-      assert_equal "IE=edge", app.response["X-UA-Compatible"]
-    end
-
-    it "does not set cache-control header for head ref" do
-      app = Test::App.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-
-      dolt.tree("gitorious", "master", "app/models")
-
-      assert !app.response.key?("Cache-Control")
-    end
-
-    it "sets cache headers for full oid ref" do
-      app = Test::App.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-
-      dolt.tree("gitorious", "a" * 40, "app/models")
-
-      assert_equal "max-age=315360000, public", app.response["Cache-Control"]
-      refute_nil app.response["Expires"]
-    end
-
-    it "unescapes ref" do
-      lookup = Test::Lookup.new(Stub::Tree.new)
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Tree"))
-
-      dolt.tree("gitorious", "issue-%23221", "app")
-
-      assert_equal "issue-#221", lookup.ref
-    end
-
-    it "redirects ref to oid if configured so" do
-      app = Test::RedirectingApp.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-
-      dolt.tree("gitorious", "master", "lib")
-
-      assert_equal 307, app.response.status
-      assert_equal "/gitorious/tree/#{'a' * 40}:lib", app.response["Location"]
-    end
   end
 
   describe "#tree_entry" do
@@ -195,58 +53,9 @@ describe Dolt::Sinatra::Actions do
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "tree:Tree", app.body
     end
-
-    it "renders template with custom data" do
-      renderer = Test::Renderer.new("Tree")
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Tree.new), renderer)
-
-      dolt.tree_entry("gitorious", "master", "app/models", { :who => 42 })
-
-      assert_equal 42, renderer.data[:who]
-    end
-
-    it "renders trees with the tree template as html" do
-      app = Test::App.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-
-      dolt.tree_entry("gitorious", "master", "app/models")
-
-      assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
-      assert_equal "blob:Blob", app.body
-    end
-
-    it "unescapes ref" do
-      lookup = Test::Lookup.new(Stub::Tree.new)
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Tree"))
-
-      dolt.tree_entry("gitorious", "issue-%23221", "app")
-
-      assert_equal "issue-#221", lookup.ref
-    end
-
-    it "redirects ref to oid if configured so" do
-      app = Test::RedirectingApp.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-
-      dolt.tree_entry("gitorious", "master", "lib")
-
-      assert_equal 307, app.response.status
-      assert_equal "/gitorious/source/#{'a' * 40}:lib", app.response["Location"]
-    end
   end
 
   describe "#raw" do
-    it "delegates to lookup" do
-      lookup = Test::Lookup.new(Stub::Blob.new)
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new)
-
-      dolt.raw("gitorious", "master", "app/models/repository.rb")
-
-      assert_equal "gitorious", lookup.repo
-      assert_equal "master", lookup.ref
-      assert_equal "app/models/repository.rb", lookup.path
-    end
-
     it "renders the raw template as text" do
       app = Test::App.new
       dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Text"))
@@ -256,60 +65,9 @@ describe Dolt::Sinatra::Actions do
       assert_equal "text/plain", app.response["Content-Type"]
       assert_equal "raw:Text", app.body
     end
-
-    it "renders template with custom data" do
-      renderer = Test::Renderer.new("Text")
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Blob.new), renderer)
-
-      dolt.raw("gitorious", "master", "app/models/repository.rb", { :who => 42 })
-
-      assert_equal 42, renderer.data[:who]
-    end
-
-    it "redirects tree views to tree action" do
-      app = Test::App.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-
-      dolt.raw("gitorious", "master", "app/models")
-
-      location = app.response["Location"]
-      assert_equal 302, app.response.status
-      assert_equal "/gitorious/tree/master:app/models", location
-      assert_equal "", app.body
-    end
-
-    it "unescapes ref" do
-      lookup = Test::Lookup.new(Stub::Blob.new)
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Blob"))
-
-      dolt.raw("gitorious", "issue-%23221", "app/models/repository.rb")
-
-      assert_equal "issue-#221", lookup.ref
-    end
-
-    it "redirects ref to oid if configured so" do
-      app = Test::RedirectingApp.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-
-      dolt.raw("gitorious", "master", "lib/gitorious.rb")
-
-      assert_equal 307, app.response.status
-      assert_equal "/gitorious/raw/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
-    end
   end
 
   describe "#blame" do
-    it "delegates to lookup" do
-      lookup = Test::Lookup.new(Stub::Blob.new)
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new)
-
-      dolt.blame("gitorious", "master", "app/models/repository.rb")
-
-      assert_equal "gitorious", lookup.repo
-      assert_equal "master", lookup.ref
-      assert_equal "app/models/repository.rb", lookup.path
-    end
-
     it "renders the blame template as html" do
       app = Test::App.new
       dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Text"))
@@ -319,47 +77,9 @@ describe Dolt::Sinatra::Actions do
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "blame:Text", app.body
     end
-
-    it "renders template with custom data" do
-      renderer = Test::Renderer.new("Text")
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Blob.new), renderer)
-
-      dolt.blame("gitorious", "master", "app/models/repository.rb", { :who => 42 })
-
-      assert_equal 42, renderer.data[:who]
-    end
-
-    it "unescapes ref" do
-      lookup = Test::Lookup.new(Stub::Blob.new)
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Blob"))
-
-      dolt.blame("gitorious", "issue-%23221", "app/models/repository.rb")
-
-      assert_equal "issue-#221", lookup.ref
-    end
-
-    it "redirects ref to oid if configured so" do
-      app = Test::RedirectingApp.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-
-      dolt.blame("gitorious", "master", "lib/gitorious.rb")
-
-      assert_equal 307, app.response.status
-      assert_equal "/gitorious/blame/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
-    end
   end
 
   describe "#history" do
-    it "delegates to lookup" do
-      lookup = Test::Lookup.new(Stub::Blob.new)
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new)
-      dolt.history("gitorious", "master", "app/models/repository.rb", 10)
-
-      assert_equal "gitorious", lookup.repo
-      assert_equal "master", lookup.ref
-      assert_equal "app/models/repository.rb", lookup.path
-    end
-
     it "renders the commits template as html" do
       app = Test::App.new
       dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Text"))
@@ -369,34 +89,6 @@ describe Dolt::Sinatra::Actions do
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "commits:Text", app.body
     end
-
-    it "renders template with custom data" do
-      renderer = Test::Renderer.new("Text")
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Blob.new), renderer)
-
-      dolt.history("gitorious", "master", "app/models/repository.rb", 10, { :who => 42 })
-
-      assert_equal 42, renderer.data[:who]
-    end
-
-    it "unescapes ref" do
-      lookup = Test::Lookup.new(Stub::Blob.new)
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Blob"))
-
-      dolt.history("gitorious", "issue-%23221", "lib/gitorious.rb", 10)
-
-      assert_equal "issue-#221", lookup.ref
-    end
-
-    it "redirects ref to oid if configured so" do
-      app = Test::RedirectingApp.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-
-      dolt.history("gitorious", "master", "lib/gitorious.rb", 10)
-
-      assert_equal 307, app.response.status
-      assert_equal "/gitorious/history/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
-    end
   end
 
   describe "#refs" do
@@ -409,15 +101,6 @@ describe Dolt::Sinatra::Actions do
       assert_equal "application/json", app.response["Content-Type"]
       assert_equal "refs:JSON", app.body
     end
-
-    it "renders template with custom data" do
-      renderer = Test::Renderer.new("Text")
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Blob.new), renderer)
-
-      dolt.refs("gitorious", { :who => 42 })
-
-      assert_equal 42, renderer.data[:who]
-    end
   end
 
   describe "#tree_history" do
@@ -430,33 +113,5 @@ describe Dolt::Sinatra::Actions do
       assert_equal "application/json", app.response["Content-Type"]
       assert_equal "tree_history:JSON", app.body
     end
-
-    it "renders template with custom data" do
-      renderer = Test::Renderer.new("Text")
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Tree.new), renderer)
-
-      dolt.tree_history("gitorious", "master", "app/models", 1, { :who => 42 })
-
-      assert_equal 42, renderer.data[:who]
-    end
-
-    it "unescapes ref" do
-      lookup = Test::Lookup.new(Stub::Tree.new)
-      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Tree"))
-
-      dolt.tree_history("gitorious", "issue-%23221", "app/models")
-
-      assert_equal "issue-#221", lookup.ref
-    end
-
-    it "redirects ref to oid if configured so" do
-      app = Test::RedirectingApp.new
-      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-
-      dolt.tree_history("gitorious", "master", "lib", 10)
-
-      assert_equal 307, app.response.status
-      assert_equal "/gitorious/tree_history/#{'a' * 40}:lib", app.response["Location"]
-    end
   end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
+  prerelease: 
 platform: ruby
 authors:
 - Christian Johansen
@@ -13,20 +14,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: libdolt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '0.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '0.27'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tiltout
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +169,7 @@ files:
 - ./Gemfile
 - ./Gemfile.lock
 - ./Rakefile
-- ./Readme.org
+- ./Readme.md
 - ./bin/dolt
 - ./dolt.gemspec
 - ./lib/dolt/sinatra/actions.rb
@@ -234,25 +253,27 @@ files:
 - bin/dolt
 homepage: http://gitorious.org/gitorious/dolt
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: dolt
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Dolt serves git trees and syntax highlighted blobs
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 1414f588cba634d0a92547366a8e87ca66583cc3
-  data.tar.gz: 84a32ef1845e4d7795c5f706fef6deb5f6606d65
-SHA512:
-  metadata.gz: a929c197c1ec49786da76fd7854e1c752cb39b6e192835f5ab9edd9a7c786879d8fb3d0e947df2a46feae49aa6674cfb50fe5f38c5013615c23a7090e42020b8
-  data.tar.gz: c8312562974affc44b68a8f1495611b93847b9b7707ded37049695d2229be4ebe363ff785d8c5fdf91a04719527c24ee1c648f89e146911fca1dbfec7474bb6d

data/Readme.org

@@ -1,166 +0,0 @@
-* Dolt
-  Dolt is a stand-alone Git repository browser. It can be used to
-  explore repositories in your browser of choice, and features syntax
-  highlighting with [[http://pygments.org/][Pygments]] and various markdown formats (see
-  below). In addition to offering tree and blob browsing, Dolt also
-  supports rendering the commit log and blame.
-
-** Installation
-   To install =dolt= you need Ruby, [[http://www.rubygems.org/][RubyGems]] Python development files. The
-   Python development files are required to support Pygments syntax
-   highlighting. Once that's installed, simply enter:
-
-#+BEGIN_SRC shell-script
-gem install dolt
-#+END_SRC
-
-   and you'll be ready to serve your repositories on the web.
-
-** The =dolt= Command Line Interface
-   Dolt installs a binary, aptly named =dolt= on your system. This
-   binary has only one required argument, the directory to serve
-   repositories from. To try it out, simply enter a git repository
-   from your terminal and enter
-
-#+BEGIN_SRC shell-script
-dolt .
-#+END_SRC
-
-   This will start a dolt instance serving your current repository on
-   port [[http://localhost:3000/][3000]].
-
-   Dolt will serve either a single repository, like above, or a
-   directory of git repositories. Let's say you have a directory
-   =/home/dolt/repositories= containing a collection of bare Git
-   repositories you push your work to over SSH. To serve all of these
-   over the web, simply:
-
-#+BEGIN_SRC shell-script
-cd /home/dolt/repositories
-dolt .
-#+END_SRC
-
-   And you'll be presented with a list of the repositories you can
-   browse.
-
-   The =dolt= binary supports a number of options, which can be
-   listed using the =--help= switch. The following options are
-   currently supported:
-
-   - =--socket= lets you specify a UNIX socket to listen to instead
-     of a port. Enter the path to a socket.
-   - =--port= lets you specify a different port than 3000. Also
-     supported through the environment variable =PORT=.
-   - =--bind= lets you bind to a different IP address than
-     =0.0.0.0=. Also supported through the environment variable =IP=.
-   - =--tabwidth= lets you specify how many spaces to use when
-     rendering a tab in a source file
-   - =--pidfile= lets you specify the path to a pid file. Entering
-     this option will daemonize the dolt process.
-   - =--logfile= lets you specify the path to a log file when running daemonized.
-
-   Please note that some of the options allowed can also be specified
-   using environment variables. If no option is given to the CLI, the
-   environment variable will be used if available, otherwise a
-   default will be used.
-
-   To stop a running Dolt server, you'll need to do a little manual
-   work:
-
-#+BEGIN_SRC shell-script
-kill `cat /path/to/dolt.pid`
-#+END_SRC
-
-   A future version of Gitorious will support stopping a running dolt server.
-
-** Deploying under "a real" web server
-   To make your repositories publicly available you could specify
-   =port= as 80. However, to do this you need to be root on the
-   machine, and it won't work if you're already running a web server
-   on your computer.
-
-   A more practical solution is to have dolt listening on a socket
-   (or port for that matter), daemonize it, and use your web server
-   as a proxy in front of dolt.
-
-   A minimal nginx configuration which lets you do this could look
-   like this (replace =server_name= with the host name you'll be using):
-
-#+BEGIN_SRC conf
-  upstream dolt {
-    server unix://tmp/dolt.sock fail_timeout=30s;
-  }
-  server {
-    server_name git.zmalltalker.com;
-    location / {
-      proxy_pass http://dolt;
-      proxy_redirect off;
-    }
-  }
-#+END_SRC
-
-   On Debian/Ubuntu, add this to =/etc/nginx/sites-available/dolt=,
-   symlink this to =/etc/nginx/sites-enabled/dolt= and reload nginx:
-
-#+BEGIN_SRC shell-script
-service nginx reload
-#+END_SRC
-
-   On CentOS, add the same contents to =/etc/nginx/conf.d/dolt.conf=
-   and reload nginx:
-
-#+BEGIN_SRC shell-script
-service nginx reload
-#+END_SRC
-
-
-** Rendering markup
-   Dolt uses [[https://github.com/github/markup][GitHub Markup]] to render different markup formats. In
-   order to have Dolt render these, you need to install some
-   different Ruby gems. These gems are not required to install Dolt,
-   so you'll have to install the ones you need separately.
-
-** Markdown
-   To render files with suffixes =.markdown=, =.mdown= and =md=,
-   install the =redcarpet= gem.
-
-#+BEGIN_SRC shell-script
-  gem install redcarpet
-#+END_SRC
-
-** Org-mode
-   To render [[http://org-mode.org/][org-mode]] files (like this one) with a =.org= suffix,
-   you'll need the =org-ruby= gem installed on your system.
-
-#+BEGIN_SRC shell-script
-gem install org-ruby
-#+END_SRC
-
-** Textile
-   Rendering =.textile= files requires the =RedCloth= gem installed
-   on your system.
-
-#+BEGIN_SRC shell-script
-gem install RedCloth
-#+END_SRC
-
-** Other formats
-   To render other markup formats, have a look at the [[https://github.com/github/markup][GitHub Markup]]
-   page.
-
-** Why dolt?
-   Dolt is an extraction of the new code browser in
-   [[https://gitorious.org/gitorious/mainline][Gitorious]]. Setting up a full-blown Git repository hosting site
-   just to make it possible to show your source code to the world
-   feels like way too much work with the current situation. You could
-   use =git instaweb=, but that's ridiculously ugly and only allows
-   serving up a single repository.
-
-   Dolt uses [[http://libgit2.github.com][libgit2]] for all git operations, and should perform a lot
-   better than implementations using the git command line tools to
-   integrate with Git.
-
-** License
-   Dolt is free software licensed under the [[http://www.gnu.org/licenses/agpl-3.0.html][GNU Affero General Public
-   License (AGPL)]].  Dolt is developed as part of the Gitorious
-   project.