git-dag 0.0.4 → 0.0.5

data/.gitignore

@@ -1,3 +1,4 @@
 output
-history.pdf
+history.*
 pkg/
+TODO

data/Gemfile.lock

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

data/README.md

@@ -4,6 +4,9 @@ git-dag is a ruby script that generates a DAG tree (in the 'dot' format) for a
 given Git repository.
 
 ## Preprequisite
+You need to have Ruby installed. Try [RVM](https://rvm.io) or
+[rbenv](http://rbenv.org) if you don't have one installed.
+
 You need to have [Graphviz](http://graphviz.org/) installed if you want
 to render the DAG visually. You can install it using the package manager
 provided by your OS.
@@ -30,7 +33,10 @@ You can pipe the 2 commands together:
 
     $ git-dag <path_to_git_repo> | dot -Tsvg -o history.svg
 
-Now you can open up 'history.svg' to see the DAG.
+Note that if it take a good amount of time if your repository has a long history
+of commits.
+
+Now you can open up 'history.svg' in your browser to see the DAG.
 
 Graphviz supports a lot of other formats, such as jpg, pdf, png, ps2 etc. Please
 see [Graphviz](http://graphviz.org/) for more info.

data/lib/git-dag.rb

@@ -2,6 +2,7 @@ require 'git-dag/application'
 require 'git-dag/git_graph'
 require 'git-dag/node'
 require 'git-dag/commit_node'
+require 'git-dag/merge_node'
 require 'git-dag/fake_head'
 require 'git-dag/tag_node'
 require 'git-dag/legend'

data/lib/git-dag/commit_node.rb

@@ -14,9 +14,7 @@ module GitDag
     end
 
     def add_parent(parent)
-      #puts "commit #{id} add parent #{parent.id}"
       @parents << parent
-      #puts "parents: #{@parents}" if id =~ /07da/
     end
 
     def dot_node
@@ -25,19 +23,11 @@ module GitDag
 
     private
     def color
-      if merge?
-        "red"
-      else
-        "black"
-      end
+      "black"
     end
 
     def short_sha1
       @grit_commit.id[0,6]
     end
-
-    def merge?
-      @parents.size > 1
-    end
   end
 end

data/lib/git-dag/git_graph.rb

@@ -9,12 +9,13 @@ module GitDag
 
     def output_dot_file
       all_commits = build_entire_graph
-      add_tag_nodes(all_commits)
+      #add_tag_nodes(all_commits)
       get_dot_str(all_commits)
     end
 
+    private
+
     def get_dot_str(all_commits)
-      #puts "all_commits: #{all_commits.size}"
       dot_str = "digraph G {\n"
       all_commits.each do |id, node|
         node.parents.each do |parent|
@@ -32,13 +33,11 @@ module GitDag
       @all_branches.each do |branch|
         commits = find_commits_per_branch(branch.name)
         commits.each do |commit|
-          my_commit = CommitNode.new(commit)
+          my_commit = create_commit_node(commit)
           all_commits[commit.id] = my_commit unless all_commits.has_key? commit.id
-          #puts "adding #{commit.id} to hash"
           commit.parents.each do |parent|
-            parent_commit = CommitNode.new(parent)
+            parent_commit = create_commit_node(parent)
             my_commit.add_parent(parent_commit)
-            #all_commits[parent.id] = parent_commit unless all_commits.has_key? parent.id
           end
         end
 
@@ -71,5 +70,9 @@ module GitDag
     def find_commits_per_branch(branch)
       @repo.commits(branch, false) # false indicates all commits
     end
+
+    def create_commit_node(commit)
+      commit.parents.size > 1 ? MergeNode.new(commit) : CommitNode.new(commit)
+    end
   end
 end

data/lib/git-dag/merge_node.rb

@@ -0,0 +1,8 @@
+module GitDag
+  class MergeNode < CommitNode
+    private
+    def color
+      "red"
+    end
+  end
+end

data/lib/git-dag/tag_node.rb

@@ -2,7 +2,7 @@ module GitDag
   class TagNode < Node
     def initialize(id, dot_node, label, parents)
       @id = id
-      @dot_node = dot_node
+      @dot_node = dot_node[0,6]
       @label = label
       @parents = parents
     end

data/lib/git-dag/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-dag
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -49,6 +49,7 @@ files:
 - lib/git-dag/fake_head.rb
 - lib/git-dag/git_graph.rb
 - lib/git-dag/legend.rb
+- lib/git-dag/merge_node.rb
 - lib/git-dag/node.rb
 - lib/git-dag/tag_node.rb
 - lib/git-dag/version.rb