dolt 0.5.1 → 0.6.0

data/lib/dolt/view/tree.rb

@@ -1,100 +0,0 @@
-# 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| [:tree, :submodule].index(e[:type]) }) +
-          sort(tree.entries.select { |e| e[:type] == :blob })
-      end
-
-      def tree_context(repo, ref, levels)
-        return "" if levels.length == 1 && levels[0].length == 1
-        total = 4 + levels.length
-        colspan = total
-        (levels.map do |level|
-          html = <<-HTML
-            <tr>
-              #{'<td></td>' * (total - colspan)}
-              <td colspan="#{colspan}">
-                #{tree_context_level_links(repo, ref, level)}
-              </td>
-            </tr>
-          HTML
-          colspan -= 1
-          html
-        end).join
-      end
-
-      def tree_context_level_links(repo, ref, level)
-        extra = "<i class=\"icon icon-folder-open\"></i>"
-
-        (level.map do |path|
-           dir = File.dirname(path)
-           dir = "" if dir == "."
-           file = path == "" ? "/" : File.basename(path)
-           url = object_url(repo, ref, dir, { :type => :tree, :name => file })
-           html = "<a href=\"#{url}\">#{extra} #{file}</a>"
-           extra = extra == "" || extra == "/" ? "/" : ""
-           html
-        end).join(" ")
-      end
-
-      def partition_path(path, maxdepth = nil)
-        path = path.sub(/^\.?\//, "")
-        result = [[""]]
-        return result if path == ""
-        parts = path.split("/")
-        maxdepth ||= parts.length
-        fill_first = [parts.length, [1, parts.length - maxdepth + 1].max].min
-        fill_first.times { result[0] << parts.shift }
-        result << [parts.shift] while parts.length > 0
-        result
-      end
-
-      def accumulate_path(pieces)
-        acc = []
-        pieces.map do |piece|
-          piece.map do |p|
-            next p if p == ""
-            acc << p
-            File.join(acc)
-          end
-        end
-      end
-
-      def tree_table_padding_width(partitioned)
-        partitioned.length == 1 ? partitioned[0].length - 1 : partitioned.length
-      end
-
-      def tree_table_padding_td(partitioned)
-        "<td></td>" * tree_table_padding_width(partitioned)
-      end
-
-      private
-      def sort(entries)
-        entries.sort_by { |e| e[:name] }
-      end
-    end
-  end
-end

data/test/dolt/async/when_test.rb

@@ -1,112 +0,0 @@
-# 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/async/when"
-
-describe When do
-  include EM::MiniTest::Spec
-
-  describe ".all" do
-    it "returns deferrable" do
-      d = When.all([When.deferred(42)])
-      assert d.respond_to?(:callback)
-      assert d.respond_to?(:errback)
-    end
-
-    it "resolves immediately if no promises" do
-      d = When.all([])
-      d.callback do |results|
-        assert_equal [], results
-        done!
-      end
-      wait!
-    end
-
-    it "resolves when single deferrable resolves" do
-      deferred = When::Deferred.new
-      d = When.all([deferred.promise])
-      resolved = false
-      d.callback { |results| resolved = true }
-
-      assert !resolved
-      deferred.resolve(42)
-      assert resolved
-    end
-
-    it "resolves when all deferrables are resolved" do
-      deferreds = [When::Deferred.new, When::Deferred.new, When::Deferred.new]
-      d = When.all(deferreds.map(&:promise))
-      resolved = false
-      d.callback { |results| resolved = true }
-
-      assert !resolved
-      deferreds[0].resolve(42)
-      assert !resolved
-      deferreds[1].resolve(13)
-      assert !resolved
-      deferreds[2].resolve(3)
-      assert resolved
-    end
-
-    it "rejects when single deferrable rejects" do
-      deferred = When::Deferred.new
-      d = When.all([deferred.promise])
-      rejected = false
-      d.errback { |results| rejected = true }
-
-      assert !rejected
-      deferred.reject(StandardError.new)
-      assert rejected
-    end
-
-    it "rejects on first rejection" do
-      deferreds = [When::Deferred.new, When::Deferred.new, When::Deferred.new]
-      d = When.all(deferreds.map(&:promise))
-      rejected = false
-      d.errback { |results| rejected = true }
-
-      deferreds[0].resolve(42)
-      deferreds[2].reject(StandardError.new)
-      deferreds[1].resolve(13)
-
-      assert rejected
-    end
-
-    it "proxies resolution vaule in array" do
-      deferred = When::Deferred.new
-      d = When.all([deferred.promise])
-      results = nil
-      d.callback { |res| results = res }
-
-      deferred.resolve(42)
-      assert_equal [42], results
-    end
-
-    it "orders results like input" do
-      deferred1 = When::Deferred.new
-      deferred2 = When::Deferred.new
-      d = When.all([deferred1.promise, deferred2.promise])
-      results = nil
-      d.callback { |res| results = res }
-
-      deferred2.resolve(42)
-      deferred1.resolve(13)
-      assert_equal [13, 42], results
-    end
-  end
-end

data/test/dolt/git/blame_test.rb

@@ -1,128 +0,0 @@
-# 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

@@ -1,89 +0,0 @@
-# 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

@@ -1,186 +0,0 @@
-# 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/repository"
-require "time"
-
-describe Dolt::Git::Repository do
-  include EM::MiniTest::Spec
-  before { @repository = Dolt::Git::Repository.new(".") }
-
-  describe "#submodules" do
-    it "returns deferrable" do
-      deferrable = @repository.submodules("master")
-      assert deferrable.respond_to?(:callback)
-      assert deferrable.respond_to?(:errback)
-    end
-
-    it "yields list of submodules" do
-      @repository.submodules("c1f6cd9").callback do |submodules|
-        url = "git://gitorious.org/gitorious/ui3.git"
-        assert_equal [{ :path => "vendor/ui", :url => url }], submodules
-        done!
-      end
-    wait!
-    end
-
-    it "resolves with empty array if no submodules" do
-      @repository.submodules("26139a3").callback do |submodules|
-        assert_equal [], submodules
-        done!
-      end
-      wait!
-    end
-  end
-
-  describe "#tree" do
-    it "includes submodule data for trees" do
-      @repository.tree("3dc532f", "vendor").callback do |tree|
-        assert_equal({
-          :type => :submodule,
-          :filemode => 57344,
-          :name => "ui",
-          :oid => "d167e3e1c17a27e4cf459dd380670801b0659659",
-          :url => "git://gitorious.org/gitorious/ui3.git"
-        }, tree.entries.first)
-        done!
-      end
-      wait!
-    end
-  end
-
-  describe "#blame" do
-    it "returns deferrable" do
-      deferrable = @repository.blame("master", "Gemfile")
-      assert deferrable.respond_to?(:callback)
-      assert deferrable.respond_to?(:errback)
-    end
-
-    it "yields blame" do
-      @repository.blame("master", "Gemfile").callback do |blame|
-        assert Dolt::Git::Blame === blame
-        done!
-      end
-      wait!
-    end
-  end
-
-  describe "#log" do
-    it "returns deferrable" do
-      deferrable = @repository.log("master", "Gemfile", 1)
-      assert deferrable.respond_to?(:callback)
-      assert deferrable.respond_to?(:errback)
-    end
-
-    it "yields commits" do
-      @repository.log("master", "dolt.gemspec", 2).callback do |log|
-        assert_equal 2, log.length
-        assert Hash === log[0]
-        done!
-      end
-      wait!
-    end
-  end
-
-  describe "#tree_history" do
-    it "returns deferrable" do
-      deferrable = @repository.tree_history("master", "")
-      assert deferrable.respond_to?(:callback)
-      assert deferrable.respond_to?(:errback)
-    end
-
-    it "fails if path is not a tree" do
-      deferrable = @repository.tree_history("master", "Gemfile")
-      deferrable.errback do |err|
-        assert_match /not a tree/, err.message
-        done!
-      end
-      wait!
-    end
-
-    it "fails if path does not exist in ref" do
-      deferrable = @repository.tree_history("26139a3", "test")
-      deferrable.errback do |err|
-        assert_match /does not exist/, err.message
-        done!
-      end
-      wait!
-    end
-
-    it "yields tree with history" do
-      promise = @repository.tree_history("48ffbf7", "")
-
-      promise.callback do |log|
-        assert_equal 11, log.length
-        expected = {
-          :type => :blob,
-          :oid => "e90021f89616ddf86855d05337c188408d3b417e",
-          :filemode => 33188,
-          :name => ".gitmodules",
-          :history => [{
-                         :oid => "906d67b4f3e5de7364ba9b57d174d8998d53ced6",
-                         :author => { :name => "Christian Johansen",
-                           :email => "christian@cjohansen.no" },
-                         :summary => "Working Moron server for viewing blobs",
-                         :date => Time.parse("Mon Sep 10 15:07:39 +0200 2012"),
-                         :message => ""
-                       }]
-        }
-
-        assert_equal expected, log[0]
-        done!
-      end
-
-      promise.errback do |err|
-        puts "FAILED! #{err.inspect}"
-      end
-
-      wait!
-    end
-
-    it "yields nested tree with history" do
-      promise = @repository.tree_history("48ffbf7", "lib")
-
-      promise.callback do |log|
-        expected = [{
-                      :type => :tree,
-                      :oid => "58f84405b588699b24c619aa4cd83669c5623f88",
-                      :filemode => 16384,
-                      :name => "dolt",
-                      :history => [{
-                                     :oid => "8ab4f8c42511f727244a02aeee04824891610bbd",
-                                     :author => { :name => "Christian Johansen",
-                                       :email => "christian@gitorious.com" },
-                                     :summary => "New version",
-                                     :date => Time.parse("Mon Oct 1 16:34:00 +0200 2012"),
-                                     :message => ""
-                                   }]
-                    }]
-
-        assert_equal expected, log
-        done!
-      end
-
-      promise.errback do |err|
-        puts "FAILED! #{err.inspect}"
-      end
-
-      wait!
-    end
-  end
-end