ruby-graphviz 0.9.6 → 0.9.7

data/AUTHORS

@@ -3,6 +3,7 @@ Brandon Coleman <metrix1978@gmail.com>
 Dave Burt <http://github.com/dburt>
 Miguel Cabrera <http://mfcabrera.com>
 obruening <http://github.com/obruening>
+reactive <http://github.com/reactive>
 
 Thanks to :
 

data/{ChangeLog → ChangeLog.rdoc}

@@ -1,3 +1,9 @@
+0.9.7 :
+* Issue #2: Small bug correction in escape_path_containing_blanks (by Andreas Ronge)
+* Issue #4: New find_executable (by reactive)
+* Issue #3: Tempfiles created in current working directory only in Windows
+* Issue #6: Respect "none" format in output options hash and respect String output-filename when the "none" format is selected. See examples/sample27.rb (by Dave Burt)
+
 0.9.6 :
 * jRuby support (by obruening)
 * Issue #1 : STDOUT in binmode

data/examples/sample27.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+puts GraphViz.new(:G){ |g|
+	(g.hello - g.none) [:style => :bold, :label => " dburt says"]
+}.save( :none => String )

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

data/lib/graphviz.rb

@@ -22,9 +22,7 @@ rescue
   IS_JRUBY= false
 end
 
-
 require 'tempfile'
-# require 'mkmf'
 
 require 'graphviz/node'
 require 'graphviz/edge'
@@ -370,15 +368,15 @@ class GraphViz
   
       xDOTScript = "#{@oGraphType} #{@name} {\n" << xDOTScript
 
-      xOutputString = false
-      xOutput = if @format != "none"
+      xOutputString = (@filename == String ||
+        @output.any? {|format, file| file == String })
+
+      xOutput =
+      if @format.to_s == "none" || @output.any? {|fmt, fn| fmt.to_s == "none" }
+        xDOTScript
+      else
         ## Act: Save script and send it to dot
-        t = if /Windows/.match( ENV['OS'] )
-          Tempfile::open( File.basename($0), "." )
-        else
-          Tempfile::open( File.basename($0) )
-        end
-      
+        t = Tempfile::open( File.basename($0) )
         t.print( xDOTScript )
         t.close
         
@@ -392,39 +390,27 @@ class GraphViz
         xOutputWithFile = ""
         xOutputWithoutFile = ""
         unless @format.nil?
-          if @filename.nil?
-            xOutputWithoutFile = "-T#{@format} "
-          elsif @filename == String
+          if @filename.nil? || @filename == String
             xOutputWithoutFile = "-T#{@format} "
-            xOutputString = true
           else
             xOutputWithFile = "-T#{@format} -o#{@filename} "
           end
         end
         @output.each do |format, file|
-          if file.nil?
+          if file.nil? || file == String
             xOutputWithoutFile << "-T#{format} "
-          elsif file == String
-            xOutputWithoutFile << "-T#{format} "
-            xOutputString = true
           else
             xOutputWithFile << "-T#{format} -o#{file} "
           end
         end
         
-        #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 )
-      else
-        xDOTScript
       end
             
       if xOutputString
@@ -662,15 +648,6 @@ class GraphViz
     end
   end
   
-  # def find_executable( ) #:nodoc:
-  #   cmd = find_executable0( @prog )
-  #   if cmd == nil and @path != nil
-  #     __cmd = File.join( @path, @prog )
-  #     cmd = __cmd if File.executable?( __cmd )
-  #   end
-  #   return cmd
-  # end
-  
   # Since this code is an adaptation of Launchy::Application#find_executable
   # (http://copiousfreetime.rubyforge.org/launchy/Launchy/Application.html)
   # it follow is licence :
@@ -687,17 +664,29 @@ 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, add_exe_suffix(bin))
+      file = File.join(path,bin)
       if File.executable?(file) then
         return file
+      elsif RUBY_PLATFORM =~ /mswin|mingw/
+        found_ext = (ENV['PATHEXT'] || '.exe;.bat;.com').split(";").find {|ext| File.executable?(file + ext) }
+        return file + found_ext if found_ext
       end
     end
     return nil
   end
-
+#   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, 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'] )
@@ -710,7 +699,7 @@ class GraphViz
 
 
   def escape_path_containing_blanks(path)
-    path.gsub!(File::ALT_SEPARATOR, File::SEPARATOR)
+    path.gsub!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
     path_elements = path.split(File::SEPARATOR)
     path_elements.map! do |element|
       if element.include?(' ')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-05 00:00:00 +01:00
+date: 2009-12-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,11 +30,11 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-- ChangeLog
+- ChangeLog.rdoc
 - COPYING
 - AUTHORS
 files: 
-- ChangeLog
+- ChangeLog.rdoc
 - COPYING
 - README.rdoc
 - AUTHORS
@@ -87,6 +87,7 @@ files:
 - examples/sample24.rb
 - examples/sample25.rb
 - examples/sample26.rb
+- examples/sample27.rb
 - examples/shapes.rb
 - examples/test.xml
 - examples/testorder.rb