dolt 0.7.1 → 0.8.0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    dolt (0.7.1)
+    dolt (0.7.2)
       async_sinatra (~> 1.0)
       json (~> 1.5)
-      libdolt (~> 0.8)
+      libdolt (~> 0.10)
       sinatra (~> 1.0)
       thin (~> 1.4)
       tiltout (~> 1.1)
@@ -27,7 +27,7 @@ GEM
     github-markup (0.7.4)
     htmlentities (4.3.1)
     json (1.7.5)
-    libdolt (0.10.0)
+    libdolt (0.10.1)
       em_pessimistic (~> 0.1)
       em_rugged (~> 0.3)
       eventmachine (~> 1.0)
@@ -47,7 +47,7 @@ GEM
     mocha (0.12.7)
       metaclass (~> 0.0.1)
     posix-spawn (0.3.6)
-    pygments.rb (0.3.1)
+    pygments.rb (0.3.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.4.1)
@@ -66,7 +66,7 @@ GEM
     tilt (1.3.3)
     tiltout (1.2.0)
       tilt (~> 1.3)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
     when (0.1.0)
     yajl-ruby (1.1.0)
 

data/bin/dolt

@@ -49,9 +49,9 @@ view.helper(Dolt::View::Breadcrumb)
 view.helper(Dolt::View::Tree)
 view.helper(Dolt::View::Commit)
 view.helper(Dolt::View::Gravatar)
-Dolt::View::TabWidth.tab_width = 4
 view.helper(Dolt::View::TabWidth)
 view.helper(Dolt::View::BinaryBlobEmbedder)
+view.helper(:tab_width => 4, :maxdepth => 3)
 
 # Configure blob rendering module
 
@@ -64,14 +64,6 @@ view.helper(Dolt::View::BinaryBlobEmbedder)
 # Render supported formats as markup, syntax highlight the rest
 view.helper(Dolt::View::SmartBlobRenderer)
 
-module MaxDepth
-  def maxdepth
-    3
-  end
-end
-
-view.helper(MaxDepth)
-
 Sinatra::Base.set(:public_folder, File.join(base, "vendor/ui"))
 server = create_app(ARGV[0], view)
 Thin::Server.start("0.0.0.0", 3000, server)

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.7.1"
+  s.version     = "0.8.0"
   s.authors     = ["Christian Johansen"]
   s.email       = ["christian@gitorious.org"]
   s.homepage    = "http://gitorious.org/gitorious/dolt"
@@ -20,11 +20,11 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "dolt"
 
-  s.add_dependency "libdolt", "~>0.8"
+  s.add_dependency "libdolt", "~>0.11"
   s.add_dependency "thin", "~>1.4"
   s.add_dependency "sinatra", "~>1.0"
   s.add_dependency "async_sinatra", "~>1.0"
-  s.add_dependency "tiltout", "~>1.1"
+  s.add_dependency "tiltout", "~>1.4"
   s.add_dependency "json", "~>1.5"
 
   s.add_development_dependency "minitest", "~> 2.0"

data/lib/dolt/sinatra/actions.rb

@@ -15,7 +15,6 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
-require "em_rugged"
 require "json"
 
 module Dolt
@@ -36,6 +35,21 @@ module Dolt
                                :repository_slug => repo,
                                :ref => ref
                              }))
+      rescue Exception => err
+        err_backtrace = err.backtrace.map { |s| "<li>#{s}</li>" }
+        error_backtrace = error.backtrace.map { |s| "<li>#{s}</li>" }
+
+        body(<<-HTML)
+        <h1>Fatal Dolt Error</h1>
+        <p>
+          Dolt encountered an exception, and additionally
+          triggered another exception trying to render the error.
+        </p>
+        <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)
@@ -50,7 +64,7 @@ module Dolt
         actions.blob(repo, ref, path) do |err, data|
           next error(err, repo, ref) if !err.nil?
           blob = data[:blob]
-          next redirect(tree_url(repo, ref, path)) if !blob.is_a?(Rugged::Blob)
+          next redirect(tree_url(repo, ref, path)) if blob.class.to_s !~ /\bBlob/
           response["Content-Type"] = options[:content_type]
           tpl_options = options[:template_options] || {}
           body(renderer.render(options[:template], data, tpl_options))
@@ -59,11 +73,15 @@ module Dolt
 
       def tree(repo, ref, path)
         actions.tree(repo, ref, path) do |err, data|
-          next error(err, repo, ref) if !err.nil?
-          tree = data[:tree]
-          next redirect(blob_url(repo, ref, path)) if tree.class.to_s !~ /\bTree/
-          response["Content-Type"] = "text/html"
-          body(renderer.render(:tree, data))
+          begin
+            next error(err, repo, ref) if !err.nil?
+            tree = data[:tree]
+            next redirect(blob_url(repo, ref, path)) if tree.class.to_s !~ /\bTree/
+            response["Content-Type"] = "text/html"
+            body(renderer.render(:tree, data))
+          rescue Exception => err
+            error(err, repo, ref)
+          end
         end
       end
 

data/lib/dolt/sinatra/multi_repo_browser.rb

@@ -16,14 +16,14 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 require "dolt/sinatra/base"
-require "libdolt/view/single_repository"
+require "libdolt/view/multi_repository"
 require "libdolt/view/blob"
 require "libdolt/view/tree"
 
 module Dolt
   module Sinatra
     class MultiRepoBrowser < Dolt::Sinatra::Base
-      include Dolt::View::SingleRepository
+      include Dolt::View::MultiRepository
       include Dolt::View::Blob
       include Dolt::View::Tree
 

metadata

@@ -1,181 +1,184 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dolt
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 0.8.0
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 1
-  version: 0.7.1
 platform: ruby
-authors: 
+authors:
 - Christian Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: libdolt
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
+      - !ruby/object:Gem::Version
+        version: '0.11'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: async_sinatra
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: async_sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: tiltout
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: tiltout
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: em-minitest-spec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: em-minitest-spec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Dolt serves git trees and syntax highlighted blobs
-email: 
+email:
 - christian@gitorious.org
-executables: 
+executables:
 - dolt
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - ./.gitmodules
 - ./Gemfile
 - ./Gemfile.lock
@@ -219,36 +222,26 @@ files:
 - bin/dolt
 homepage: http://gitorious.org/gitorious/dolt
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: dolt
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Dolt serves git trees and syntax highlighted blobs
 test_files: []
-