dolt 0.21.0 → 0.22.0

data/.travis.yml

@@ -3,6 +3,5 @@ rvm:
   - 1.9.3
   - rbx-18mode
   - rbx-19mode
-  - ruby-head
   - 1.8.7
   - ree

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dolt (0.21.0)
+    dolt (0.22.0)
       json (~> 1.5)
       libdolt (~> 0.21)
       sinatra (~> 1.0)

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.21.0"
+  s.version     = "0.22.0"
   s.authors     = ["Christian Johansen"]
   s.email       = ["christian@gitorious.org"]
   s.homepage    = "http://gitorious.org/gitorious/dolt"

data/lib/dolt/sinatra/actions.rb

@@ -28,7 +28,7 @@ module Dolt
         body ""
       end
 
-      def error(error, repo, ref)
+      def render_error(error, repo, ref)
         template = error.class.to_s == "Rugged::IndexerError" ? :"404" : :"500"
         add_headers(response)
         body(renderer.render(template, {

data/lib/dolt/sinatra/multi_repo_browser.rb

@@ -43,7 +43,7 @@ module Dolt
           repo, ref, path = params[:splat]
           tree(repo, ref, path)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 
@@ -56,7 +56,7 @@ module Dolt
           repo, ref, path = params[:splat]
           blob(repo, ref, path)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 
@@ -69,7 +69,7 @@ module Dolt
           repo, ref, path = params[:splat]
           raw(repo, ref, path)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 
@@ -82,7 +82,7 @@ module Dolt
           repo, ref, path = params[:splat]
           blame(repo, ref, path)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 
@@ -95,7 +95,7 @@ module Dolt
           repo, ref, path = params[:splat]
           history(repo, ref, path, (params[:commit_count] || 20).to_i)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 
@@ -107,7 +107,7 @@ module Dolt
         begin
           refs(params[:splat].first)
         rescue Exception => err
-          error(err, repo, nil)
+          render_error(err, repo, nil)
         end
       end
 
@@ -116,7 +116,7 @@ module Dolt
           repo, ref, path = params[:splat]
           tree_history(repo, ref, path)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 

data/lib/dolt/sinatra/single_repo_browser.rb

@@ -44,7 +44,7 @@ module Dolt
           ref, path = params[:splat]
           tree(repo, ref, path)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 
@@ -57,7 +57,7 @@ module Dolt
           ref, path = params[:splat]
           blob(repo, ref, path)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 
@@ -70,7 +70,7 @@ module Dolt
           ref, path = params[:splat]
           raw(repo, ref, path)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 
@@ -83,7 +83,7 @@ module Dolt
           ref, path = params[:splat]
           blame(repo, ref, path)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 
@@ -96,7 +96,7 @@ module Dolt
           ref, path = params[:splat]
           history(repo, ref, path, (params[:commit_count] || 20).to_i)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 
@@ -108,7 +108,7 @@ module Dolt
         begin
           refs(repo)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 
@@ -117,7 +117,7 @@ module Dolt
           ref, path = params[:splat]
           tree_history(repo, ref, path)
         rescue Exception => err
-          error(err, repo, ref)
+          render_error(err, repo, ref)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libdolt