rdot 1.0.4 → 1.1.0.pre3

data/README.md

@@ -113,6 +113,9 @@
                                            'monospace' by default.
             --font-size=size             Font size for main text (pt).
                                            9 by default.
+
+            --graph-splines=mode         Edges form in graph.
+                                           'spline' by default.
     Colors:
       May be RGB value or name from X11 scheme,
       see http://graphviz.org/content/color-names#x11.
@@ -136,7 +139,7 @@
             --color-module-preloaded=color
                                          Background color of preloaded module title.
                                            #CCCCEE by default.
-            --color-module-core=color    Background color of core module title.
+            --color-modude-core=color    Background color of core modude title.
                                            #DDDDFF by default.
             --color-protected=color      Background color for protected methods.
                                            #EEEEEE by default.

data/bin/rbdot

@@ -0,0 +1,4 @@
+#!/usr/bin/ruby
+# encoding: utf-8
+
+

data/bin/rdot

@@ -385,6 +385,24 @@ else
       options[:node_fontsize] = value
     end
 
+    o.separator ''
+
+    o.on '--graph-splines', '=mode',
+        [
+          'none',
+          'line',
+          'polyline',
+          'curved',
+          'ortho',
+          'spline',
+          'true',
+          'false'
+        ],
+        'Edges form in graph.',
+        "  '#{RDot::defaults[:graph_splines]}' by default." do |value|
+      options[:graph_splines] = value
+    end
+
     o.separator "Colors:\n" +
         '  May by RGB value or name from X11 scheme,' + "\n" +
         '  see http://graphviz.org/content/color-names#x11.'
@@ -435,8 +453,8 @@ else
       options[:color_module_preloaded] = value
     end
 
-    o.on '--color-module-core', '=color', String,
-        'Background color of core module title.',
+    o.on '--color-modude-core', '=color', String,
+        'Background color of core modude title.',
         "  #{RDot::defaults[:color_module_core]} by default." do |value|
       options[:color_module_core] = value
     end

data/lib/rbdot.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+
+require 'rdot-common'
+
+module Kernel
+
+  alias :rbdot_original_require :require
+
+  def require lib
+    result = rbdot_original_require lib
+  end
+
+  private :rbdot_original_require, :require
+
+end
+
+module RbDot
+
+  EXTENSIONS = ['.rb', '.so', '.o', '.dll']
+
+  class << self
+
+    def find_file name
+      case File.extname(name).downcase
+      when *EXTENSIONS
+        return name
+      else
+        EXTENSIONS.each do |ext|
+          fn = name + ext
+          $:.each do |path|
+            if File.exists?(File.join(path, fn))
+              return fn
+            end
+          end
+        end
+      end
+      nil
+    end
+
+    def register_link from_file, from_line, to
+      @links ||= []
+      link = {
+        :from => {
+                  :file => RDot.get_file(from_file),
+                  :line => from_line
+                 },
+        :to => find_file(to)
+      }
+      @links << link
+    end
+
+  end
+
+end

data/lib/rdot-common.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+module RDot
+
+  VERSION = '1.1.0'
+
+  class << self
+
+    def get_file file
+      src = File.expand_path file
+      $:.each do |dir|
+        dir = File.expand_path dir
+        len = dir.length
+        if src[0...len] == dir
+          src = src[len..-1]
+          if src[0] == '/'
+            src = src[1..-1]
+          end
+          return src
+        end
+      end
+      return file
+    end
+
+  end
+
+end

data/lib/rdot.rb

@@ -2,6 +2,7 @@
 
 require 'is/monkey/sandbox'
 require 'is/monkey/namespace'
+require 'rdot-common'
 
 # @private
 class Module
@@ -69,8 +70,6 @@ end
 
 module RDot
 
-  VERSION = '1.0.4'
-
   class << self
 
     # @private
@@ -86,23 +85,6 @@ module RDot
       end
     end
 
-    # @private
-    def get_file file
-      src = File.expand_path file
-      $:.each do |dir|
-        dir = File.expand_path dir
-        len = dir.length
-        if src[0...len] == dir
-          src = src[len..-1]
-          if src[0] == '/'
-            src = src[1..-1]
-          end
-          return src
-        end
-      end
-      return file
-    end
-
     # @private
     def get_method_object mod, scope, name
       case scope
@@ -313,8 +295,10 @@ module RDot
       result[:module] = base[:module]
       result[:superclass] = base[:superclass]
       result[:nested] = base[:nested]
-      result[:included] = base[:included] - other[:included]
-      result[:extended] = base[:extended] - other[:extended]
+      result[:included] = base[:included] # - other[:included]
+      test_included = base[:included] - other[:included]
+      result[:extended] = base[:extended] # - other[:extended]
+      test_extended = base[:extended] - other[:extended]
       result[:constants] = {}
       if base[:constants]
         base[:constants].each do |c|
@@ -342,7 +326,7 @@ module RDot
           end
         end
       end
-      if result[:included].empty? && result[:extended].empty? &&
+      if test_included.empty? && test_extended.empty? &&
           result[:constants].empty? && result[:class].nil? &&
           result[:instance].nil?
         nil
@@ -396,21 +380,31 @@ module RDot
         :graph_label                    => 'RDot Graph',
         :node_fontname                  => 'monospace',
         :node_fontsize                  => 9,
-        :color_class                    => '#BBFFBB',
-        :color_class_preloaded          => '#CCEECC',
-        :color_class_core               => '#DDFF99',
-        :color_exception                => '#FFBBBB',
-        :color_exception_preloaded      => '#EECCCC',
-        :color_exception_core           => '#FFDD99',
-        :color_module                   => '#BBBBFF',
-        :color_module_preloaded         => '#CCCCEE',
-        :color_module_core              => '#99DDFF',
+        :color_class                    => '#77FF77',
+        :color_class_preloaded          => '#AAFFAA',
+        :color_class_core               => '#DDFFDD',
+        :color_exception                => '#FF7777',
+        :color_exception_preloaded      => '#FFAAAA',
+        :color_exception_core           => '#FFDDDD',
+        :color_module                   => '#9999FF',
+        :color_module_preloaded         => '#BBBBFF',
+        :color_module_core              => '#DDDDFF',
+#         :color_class                    => '#BBFFBB',
+#         :color_class_preloaded          => '#CCEECC',
+#         :color_class_core               => '#DDFF99',
+#         :color_exception                => '#FFBBBB',
+#         :color_exception_preloaded      => '#EECCCC',
+#         :color_exception_core           => '#FFDD99',
+#         :color_module                   => '#BBBBFF',
+#         :color_module_preloaded         => '#CCCCEE',
+#         :color_module_core              => '#99DDFF',
         :color_protected                => '#EEEEEE',
         :color_private                  => '#DDDDDD',
         :color_inherited                => '#0000FF',
         :color_included                 => '#00AAFF',
         :color_extended                 => '#AA00FF',
-        :color_nested                   => '#EEEEEE'
+        :color_nested                   => '#EEEEEE',
+        :graph_splines                  => 'spline'
       }
     end
 
@@ -616,16 +610,19 @@ module RDot
       result << node_name(name) + '['
       result << '  label=<' + node_label(name, m, opts) + '>'
       result << '];'
+      if opts[:hide_nested] || ! m[:module].namespace #) && ! (Class === m[:module]) && ! (m[:module] == Kernel)
+        result << node_name(name) + ' -> nullnode[color=transparent,minlen=0,weight=1];'
+      end
       if m[:nested] && ! opts[:hide_nested]
         ns = find_module space, m[:nested]
         result << dot_module(space, m[:nested], ns, opts)
-        @nested << node_name(m[:nested]) + ' -> ' + node_name(name) + ';'
+        @nested << node_name(name) + ' -> ' + node_name(m[:nested]) + ';'
       end
       if ! opts[:hide_extended]
         m[:extended].each do |e|
           ext = find_module space, e
           result << dot_module(space, e, ext, opts)
-          @extended << node_name(e) + ' -> ' + node_name(name) + ';'
+          @extended << node_name(name) + ' -> ' + node_name(e) + ';'
         end
       end
       if ! opts[:hide_included]
@@ -633,13 +630,13 @@ module RDot
           next if m[:module].name == 'CMath' && i == 'Math'
           inc = find_module space, i
           result << dot_module(space, i, inc, opts)
-          @included << node_name(i) + ' -> ' + node_name(name) + ';'
+          @included << node_name(name) + ' -> ' + node_name(i) + ';'
         end
       end
       if m[:superclass]
         spc = find_module space, m[:superclass]
         result << dot_module(space, m[:superclass], spc, opts)
-        @inherited << node_name(m[:superclass]) + ' -> ' + node_name(name) + ';'
+        @inherited << node_name(name) + ' -> ' + node_name(m[:superclass]) + ';'
       end
       result.join "\n  "
     end
@@ -686,9 +683,9 @@ module RDot
       result = []
       result << 'digraph graph_RDot{'
       result << '  graph['
-      result << '    rankdir=LR,'
-      result << '    splines=true,'
-      result << '    labelloc=t,'
+      result << '    rankdir=RL,'
+      result << '    splines=' + opts[:graph_splines] + ','
+      result << '    labelloc=t,searchsize=1000,'
       result << '    fontname="' + opts[:graph_fontname] + '",'
       result << '    fontsize=' + opts[:graph_fontsize].to_s + ','
       result << '    label="' + opts[:graph_label] + '"'
@@ -699,10 +696,12 @@ module RDot
       result << '    fontsize=' + opts[:node_fontsize].to_s + ''
       result << '  ];'
       result << '  edge['
-      result << '    dir=back,'
-      result << '    arrowtail=vee,'
+#      result << '    dir=back,'
+#      result << '    arrowhead=vee,'
       result << '    penwidth=0.5, arrowsize=0.5'
       result << '  ];'
+      result << '  nullnode[label=""];'
+#      result << '  nullnode -> ' + node_name('Kernel') + '[color=yellow,weight=0,minlen=0];'
       @processed = []
       @nested = []
       @extended = []
@@ -715,7 +714,7 @@ module RDot
       result << '  subgraph subNested{'
       result << '    edge['
       result << '      color="' + opts[:color_nested] + '",'
-      result << '      weight=8,'
+      result << '      weight=1,'
       result << '      minlen=0'
       result << '    ];'
       result << '    ' + @nested.join("\n    ")
@@ -748,7 +747,7 @@ module RDot
       result.join "\n"
     end
 
-    private :get_file, :get_method_object, :get_module, :add_method,
+    private :get_method_object, :get_module, :add_method,
         :add_module, :diff_module, :find_module, :dot_module, :node_name,
         :node_color, :node_label, :module_kind, :dot_constants, :dot_scope,
         :module_stage, :escape

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rdot
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.1.0.pre3
+  prerelease: 6
 platform: ruby
 authors:
 - Ivan Shikhalev
@@ -31,12 +31,16 @@ description: GraphViz diagrams for Ruby classes.
 email: shikhalev@gmail.com
 executables:
 - rdot
+- rbdot
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/rbdot.rb
 - lib/rdot.rb
+- lib/rdot-common.rb
 - README.md
 - bin/rdot
+- bin/rbdot
 - .yardopts
 homepage: https://github.com/shikhalev/rdot
 licenses:
@@ -54,9 +58,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25