ruby-graphviz 0.9.5 → 0.9.6

data/AUTHORS

@@ -2,6 +2,7 @@ Gregoire Lejeune <glejeune.lejeune@free.fr>
 Brandon Coleman <metrix1978@gmail.com>
 Dave Burt <http://github.com/dburt>
 Miguel Cabrera <http://mfcabrera.com>
+obruening <http://github.com/obruening>
 
 Thanks to :
 

data/ChangeLog

@@ -1,3 +1,7 @@
+0.9.6 :
+* jRuby support (by obruening)
+* Issue #1 : STDOUT in binmode
+
 0.9.5 :
 * Remove 'mkmf' dependency
 * GraphViz::Edge#[] modification

data/examples/maketest.sh

@@ -1,36 +1,36 @@
 #!/bin/sh
 
 echo "arrowhead.rb"
-ruby arrowhead.rb $1
+ruby arrowhead.rb 
 echo "HTML-Labels.rb"
 ruby HTML-Labels.rb
 echo "p2p.rb"
-ruby p2p.rb $1
+ruby p2p.rb 
 
 echo "sample01.rb"
-ruby sample01.rb $1
+ruby sample01.rb 
 echo "sample02.rb"
-ruby sample02.rb $1
+ruby sample02.rb 
 echo "sample03.rb"
-ruby sample03.rb $1
+ruby sample03.rb 
 echo "sample04.rb"
-ruby sample04.rb $1
+ruby sample04.rb 
 echo "sample05.rb"
-ruby sample05.rb $1
+ruby sample05.rb 
 echo "sample06.rb"
 ruby sample06.rb                   
 echo "sample07.rb"
-ruby sample07.rb $1
+ruby sample07.rb 
 echo "sample08.rb"
-ruby sample08.rb $1
+ruby sample08.rb 
 echo "sample09.rb"
-ruby sample09.rb $1
+ruby sample09.rb 
 echo "sample10.rb"
-ruby sample10.rb $1
+ruby sample10.rb 
 echo "sample11.rb"
-ruby sample11.rb $1
+ruby sample11.rb 
 echo "sample12.rb"
-ruby sample12.rb $1
+ruby sample12.rb 
 echo "sample13.rb"
 ruby sample13.rb
 echo "sample14.rb"
@@ -59,11 +59,11 @@ echo "sample25.rb"
 ruby sample25.rb
 
 echo "shapes.rb"
-ruby shapes.rb $1
+ruby shapes.rb 
 echo "testorder.rb"
-ruby testorder.rb $1
+ruby testorder.rb 
 echo "testxml.rb"
-ruby testxml.rb $1
+ruby testxml.rb 
 
 cd dot
 pwd

data/lib/graphviz.rb

@@ -14,6 +14,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
+
+begin
+  include Java
+  IS_JRUBY = true
+rescue
+  IS_JRUBY= false
+end
+
+
 require 'tempfile'
 # require 'mkmf'
 
@@ -369,6 +378,7 @@ class GraphViz
         else
           Tempfile::open( File.basename($0) )
         end
+      
         t.print( xDOTScript )
         t.close
         
@@ -376,7 +386,9 @@ class GraphViz
         if cmd == nil
           raise StandardError, "GraphViz not installed or #{@prog} not in PATH. Install GraphViz or use the 'path' option"
         end
-        
+
+        cmd = escape_path_containing_blanks(cmd) if IS_JRUBY
+
         xOutputWithFile = ""
         xOutputWithoutFile = ""
         unless @format.nil?
@@ -402,7 +414,12 @@ class GraphViz
         
         #xCmd = "#{cmd} #{xOutputWithFile} #{xOutputWithoutFile} #{t.path}"
         #if /Windows/.match( ENV['OS'] )
+
+        if IS_JRUBY
+          xCmd = "#{cmd} -q#{@errors} #{xOutputWithFile} #{xOutputWithoutFile} #{t.path}"
+        else
           xCmd = "\"#{cmd}\" -q#{@errors} #{xOutputWithFile} #{xOutputWithoutFile} #{t.path}"
+        end
         #end
 
         output_from_command( xCmd )
@@ -419,7 +436,7 @@ class GraphViz
   end
   
   alias :save :output
-  
+
   def output_and_errors_from_command(cmd) #:nodoc:
    unless defined? Open3
      begin
@@ -431,10 +448,12 @@ class GraphViz
    begin
      Open3.popen3( cmd ) do |stdin, stdout, stderr|
        stdin.close
+       stdout.binmode
        [stdout.read, stderr.read]
      end
    rescue NotImplementedError, NoMethodError
      IO.popen( cmd ) do |stdout|
+       stdout.binmode
        [stdout.read, nil]
      end
    end
@@ -660,7 +679,7 @@ class GraphViz
   # purpose with or without fee is hereby granted, provided that the above 
   # copyright notice and this permission notice appear in all copies.
   #
-  # THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL WARRANTIES 
+  # THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES 
   # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
   # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY 
   # SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
@@ -668,14 +687,41 @@ class GraphViz
   # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
   # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   def find_executable(bin = @prog, *paths) #:nodoc:
+  
     paths = ENV['PATH'].split(File::PATH_SEPARATOR) if paths.empty?
     paths.each do |path|
-      file = File.join(path,bin)
+      file = File.join(path, add_exe_suffix(bin))
       if File.executable?(file) then
         return file
       end
     end
     return nil
   end
+
+
+  def add_exe_suffix(prog)
+    if /Windows/.match( ENV['OS'] )
+      suffix = '.exe'
+    else
+      suffix = ''
+    end
+    "#{prog}#{suffix}"
+  end
+
+
+  def escape_path_containing_blanks(path)
+    path.gsub!(File::ALT_SEPARATOR, File::SEPARATOR)
+    path_elements = path.split(File::SEPARATOR)
+    path_elements.map! do |element|
+      if element.include?(' ')
+        "\"#{element}\""
+      else
+        element
+      end
+    end
+    path_elements.join(File::SEPARATOR)
+  end
+
+  
 end
 

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.5"
+  RGV_VERSION = "0.9.6"
   
   ## Const: Output formats
   FORMATS = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 +01:00
+date: 2009-12-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency