dolt 0.1.1 → 0.2.0

data/lib/dolt/view/blame.rb

@@ -0,0 +1,57 @@
+# 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/>.
+#++
+
+module Dolt
+  module View
+    module Blame
+      def blame_annotations(blame)
+        blame.chunks.inject([]) do |blames, chunk|
+          blames << chunk
+          (chunk[:lines].length - 1).times { blames << nil }
+          blames
+        end
+      end
+
+      def blame_lines(path, blame)
+        lines = blame.chunks.inject([]) do |lines, chunk|
+          lines.concat(chunk[:lines])
+        end
+
+        return lines unless respond_to?(:highlight)
+        highlight(path, lines.join("\n")).split("\n")
+      end
+
+      def blame_annotation_cell(annotation)
+        class_name = "gts-blame-annotation" + (annotation.nil? ? "" : " gts-annotated")
+        return "<td class=\"#{class_name}\"></td>" if annotation.nil?
+
+        <<-HTML
+          <td class="#{class_name}">
+            <span class="gts-sha">#{annotation[:oid][0..7]}</span>
+            #{annotation[:committer][:time].strftime("%Y-%m-%d")}
+            #{annotation[:committer][:name]}
+          </td>
+        HTML
+      end
+
+      def blame_code_cell(line)
+        "<td class=\"gts-code\"><code>#{line}</code></td>"
+      end
+    end
+  end
+end

data/lib/dolt/view/blob.rb

@@ -0,0 +1,60 @@
+# 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/>.
+#++
+require "htmlentities"
+
+module Dolt
+  module View
+    module Blob
+      def format_blob(path, content)
+        @coder ||= HTMLEntities.new
+        multiline(@coder.encode(content))
+      end
+
+      def blob_url(repository, ref, path)
+        repo_url(repository, "/blob/#{ref}:#{path}")
+      end
+
+      def blame_url(repository, ref, path)
+        repo_url(repository, "/blame/#{ref}:#{path}")
+      end
+
+      def history_url(repository, ref, path)
+        repo_url(repository, "/history/#{ref}:#{path}")
+      end
+
+      def raw_url(repository, ref, path)
+        repo_url(repository, "/raw/#{ref}:#{path}")
+      end
+
+      def multiline(blob, options = {})
+        class_names = options[:class_names] || []
+        class_names << "prettyprint" << "linenums"
+
+        num = 0
+        lines = blob.split("\n").inject("") do |html, line|
+          num += 1
+          line = line.gsub(/\t/, "    ")
+          "#{html}<li class=\"L#{num}\"><span class=\"line\">#{line}</span></li>"
+        end
+
+        "<pre class=\"#{class_names.join(' ')}\">" +
+          "<ol class=\"linenums\">#{lines}</ol></pre>"
+      end
+    end
+  end
+end

data/lib/dolt/view/breadcrumb.rb

@@ -15,40 +15,33 @@
 #   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/>.
 #++
+
 module Dolt
   module View
-    class Breadcrumb
-      attr_reader :multi_repo_mode
-
-      def initialize(options = {})
-        @multi_repo_mode = options[:multi_repo_mode]
-      end
-
-      def render(repository, ref, path)
+    module Breadcrumb
+      def breadcrumb(repository, ref, path)
         dirs = path.split("/")
         filename = dirs.pop
-        dir_html = accumulate_dirs(dirs, repository.name, ref)
+        dir_html = accumulate_dirs(dirs, repository, ref)
+        url = repo_url(repository, "/tree/#{ref}")
         <<-HTML
           <ul class="breadcrumb">
-            <li><a href="#{prefix(repository)}/tree/#{ref}:"><i class="icon icon-file"></i></a></li>
+            <li><a href="#{url}:"><i class="icon icon-file"></i></a></li>
             #{dir_html}<li class="active">#{filename}</li>
           </ul>
         HTML
       end
 
       private
-      def accumulate_dirs(dirs, repo, ref)
+      def accumulate_dirs(dirs, repository, ref)
         accumulated = []
+        divider = "<span class=\"divider\">/</span>"
         dir_html = dirs.inject("") do |html, dir|
           accumulated << dir
-          "#{html}<li><a href=\"#{prefix(repo)}/tree/#{ref}:#{accumulated.join('/')}\">" +
-            "#{dir}<span class=\"divider\">/</span></a></li>"
+          url = repo_url(repository, "/tree/#{ref}:#{accumulated.join('/')}")
+          "#{html}<li><a href=\"#{url}\">#{dir}#{divider}</a></li>"
         end
       end
-
-      def prefix(repo)
-        multi_repo_mode ? "/#{repo}" : ""
-      end
     end
   end
 end

data/lib/dolt/{git/blob.rb → view/commit.rb}

@@ -15,18 +15,12 @@
 #   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/>.
 #++
-module Dolt
-  module Git
-    class Blob
-      attr_reader :path, :raw, :repo
-
-      def initialize(path, raw)
-        @path = path
-        @raw = raw
-      end
 
-      def lines
-        raw.split("\n")
+module Dolt
+  module View
+    module Commit
+      def commit_oid(oid)
+        oid[0...7]
       end
     end
   end

data/lib/dolt/view/gravatar.rb

@@ -0,0 +1,29 @@
+# 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/>.
+#++
+require 'digest/md5'
+
+module Dolt
+  module View
+    module Gravatar
+      def gravatar(email)
+        hashed = Digest::MD5.hexdigest(email.downcase)
+        "http://www.gravatar.com/avatar/#{hashed}"
+      end
+    end
+  end
+end

data/lib/dolt/{git/shell.rb → view/markup.rb}

@@ -15,28 +15,22 @@
 #   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 "dolt/async/deferrable_child_process"
+require "github/markup"
 
 module Dolt
-  module Git
-    class Shell
-      def initialize(work_tree, git_dir = nil)
-        @work_tree = work_tree
-        @git_dir = git_dir || File.join(work_tree, ".git")
+  module View
+    module Markup
+      def render_markup(path, content)
+        markup = GitHub::Markup.render(path, content)
+        "<div class=\"gts-markup\">#{markup}</div>"
       end
 
-      def show(path, ref)
-        git("show", "#{ref}:#{path}")
+      def supported_markup_format?(path)
+        GitHub::Markup.can_render?(path)
       end
 
-      def ls_tree(path, ref)
-        git("ls-tree", ref, path.sub(/(^\.?\/)?/, "./").sub(/\/?$/, "/"))
-      end
-
-      def git(command, *args)
-        base = "git --git-dir #{@git_dir} --work-tree #{@work_tree}"
-        cmd = "#{base} #{command} #{args.join(' ')}".strip
-        Dolt::DeferrableChildProcess.open(cmd)
+      def format_blob(path, code, options = {})
+        render_markup(path, code)
       end
     end
   end

data/lib/dolt/view/multi_repository.rb

@@ -0,0 +1,27 @@
+# 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/>.
+#++
+
+module Dolt
+  module View
+    module MultiRepository
+      def repo_url(repository, url)
+        "/#{repository}#{url}"
+      end
+    end
+  end
+end

data/lib/dolt/{async/deferrable_child_process.rb → view/object.rb}

@@ -15,34 +15,21 @@
 #   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 "eventmachine"
 
 module Dolt
-  # A deferrable child process implementation that actually considers
-  # the not uncommon situation where the command fails.
-  #
-  class DeferrableChildProcess < EventMachine::Connection
-    include EventMachine::Deferrable
-
-    def initialize
-      super
-      @data = []
-    end
-
-    def self.open cmd
-      EventMachine.popen(cmd, DeferrableChildProcess)
-    end
+  module View
+    module Object
+      def object_url(repository, ref, path, object)
+        url = "/#{object[:type]}/#{ref}:#{object_path(path, object)}"
+        repo_url(repository, url)
+      end
 
-    def receive_data data
-      @data << data
-    end
+      def object_path(root, object)
+        File.join(root, object[:name]).sub(/^\//, "")
+      end
 
-    def unbind
-      status = get_status
-      if status.exitstatus != 0
-        fail(status)
-      else
-        succeed(@data.join, status)
+      def object_icon_class(entry)
+        entry[:type] == :blob ? "icon-file" : "icon-folder-close"
       end
     end
   end

data/lib/dolt/view/single_repository.rb

@@ -0,0 +1,27 @@
+# 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/>.
+#++
+
+module Dolt
+  module View
+    module SingleRepository
+      def repo_url(repository, url)
+        url
+      end
+    end
+  end
+end

data/lib/dolt/view/smart_blob_renderer.rb

@@ -0,0 +1,33 @@
+# 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/>.
+#++
+require "dolt/view/syntax_highlight"
+require "dolt/view/markup"
+
+module Dolt
+  module View
+    module SmartBlobRenderer
+      include Dolt::View::Markup
+      include Dolt::View::SyntaxHighlight
+
+      def format_blob(path, content, options = {})
+        return render_markup(path, content) if supported_markup_format?(path)
+        highlight_multiline(path, content, options)
+      end
+    end
+  end
+end

data/lib/dolt/view/syntax_highlight.rb

@@ -0,0 +1,86 @@
+# 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/>.
+#++
+require "pygments"
+
+module Dolt
+  module View
+    module SyntaxHighlight
+      def highlight(path, code, opt = {})
+        options = { :lexer => lexer(path, code) }.merge(opt)
+        Pygments.highlight(code, highlight_options(options))
+      rescue RubyPython::PythonError
+        code
+      end
+
+      def highlight_multiline(path, code, options = {})
+        return highlight(path, code, options) unless respond_to?(:multiline)
+        lexer = lexer(path, code)
+        multiline(highlight(path, code, options), :class_names => [lexer])
+      end
+
+      def format_blob(path, code, options = {})
+        highlight_multiline(path, code, options)
+      end
+
+      def lexer(path, code = nil)
+        Dolt::View::SyntaxHighlight.lexer(path.split(".").pop, code)
+      end
+
+      def self.lexer(suffix, code = nil)
+        return @@lexer_aliases[suffix] if @@lexer_aliases[suffix]
+        shebang_language(shebang(code)) || suffix
+      end
+
+      def self.shebang(code)
+        first_line = (code || "").split("\n")[0]
+        first_line =~ /^#!/ ? first_line : nil
+      end
+
+      def self.shebang_language(shebang)
+        shebang = @@lexer_shebangs.find { |s| (shebang || "") =~ s[:pattern] }
+        shebang && shebang[:lexer]
+      end
+
+      def self.add_lexer_alias(extension, lexer)
+        @@lexer_aliases ||= {}
+        @@lexer_aliases[extension] = lexer
+      end
+
+      def self.add_lexer_shebang(pattern, lexer)
+        @@lexer_shebangs ||= []
+        @@lexer_shebangs << { :pattern => pattern, :lexer => lexer }
+      end
+
+      private
+      def highlight_options(options = {})
+        options[:options] ||= {}
+        options[:options][:nowrap] = true
+        options[:options][:encoding] ||= "utf-8"
+        options
+      end
+    end
+  end
+end
+
+Dolt::View::SyntaxHighlight.add_lexer_alias("yml", "yaml")
+Dolt::View::SyntaxHighlight.add_lexer_alias("Rakefile", "rb")
+Dolt::View::SyntaxHighlight.add_lexer_alias("Gemfile", "rb")
+Dolt::View::SyntaxHighlight.add_lexer_alias("Gemfile.lock", "yaml")
+Dolt::View::SyntaxHighlight.add_lexer_alias("gemspec", "rb")
+
+Dolt::View::SyntaxHighlight.add_lexer_shebang(/\bruby\b/, "rb")