ruby-graphviz 0.9.2 → 0.9.3

data/ChangeLog

@@ -1,3 +1,8 @@
+0.9.3 :
+* Minor bug correction for Windows
+* Use Open3.popen3 if installed, else use IO.popen (by Dave Burt)
+* Add '-', '>' and '>>' has aliases of '<<' to create an edge.
+
 0.9.2 :
 * Escape nodes (by Dave Burt)
 * Handle errors from graphviz command (by Dave Burt)

data/examples/maketest.sh

@@ -22,6 +22,10 @@ ruby sample16.rb
 ruby sample17.rb
 ruby sample18.rb
 ruby sample19.rb
+ruby sample20.rb
+ruby sample21.rb
+ruby sample22.rb
+ruby sample23.rb
 
 ruby testorder.rb $1
 ruby testxml.rb $1

data/examples/sample24.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+GraphViz::new( "G" ) { |g|
+  g.hello << g.world
+  g.bonjour - g.monde
+  g.hola > g.mundo
+  g.holla >> g.welt
+}.output( :path => "/usr/local/bin", :png => "#{$0}.png" )

data/lib/graphviz.rb

@@ -16,7 +16,6 @@
 
 require 'tempfile'
 require 'mkmf'
-require 'open3'
 
 require 'graphviz/node'
 require 'graphviz/edge'
@@ -324,7 +323,7 @@ class GraphViz
     else
       if hOpt.nil? == false and hOpt[0].nil? == false
         hOpt[0].each do |xKey, xValue|
-          xValue = xValue.to_s unless xValue.nil? or xValue.class == Class
+          xValue = xValue.to_s unless xValue.nil? or [Class, TrueClass, FalseClass].include?(xValue.class)
           case xKey.to_s
             when "output"
               warn ":output option is deprecated, please use :<format> => :<file>"
@@ -356,12 +355,14 @@ class GraphViz
       xOutputString = false
       xOutput = if @format != "none"
         ## Act: Save script and send it to dot
-        t = Tempfile::open( File.basename($0) + "." )
+        t = if /Windows/.match( ENV['OS'] )
+          Tempfile::open( File.basename($0), "." )
+        else
+          Tempfile::open( File.basename($0) )
+        end
         t.print( xDOTScript )
         t.close
         
-        #cmd = find_executable( @prog )
-        #cmd = find_executable0( @prog )
         cmd = find_executable( )
         if cmd == nil
           raise StandardError, "GraphViz not installed or #{@prog} not in PATH. Install GraphViz or use the 'path' option"
@@ -390,21 +391,13 @@ class GraphViz
           end
         end
         
-        xCmd = "#{cmd} #{xOutputWithFile} #{xOutputWithoutFile} #{t.path}"
-        
-        #f = IO.popen( xCmd )
-        #print f.readlines
-        #f.close
-        Open3.popen3( xCmd ) do |_, stdout, stderr|
-          errors = stderr.read
-          if errors.blank?
-            stdout.read
-          else
-            raise "Error from graphviz (#{xCmd}):\n#{errors}"
-          end
-        end
+        #xCmd = "#{cmd} #{xOutputWithFile} #{xOutputWithoutFile} #{t.path}"
+        #if /Windows/.match( ENV['OS'] )
+          xCmd = "\"#{cmd}\" #{xOutputWithFile} #{xOutputWithoutFile} #{t.path}"
+        #end
+
+        output_from_command( xCmd )
       else
-        #puts xDOTScript
         xDOTScript
       end
             
@@ -418,6 +411,35 @@ class GraphViz
   
   alias :save :output
   
+  def output_and_errors_from_command(cmd) #:nodoc:
+   unless defined? Open3
+     begin
+       require 'open3'
+       require 'win32/open3'
+     rescue LoadError
+     end
+   end
+   begin
+     Open3.popen3( cmd ) do |stdin, stdout, stderr|
+       stdin.close
+       [stdout.read, stderr.read]
+     end
+   rescue NotImplementedError, NoMethodError
+     IO.popen( cmd ) do |stdout|
+       [stdout.read, nil]
+     end
+   end
+  end
+
+  def output_from_command(cmd) #:nodoc:
+   output, errors = output_and_errors_from_command(cmd)
+   if errors.nil? || errors.strip.empty?
+     output
+   else
+     raise "Error from #{cmd}:\n#{errors}"
+   end
+  end
+  
   # 
   # Get the graph name
   #
@@ -439,6 +461,9 @@ class GraphViz
       return GraphViz::commonGraph( oNode, self ).add_edge( self, oNode )
     end
   end
+  alias :> :<<
+  alias :- :<<
+  alias :>> :<<
   
   def pg #:nodoc:
     @oParentGraph

data/lib/graphviz/constants.rb

@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
 module Constants
-  RGV_VERSION = "0.9.2"
+  RGV_VERSION = "0.9.3"
   
   ## Const: Output formats
   FORMATS = [

data/lib/graphviz/edge.rb

@@ -71,6 +71,10 @@ class GraphViz
       
       GraphViz::commonGraph( oNode, n ).add_edge( n, oNode )
     end
+    alias :> :<<
+    alias :- :<<
+    alias :>> :<<
+    
     #
     # Set edge attributs
     #

data/lib/graphviz/node.rb

@@ -71,6 +71,9 @@ class GraphViz
         return GraphViz::commonGraph( oNode, self ).add_edge( self, oNode )
       end
     end
+    alias :> :<<
+    alias :- :<<
+    alias :>> :<<
     
     #
     # Set node attributs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 +02:00
+date: 2009-10-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,8 @@ files:
 - examples/sample21.rb
 - examples/sample22.rb
 - examples/sample23.rb
+- examples/sample24.rb
+- examples/sample24.rb.png
 - examples/shapes.rb
 - examples/test.xml
 - examples/testorder.rb
@@ -101,8 +103,11 @@ homepage: http://raa.ruby-lang.org/project/ruby-graphviz/
 licenses: []
 
 post_install_message: |+
-  Since version 0.9.2, Ruby/GraphViz use Open3.popen3. 
-  On Windows, you need to install win32-open3
+  
+  Since version 0.9.2, Ruby/GraphViz can use Open3.popen3 (or not)
+  On Windows, you can install 'win32-open3'
+  
+  You need to install GraphViz (http://graphviz.org/) to use this Gem.
   
 rdoc_options: 
 - --title