dolt 0.22.0 → 0.23.0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dolt (0.22.0)
+    dolt (0.23.0)
       json (~> 1.5)
-      libdolt (~> 0.21)
+      libdolt (~> 0.23)
       sinatra (~> 1.0)
       thin (~> 1.4)
       tiltout (~> 1.4)
@@ -16,13 +16,13 @@ GEM
     eventmachine (1.0.3)
     github-markup (0.7.5)
     htmlentities (4.3.1)
-    json (1.7.7)
-    libdolt (0.22.0)
+    json (1.8.0)
+    libdolt (0.23.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
       makeup (~> 0.2)
       mime-types (~> 1.19)
-      rugged (= 0.17.0.b6)
+      rugged (= 0.18.0.gh.de28323)
       tzinfo (~> 0.3)
     makeup (0.3.0)
       github-markup (~> 0.7)
@@ -40,7 +40,7 @@ GEM
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (0.9.6)
-    rugged (0.17.0.b6)
+    rugged (0.18.0.gh.de28323)
     sinatra (1.4.3)
       rack (~> 1.4)
       rack-protection (~> 1.4)

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.22.0"
+  s.version     = "0.23.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.21"
+  s.add_dependency "libdolt", "~>0.23"
   s.add_dependency "thin", "~>1.4"
   s.add_dependency "sinatra", "~>1.0"
   s.add_dependency "tiltout", "~>1.4"

data/lib/dolt/sinatra/actions.rb

@@ -29,6 +29,9 @@ module Dolt
       end
 
       def render_error(error, repo, ref)
+        if error.class.to_s == "Rugged::ReferenceError" && ref == "HEAD"
+          return body(renderer.render("empty", { :repository => repo, :ref => ref }))
+        end
         template = error.class.to_s == "Rugged::IndexerError" ? :"404" : :"500"
         add_headers(response)
         body(renderer.render(template, {

data/lib/dolt/sinatra/multi_repo_browser.rb

@@ -35,7 +35,7 @@ module Dolt
       end
 
       get "/:repo" do
-        redirect "/#{params[:repo]}/tree/master:"
+        redirect "/#{params[:repo]}/tree/HEAD:"
       end
 
       get "/*/tree/*:*" do
@@ -48,7 +48,7 @@ module Dolt
       end
 
       get "/*/tree/*" do
-        force_ref(params[:splat], "tree", "master")
+        force_ref(params[:splat], "tree", "HEAD")
       end
 
       get "/*/blob/*:*" do
@@ -61,7 +61,7 @@ module Dolt
       end
 
       get "/*/blob/*" do
-        force_ref(params[:splat], "blob", "master")
+        force_ref(params[:splat], "blob", "HEAD")
       end
 
       get "/*/raw/*:*" do
@@ -74,7 +74,7 @@ module Dolt
       end
 
       get "/*/raw/*" do
-        force_ref(params[:splat], "raw", "master")
+        force_ref(params[:splat], "raw", "HEAD")
       end
 
       get "/*/blame/*:*" do
@@ -87,7 +87,7 @@ module Dolt
       end
 
       get "/*/blame/*" do
-        force_ref(params[:splat], "blame", "master")
+        force_ref(params[:splat], "blame", "HEAD")
       end
 
       get "/*/history/*:*" do
@@ -100,7 +100,7 @@ module Dolt
       end
 
       get "/*/history/*" do
-        force_ref(params[:splat], "history", "master")
+        force_ref(params[:splat], "history", "HEAD")
       end
 
       get "/*/refs" do

data/lib/dolt/sinatra/single_repo_browser.rb

@@ -36,7 +36,7 @@ module Dolt
       not_found { renderer.render("404") }
 
       get "/" do
-        redirect("/tree/master:")
+        redirect("/tree/HEAD:")
       end
 
       get "/tree/*:*" do
@@ -49,7 +49,7 @@ module Dolt
       end
 
       get "/tree/*" do
-        force_ref(params[:splat], "tree", "master")
+        force_ref(params[:splat], "tree", "HEAD")
       end
 
       get "/blob/*:*" do
@@ -62,7 +62,7 @@ module Dolt
       end
 
       get "/blob/*" do
-        force_ref(params[:splat], "blob", "master")
+        force_ref(params[:splat], "blob", "HEAD")
       end
 
       get "/raw/*:*" do
@@ -75,7 +75,7 @@ module Dolt
       end
 
       get "/raw/*" do
-        force_ref(params[:splat], "raw", "master")
+        force_ref(params[:splat], "raw", "HEAD")
       end
 
       get "/blame/*:*" do
@@ -88,7 +88,7 @@ module Dolt
       end
 
       get "/blame/*" do
-        force_ref(params[:splat], "blame", "master")
+        force_ref(params[:splat], "blame", "HEAD")
       end
 
       get "/history/*:*" do
@@ -101,7 +101,7 @@ module Dolt
       end
 
       get "/history/*" do
-        force_ref(params[:splat], "blame", "master")
+        force_ref(params[:splat], "blame", "HEAD")
       end
 
       get "/refs" do

data/test/dolt/sinatra/multi_repo_browser_test.rb

@@ -42,6 +42,6 @@ describe Dolt::Sinatra::MultiRepoBrowser do
   it "redirects repo requests to main tree" do
     get "/gitorious.git"
     assert_equal 302, last_response.status
-    assert_equal "/gitorious.git/tree/master:", last_response.headers["Location"]
+    assert_equal "/gitorious.git/tree/HEAD:", last_response.headers["Location"]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement