dolt 0.5.1 → 0.6.0

data/Gemfile.lock

@@ -1,21 +1,12 @@
 PATH
   remote: .
   specs:
-    dolt (0.5.0)
-      async_sinatra (~> 1.0)
-      builder (~> 3.1)
-      em_pessimistic (~> 0.1)
-      em_rugged (~> 0.1.2)
-      eventmachine (~> 1.0)
-      github-markup (~> 0.7)
-      htmlentities (~> 4.3)
-      json (~> 1.7)
-      mime-types (~> 1.19)
-      pygments.rb (~> 0.2)
-      sinatra (~> 1.3)
+    dolt (0.6.0)
+      async_sinatra (~> 1)
+      libdolt (~> 0)
+      sinatra (~> 1)
       thin (~> 1.4)
-      tilt (~> 1.3)
-      tzinfo (~> 0.3)
+      tiltout (~> 1)
 
 GEM
   remote: http://rubygems.org/
@@ -23,7 +14,6 @@ GEM
     async_sinatra (1.0.0)
       rack (>= 1.4.1)
       sinatra (>= 1.3.2)
-    builder (3.1.3)
     daemons (1.1.9)
     em-minitest-spec (1.1.1)
       eventmachine
@@ -36,10 +26,23 @@ GEM
     github-markup (0.7.4)
     htmlentities (4.3.1)
     json (1.7.5)
+    libdolt (0.6.0)
+      em_pessimistic (~> 0.1)
+      em_rugged (~> 0.1.2)
+      eventmachine (~> 1.0)
+      htmlentities (~> 4.3)
+      json (~> 1.7)
+      makeup (~> 0)
+      mime-types (~> 1.19)
+      tzinfo (~> 0.3)
+    makeup (0.1.1)
+      github-markup (~> 0.7)
+      htmlentities (~> 4.3)
+      pygments.rb (~> 0.2)
     metaclass (0.0.1)
     mime-types (1.19)
     minitest (2.12.1)
-    mocha (0.12.4)
+    mocha (0.12.6)
       metaclass (~> 0.0.1)
     posix-spawn (0.3.6)
     pygments.rb (0.3.1)
@@ -49,7 +52,6 @@ GEM
     rack-protection (1.2.0)
       rack
     rake (0.9.2.2)
-    redcarpet (2.1.1)
     rugged (0.17.0.b6)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
@@ -60,6 +62,8 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.3)
+    tiltout (1.0.0)
+      tilt (~> 1.3)
     tzinfo (0.3.33)
     yajl-ruby (1.1.0)
 
@@ -72,4 +76,3 @@ DEPENDENCIES
   minitest (~> 2.0)
   mocha
   rake (~> 0.9)
-  redcarpet

data/Readme.md

@@ -6,11 +6,9 @@ your browser of choice and features syntax highlighting with
 [Markdown](http://daringfireball.net/projects/markdown/)/[org-mode](http://orgmode.org/)/[+++](https://github.com/github/markup/)
 rendering, commit log and blame.
 
-Dolt is also a library, designed to render Git trees, blobs, commit log and
-blame. It can render said views with or without a layout, or you can provide
-your own templates (through [Tilt](https://github.com/rtomayko/tilt/)). You can
-also provide your own rendering implementation to render other formats than
-templates outputting HTML.
+The Dolt repository browser is both a stand-alone application and a library.
+`Dolt` (this package) is the stand-alone application, while `libdolt` is the
+generally reusable library.
 
 Dolt is the implementation of the next generation repo browser to be used in the
 [Gitorious](http://gitorious.org) software.

data/bin/dolt

@@ -1,10 +1,8 @@
 #!/usr/bin/env ruby
+require "libdolt"
+require "tiltout"
 require "thin"
 require "sinatra/base"
-require "dolt/repo_actions"
-require "dolt/template_renderer"
-require "dolt/view"
-require "dolt/disk_repo_resolver"
 
 if ARGV.length == 0
   puts("Dolt should be run with a directory as its sole argument")
@@ -38,8 +36,7 @@ end
 
 base = File.join(File.dirname(__FILE__), "..")
 
-template_root = File.join(base, "views")
-view = Dolt::TemplateRenderer.new(template_root, {
+view = Tiltout.new(Dolt.template_dir, {
   :cache => false,
   :layout => "layout"
 })

data/dolt.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
 dir = File.expand_path(File.dirname(__FILE__))
-require File.join(dir, "lib/dolt/version")
 
 module GemSpecHelper
   def self.files(path)
@@ -12,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = Dolt::VERSION
+  s.version     = "0.6.0"
   s.authors     = ["Christian Johansen"]
   s.email       = ["christian@gitorious.org"]
   s.homepage    = "http://gitorious.org/gitorious/dolt"
@@ -21,26 +20,16 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "dolt"
 
-  s.add_dependency "eventmachine", "~>1.0"
+  s.add_dependency "libdolt", "~>0"
   s.add_dependency "thin", "~>1.4"
-  s.add_dependency "sinatra", "~>1.3"
-  s.add_dependency "async_sinatra", "~>1.0"
-  s.add_dependency "tilt", "~>1.3"
-  s.add_dependency "pygments.rb", "~>0.2"
-  s.add_dependency "em_pessimistic", "~>0.1"
-  s.add_dependency "builder", "~> 3.1"
-  s.add_dependency "em_rugged", "~> 0.1.2"
-  s.add_dependency "tzinfo", "~> 0.3"
-  s.add_dependency "github-markup", "~> 0.7"
-  s.add_dependency "htmlentities", "~> 4.3"
-  s.add_dependency "json", "~> 1.7"
-  s.add_dependency "mime-types", "~> 1.19"
+  s.add_dependency "sinatra", "~>1"
+  s.add_dependency "async_sinatra", "~>1"
+  s.add_dependency "tiltout", "~>1"
 
   s.add_development_dependency "minitest", "~> 2.0"
   s.add_development_dependency "em-minitest-spec", "~> 1.1"
   s.add_development_dependency "rake", "~> 0.9"
   s.add_development_dependency "mocha"
-  s.add_development_dependency "redcarpet"
 
   s.files         = GemSpecHelper.files(".") + GemSpecHelper.files("vendor/ui")
   s.test_files    = `git ls-files -- {test}/*`.split("\n")

data/lib/dolt/sinatra/multi_repo_browser.rb

@@ -16,9 +16,9 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 require "dolt/sinatra/base"
-require "dolt/view/single_repository"
-require "dolt/view/blob"
-require "dolt/view/tree"
+require "libdolt/view/single_repository"
+require "libdolt/view/blob"
+require "libdolt/view/tree"
 
 module Dolt
   module Sinatra

data/lib/dolt/sinatra/single_repo_browser.rb

@@ -16,9 +16,9 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 require "dolt/sinatra/base"
-require "dolt/view/single_repository"
-require "dolt/view/blob"
-require "dolt/view/tree"
+require "libdolt/view/single_repository"
+require "libdolt/view/blob"
+require "libdolt/view/tree"
 
 module Dolt
   module Sinatra

data/test/test_helper.rb

@@ -19,7 +19,8 @@ require "bundler/setup"
 require "minitest/autorun"
 require "em/minitest/spec"
 require "eventmachine"
-require "dolt/view"
+require "libdolt/view"
+require "tiltout"
 
 Bundler.require(:default, :test)
 
@@ -31,8 +32,9 @@ module Dolt
   end
 
   module ViewTest
-    def prepare_renderer(root, options = {}, helpers = nil)
-      renderer = Dolt::TemplateRenderer.new(root, options)
+    def prepare_renderer(options = {}, helpers = nil)
+      root = File.join(File.dirname(__FILE__), "..", "views")
+      renderer = Tiltout.new(root, options)
       renderer.helper(helpers || [Dolt::View::MultiRepository,
                                   Dolt::View::Object,
                                   Dolt::View::Blob,

data/vendor/ui/css/gitorious.css

@@ -601,3 +601,8 @@ input[type=text].gts-ref-input {
     font-size: 0.9em;
     padding: 2px;
 }
+
+
+.gts-markup pre code {
+    font-size: inherit;
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dolt
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Christian Johansen
@@ -15,22 +15,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-04 00:00:00 +02:00
+date: 2012-10-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: libdolt
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -56,11 +55,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 1
         segments: 
         - 1
-        - 3
-        version: "1.3"
+        version: "1"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -71,138 +69,16 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 1
         segments: 
         - 1
-        - 0
-        version: "1.0"
+        version: "1"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: tilt
+  name: tiltout
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: pygments.rb
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 2
-        version: "0.2"
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: em_pessimistic
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
-  type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
-  type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: em_rugged
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
-        version: 0.1.2
-  type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
-  type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: github-markup
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
-  type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: htmlentities
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 4
-        - 3
-        version: "4.3"
-  type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -210,29 +86,13 @@ dependencies:
         hash: 1
         segments: 
         - 1
-        - 7
-        version: "1.7"
+        version: "1"
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: mime-types
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 1
-        - 19
-        version: "1.19"
-  type: :runtime
-  version_requirements: *id014
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -243,11 +103,11 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  version_requirements: *id015
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: em-minitest-spec
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -258,11 +118,11 @@ dependencies:
         - 1
         version: "1.1"
   type: :development
-  version_requirements: *id016
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -273,25 +133,11 @@ dependencies:
         - 9
         version: "0.9"
   type: :development
-  version_requirements: *id017
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
-  prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -301,7 +147,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id019
+  version_requirements: *id009
 description: Dolt serves git trees and syntax highlighted blobs
 email: 
 - christian@gitorious.org
@@ -319,74 +165,12 @@ files:
 - ./Readme.md
 - ./bin/dolt
 - ./dolt.gemspec
-- ./lib/dolt/async/when.rb
-- ./lib/dolt/disk_repo_resolver.rb
-- ./lib/dolt/git/blame.rb
-- ./lib/dolt/git/commit.rb
-- ./lib/dolt/git/repository.rb
-- ./lib/dolt/git/submodule.rb
-- ./lib/dolt/git/tree.rb
-- ./lib/dolt/repo_actions.rb
 - ./lib/dolt/sinatra/actions.rb
 - ./lib/dolt/sinatra/base.rb
 - ./lib/dolt/sinatra/multi_repo_browser.rb
 - ./lib/dolt/sinatra/single_repo_browser.rb
-- ./lib/dolt/template_renderer.rb
-- ./lib/dolt/version.rb
-- ./lib/dolt/view.rb
-- ./lib/dolt/view/binary_blob_embedder.rb
-- ./lib/dolt/view/blame.rb
-- ./lib/dolt/view/blob.rb
-- ./lib/dolt/view/breadcrumb.rb
-- ./lib/dolt/view/commit.rb
-- ./lib/dolt/view/gravatar.rb
-- ./lib/dolt/view/markup.rb
-- ./lib/dolt/view/multi_repository.rb
-- ./lib/dolt/view/object.rb
-- ./lib/dolt/view/single_repository.rb
-- ./lib/dolt/view/smart_blob_renderer.rb
-- ./lib/dolt/view/syntax_highlight.rb
-- ./lib/dolt/view/tab_width.rb
-- ./lib/dolt/view/tree.rb
-- ./test/dolt/async/when_test.rb
-- ./test/dolt/git/blame_test.rb
-- ./test/dolt/git/commit_test.rb
-- ./test/dolt/git/repository_test.rb
-- ./test/dolt/repo_actions_test.rb
 - ./test/dolt/sinatra/actions_test.rb
-- ./test/dolt/template_renderer_test.rb
-- ./test/dolt/templates/blame_test.rb
-- ./test/dolt/templates/blob_test.rb
-- ./test/dolt/templates/commits_test.rb
-- ./test/dolt/templates/raw_test.rb
-- ./test/dolt/templates/refs_test.rb
-- ./test/dolt/templates/tree_history_test.rb
-- ./test/dolt/templates/tree_test.rb
-- ./test/dolt/view/binary_blob_embedder_test.rb
-- ./test/dolt/view/blame_test.rb
-- ./test/dolt/view/blob_test.rb
-- ./test/dolt/view/breadcrumb_test.rb
-- ./test/dolt/view/commit_test.rb
-- ./test/dolt/view/gravatar_test.rb
-- ./test/dolt/view/markup_test.rb
-- ./test/dolt/view/multi_repository_test.rb
-- ./test/dolt/view/object_test.rb
-- ./test/dolt/view/single_repository_test.rb
-- ./test/dolt/view/smart_blob_renderer_test.rb
-- ./test/dolt/view/syntax_highlight_test.rb
-- ./test/dolt/view/tab_width_test.rb
-- ./test/dolt/view/tree_test.rb
 - ./test/test_helper.rb
-- ./views/500.erb
-- ./views/blame.erb
-- ./views/blob.erb
-- ./views/commits.erb
-- ./views/index.erb
-- ./views/layout.erb
-- ./views/raw.erb
-- ./views/refs.erb
-- ./views/tree.erb
-- ./views/tree_history.erb
 - vendor/ui/.gitignore
 - vendor/ui/.gitmodules
 - vendor/ui/build