dolt 0.1.1 → 0.2.0

data/lib/dolt/view/tree.rb

@@ -0,0 +1,69 @@
+# 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 Tree
+      def tree_url(repository, ref, path)
+        repo_url(repository, "/tree/#{ref}:#{path}")
+      end
+
+      def tree_entries(tree)
+        sort(tree.entries.select { |e| e[:type] == :tree }) +
+          sort(tree.entries.select { |e| e[:type] == :blob })
+      end
+
+      def tree_context(repo, ref, path)
+        acc = ""
+        pieces = path.sub(/^\.?\//, "").split("/")
+        total = 5 + pieces.length
+        colspan = total
+        pieces.inject("") do |html, dir|
+          padding_td = tree_table_padding_td(acc.sub(/^\.?\//, ""))
+          url = object_url(repo, ref, acc, { :type => :tree, :name => dir })
+          acc << "/#{dir}"
+          colspan -= 1
+          <<-HTML
+            #{html}
+            <tr>
+              #{padding_td}
+              <td colspan="#{colspan}">
+                <a href=\"#{url}\">
+                  <i class="icon icon-folder-open"></i> #{dir}
+                </a>
+              </td>
+            </tr>
+          HTML
+        end
+      end
+
+      def tree_table_padding_td(path)
+        "<td></td>" * tree_table_padding_width(path)
+      end
+
+      def tree_table_padding_width(path)
+        path.split("/").length
+      end
+
+      private
+      def sort(entries)
+        entries.sort_by { |e| e[:name] }
+      end
+    end
+  end
+end

data/test/dolt/git/blame_test.rb

@@ -0,0 +1,128 @@
+# 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 "test_helper"
+require "dolt/git/blame"
+
+describe Dolt::Git::Blame do
+  include EM::MiniTest::Spec
+
+  describe "parse" do
+    before do
+      @blame = <<-GIT
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 1 1 17
+author Christian Johansen
+author-mail <christian@cjohansen.no>
+author-time 1347282459
+author-tz +0200
+committer Christian Johansen
+committer-mail <christian@cjohansen.no>
+committer-time 1347282459
+committer-tz +0200
+summary Working Moron server for viewing blobs
+filename lib/moron/view.rb
+ # encoding: utf-8
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 2 2
+ #--
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 3 3
+ #   Copyright (C) 2012 Gitorious AS
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 4 4
+ #
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 5 5
+ #   This program is free software: you can redistribute it and/or modify
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 6 6
+ #   it under the terms of the GNU Affero General Public License as published by
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 7 7
+ #   the Free Software Foundation, either version 3 of the License, or
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 8 8
+ #   (at your option) any later version.
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 9 9
+ #
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 10 10
+ #   This program is distributed in the hope that it will be useful,
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 11 11
+ #   but WITHOUT ANY WARRANTY; without even the implied warranty of
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 12 12
+ #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 13 13
+ #   GNU Affero General Public License for more details.
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 14 14
+ #
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 15 15
+ #   You should have received a copy of the GNU Affero General Public License
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 16 16
+ #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 17 17
+ #++
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 20 18 1
+
+beb65bee5619c651532179b19421363ead2c2a44 19 19 1
+author Christian Johansen
+author-mail <christian@gitorious.com>
+author-time 1348128947
+author-tz +0200
+committer Christian Johansen
+committer-mail <christian@gitorious.com>
+committer-time 1348128947
+committer-tz +0200
+summary Helpers are modules again
+previous 05f0137175fe341545587a544315cd4a6cc2c824 lib/dolt/view.rb
+filename lib/dolt/view.rb
+ dir = File.join(File.dirname(__FILE__), "view")
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 30 20 1
+
+beb65bee5619c651532179b19421363ead2c2a44 21 21 2
+ Dir.entries(dir).select { |f| f =~ /\.rb$/ }.map do |file|
+beb65bee5619c651532179b19421363ead2c2a44 22 22
+   require(File.join(dir, file))
+906d67b4f3e5de7364ba9b57d174d8998d53ced6 58 23 1
+ end
+      GIT
+
+      @blame = Dolt::Git::Blame.parse_porcelain(@blame)
+    end
+
+    it "has chunks" do
+      assert_equal 5, @blame.chunks.length
+    end
+
+    it "has chunk with commit meta data" do
+      chunk = @blame.chunks.first
+      author = chunk[:author]
+      committer = chunk[:committer]
+
+      assert_equal "906d67b4f3e5de7364ba9b57d174d8998d53ced6", chunk[:oid]
+      assert_equal "Christian Johansen", author[:name]
+      assert_equal "christian@cjohansen.no", author[:mail]
+      assert_equal "2012-09-10 17:07:39", author[:time].strftime("%Y-%m-%d %H:%M:%S")
+      assert_equal "Christian Johansen", committer[:name]
+      assert_equal "christian@cjohansen.no", committer[:mail]
+      assert_equal "2012-09-10 17:07:39", committer[:time].strftime("%Y-%m-%d %H:%M:%S")
+      assert_equal "Working Moron server for viewing blobs", chunk[:summary]
+    end
+
+    it "has chunk with lines" do
+      chunk = @blame.chunks.first
+      assert_equal 18, chunk[:lines].length
+      assert_equal "#   Copyright (C) 2012 Gitorious AS", chunk[:lines][2]
+    end
+
+    it "repeats commit meta" do
+      assert_equal @blame.chunks[2][:committer], @blame.chunks[0][:committer]
+    end
+  end
+end

data/test/dolt/git/commit_test.rb

@@ -0,0 +1,89 @@
+# 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 "test_helper"
+require "dolt/git/commit"
+
+describe Dolt::Git::Commit do
+  include EM::MiniTest::Spec
+
+  describe "parse" do
+    before do
+      @log = <<-GIT
+commit dc0846b6c98a3f6db1172629329b70ada80598bb
+Author: Christian Johansen <christian@gitorious.com>
+Date:   Thu Sep 20 15:55:52 2012 +0200
+
+    Add rough blame
+
+commit 222eef3679553c9da2897144e03a5844f6e77586
+Author: Christian Johansen <christian@gitorious.com>
+Date:   Wed Sep 19 12:27:54 2012 +0200
+
+    Rewrite template/views. Use EMRugged for Git.
+
+      - Not complete, still some failing tests
+      - View helpers need to change
+
+commit 06293404488d9cc72e70eb2ae25aa609af73dada
+Author: Christian Johansen <christian@gitorious.com>
+Date:   Tue Sep 11 20:03:14 2012 +0200
+
+    Rename FileSystemRepositoryResolver to DiskRepoResolver
+
+commit 7a3d69a2327bb9575bb520fe30c6abb3bbd0b719
+Author: Christian Johansen <christian@gitorious.com>
+Date:   Tue Sep 11 19:57:22 2012 +0200
+
+    One more rename: "Dolt" is shorter, better
+
+commit eabcd577e921d01aeaf777d2daac565f88ab174c
+Author: Christian Johansen <christian@gitorious.com>
+Date:   Tue Sep 11 15:25:50 2012 +0200
+
+    Moron was taken, going with Addlepate
+
+      GIT
+
+      @commits = Dolt::Git::Commit.parse_log(@log)
+    end
+
+    it "has commits" do
+      assert_equal 5, @commits.length
+    end
+
+    it "has commit oids" do
+      assert_equal "dc0846b6c98a3f6db1172629329b70ada80598bb", @commits[0][:oid]
+      assert_equal "222eef3679553c9da2897144e03a5844f6e77586", @commits[1][:oid]
+      assert_equal "06293404488d9cc72e70eb2ae25aa609af73dada", @commits[2][:oid]
+      assert_equal "7a3d69a2327bb9575bb520fe30c6abb3bbd0b719", @commits[3][:oid]
+      assert_equal "eabcd577e921d01aeaf777d2daac565f88ab174c", @commits[4][:oid]
+    end
+
+    it "has author" do
+      expected = {
+        :name => "Christian Johansen",
+        :email => "christian@gitorious.com"
+      }
+      assert_equal expected, @commits.first[:author]
+    end
+
+    it "has commit date" do
+      assert_equal "2012-09-11", @commits.last[:date].strftime("%Y-%m-%d")
+    end
+  end
+end

data/test/dolt/git/repository_test.rb

@@ -17,93 +17,44 @@
 #++
 require "test_helper"
 require "dolt/git/repository"
-require "dolt/async/when"
-
-class FakeGit
-  attr_reader :cmds, :deferreds
-
-  def initialize
-    @cmds = []
-    @deferreds = []
-  end
-
-  def show(path, ref)
-    git("show", path, ref)
-  end
-
-  def ls_tree(path, ref)
-    git("ls-tree", path, ref)
-  end
-
-  def git(*args)
-    cmds << args
-    deferred = When::Deferred.new
-    deferreds << deferred.resolver
-    deferred.promise
-  end
-
-  def last_command; cmds.last; end
-  def last_resolver; deferreds.last; end
-end
 
 describe Dolt::Git::Repository do
-  before { @git = FakeGit.new }
+  include EM::MiniTest::Spec
 
-  describe "#blob" do
-    it "uses git-show to cat file at ref" do
-      repo = Dolt::Git::Repository.new("gitorious", @git)
-      repo.blob("models/repository.rb", "master")
+  describe "#blame" do
+    before { @repository = Dolt::Git::Repository.new(".") }
 
-      assert_equal ["show", "models/repository.rb", "master"], @git.last_command
+    it "returns deferrable" do
+      deferrable = @repository.blame("master", "Gemfile")
+      assert deferrable.respond_to?(:callback)
+      assert deferrable.respond_to?(:errback)
     end
 
-    it "defaults to showing the file at HEAD" do
-      repo = Dolt::Git::Repository.new("gitorious", @git)
-      repo.blob("models/repository.rb")
-
-      assert_equal ["show", "models/repository.rb", "HEAD"], @git.last_command
-    end
-
-    it "invokes callback with blob object" do
-      repo = Dolt::Git::Repository.new("gitorious", @git)
-      d = repo.blob("models/repository.rb")
-
-      d.callback do |blob|
-        assert_equal "class Repository;end", blob.raw
+    it "yields blame" do
+      @repository.blame("master", "Gemfile").callback do |blame|
+        assert Dolt::Git::Blame === blame
+        done!
       end
-
-      @git.last_resolver.resolve("class Repository;end")
+      wait!
     end
   end
 
-  describe "#tree" do
-    it "uses git ls-tree to list tree" do
-      repo = Dolt::Git::Repository.new("gitorious", @git)
-      repo.tree("app/models", "master")
+  describe "#log" do
+    before { @repository = Dolt::Git::Repository.new(".") }
 
-      assert_equal ["ls-tree", "app/models", "master"], @git.last_command
+    it "returns deferrable" do
+      deferrable = @repository.log("master", "Gemfile", 1)
+      assert deferrable.respond_to?(:callback)
+      assert deferrable.respond_to?(:errback)
     end
 
-    it "defaults to listing tree at HEAD" do
-      repo = Dolt::Git::Repository.new("gitorious", @git)
-      repo.tree("app/models")
-
-      assert_equal ["ls-tree", "app/models", "HEAD"], @git.last_command
-    end
-
-    it "invokes callback with tree object" do
-      repo = Dolt::Git::Repository.new("gitorious", @git)
-      d = repo.tree("app/models")
-
-      d.callback do |tree|
-        assert_equal 3, tree.entries.length
+    it "yields commits" do
+      @repository.log("master", "dolt.gemspec", 2).callback do |log|
+        assert_equal 2, log.length
+        assert Hash === log[0]
+        done!
       end
-
-      @git.last_resolver.resolve(<<-GIT)
-100644 blob e90021f89616ddf86855d05337c188408d3b417e    .gitmodules
-100644 blob c80ee3697054566d1a4247d80be78ec3ddfde295    Gemfile
-100644 blob 0053b3c95b0d9faa4916f7cd5e559c2b0f138027    Gemfile.lock
-      GIT
+      wait!
     end
   end
 end

data/test/dolt/repo_actions_test.rb

@@ -23,12 +23,17 @@ class Repository
   attr_reader :name
   def initialize(name); @name = name; end
 
-  def blob(path, ref)
+  def rev_parse(rev)
     @deferred = When::Deferred.new
     @deferred.promise
   end
 
-  def tree(path, ref)
+  def blame(ref, path)
+    @deferred = When::Deferred.new
+    @deferred.promise
+  end
+
+  def log(ref, path, limit)
     @deferred = When::Deferred.new
     @deferred.promise
   end
@@ -57,46 +62,103 @@ describe Dolt::RepoActions do
 
   describe "#blob" do
     it "resolves repository" do
-      @actions.blob("gitorious", "app", "master")
+      @actions.blob("gitorious", "master", "app")
 
       assert_equal ["gitorious"], @resolver.resolved.map(&:name)
     end
 
-    it "yields blob, repo, ref and base_tree_url to block" do
+    it "yields path, blob, repo, ref and base_tree_url to block" do
       data = nil
-      @actions.blob("gitorious", "app", "babd120") do |status, d|
+      @actions.blob("gitorious", "babd120", "app") do |err, d|
         data = d
       end
 
-      repo = @resolver.resolved.last
-      repo.resolve_promise "Blob"
+      @resolver.resolved.last.resolve_promise("Blob")
 
       assert_equal({
-        :blob => "Blob",
-        :repository => repo,
-        :ref =>  "babd120"
-      }, data)
+                     :blob => "Blob",
+                     :repository => "gitorious",
+                     :ref =>  "babd120",
+                     :path => "app"
+                   }, data)
     end
   end
 
   describe "#tree" do
     it "resolves repository" do
-      @actions.tree("gitorious", "app", "master")
+      @actions.tree("gitorious", "master", "app")
 
       assert_equal ["gitorious"], @resolver.resolved.map(&:name)
     end
 
     it "yields tree, repo and ref to block" do
       data = nil
-      @actions.tree("gitorious", "app", "babd120") do |status, d|
+      @actions.tree("gitorious", "babd120", "app") do |err, d|
         data = d
       end
 
       repo = @resolver.resolved.last
       repo.resolve_promise "Tree"
 
-      expected = { :tree => "Tree", :repository => repo, :ref =>  "babd120" }
+      expected = {
+        :tree => "Tree",
+        :repository => "gitorious",
+        :ref =>  "babd120",
+        :path => "app"
+      }
+      assert_equal expected, data
+    end
+  end
+
+  describe "#blame" do
+    it "resolves repository" do
+      @actions.blame("gitorious", "master", "app")
+
+      assert_equal ["gitorious"], @resolver.resolved.map(&:name)
+    end
+
+    it "yields blame, repo and ref to block" do
+      data = nil
+      @actions.blame("gitorious", "babd120", "app") do |err, d|
+        data = d
+      end
+
+      repo = @resolver.resolved.last
+      repo.resolve_promise "Blame"
+
+      expected = {
+        :blame => "Blame",
+        :repository => "gitorious",
+        :ref =>  "babd120",
+        :path => "app"
+      }
       assert_equal expected, data
     end
- end
+  end
+
+  describe "#history" do
+    it "resolves repository" do
+      @actions.history("gitorious", "master", "app", 1)
+
+      assert_equal ["gitorious"], @resolver.resolved.map(&:name)
+    end
+
+    it "yields commits, repo and ref to block" do
+      data = nil
+      @actions.history("gitorious", "babd120", "app", 2) do |err, d|
+        data = d
+      end
+
+      repo = @resolver.resolved.last
+      repo.resolve_promise "History"
+
+      expected = {
+        :commits => "History",
+        :repository => "gitorious",
+        :ref =>  "babd120",
+        :path => "app"
+      }
+      assert_equal expected, data
+    end
+  end
 end