ruby-graphviz 1.0.7 → 1.0.8

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = CHANGELOG
 
+== 1.0.8 :
+* Cleanup format (by markus1189)
+* Issue #49 : (undefined local variable or method `file' ) (by markus1189)
+
 == 1.0.7 :
 * Issue #48 : add_graph fails when passed a GraphViz object
 * Issue #47 : Find executable (by markus1189)

data/bin/dot2ruby

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
@@ -20,7 +20,7 @@ require 'graphviz/constants'
 require 'graphviz/dot2ruby'
 require 'getoptlong'
 
-def usage 
+def usage
   puts "usage: dot2ruby [-ofile] [-Tformat] [-h] [-V] script"
   puts "-o, --output-file file        Output file"
   puts "-T, --output-format format    Output format (default: nil)"
@@ -83,7 +83,7 @@ end
 
 xFile = ARGV[0]
 
-if xFile.nil? == true
+if xFile.nil?
   usage( )
   exit
 end

data/bin/gem2gv

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
@@ -22,24 +22,24 @@ require 'getoptlong'
 class Gem2Gv
   def initialize( xGVPath, xUse )
     @oGraph = GraphViz::new( :G, :path => xGVPath, :use => xUse )
-    
+
     @nodes = []
     @name = 'gem2gv'
   end
-  
+
   def out( xFormat = "dot", xFile = nil )
-    if xFile.nil? == true
+    if xFile.nil?
       @oGraph.output( xFormat => String )
     else
       @oGraph.output( xFormat => xFile )
     end
   end
-  
+
   def go( gemName, version = ">0" )
     nodes = getDependency(gemName, version)
-    
+
     createEdges( gemName, version, nodes )
-    
+
     nodes.each do |node|
       unless @nodes.include?(node)
         @nodes << node
@@ -50,22 +50,22 @@ class Gem2Gv
 
   def getDependency( gemName, version = ">0" )
     nodes = []
-    
+
     dependency = Gem::Dependency.new( gemName, version )
     fetcher = Gem::SpecFetcher.fetcher
-    
+
     fetcher.find_matching(dependency).each do |spec_tuple, source_uri|
       spec = fetcher.fetch_spec spec_tuple, URI.parse(source_uri)
-      
+
       spec.dependencies.each do |dep|
         #nodes << { :name => dep.name, :version => dep.version_requirements.to_s} unless nodes.include?({ :name => dep.name, :version => dep.version_requirements.to_s})
         nodes << { :name => dep.name, :version => ">0" } unless nodes.include?({ :name => dep.name, :version => ">0" })
       end
     end
-    
+
     return nodes
   end
-  
+
   def getNode( name, version )
     #nodeName = "#{name}#{version}"
     #nodeLabel = "#{name}\n#{version}"
@@ -73,10 +73,10 @@ class Gem2Gv
     nodeLabel = "#{name}"
     return @oGraph.get_node(nodeName) || @oGraph.add_nodes( nodeName, "label" => nodeLabel )
   end
-  
+
   def createEdges( gemName, version, nodes )
     nodeA = getNode( gemName, version )
-    
+
     nodes.each do |node|
       nodeB = getNode( node[:name], node[:version] )
       @oGraph.add_edges( nodeA, nodeB )
@@ -84,7 +84,7 @@ class Gem2Gv
   end
 end
 
-def usage 
+def usage
   puts "usage: gem2gv [-Tformat] [-ofile] [-h] [-V] gemname"
   puts "-T, --output-format format    Output format (default: PNG)"
   puts "-o, --output-file file        Output file (default: STDOUT)"
@@ -154,7 +154,7 @@ end
 
 xGem = ARGV[0]
 
-if xGem.nil? == true
+if xGem.nil?
   usage( )
   exit
 end

data/bin/git2gv

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
@@ -23,41 +23,41 @@ class Git2Gv
   def initialize( xGVPath, xOutFile, xOutFormat, bNothugly )
     @xGVPath, @xOutFile, @xOutFormat, @bNothugly = xGVPath, xOutFile, xOutFormat.to_sym, bNothugly
   end
-  
+
   def run
     git = GraphViz.new( :G, :path => @xGVPath )
-    
+
     git.node[:shape => "record"]
-    
+
     branches.each do |branch|
       git.add_nodes( branch, :style => "filled", :fillcolor => :lightgrey )
     end
-    
+
     commits.each do |commit|
-      git.add_nodes( 
-        commit[:short], 
+      git.add_nodes(
+        commit[:short],
         :style => "filled",
         :fillcolor => :lightblue,
-        :label => "{ #{commit[:long]} |{ #{commit[:comment].gsub(/\{/, "\\{").gsub(/\}/, "\\}").gsub(/\|/, "\\|").gsub(/</, "\\<").gsub(/>/, "\\>")}}| { #{commit[:commiter]} | #{commit[:date]} } }" 
+        :label => "{ #{commit[:long]} |{ #{commit[:comment].gsub(/\{/, "\\{").gsub(/\}/, "\\}").gsub(/\|/, "\\|").gsub(/</, "\\<").gsub(/>/, "\\>")}}| { #{commit[:commiter]} | #{commit[:date]} } }"
       )
     end
-    
+
     refs.each do |from, to|
       git.add_edges( from, to )
     end
-    
+
     relations.each do |from, to|
       git.add_edges( to, from, :dir => "back" )
     end
-    
+
     git.output( @xOutFormat => @xOutFile, :nothugly => @bNothugly )
   end
-  
+
   # private
   def cmd(c, &blk)
     `#{c}`.split($/).map(&blk || proc {|a| a })
   end
-  
+
   def commits
     @commits ||= begin
       data = []
@@ -74,30 +74,30 @@ class Git2Gv
       data
     end
   end
-  
+
   def relations
     @rels ||= cmd("git log --pretty=format:\"%h %p\"") { |l|
       c, *parents = l.split
       parents.map {|p| [p, c] }
     }.flatten(1)
   end
-  
+
   def branches
     @branches ||= cmd("git branch") {|b| b[2..-1] }
   end
-  
+
   def refs
     branches.inject({}) {|h,b|
       h.tap { h[b] = `git log -1 #{b} --pretty=format:"%h"` }
     }
   end
-  
+
   def current_branch
     cmd("git branch").select {|l| l =~ /^\*/ }.first.strip[2..-1]
   end
 end
 
-def usage 
+def usage
   puts "usage: git2gv [-Tformat] [-ofile] [-h] [-V]"
   puts "-T, --output-format format    Output format (default: png)"
   puts "    --nothugly                Use nothugly if SVG output"

data/bin/ruby2gv

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2005 - 2012 Gregoire Lejeune <gregoire.lejeune@free.fr>
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
@@ -34,7 +34,7 @@ class Rb2Gv
     @hxEdge = Array::new( )
     @lxStops = xStops
   end
-  
+
   public
   def parse( xFile )
     @hxNodes[xFile] = gv_newNode( xFile, "box", "forestgreen" )
@@ -44,38 +44,38 @@ class Rb2Gv
   end
 
   def out( xFormat = "dot", xFile = nil )
-    if xFile.nil? == true
+    if xFile.nil?
       @oGraph.output( xFormat => String )
     else
       @oGraph.output( xFormat => xFile )
     end
   end
-  
+
   private
-  def gv_newNode( xNode, xShape = "box", xColor = nil )  
+  def gv_newNode( xNode, xShape = "box", xColor = nil )
     xNodeName = xNode.gsub( /[^a-zA-Z0-9]/, "_" )
-    if xColor.nil? == true
+    if xColor.nil?
       @oGraph.add_nodes( xNodeName, "label" => xNode, "shape" => xShape )
     else
       @oGraph.add_nodes( xNodeName, "label" => xNode, "shape" => xShape, "style" => "filled", "color" => xColor )
     end
   end
-  
+
   def getLibraryPath( xLib, xExt = ["rb"] )
-  
+
     xPath = [ "libexecdir", "libdir", "sitedir", "rubylibdir", "sitelibdir", "archdir", "sitedir", "sitearchdir" ]
     xRbLib = with_config( xLib+'lib', xLib)
-    
+
     if /\.(rb|so|bundle|dll)$/.match( xRbLib )
       match = /^(.*)\.([^\.]*)$/.match(xRbLib)
       xRbFile, xExt = match[1], [match[2]]
     else
       xRbFile = xRbLib
     end
-    
+
     xExt.each do |e|
       xRbFileWithExt = xRbFile + "." + e
-    
+
       # Search in "standard" paths
       xPath.each do |xDir|
         xCurrentPath = Config::expand( Config::CONFIG[xDir] )
@@ -84,7 +84,7 @@ class Rb2Gv
           return xFileFound
         end
       end
-    
+
       # Search in "rubygems" :: This is not utile but...
       spec = Gem.searcher.find(xLib)
       unless spec.nil?
@@ -103,10 +103,10 @@ class Rb2Gv
 
     return nil
   end
-  
+
   def parseFile( xFile, xFromFile = nil, xLib = nil )
-  
-    if xFromFile.nil? == false
+
+    if xFromFile
       puts "Parse #{xFile} required in #{xFromFile} :" if DEBUG
     else
       puts "Parse #{xFile} :" if DEBUG
@@ -115,18 +115,18 @@ class Rb2Gv
     fp = open( xFile, 'r' )
     xData = fp.read()
     fp.close
-    
+
     xData.each do |xLine|
       if lxLineMatch = REQUIRE.match( xLine )
         xRequiredLib = lxLineMatch[2].gsub( /\.(rb|so)$/, "" )
-        
-        if @hxNodes.has_key?( xRequiredLib ) == false
+
+        if not @hxNodes.has_key?( xRequiredLib )
           puts "  + Node #{xRequiredLib}" if DEBUG
 
           xRequiredFile = getLibraryPath( xRequiredLib )
-          if xRequiredFile.nil? == false
+          if xRequiredFile
             unless @lxStops.include?(xRequiredLib)
-              @hxNodes[xRequiredLib] = gv_newNode( xRequiredLib )             
+              @hxNodes[xRequiredLib] = gv_newNode( xRequiredLib )
               parseFile( xRequiredFile, xFile, xRequiredLib )
             else
               @hxNodes[xRequiredLib] = gv_newNode( xRequiredLib, "invhouse", "deepskyblue" )
@@ -140,7 +140,7 @@ class Rb2Gv
           end
 
         end
-        
+
         puts "  + Edge #{xLib} -> #{xRequiredLib}" if DEBUG
         unless @hxEdge.include?( "#{@hxNodes[xLib].id}-#{@hxNodes[xRequiredLib].id}" )
           @oGraph.add_edges( @hxNodes[xLib], @hxNodes[xRequiredLib] )
@@ -148,12 +148,12 @@ class Rb2Gv
         end
       end
     end
-    
+
   end
 
 end
 
-def usage 
+def usage
   puts "usage: ruby2gv [-Tformat] [-ofile] [-h] [-V] script"
   puts "-T, --output-format format    Output format (default: PNG)"
   puts "-o, --output-file file        Output file (default: STDOUT)"
@@ -226,7 +226,7 @@ end
 
 xFile = ARGV[0]
 
-if xFile.nil? == true
+if xFile.nil?
   usage( )
   exit
 end

data/bin/xml2gv

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2005 - 2012 Gregoire Lejeune <gregoire.lejeune@free.fr>
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
@@ -19,7 +19,7 @@ require 'rubygems'
 require 'getoptlong'
 require 'graphviz/xml'
 
-def usage 
+def usage
   puts "usage: xml2gv [-Tformat] [-ofile] [-h] [-V] script"
   puts "-T, --output-format format    Output format (default: PNG)"
   puts "-o, --output-file file        Output file (default: STDOUT)"
@@ -87,7 +87,7 @@ end
 
 xFile = ARGV[0]
 
-if xFile.nil? == true
+if xFile.nil?
   usage( )
   exit
 end