dolt 0.1.1 → 0.2.0

data/vendor/ui/css/gitorious.css

@@ -165,20 +165,28 @@ li + .dropdown-label {
     vertical-align: middle;
 }
 
-.gts-readme {
+.gts-markup {
     font-size: 1.1em;
     line-height: 1.5;
 }
 
-.gts-readme h1,
-.gts-readme h2 {
+.gts-markup h1 {
+    margin-top: 1em;
+}
+
+.gts-markup h1,
+.gts-markup h2,
+.gts-markup h3,
+.gts-markup h4,
+.gts-markup h5,
+.gts-markup h6 {
     margin-bottom: 0.25em;
 }
 
-.gts-readme p,
-.gts-readme ul,
-.gts-readme ol,
-.gts-readme pre {
+.gts-markup p,
+.gts-markup ul,
+.gts-markup ol,
+.gts-markup pre {
     margin-bottom: 1em;
 }
 
@@ -532,4 +540,8 @@ input[type=url].gts-current-repo-url {
 
 .form-horizontal legend + p {
     margin: -20px 0 27px;
-}
+}
+
+.gts-col-commit {
+    width: 50em;
+}

data/views/blame.erb

@@ -0,0 +1,41 @@
+<%#
+# encoding: utf-8
+#--
+#   Copyright (C) 2012 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   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/>.
+#++
+%>
+<% @title = "Blame #{path} in #{repository}:master" %>
+
+<div class="gts-file">
+  <ul class="pull-right gts-blob-view">
+    <li><a href="<%= blob_url(repository, ref, path) %>">Blob content</a></li>
+    <li class="active">Blame</li>
+    <li><a href="<%= history_url(repository, ref, path) %>">History</a></li>
+    <li><a href="<%= raw_url(repository, ref, path) %>">Raw blob</a></li>
+  </ul>
+  <%= breadcrumb(repository, ref, path) %>
+  <table class="gts-code-listing">
+    <% annotations = blame_annotations(blame) %>
+    <% lines = blame_lines(path, blame) %>
+    <% annotations.length.times do |i| %>
+      <tr>
+        <%= blame_annotation_cell(annotations[i]) %>
+        <td class="linenum L<%= i + 1 %>"><%= i + 1 %></td>
+        <%= blame_code_cell(lines[i]) %>
+      </tr>
+    <% end %>
+  </table>
+</div>

data/views/blob.erb

@@ -17,10 +17,7 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 %>
-<%
-  @title = "#{blob.path} in #{repository.name}:master"
-  if !defined?(multi_repo_mode); multi_repo_mode = false; end
-%>
+<% @title = "#{path} in #{repository}:master" %>
 <div class="gts-file">
   <%#
   <div class="dropdown gts-branch-selector pull-right">
@@ -35,10 +32,10 @@
   %>
   <ul class="pull-right gts-blob-view">
     <li class="active">Blob content</li>
-    <li><a href="<%= blame_url(repository, blob, ref, multi_repo_mode) %>">Blame</a></li>
-    <li><a href="<%= history_url(repository, blob, ref, multi_repo_mode) %>">History</a></li>
-    <li><a href="<%= raw_url(repository, blob, ref, multi_repo_mode) %>">Raw blob</a></li>
+    <li><a href="<%= blame_url(repository, ref, path) %>">Blame</a></li>
+    <li><a href="<%= history_url(repository, ref, path) %>">History</a></li>
+    <li><a href="<%= raw_url(repository, ref, path) %>">Raw blob</a></li>
   </ul>
-  <%= breadcrumb(repository, blob.path, ref, :multi_repo_mode => multi_repo_mode) %>
-  <%= highlight_lines(blob.path, blob.raw) %>
+  <%= breadcrumb(repository, ref, path) %>
+  <%= format_blob(path, blob.content) %>
 </div>

data/views/commits.erb

@@ -0,0 +1,23 @@
+<% @title = "History of #{path}" %>
+<ul class="pull-right gts-blob-view">
+  <li><a href="<%= blob_url(repository, ref, path) %>">Blob content</a></li>
+  <li><a href="<%= blame_url(repository, ref, path) %>">Blame</a></li>
+  <li class="active">History</li>
+  <li><a href="<%= raw_url(repository, ref, path) %>">Raw blob</a></li>
+</ul>
+<%= breadcrumb(repository, ref, path) %>
+<% commits.each do |commit| %>
+  <div class="gts-commit">
+    <p class="gts-log-message">
+      <span class="gts-commit-oid"><%= commit_oid(commit[:oid]) %></span>:
+      <%= commit[:summary] %>
+    </p>
+    <p>
+      <a class="event-author" href="/~">
+        <img width="24" height="24" src="<%= gravatar(commit[:author][:email]) %>" alt="avatar" class="gts-avatar">
+        <%= commit[:author][:name] %>
+      </a>
+      <span class="event-time"><%= commit[:date].strftime("%H:%M") %></span>
+    </p>
+  </div>
+<% end %>

data/views/index.erb

@@ -0,0 +1,25 @@
+<%#
+# encoding: utf-8
+#--
+#   Copyright (C) 2012 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   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/>.
+#++
+%>
+<h1><%= @title = "All repositories" %></h1>
+<ul>
+  <% repositories.each do |repo| %>
+    <li><a href="/<%= repo %>/tree/master:"><%= repo %></a></li>
+  <% end %>
+</ul>

data/views/raw.erb

@@ -0,0 +1,19 @@
+<%#
+# encoding: utf-8
+#--
+#   Copyright (C) 2012 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   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/>.
+#++
+%><%= blob.content %>

data/views/tree.erb

@@ -1,38 +1,40 @@
 <%#
-   # encoding: utf-8
-   #--
-   #   Copyright (C) 2012 Gitorious AS
-   #
-   #   This program is free software: you can redistribute it and/or modify
-   #   it under the terms of the GNU Affero General Public License as published by
-   #   the Free Software Foundation, either version 3 of the License, or
-   #   (at your option) any later version.
-   #
-   #   This program is distributed in the hope that it will be useful,
-   #   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   #   GNU Affero General Public License for more details.
-   #
-   #   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/>.
-   #++
-   %>
-<% @title = "#{tree.path} in #{repository.name}:#{ref}" %>
+  # encoding: utf-8
+  #--
+  #   Copyright (C) 2012 Gitorious AS
+  #
+  #   This program is free software: you can redistribute it and/or modify
+  #   it under the terms of the GNU Affero General Public License as published by
+  #   the Free Software Foundation, either version 3 of the License, or
+  #   (at your option) any later version.
+  #
+  #   This program is distributed in the hope that it will be useful,
+  #   but WITHOUT ANY WARRANTY; without even the implied warranty of
+  #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  #   GNU Affero General Public License for more details.
+  #
+  #   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/>.
+  #++
+%>
+<% @title = "#{path} in #{ref}" %>
 <table class="table table-striped gts-tree-explorer">
   <thead>
     <tr>
-      <th>File</th>
-      <th>Changed</th>
-      <th colspan="2">Last commit</th>
+      <th colspan="<%= tree_table_padding_width("/#{path}") %>">File</th>
+      <th class="gts-col-changed">Changed</th>
+      <th class="gts-col-commit" colspan="2">Last commit</th>
     </tr>
   </thead>
   <tbody>
-    <% tree.entries.each do |entry| %>
+    <%= tree_context(repository, ref, path) %>
+    <% tree_entries(tree).each do |object| %>
       <tr>
+        <%= tree_table_padding_td(path) %>
         <td class="gts-name">
-          <a href="<%= tree_url(repository, entry, ref, defined?(multi_repo_mode) && multi_repo_mode) %>">
-            <i class="icon <%= entry.file? ? "icon-file" : "icon-folder-close" %>"></i>
-            <%= entry.path %>
+          <a href="<%= object_url(repository, ref, path, object) %>">
+            <i class="icon <%= object_icon_class(object) %>"></i>
+            <%= object[:name] %>
           </a>
         </td>
         <td></td>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dolt
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Christian Johansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-11 00:00:00 +02:00
+date: 2012-09-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 12
-        version: "0.12"
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -109,9 +109,100 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  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: minitest
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,11 +213,11 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: em-minitest-spec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -137,11 +228,11 @@ dependencies:
         - 1
         version: "1.1"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -152,11 +243,11 @@ dependencies:
         - 9
         version: "0.9"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -166,7 +257,21 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: redcarpet
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id017
 description: Dolt serves git trees and syntax highlighted blobs
 email: 
 - christian@gitorious.org
@@ -184,13 +289,11 @@ files:
 - ./Readme.md
 - ./bin/dolt
 - ./dolt.gemspec
-- ./lib/dolt/async/deferrable_child_process.rb
 - ./lib/dolt/async/when.rb
 - ./lib/dolt/disk_repo_resolver.rb
-- ./lib/dolt/git/blob.rb
+- ./lib/dolt/git/blame.rb
+- ./lib/dolt/git/commit.rb
 - ./lib/dolt/git/repository.rb
-- ./lib/dolt/git/shell.rb
-- ./lib/dolt/git/tree.rb
 - ./lib/dolt/repo_actions.rb
 - ./lib/dolt/sinatra/actions.rb
 - ./lib/dolt/sinatra/base.rb
@@ -199,20 +302,47 @@ files:
 - ./lib/dolt/template_renderer.rb
 - ./lib/dolt/version.rb
 - ./lib/dolt/view.rb
+- ./lib/dolt/view/blame.rb
+- ./lib/dolt/view/blob.rb
 - ./lib/dolt/view/breadcrumb.rb
-- ./lib/dolt/view/highlighter.rb
-- ./test/dolt/git/blob_test.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/tree.rb
+- ./test/dolt/git/blame_test.rb
+- ./test/dolt/git/commit_test.rb
 - ./test/dolt/git/repository_test.rb
-- ./test/dolt/git/shell_test.rb
-- ./test/dolt/git/tree_test.rb
 - ./test/dolt/repo_actions_test.rb
 - ./test/dolt/sinatra/actions_test.rb
 - ./test/dolt/template_renderer_test.rb
-- ./test/dolt/view_test.rb
-- ./test/dolt/views/blob_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/tree_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/syntax_highlight_test.rb
+- ./test/dolt/view/tree_test.rb
 - ./test/test_helper.rb
+- ./views/blame.erb
 - ./views/blob.erb
+- ./views/commits.erb
+- ./views/index.erb
 - ./views/layout.erb
+- ./views/raw.erb
 - ./views/tree.erb
 - vendor/ui/bootstrap/css/bootstrap-responsive.min.css
 - vendor/ui/bootstrap/css/bootstrap.min.css