capillary 0.2.2 → 0.2.3

data/Gemfile.lock

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

data/lib/capillary/log_parser.rb

@@ -27,7 +27,6 @@ module Capillary
       @branches = []
       @seq_ids = {}
       @commit_positions = {}
-      @relationships = {}
     end
 
     def <<(commit)
@@ -81,14 +80,6 @@ module Capillary
         @commit_positions[commit.id] = [col, branches[col].length]
       end
 
-      if branches[col].length > 0
-        pid = branches[col].last.commit.id
-        relationship = "#{commit.id}:#{pid}"
-        return if @relationships[relationship]
-        @relationships[relationship] = true
-      end
-
-      parent = commit.parent_id ? " (#{commit.parent_id[0...7]})" : ""
       branches[col] << commit
     end
   end

data/lib/capillary/version.rb

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

data/test/capillary/log_parser_test.rb

@@ -27,12 +27,15 @@ class LogParserTest < MiniTest::Spec
   end
 
   def load_fixture(fixture)
-    fixtures = fixture(fixture).split("\n")
+    parse_log(fixture(fixture))
+  end
+
+  def parse_log(log)
     @log_parser = Capillary::LogParser.new
     @lines = []
 
-    fixtures.reject { |f| f.strip == "" }.each do |fixture|
-      @lines << Capillary::Commit.parse(fixture)
+    log.split("\n").reject { |f| f.strip == "" }.each do |log|
+      @lines << Capillary::Commit.parse(log)
       @log_parser << @lines.last
     end
   end
@@ -172,14 +175,7 @@ class LogParserTest < MiniTest::Spec
   # | | |
   context "Complex graph merged with --no-ff" do
     setup do
-      fixtures = fixture("complex_graph_no_ff.txt").split("\n")
-      @log_parser = Capillary::LogParser.new
-      @lines = []
-
-      fixtures.reject { |f| f.strip == "" }.each do |fixture|
-        @lines << Capillary::Commit.parse(fixture)
-        @log_parser << @lines.last
-      end
+      load_fixture("complex_graph_no_ff.txt")
     end
 
     should "have four branches" do
@@ -250,14 +246,7 @@ class LogParserTest < MiniTest::Spec
   # |
   context "Complex graph merged with --no-ff" do
     setup do
-      fixtures = fixture("complex_graph.txt").split("\n")
-      @log_parser = Capillary::LogParser.new
-      @lines = []
-
-      fixtures.reject { |f| f.strip == "" }.each do |fixture|
-        @lines << Capillary::Commit.parse(fixture)
-        @log_parser << @lines.last
-      end
+      load_fixture("complex_graph.txt")
     end
 
     should "have three branches" do
@@ -273,7 +262,7 @@ class LogParserTest < MiniTest::Spec
     end
 
     should "have three commits in the third branch" do
-      assert_equal 3, @log_parser.branches[2].size
+      assert_equal 4, @log_parser.branches[2].size
     end
 
     should "not create more seq_id's than there are commits" do
@@ -282,7 +271,7 @@ class LogParserTest < MiniTest::Spec
 
     should "not represent same commit under different seq_id's" do
       assert_equal [2, 4, 5, 6, 7, 9, 10], @log_parser.branches[1].collect { |c| c.seq_id }
-      assert_equal [5, 8, 9], @log_parser.branches[2].collect { |c| c.seq_id }
+      assert_equal [5, 8, 9, 10], @log_parser.branches[2].collect { |c| c.seq_id }
     end
   end
 
@@ -308,14 +297,7 @@ class LogParserTest < MiniTest::Spec
   # | |
   context "Parsing log --graph output" do
     setup do
-      fixtures = fixture("log_graph.txt").split("\n")
-      @log_parser = Capillary::LogParser.new
-      @lines = []
-
-      fixtures.reject { |f| f.strip == "" }.each do |fixture|
-        @lines << Capillary::Commit.parse(fixture)
-        @log_parser << @lines.last
-      end
+      load_fixture("log_graph.txt")
     end
 
     should "have two branches" do
@@ -365,39 +347,32 @@ class LogParserTest < MiniTest::Spec
   # |
   context "Two branches forked from same commit" do
     setup do
-      fixtures = fixture("double_fork.txt").split("\n")
-      @log_parser = Capillary::LogParser.new
-      @lines = []
-
-      fixtures.reject { |f| f.strip == "" }.each do |fixture|
-        @lines << Capillary::Commit.parse(fixture)
-        @log_parser << @lines.last
-      end
+      load_fixture("double_fork.txt")
     end
 
     should "have three branches" do
-       assert_equal 3, @log_parser.branches.length
+      assert_equal 3, branches.length
     end
 
-    should "have the six commits in the first branch" do
+    should "have six commits in the first branch" do
       commits = @log_parser.branches[0].collect { |c| c.id[0...7] }
 
       assert_equal 6, commits.length
       assert_equal %w[0f54800 5bdf304 2477a17 ea4d6ce fdc39f6 9002b5b], commits
     end
 
-    should "have the ten commits in the second branch" do
+    should "have eleven commits in the second branch" do
       commits = @log_parser.branches[1].collect { |c| c.id[0...7] }
 
-      assert_equal 10, commits.length
-      assert_equal %w[2477a17 13c727b bd73540 6fb3997 9266f54 a5f9deb 1551dfe 16d2ac1 1e69972 fdc39f6], commits
+      assert_equal 11, commits.length
+      assert_equal %w[2477a17 13c727b bd73540 6fb3997 9266f54 a5f9deb 1551dfe 16d2ac1 1e69972 fdc39f6 9002b5b], commits
     end
 
-    should "have the eight commits in the third branch" do
+    should "have nine commits in the third branch" do
       commits = @log_parser.branches[2].collect { |c| c.id[0...7] }
 
-      assert_equal 8, commits.length
-      assert_equal %w[ea4d6ce 74510fd 09b2486 4f0eaf7 fe57cfc cbdfa12 81febec fdc39f6], commits
+      assert_equal 9, commits.length
+      assert_equal %w[ea4d6ce 74510fd 09b2486 4f0eaf7 fe57cfc cbdfa12 81febec fdc39f6 9002b5b], commits
     end
   end
 
@@ -407,13 +382,10 @@ class LogParserTest < MiniTest::Spec
   # | |
   context "Two dangling branches" do
     setup do
-      log = <<-GIT
+      parse_log <<-GIT
 ca2d07e0172565c9e0f18d41e49b70d7d75fced6§3370cb3615b3368be97c0f39b86f5dc2f9fa3650 c4e7446e2a98f1bf28da51fc57bb42b532222942§Tue May 10 12:47:08 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/2230'§
 c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60f8§Tue May 10 12:41:19 2011 +0200§christian@gitorious.org§§Merge commit 'refs/merge-requests/2230' of gitorious.org:gitorious/mainline into merge-requests/2230§
       GIT
-
-      @log_parser = Capillary::LogParser.new
-      log.split("\n").each { |l| @log_parser << l }
     end
 
     should "have two branches" do
@@ -437,14 +409,11 @@ c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60
   # | |
   context "Two dangling branches with leading commit" do
     setup do
-      log = <<-GIT
+      parse_log <<-GIT
 1f2b8a4e3f61ffedf9908e28b280de8c6bf38a16§ca2d07e0172565c9e0f18d41e49b70d7d75fced6§Tue May 10 13:04:10 2011 +0200§christian@gitorious.org§§Some commit§
 ca2d07e0172565c9e0f18d41e49b70d7d75fced6§3370cb3615b3368be97c0f39b86f5dc2f9fa3650 c4e7446e2a98f1bf28da51fc57bb42b532222942§Tue May 10 12:47:08 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/2230'§
 c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60f8§Tue May 10 12:41:19 2011 +0200§christian@gitorious.org§§Merge commit 'refs/merge-requests/2230' of gitorious.org:gitorious/mainline into merge-requests/2230§
       GIT
-
-      @log_parser = Capillary::LogParser.new
-      log.split("\n").each { |l| @log_parser << l }
     end
 
     should "have two branches" do
@@ -468,14 +437,11 @@ c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60
   # | | |
   context "Three dangling branches" do
     setup do
-      log = <<-GIT
+      parse_log <<-GIT
 1f2b8a4e3f61ffedf9908e28b280de8c6bf38a16§ca2d07e0172565c9e0f18d41e49b70d7d75fced6 275932ab0995a11fcebeb0af7f19a7b8df5dea3f§Tue May 10 13:04:10 2011 +0200§christian@gitorious.org§§Some commit§
 ca2d07e0172565c9e0f18d41e49b70d7d75fced6§3370cb3615b3368be97c0f39b86f5dc2f9fa3650 c4e7446e2a98f1bf28da51fc57bb42b532222942§Tue May 10 12:47:08 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/2230'§
 c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60f8§Tue May 10 12:41:19 2011 +0200§christian@gitorious.org§§Merge commit 'refs/merge-requests/2230' of gitorious.org:gitorious/mainline into merge-requests/2230§
       GIT
-
-      @log_parser = Capillary::LogParser.new
-      log.split("\n").each { |l| @log_parser << l }
     end
 
     should "have three branches" do
@@ -508,7 +474,7 @@ c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60
   # | | |
   context "Three dangling branches with closed branch" do
     setup do
-      log = <<-GIT
+      parse_log <<-GIT
 0000000000000000000000000000000000000000§1111111111111111111111111111111111111111 3333333333333333333333333333333333333333§Tue May 10 13:00:00 2011 +0200§christian@gitorious.org§§Message§
 1111111111111111111111111111111111111111§4444444444444444444444444444444444444444 2222222222222222222222222222222222222222§Tue May 10 12:00:00 2011 +0200§christian@gitorious.org§§Message§
 2222222222222222222222222222222222222222§4444444444444444444444444444444444444444§Tue May 10 11:00:00 2011 +0200§christian@gitorious.org§§Message§
@@ -516,9 +482,6 @@ c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60
 4444444444444444444444444444444444444444§7777777777777777777777777777777777777777 5555555555555555555555555555555555555555§Tue May 10 09:00:00 2011 +0200§christian@gitorious.org§§Message§
 5555555555555555555555555555555555555555§8888888888888888888888888888888888888888§Tue May 10 08:00:00 2011 +0200§christian@gitorious.org§§Message§
       GIT
-
-      @log_parser = Capillary::LogParser.new
-      log.split("\n").each { |l| @log_parser << l }
     end
 
     should "have four branches" do
@@ -546,29 +509,104 @@ c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60
   # |\
   # | 0
   # | |\
-  # | | 0
-  # |/  |
-  # 0   |
-  # |\  |
-  # | 0 |
-  # | | |
-  # | 0 |
-  # | | |
-  # | 0-|
-  # | | |\
-  # | | | 0
-  # |/  | |
-  # 0   | |
-  # |\  | |
-  # | 0 | |
-  # | | | |
+  context "two commits with two parents" do
+    setup do
+      parse_log <<-GIT
+ca2d07e0172565c9e0f18d41e49b70d7d75fced6§3370cb3615b3368be97c0f39b86f5dc2f9fa3650 c4e7446e2a98f1bf28da51fc57bb42b532222942§Tue May 10 12:47:08 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/2230'§
+c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60f8 c1e52fba9e7c88f1146bb6df1f8b58dff006f45e§Tue May 10 12:41:19 2011 +0200§christian@gitorious.org§§Merge commit 'refs/merge-requests/2230' of gitorious.org:gitorious/mainline into merge-requests/2230§
+      GIT
+    end
+
+    should "have three branches" do
+      assert_equal 3, branches.length
+    end
+
+    should "have one commit in the first branch" do
+      assert_equal %w[ca2d07e], commits_for_branch(0)
+    end
+
+    should "have two commits in the second branch" do
+      assert_equal %w[ca2d07e c4e7446], commits_for_branch(1)
+    end
+
+    should "have three commits in the third branch" do
+      assert_equal %w[c4e7446], commits_for_branch(2)
+    end
+  end
+
+  # 1f2b8a4                 # 0
+  # |      \                # |\
+  # |       a2f271b         # | 0
+  # |       |      \        # | |\
+  # |       |       3ec0ec6 # | | 0
+  # |      /        |       # |/  |
+  # ca2d07e         |       # 0   |
+  # |      \        |       # |\  |
+  # |       c4e7446-|-      # | 0-|
+  # |       |       | \     # | | |\
+  context "Three branches from four dangling branches" do
+    setup do
+      parse_log <<-GIT
+1f2b8a4e3f61ffedf9908e28b280de8c6bf38a16§ca2d07e0172565c9e0f18d41e49b70d7d75fced6 a2f271b1aa55e52ba848779c62a6fa02cbc5ea0c§Tue May 10 13:04:10 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/147'§
+a2f271b1aa55e52ba848779c62a6fa02cbc5ea0c§ca2d07e0172565c9e0f18d41e49b70d7d75fced6 3ec0ec68ac9ae2db3f222dfe1842cd2c6812cf97§Tue May 10 12:50:35 2011 +0200§christian@gitorious.org§§Merge commit 'refs/merge-requests/147' of gitorious.org:gitorious/mainline into merge-requests/147§
+3ec0ec68ac9ae2db3f222dfe1842cd2c6812cf97§0685c52dd27dba8eaa6ec6f6bfacf014d37a6a1b§Tue Apr 12 10:04:20 2011 +1000§openid@obfusc8.org§§Bug: Do not redirect_back_or_default on new OpenID§
+ca2d07e0172565c9e0f18d41e49b70d7d75fced6§3370cb3615b3368be97c0f39b86f5dc2f9fa3650 c4e7446e2a98f1bf28da51fc57bb42b532222942§Tue May 10 12:47:08 2011 +0200§christian@gitorious.org§§Merge branch 'merge-requests/2230'§
+c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60f8 c1e52fba9e7c88f1146bb6df1f8b58dff006f45e§Tue May 10 12:41:19 2011 +0200§christian@gitorious.org§§Merge commit 'refs/merge-requests/2230' of gitorious.org:gitorious/mainline into merge-requests/2230§
+      GIT
+    end
+
+    should "have five branches" do
+      assert_equal 5, branches.length
+    end
+
+    should "have two commits in first branch" do
+      assert_equal %w[1f2b8a4 ca2d07e], commits_for_branch(0)
+    end
+
+    should "have three commits in second branch" do
+      assert_equal %w[1f2b8a4 a2f271b ca2d07e], commits_for_branch(1)
+    end
+
+    should "have two commits in third branch" do
+      assert_equal %w[a2f271b 3ec0ec6], commits_for_branch(2)
+    end
+
+    should "have two commits in fourth branch" do
+      assert_equal %w[ca2d07e c4e7446], commits_for_branch(3)
+    end
+
+    should "have one commit in fifth branch" do
+      assert_equal %w[c4e7446], commits_for_branch(4)
+    end
+  end
+
+  # 44c5c1d
+  # |      \
+  # |       e81d019
+  # |       |      \
+  # |       |       bbbd502
+  # |      /        |
+  # 1f2b8a4         |
+  # |      \        |
+  # |       275932a |
+  # |       |       |
+  # |       7487183 |
+  # |       |       |
+  # |       a2f271b-|------
+  # |       |       |      \
+  # |       |       |       3ec0ec6
+  # |      /        |       |
+  # ca2d07e         |       |
+  # |      \        |       |
+  # |       c4e7446-|-------|------
+  # |       |       |       |      \
   context "Four dangling branches" do
     setup do
       load_fixture("4x_dangling_branches.txt")
     end
 
     should "have seven branches" do
-      assert_equal 6, branches.length
+      assert_equal 7, branches.length
     end
 
     should "have 3 commits in the first branch" do
@@ -576,7 +614,7 @@ c4e7446e2a98f1bf28da51fc57bb42b532222942§c3e1d675667939e64ced1bb5b541c9042a1d60
     end
 
     should "have 3 commits in the second branch" do
-      assert_equal %w[44c5c1d e81d019 1f2b8a4], commits_for_branch(1)
+      assert_equal %w[44c5c1d e81d019 1f2b8a4 ca2d07e], commits_for_branch(1)
     end
 
     should "have 2 commits in the third branch" do

metadata

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