git-dag 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-dag (0.0.2)
+    git-dag (0.0.3)
       grit (~> 2.5.0)
 
 GEM

data/lib/git-dag.rb

@@ -3,3 +3,5 @@ require 'git-dag/git_graph'
 require 'git-dag/node'
 require 'git-dag/commit_node'
 require 'git-dag/fake_head'
+require 'git-dag/tag_node'
+require 'git-dag/legend'

data/lib/git-dag/git_graph.rb

@@ -9,6 +9,7 @@ module GitDag
 
     def output_dot_file
       all_commits = build_entire_graph
+      add_tag_nodes(all_commits)
       get_dot_str(all_commits)
     end
 
@@ -21,6 +22,8 @@ module GitDag
         end
         dot_str << %Q(#{node.dot_node} #{node.label};\n)
       end
+      dot_str << Legend.dot_output
+
       dot_str << "}\n"
     end
 
@@ -46,6 +49,18 @@ module GitDag
       all_commits
     end
 
+    def add_tag_nodes(all_commits)
+      @repo.tags.each do |tag|
+        commit = tag.commit
+        parent_commit = all_commits.find {|id, c| id == commit.id}[1]
+        id = tag.name
+        dot_node = %Q("#{tag.name}")
+        label = %Q([color="green" shape=circle])
+        tag_node = TagNode.new(id, dot_node, label, [parent_commit])
+        all_commits[tag_node.id] = tag_node
+      end
+    end
+
     def create_fake_commit_for_head(branch_name, parent)
       id = branch_name
       dot_node = %Q("#{branch_name}")

data/lib/git-dag/legend.rb

@@ -0,0 +1,34 @@
+TEMPLATE = <<HERE
+{ rank = same;
+    Legend [shape=none, margin=0, label=<
+    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" CELLPADDING="4">
+     <TR>
+      <TD COLSPAN="2" BGCOLOR="grey"><B>Legend</B></TD>
+     </TR>
+     <TR>
+      <TD><FONT COLOR="black">ellipse</FONT></TD>
+      <TD>regular commit</TD>
+     </TR>
+     <TR>
+      <TD><FONT COLOR="red">ellipse</FONT></TD>
+      <TD>merge commit</TD>
+     </TR>
+     <TR>
+      <TD><FONT COLOR="blue">box</FONT></TD>
+      <TD>branch</TD>
+     </TR>
+     <TR>
+      <TD><FONT COLOR="green">circle</FONT></TD>
+      <TD>tag</TD>
+     </TR>
+    </TABLE>
+   >];
+  }
+HERE
+module GitDag
+  module Legend
+    def self.dot_output
+      TEMPLATE
+    end
+  end
+end

data/lib/git-dag/tag_node.rb

@@ -0,0 +1,10 @@
+module GitDag
+  class TagNode < Node
+    def initialize(id, dot_node, label, parents)
+      @id = id
+      @dot_node = dot_node
+      @label = label
+      @parents = parents
+    end
+  end
+end

data/lib/git-dag/version.rb

@@ -1,3 +1,3 @@
 module GitDag
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/integ/git_graph_test.rb

@@ -32,6 +32,35 @@ digraph G {
 "dev" [color="blue" shape=box];
 "master" -> "8b61ae";
 "master" [color="blue" shape=box];
+"0.0.1" -> "c554da";
+"0.0.1" [color="green" shape=circle];
+"0.0.2" -> "37f6a9";
+"0.0.2" [color="green" shape=circle];
+{ rank = same;
+    Legend [shape=none, margin=0, label=<
+    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" CELLPADDING="4">
+     <TR>
+      <TD COLSPAN="2" BGCOLOR="grey"><B>Legend</B></TD>
+     </TR>
+     <TR>
+      <TD><FONT COLOR="black">ellipse</FONT></TD>
+      <TD>regular commit</TD>
+     </TR>
+     <TR>
+      <TD><FONT COLOR="red">ellipse</FONT></TD>
+      <TD>merge commit</TD>
+     </TR>
+     <TR>
+      <TD><FONT COLOR="blue">box</FONT></TD>
+      <TD>branch</TD>
+     </TR>
+     <TR>
+      <TD><FONT COLOR="green">circle</FONT></TD>
+      <TD>tag</TD>
+     </TR>
+    </TABLE>
+   >];
+  }
 }
 HERE
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-dag
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -48,7 +48,9 @@ files:
 - lib/git-dag/commit_node.rb
 - lib/git-dag/fake_head.rb
 - lib/git-dag/git_graph.rb
+- lib/git-dag/legend.rb
 - lib/git-dag/node.rb
+- lib/git-dag/tag_node.rb
 - lib/git-dag/version.rb
 - test/integ/git_graph_test.rb
 - test/test_helper.rb