capillary 0.2.3 → 0.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capillary (0.2.2)
+    capillary (0.2.3)
       json (~> 1.5.1)
 
 GEM

data/lib/capillary/commit.rb

@@ -43,7 +43,7 @@ module Capillary
       if spec == ""
         @ref_names = []
       else
-        @ref_names = spec.gsub(/[\(\)]/,"").split(/,\s?/)
+        @ref_names = spec.gsub(/[\(\)]/,"").split(/,\s?/).collect(&:strip)
       end
     end
 

data/lib/capillary/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Capillary
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/test/capillary/commit_test.rb

@@ -16,6 +16,7 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
+require "json"
 require "test_helper"
 require "capillary/commit"
 
@@ -41,7 +42,7 @@ class CommitTest < MiniTest::Spec
     should "extract the committer email" do
       assert_equal "chris@example.com", @commit.committer_email
     end
-    
+
     should "extract the commit message" do
       assert_equal "And this is commit 10 Merge branch 'topic'", @commit.message
     end

data/test/capillary/log_parser_test.rb

@@ -26,17 +26,20 @@ class LogParserTest < MiniTest::Spec
     branches[num].collect { |c| c.id[0...7] }
   end
 
-  def load_fixture(fixture)
-    parse_log(fixture(fixture))
+  def load_fixture(fixture, num = -1)
+    parse_log(fixture(fixture), num)
   end
 
-  def parse_log(log)
+  def parse_log(log, num = -1)
     @log_parser = Capillary::LogParser.new
     @lines = []
+    i = 0
 
     log.split("\n").reject { |f| f.strip == "" }.each do |log|
+      return if num >= 0 && i == num
       @lines << Capillary::Commit.parse(log)
       @log_parser << @lines.last
+      i += 1
     end
   end
 
@@ -634,6 +637,34 @@ c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60
     end
   end
 
+  # 8ff4eb2
+  # |
+  # db060ee
+  # |      \
+  # |       0bca89d
+  # |       |
+  # |       1793145
+  # |       |
+  # |       f9e1735
+  # |       |
+  # 4aee02f |
+  # |       |
+  # |       07b25c9
+  # |       |
+  context "Axis log" do
+    setup do
+      load_fixture("axis.txt", 50)
+    end
+
+    should "include correct commits in second branch" do
+      assert_equal %w[db060ee 0bca89d 1793145 f9e1735], commits_for_branch(1)
+    end
+
+    should "include correct commits in fifth branch" do
+      assert_equal %w[e2f706e 02edff1 3e54c31], commits_for_branch(5)
+    end
+  end
+
   context "Streaming parser" do
     setup do
       @lines = fixture("complex_graph_no_ff.txt").split("\n")

data/test/fixtures/first_commit.txt

@@ -1 +1 @@
-a7cf78bfff06d52b5b0aa021508b44c00cad067a§db75ad82d678d51b29709d26af64d4a85b6f8071§2011-07-13 07:55:47 +0200§chris@example.com§(master, refactor)§And this is commit 10 Merge branch 'topic'§
+a7cf78bfff06d52b5b0aa021508b44c00cad067a§db75ad82d678d51b29709d26af64d4a85b6f8071§2011-07-13 07:55:47 +0200§chris@example.com§ (master, refactor)§And this is commit 10 Merge branch 'topic'§

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capillary
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Marius Mathiesen
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 +02:00
+date: 2011-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency