libdolt 0.8.0 → 0.9.0

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     libdolt (0.8.0)
       em_pessimistic (~> 0.1)
-      em_rugged (~> 0.1.2)
+      em_rugged (~> 0.3)
       eventmachine (~> 1.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
@@ -19,7 +19,7 @@ GEM
       eventmachine
     em_pessimistic (0.1.2)
       eventmachine (~> 1.0)
-    em_rugged (0.1.5)
+    em_rugged (0.3.0)
       eventmachine (~> 1.0)
       rugged (= 0.17.0.b6)
     eventmachine (1.0.0)
@@ -37,10 +37,10 @@ GEM
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rake (0.9.2.2)
-    redcarpet (2.1.1)
+    redcarpet (2.2.0)
     rugged (0.17.0.b6)
     tilt (1.3.3)
-    tiltout (1.1.0)
+    tiltout (1.2.0)
       tilt (~> 1.3)
     tzinfo (0.3.33)
     when (0.1.0)
@@ -54,5 +54,5 @@ DEPENDENCIES
   libdolt!
   minitest (~> 2.0)
   rake (~> 0.9)
-  redcarpet
-  tiltout (~> 1)
+  redcarpet (= 2.2.0)
+  tiltout (~> 1.2)

data/lib/libdolt/git/repository.rb

@@ -69,20 +69,32 @@ module Dolt
       end
 
       def tree_history(ref, path, limit = 1)
-        d = When.defer
-        rp = rev_parse("#{ref}:#{path}")
-        rp.errback { |err| d.reject(err) }
-        rp.callback do |tree|
-          if tree.class != Rugged::Tree
-            message = "#{ref}:#{path} is not a tree (#{tree.class.to_s})"
-            break d.reject(Exception.new(message))
+        When.defer do |d|
+          rp = rev_parse("#{ref}:#{path}")
+          rp.errback { |err| d.reject(err) }
+          rp.callback do |tree|
+            if tree.class != Rugged::Tree
+              message = "#{ref}:#{path} is not a tree (#{tree.class.to_s})"
+              break d.reject(Exception.new(message))
+            end
+
+            building = build_history(path || "./", ref, tree, limit)
+            building.callback { |history| d.resolve(history) }
+            building.errback { |err| d.reject(err) }
           end
+        end
+      end
 
-          building = build_history(path || "./", ref, tree, limit)
-          building.callback { |history| d.resolve(history) }
-          building.errback { |err| d.reject(err) }
+      def readme(ref)
+        When.defer do |d|
+          t = self.tree(ref, "")
+          t.callback do |tree|
+            d.resolve(tree.entries.select do |e|
+                        e[:type] == :blob && e[:name].match(/readme/i)
+                      end)
+          end
+          t.errback { |err| d.resolve([]) }
         end
-        d
       end
 
       private

data/lib/libdolt/gitorious_repo_resolver.rb

@@ -22,7 +22,7 @@ module Dolt
       @repository = repository
     end
 
-    def resolve(repo)
+    def resolve(repo = nil)
       Dolt::Git::Repository.new(@repository.full_repository_path)
     end
   end

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/libdolt.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
   s.add_dependency "eventmachine", "~>1.0"
   s.add_dependency "when", "~>0"
   s.add_dependency "em_pessimistic", "~>0.1"
-  s.add_dependency "em_rugged", "~> 0.1.2"
+  s.add_dependency "em_rugged", "~> 0.3"
   s.add_dependency "tzinfo", "~> 0.3"
-  s.add_dependency "makeup", "~>0"
+  s.add_dependency "makeup", "~>0.2"
   s.add_dependency "htmlentities", "~> 4.3"
   s.add_dependency "json", "~> 1.7"
   s.add_dependency "mime-types", "~> 1.19"
@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "minitest", "~> 2.0"
   s.add_development_dependency "em-minitest-spec", "~> 1.1"
   s.add_development_dependency "rake", "~> 0.9"
-  s.add_development_dependency "redcarpet"
-  s.add_development_dependency "tiltout", "~>1"
+  s.add_development_dependency "redcarpet", "2.2.0"
+  s.add_development_dependency "tiltout", "~>1.2"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test}/*`.split("\n")

data/test/libdolt/git/repository_test.rb

@@ -18,6 +18,7 @@
 require "test_helper"
 require "libdolt/git/repository"
 require "time"
+require "ostruct"
 
 describe Dolt::Git::Repository do
   include EM::MiniTest::Spec
@@ -216,4 +217,78 @@ describe Dolt::Git::Repository do
       wait!
     end
   end
+
+  describe "#readme" do
+    it "returns deferrable" do
+      deferrable = @repository.readme("master")
+      assert deferrable.respond_to?(:callback)
+      assert deferrable.respond_to?(:errback)
+    end
+
+    it "yields single readme" do
+      def @repository.tree(ref, path)
+        entries = [{ :type => :blob, :name => "Readme" },
+                   { :type => :blob, :name => "file.txt" },
+                   { :type => :tree, :name => "dir" }]
+        if ref == "master" && path == ""
+          When.resolve(OpenStruct.new(:entries => entries))
+        else
+          When.reject("Wrong ref/path")
+        end
+      end
+
+      @repository.readme("master").callback do |readmes|
+        assert_equal 1, readmes.length
+        assert_equal "Readme", readmes.first[:name]
+        done!
+      end
+
+      wait!
+    end
+
+    it "does not yield trees" do
+      def @repository.tree(ref, path)
+        entries = [{ :type => :tree, :name => "Readme" },
+                   { :type => :blob, :name => "file.txt" },
+                   { :type => :tree, :name => "dir" }]
+        When.resolve(OpenStruct.new(:entries => entries))
+      end
+
+      @repository.readme("master").callback do |readmes|
+        assert_equal 0, readmes.length
+        done!
+      end
+
+      wait!
+    end
+
+    it "yields all readmes" do
+      def @repository.tree(ref, path)
+        entries = [{ :type => :blob, :name => "Readme.rdoc" },
+                   { :type => :blob, :name => "readme" },
+                   { :type => :blob, :name => "Readme.md" }]
+        When.resolve(OpenStruct.new(:entries => entries))
+      end
+
+      @repository.readme("master").callback do |readmes|
+        assert_equal 3, readmes.length
+        done!
+      end
+
+      wait!
+    end
+
+    it "yields empty array of readmes when promise rejects" do
+      def @repository.tree(ref, path)
+        When.reject(OpenStruct.new({ :message => "Unknown reason" }))
+      end
+
+      @repository.readme("master").callback do |readmes|
+        assert_equal 0, readmes.length
+        done!
+      end
+
+      wait!
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libdolt
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Christian Johansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-12 00:00:00 +02:00
+date: 2012-10-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,12 +70,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 13
         segments: 
         - 0
-        - 1
-        - 2
-        version: 0.1.2
+        - 3
+        version: "0.3"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -101,10 +100,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 0
-        version: "0"
+        - 2
+        version: "0.2"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -203,12 +203,14 @@ dependencies:
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 2
+        - 2
         - 0
-        version: "0"
+        version: 2.2.0
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -219,10 +221,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
         - 1
-        version: "1"
+        - 2
+        version: "1.2"
   type: :development
   version_requirements: *id014
 description: Dolt API for serving git trees and syntax highlighted blobs