libdolt 0.13.0 → 0.14.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libdolt (0.12.0)
+    libdolt (0.13.0)
       em_pessimistic (~> 0.1)
       em_rugged (~> 0.3)
       eventmachine (~> 1.0)
@@ -25,13 +25,16 @@ GEM
     eventmachine (1.0.0)
     github-markup (0.7.4)
     htmlentities (4.3.1)
-    json (1.7.5)
+    json (1.7.6)
     makeup (0.3.0)
       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.13.1)
+      metaclass (~> 0.0.1)
     posix-spawn (0.3.6)
     pygments.rb (0.3.2)
       posix-spawn (~> 0.3.6)
@@ -53,6 +56,7 @@ DEPENDENCIES
   em-minitest-spec (~> 1.1)
   libdolt!
   minitest (~> 2.0)
+  mocha
   rake (~> 0.9)
   redcarpet (= 2.2.0)
   tiltout (~> 1.4)

data/lib/libdolt/git/archiver.rb

@@ -0,0 +1,107 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2013 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 "when"
+require "eventmachine"
+require "em_pessimistic"
+require "fileutils"
+
+module Dolt
+  module Git
+    class Archiver
+      def initialize(work_dir, cache_dir)
+        # A hash of currently processing archiving jobs. It contains tuples of
+        # "#{repo.id}-#{oid}-#{format}" => promises representing the eventual
+        # completion of archiving tasks. When an archiving task is completed,
+        # its promise is removed from the hash. Previously generated tarballs
+        # can be found on disk.
+        @processing = {}
+        @work_dir = work_dir
+        @cache_dir = cache_dir
+      end
+
+      # Returns a promise that resolves with the filename of the generated
+      # tarball/zip file.
+      #
+      #   repo   - A repository object
+      #   oid    - A valid commit oid
+      #   format - A symbol. If it is not :zip, tar.gz is assumed.
+      def archive(repo, oid, format = :tgz)
+        filename = cache_path(repo, oid, format)
+        return When.resolve(filename) if File.exists?(filename)
+        pending = pending_process(repo, oid, format)
+        return pending if pending
+        start_process(repo, oid, format)
+      end
+
+      private
+      def process_id(repo, oid, format)
+        "#{repo.id}-#{oid}-#{ext(format)}"
+      end
+
+      def pending_process(repo, oid, format)
+        @processing[process_id(repo, oid, format)]
+      end
+
+      def start_process(repo, oid, format)
+        @processing[process_id(repo, oid, format)] = When.defer do |d|
+          p = EMPessimistic::DeferrableChildProcess.open(cmd(repo, oid, format))
+
+          p.callback do |output, status|
+            filename = cache_path(repo, oid, format)
+            FileUtils.mv(work_path(repo, oid, format), filename)
+            d.resolve(filename)
+          end
+
+          p.errback do |output, status|
+            d.reject(Exception.new(output))
+          end
+        end
+      end
+
+      def cmd(repository, oid, format)
+        path_segment = repository.path_segment.gsub(/\//, "-")
+        cmd = "sh -c 'git --git-dir #{repository.full_repository_path} archive "
+        cmd += "--prefix='#{u(path_segment)}/' --format="
+        wpath = u(work_path(repository, oid, format))
+        cmd + (format.to_s == "zip" ? "zip #{u(oid)} > #{wpath}" : "tar #{u(oid)} | gzip -m > #{wpath}") + "'"
+      end
+
+      def cache_path(repository, oid, format)
+        File.join(@cache_dir, basename(repository, oid, format))
+      end
+
+      def work_path(repository, oid, format)
+        File.join(@work_dir, basename(repository, oid, format))
+      end
+
+      def basename(repository, oid, format)
+        path_segment = repository.path_segment.gsub(/\//, "-")
+        "#{path_segment}-#{oid}.#{ext(format)}"
+      end
+
+      def ext(format)
+        format.to_s == "zip" ? "zip" : "tar.gz"
+      end
+
+      # Unquote a string by stripping off any single or double quotes
+      def u(string)
+        string.gsub("'", '').gsub('"', '')
+      end
+    end
+  end
+end

data/lib/libdolt/repo_actions.rb

@@ -1,7 +1,6 @@
-
 # encoding: utf-8
 #--
-#   Copyright (C) 2012 Gitorious AS
+#   Copyright (C) 2012-2013 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
@@ -24,8 +23,9 @@ class Time; def to_json(*args); "\"#{iso8601}\""; end; end
 
 module Dolt
   class RepoActions
-    def initialize(repo_resolver)
+    def initialize(repo_resolver, archiver = nil)
       @repo_resolver = repo_resolver
+      @archiver = archiver
     end
 
     def blob(repo, ref, path, &block)
@@ -71,6 +71,13 @@ module Dolt
       repo_action(repo, ref, path, :tree, :tree_history, ref, path, count, &block)
     end
 
+    def archive(repo, ref, format, &block)
+      repository = resolve_repository(repo)
+      d = @archiver.archive(repository, ref, format)
+      d.callback { |filename| block.call(nil, filename) }
+      d.errback { |err| block.call(err, nil) }
+    end
+
     def repositories
       repo_resolver.all
     end

data/lib/libdolt/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #--
-#   Copyright (C) 2012 Gitorious AS
+#   Copyright (C) 2012-2013 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
@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/libdolt.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", "~> 0.9"
   s.add_development_dependency "redcarpet", "2.2.0"
   s.add_development_dependency "tiltout", "~>1.4"
+  s.add_development_dependency "mocha"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test}/*`.split("\n")

data/test/libdolt/git/archiver_test.rb

@@ -0,0 +1,182 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2013 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 "mocha/setup"
+require "libdolt/git/archiver"
+
+class StubRepository
+  attr_reader :id, :full_repository_path, :path_segment
+  def initialize(path_segment)
+    @@counter ||= 0
+    @id = (@@counter += 1)
+    @full_repository_path = "/repos/#{path_segment}.git"
+    @path_segment = path_segment
+  end
+end
+
+class StubProcessStatus
+  attr_reader :exitstatus
+  def initialize(code)
+    @exitstatus = code
+  end
+end
+
+describe Dolt::Git::Archiver do
+  include EM::MiniTest::Spec
+
+  describe "archive" do
+    before do
+      @archiver = Dolt::Git::Archiver.new("/work", "/cache")
+    end
+
+    it "resolves with existing cached file" do
+      File.stubs(:exists?).with("/cache/gts-mainline-master.tar.gz").returns(true)
+      repo = StubRepository.new("gts/mainline")
+
+      @archiver.archive(repo, "master", :tar).then do |filename|
+        assert_equal "/cache/gts-mainline-master.tar.gz", filename
+        done!
+      end
+      wait!
+    end
+
+    it "generates tarball" do
+      repo = StubRepository.new("gts/mainline")
+
+      cmd = "sh -c 'git --git-dir /repos/gts/mainline.git archive --prefix='gts-mainline/' " +
+        "--format=tar master | gzip -m > /work/gts-mainline-master.tar.gz'"
+      d = EM::DefaultDeferrable.new
+      EMPessimistic::DeferrableChildProcess.expects(:open).with(cmd).returns(d)
+
+      @archiver.archive(repo, "master", :tar)
+    end
+
+    it "uses gzip format from string" do
+      repo = StubRepository.new("gts/mainline")
+
+      cmd = "sh -c 'git --git-dir /repos/gts/mainline.git archive --prefix='gts-mainline/' " +
+        "--format=tar master | gzip -m > /work/gts-mainline-master.tar.gz'"
+      d = EM::DefaultDeferrable.new
+      EMPessimistic::DeferrableChildProcess.expects(:open).with(cmd).returns(d)
+
+      @archiver.archive(repo, "master", "tar")
+    end
+
+    it "uses zip format from string" do
+      repo = StubRepository.new("gts/mainline")
+
+      cmd = "sh -c 'git --git-dir /repos/gts/mainline.git archive --prefix='gts-mainline/' " +
+        "--format=zip master > /work/gts-mainline-master.zip'"
+      d = EM::DefaultDeferrable.new
+      EMPessimistic::DeferrableChildProcess.expects(:open).with(cmd).returns(d)
+
+      @archiver.archive(repo, "master", "zip")
+    end
+
+    it "moves tarball when successfully generated" do
+      FileUtils.expects(:mv).with("/work/gts-mainline-master.tar.gz",
+                                  "/cache/gts-mainline-master.tar.gz")
+      repo = StubRepository.new("gts/mainline")
+      d = EM::DefaultDeferrable.new
+      EMPessimistic::DeferrableChildProcess.expects(:open).returns(d)
+      d.succeed("", StubProcessStatus.new(0))
+
+      @archiver.archive(repo, "master", :tar)
+    end
+
+    it "does not move tarball when raising error" do
+      FileUtils.expects(:mv).with("/work/gts-mainline-master.tar.gz",
+                                  "/cache/gts-mainline-master.tar.gz").never
+      repo = StubRepository.new("gts/mainline")
+      d = EM::DefaultDeferrable.new
+      EMPessimistic::DeferrableChildProcess.expects(:open).returns(d)
+      d.fail("", StubProcessStatus.new(1))
+
+      @archiver.archive(repo, "master", :tar)
+    end
+
+    it "resolves promise with generated filename" do
+      FileUtils.stubs(:mv)
+      repo = StubRepository.new("gts/mainline")
+      d = EM::DefaultDeferrable.new
+      EMPessimistic::DeferrableChildProcess.expects(:open).returns(d)
+      d.succeed("", StubProcessStatus.new(0))
+
+      @archiver.archive(repo, "master", :tar).then do |filename|
+        assert_equal "/cache/gts-mainline-master.tar.gz", filename
+        done!
+      end
+      wait!
+    end
+
+    it "rejects promise when failing to archive" do
+      repo = StubRepository.new("gts/mainline")
+      d = EM::DefaultDeferrable.new
+      EMPessimistic::DeferrableChildProcess.expects(:open).returns(d)
+      d.fail("It done failed", StubProcessStatus.new(1))
+
+      @archiver.archive(repo, "master", :tar).errback do |err|
+        assert_match "It done failed", err.message
+        done!
+      end
+      wait!
+    end
+
+    it "does not spawn multiple identical processes" do
+      FileUtils.stubs(:mv)
+      repo = StubRepository.new("gts/mainline")
+      d = EM::DefaultDeferrable.new
+      EMPessimistic::DeferrableChildProcess.expects(:open).once.returns(d)
+      callbacks = 0
+      blk = lambda do |filename|
+        assert_equal "/cache/gts-mainline-master.tar.gz", filename
+        callbacks += 1
+        done! if callbacks == 2
+      end
+
+      @archiver.archive(repo, "master", :tar).then(&blk)
+      @archiver.archive(repo, "master", :tar).then(&blk)
+
+      wait!
+      d.succeed("", StubProcessStatus.new(0))
+    end
+
+    it "spawns new process when format is different" do
+      FileUtils.stubs(:mv)
+      repo = StubRepository.new("gts/mainline")
+      d = EM::DefaultDeferrable.new
+      EMPessimistic::DeferrableChildProcess.expects(:open).twice.returns(d)
+      callbacks = 0
+
+      @archiver.archive(repo, "master", :tar).then do |filename|
+        assert_equal "/cache/gts-mainline-master.tar.gz", filename
+        callbacks += 1
+        done! if callbacks == 2
+      end
+
+      @archiver.archive(repo, "master", :zip).then do |filename|
+        assert_equal "/cache/gts-mainline-master.zip", filename
+        callbacks += 1
+        done! if callbacks == 2
+      end
+
+      wait!
+      d.succeed("", StubProcessStatus.new(0))
+    end
+  end
+end

data/test/libdolt/templates/blob_test.rb

@@ -21,6 +21,7 @@ require "libdolt/view"
 class Blob
   attr_reader :content
   def initialize(content); @content = content; end
+  def text(max_lines, encoding); content; end
 end
 
 describe "blob template" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libdolt
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -235,6 +235,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Dolt API for serving git trees and syntax highlighted blobs
 email:
 - christian@gitorious.org
@@ -249,6 +265,7 @@ files:
 - Readme.md
 - lib/libdolt.rb
 - lib/libdolt/disk_repo_resolver.rb
+- lib/libdolt/git/archiver.rb
 - lib/libdolt/git/blame.rb
 - lib/libdolt/git/commit.rb
 - lib/libdolt/git/repository.rb
@@ -274,6 +291,7 @@ files:
 - lib/libdolt/view/tree.rb
 - lib/libdolt/view/urls.rb
 - libdolt.gemspec
+- test/libdolt/git/archiver_test.rb
 - test/libdolt/git/blame_test.rb
 - test/libdolt/git/commit_test.rb
 - test/libdolt/git/repository_test.rb