capillary 0.1.3 → 0.2.0

data/Gemfile.lock

@@ -7,7 +7,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    json (1.5.1)
+    json (1.5.3)
     mini_shoulda (0.3.0)
       minitest (~> 2.1.0)
     minitest (2.1.0)
@@ -17,6 +17,5 @@ PLATFORMS
 
 DEPENDENCIES
   capillary!
-  json (~> 1.5.1)
   mini_shoulda (~> 0.3.0)
   minitest (~> 2.0)

data/README

@@ -36,7 +36,7 @@ Capillary parses output from Git, in the format as specified in
 test/fixtures/single_commit.txt. This output was generated from Git using the
 following command:
 
-    git log --all --pretty=format:"%H§%P§%ad§%ae§%d§%s§"
+    git log --pretty=format:"%H§%P§%ad§%ae§%d§%s§"
 
 The name
 --------

data/lib/capillary/commit.rb

@@ -19,7 +19,7 @@ require "time"
 
 module Capillary
   class Commit
-    attr_accessor :id, :parent_ids, :committed_at, :message, :committer_email
+    attr_accessor :id, :parent_ids, :committed_at, :message, :committer_email, :seq_id
     attr_reader :ref_names
     LOG_SEPARATOR = "§"
 
@@ -54,7 +54,13 @@ module Capillary
     end
 
     def to_json
-      JSON.unparse(to_hash)
+      JSON.unparse({ "id" => id,
+                     "parentIds" => parent_ids,
+                     "committedAt" => committed_at,
+                     "committerEmail" => committer_email,
+                     "refNames" => ref_names,
+                     "message" => message,
+                     "seqId" => seq_id})
     end
   end
 end

data/lib/capillary/log_parser.rb

@@ -26,6 +26,7 @@ module Capillary
       @commit_count = 0
       @branches = []
       @seq_ids = {}
+      @commit_positions = {}
     end
 
     def <<(commit)
@@ -41,34 +42,57 @@ module Capillary
     end
 
     def to_json
-      JSON.unparse(branches.collect { |b| b.collect { |c| c.to_hash } })
+      branches_json = branches.collect do |b|
+        "[" + b.collect { |c| "#{c.to_json}" }.join(",") + "]"
+      end
+
+      "[#{branches_json.join(', ')}]"
     end
 
     private
     def place_commit(commit)
-      placed = branches.inject(false) do |placed, branch|
-        if branch.last.parent_id == commit.id
+      col = 0
+
+      placed = branches.inject(false) do |was_placed, branch|
+        if !branch.last.closed? && branch.last.parent_id == commit.id
+          pos = @commit_positions[branch.last.parent_id]
+
+          if pos
+            diff = (pos.first - col).abs
+            next true if diff > 1
+          else
+            @commit_positions[commit.id] = [col, branch.length]
+          end
+
           branch << commit
-          placed = true
+          was_placed = true
         end
 
-        placed
+        col += 1
+        was_placed
       end
 
-      branches << [commit] unless placed
+      unless placed
+        @commit_positions[commit.id] = [col, 0]
+        branches << [commit]
+      end
     end
   end
 
   class CommitNode
-    attr_reader :seq_id, :commit, :parent_id
+    attr_reader :commit, :parent_id
 
     def initialize(seq_id, commit, parent_id)
-      @seq_id = seq_id
       @commit = commit
+      @commit.seq_id = seq_id
       @parent_id = parent_id
+      @closed = false
     end
 
+    def seq_id; commit.seq_id; end
     def id; commit.id; end
-    def to_hash; commit.to_hash.merge({ "seq_id" => seq_id }); end
+    def to_json; commit.to_json; end
+    def closed?; @closed; end
+    def close; @closed = true; end
   end
 end

data/lib/capillary/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Capillary
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/test/capillary/commit_test.rb

@@ -58,11 +58,12 @@ class CommitTest < MiniTest::Spec
     should "convert commit to JSON" do
       assert_equal JSON.parse(@commit.to_json), {
         "id" => "a7cf78bfff06d52b5b0aa021508b44c00cad067a",
-        "parent_ids" => ["db75ad82d678d51b29709d26af64d4a85b6f8071"],
-        "committed_at" => "Wed Jul 13 07:55:47 +0200 2011",
-        "committer_email" => "chris@example.com",
-        "ref_names" => ["master", "refactor"],
-        "message" => "And this is commit 10 Merge branch 'topic'"
+        "parentIds" => ["db75ad82d678d51b29709d26af64d4a85b6f8071"],
+        "committedAt" => "Wed Jul 13 07:55:47 +0200 2011",
+        "committerEmail" => "chris@example.com",
+        "refNames" => ["master", "refactor"],
+        "message" => "And this is commit 10 Merge branch 'topic'",
+        "seqId" => nil
       }
     end
   end

data/test/capillary/log_parser_test.rb

@@ -204,6 +204,67 @@ class LogParserTest < MiniTest::Spec
     end
   end
 
+  #
+  # 0
+  # |
+  # 0
+  # |
+  # 0
+  # |\
+  # 0 |
+  # | |
+  # | 0
+  # | |
+  # | 0
+  # | |\
+  # | 0 |
+  # | | |
+  # | 0 |
+  # | | |
+  # | | 0
+  # | |/
+  # | 0
+  # |/
+  # 0
+  # |
+  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
+    end
+
+    should "have three branches" do
+      assert_equal 3, @log_parser.branches.size
+    end
+
+    should "have five commits in the first branch" do
+      assert_equal 5, @log_parser.branches.first.size
+    end
+
+    should "have seven commits in the second branch" do
+      assert_equal 7, @log_parser.branches[1].size
+    end
+
+    should "have three commits in the third branch" do
+      assert_equal 3, @log_parser.branches[2].size
+    end
+
+    should "not create more seq_id's than there are commits" do
+      assert_equal [0, 1, 2, 3, 10], @log_parser.branches.first.collect { |c| c.seq_id }
+    end
+
+    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 }
+    end
+  end
+
   context "Streaming parser" do
     setup do
       @lines = fixture("complex_graph_no_ff.txt").split("\n")

data/test/fixtures/complex_graph.txt

@@ -0,0 +1,11 @@
+ebd6ca933644ace5a405e9300ff3ff86fa9678cf§fe87dba23f935a1a6280fdc00dca01a7502772ce§Fri Jul 15 21:23:55 2011 +0200§christian@gitorious.org§ (HEAD, origin/master, origin/HEAD, master)§Up version and JSON dependency§
+fe87dba23f935a1a6280fdc00dca01a7502772ce§3244d9ec9024325bee95112da51ebf7636717bd4§Fri Jul 15 21:23:40 2011 +0200§christian@gitorious.org§§Fix JSON output so it uses idiomatic camelCasing for property names§
+3244d9ec9024325bee95112da51ebf7636717bd4§99626ea0ec232d403395d2e9d7c9ee27017c2f48 50c64c2f9fecdfd32aaf37486106eabe8e3984b7§Fri Jul 15 14:53:16 2011 +0200§marius@gitorious.org§§Merge branch 'master' of gitorious.org:capillary/capillary_rb§
+99626ea0ec232d403395d2e9d7c9ee27017c2f48§13862a57985d61ae215eab265c4751182303a6e9§Fri Jul 15 14:53:03 2011 +0200§marius@gitorious.org§§Add a failing test for Christian§
+50c64c2f9fecdfd32aaf37486106eabe8e3984b7§925fee4ceea3b051dbf89e3faa60af5121c4d757§Fri Jul 15 10:50:08 2011 +0200§christian@gitorious.org§§Up gemspec version§
+925fee4ceea3b051dbf89e3faa60af5121c4d757§6aef451a1e152182c03d141d52e68be8484f51f8 7b4a45d3dd4f35fb8a2c7f941f59e9f9f70f0f95§Fri Jul 15 10:49:53 2011 +0200§christian@gitorious.org§§Merge branch 'master' of gitorious.org:capillary/capillary_
+6aef451a1e152182c03d141d52e68be8484f51f8§fb6841db8b3b757e961330d9a93895883b26cb31§Fri Jul 15 10:42:46 2011 +0200§christian@gitorious.org§§Don't add merge commits multiple times with different sequence numbers§
+fb6841db8b3b757e961330d9a93895883b26cb31§faee9a1ce450bb012afe374b8fde93939655ab15§Fri Jul 15 10:41:51 2011 +0200§christian@gitorious.org§§JSON goes out§
+7b4a45d3dd4f35fb8a2c7f941f59e9f9f70f0f95§faee9a1ce450bb012afe374b8fde93939655ab15§Thu Jul 14 15:08:05 2011 +0200§marius@gitorious.org§§Fix typo in hash representation of Commit, ref_names will always be an array§
+faee9a1ce450bb012afe374b8fde93939655ab15§13862a57985d61ae215eab265c4751182303a6e9§Thu Jul 14 09:18:59 2011 +0200§marius@gitorious.org§§Adding gemspec along with version§
+13862a57985d61ae215eab265c4751182303a6e9§d1cec484438bce51a1f5e6f8ed213f014a85a439§Thu Jul 14 07:54:39 2011 +0200§christian@gitorious.org§§Binary for converting log input from stdin to JSON§

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capillary
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Marius Mathiesen
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 +02:00
+date: 2011-08-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ files:
 - lib/capillary/version.rb
 - test/capillary/commit_test.rb
 - test/capillary/log_parser_test.rb
+- test/fixtures/complex_graph.txt
 - test/fixtures/complex_graph_no_ff.txt
 - test/fixtures/first_commit.txt
 - test/fixtures/parent_commit.txt