codegraph 0.7.7 → 0.7.8

data/bin/codegraph

@@ -4,8 +4,7 @@ require "getoptlong"
 
 def show_usage
 puts <<-END
-Usage: #{__FILE__}: 
-                    --help, -h   guess what
+Usage: codegraph    --help, -h   guess what
                     
                     --file-list, -F "<list>"
                                  fill the graph with every function, 
@@ -14,9 +13,6 @@ Usage: #{__FILE__}:
                     --function, -f "<funcname>"
                                  take the given func as the root knode
 
-                    --show-body, -s "<funcname>"
-                                 display the function code in the terminal
-                                 
                     --upper-funx, -u "<funcname>"
                                  scan for all funx, which depends directly or 
                                  indirectly on <funcname>
@@ -26,9 +22,6 @@ Usage: #{__FILE__}:
                                  <funcname> AND which call <funcname> 
                                  (in)directly
                                  
-                    --exclude, -x "<list>"
-                                 exclude a list of functions from the graph
-                                 
                     --depth, -d <integer>
                                  Set maximal Graph depth
                                  
@@ -54,12 +47,10 @@ end
 # Which options are availabile ------------------------------------------------
 options = GetoptLong.new(
    ["--help",          "-h", GetoptLong::NO_ARGUMENT],
-   ["--debug",          "-y", GetoptLong::NO_ARGUMENT],
-#   ["--local",         "-l", GetoptLong::NO_ARGUMENT],
-#   ["--source",        "-s", GetoptLong::NO_ARGUMENT],
-#   ["--with-internal", "-w", GetoptLong::NO_ARGUMENT],
+   ["--debug",         "-y", GetoptLong::NO_ARGUMENT],
+#   ["--add",           "-a", GetoptLong::REQUIRED_ARGUMENT],
    ["--function",      "-f", GetoptLong::REQUIRED_ARGUMENT],
-   ["--show-body",     "-s", GetoptLong::REQUIRED_ARGUMENT],
+#   ["--show-body",     "-s", GetoptLong::REQUIRED_ARGUMENT],
    ["--upper-funx",    "-u", GetoptLong::REQUIRED_ARGUMENT],
    ["--8-funx",        "-8", GetoptLong::REQUIRED_ARGUMENT],
    ["--file-list",     "-F", GetoptLong::REQUIRED_ARGUMENT],
@@ -69,8 +60,8 @@ options = GetoptLong.new(
    ["--to-png",        "-P", GetoptLong::REQUIRED_ARGUMENT],
    ["--to-jpg",        "-J", GetoptLong::REQUIRED_ARGUMENT],
    ["--to-dot",        "-D", GetoptLong::REQUIRED_ARGUMENT],
-   ["--to-txt",        "-T", GetoptLong::NO_ARGUMENT],
-   ["--exclude",       "-x", GetoptLong::REQUIRED_ARGUMENT],
+   ["--to-txt",        "-T", GetoptLong::NO_ARGUMENT]
+#   ["--exclude",       "-x", GetoptLong::REQUIRED_ARGUMENT],
 )
 options.ordering = GetoptLong::RETURN_IN_ORDER
 # Default values --------------------------------------------------------------
@@ -81,8 +72,9 @@ internal = false
 filename = ""
 dotfile  = ""
 function = ""
-depth = nil
-exclude  = Array.new
+depth    = nil
+adds     = Array.new
+excludes = Array.new
 files    = Array.new
 debug    = false
 # option parsing --------------------------------------------------------------
@@ -122,8 +114,10 @@ options.each do |opt, arg|
          filename = arg
       when "--to-txt"
          output = "txt"
+      when "--add"
+         adds = arg.split(/ /)
       when "--exclude"
-         exclude = arg.split(/ /)
+         excludes = arg.split(/ /)
       when "--debug"
         debug = true
       else
@@ -156,10 +150,10 @@ end
 g.debug = debug
 
 # Include the internal functions of the language?
-g.internal = internal
+g.adds = adds
 
 # Creates the Knodes/Edges of the graph
-g.fill(files,exclude)
+g.fill(files,excludes)
 
 # Remove edges 
 g.limit(depth) if depth

data/gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name              = "codegraph"
-  s.version           = "0.7.7"
+  s.version           = "0.7.8"
   s.date              = Time.new.to_s
   s.platform          = Gem::Platform::RUBY
   s.bindir            = 'bin'
@@ -11,8 +11,8 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('rgl')
   s.add_dependency('asciify')
   s.rubyforge_project = "codegraph"
-  s.description       = "Display functional dependencies in source code (C, Fortran, PHP, Perl).\n" +
-    "Changes (#{s.version}): --debug opton added"
+  s.description       = "Display functional dependencies in source code (C, Fortran, PHP, Perl).\n"
+#    "Changes (#{s.version}):"
   s.summary           = "Display functional dependencies in source code (C, Fortran, PHP, Perl)"
   s.author            = "Ralf Mueller"
   s.email             = "stark.dreamdetective@gmail.com"

data/lib/codegraph.rb

@@ -7,7 +7,7 @@ require 'thread'
 require 'asciify'
 
 class FunctionGraph < RGL::DirectedAdjacencyGraph
-   attr_accessor :funx, :internal, :debug
+   attr_accessor :funx, :adds, :excludes, :debug
 
    # Theses Parameters are used by interactive representation and for the file
    # generation function to_dot and to_type. They can only be given for the
@@ -35,7 +35,6 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
 
    @@home               = `echo $HOME`.chomp
    @@codehomedir        = "#{@@home}/.codegraph"
-   @@internal_funx      = []
    @@matchBeforFuncName = '[^A-z0-9_]\s*'
    @@matchAfterFuncName = ' *\('
    @@map = Asciify::Mapping.new(:default) 
@@ -51,8 +50,6 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
       # the following attribute will hold the functionnames and their bodies
       @funx = Hash.new
       @lock = Mutex.new
-      # Should the internal functions be displayed?
-      @internal = false
    end
    
    # Generates the necessary files:
@@ -124,7 +121,7 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
 #        threads << Threads.new(name,body,names) {|name,body|
           puts "Add func: #{name}" if @debug
           add_vertex(name)
-          (names - [name] + @@internal_funx).each { |func|
+          (names - [name] + @adds).each { |func|
             puts body if @debug
             add_edge("#{name}","#{func}") if/#@@matchBeforFuncName#{func}#@@matchAfterFuncName/.match(body)
           }
@@ -213,10 +210,10 @@ class SingleFunctionGraph < FunctionGraph
          @scannednames << f
          body = graph.funx[f]
          # scan for any other function in the body of f
-         (names - [f] + @@internal_funx).each {|g|
+         (names - [f] + @adds).each {|g|
             if /#@@matchBeforFuncName#{g}#@@matchAfterFuncName/.match(body) 
                graph.add_edge(f,g)
-               # unless its not an internal function, go downstairs
+               # go downstairs for all functions from the scanned files
                scan(graph,g) if names.include?(g)
             end
          }
@@ -231,11 +228,10 @@ class UpperFunctionGraph < SingleFunctionGraph
    def scan(graph,func)
       if @scannednames.include?(func) 
       else
-         if not (graph.funx.keys + @@internal_funx).include?(func)
-            puts "Function '#{func}' not found. If this is an internal function, " +
+         if not (graph.funx.keys + @adds).include?(func)
+            warn "Function '#{func}' not found. If this is an internal function, " +
                  "please try again with the '-w' option to include the internal " +
                  "funx before scanning."
-            #system("rm ~/.codegraph/all.#{ng} ~/.codegraph/code-names")
             exit
          end
          @scannednames << func

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 7
-  version: 0.7.7
+  - 8
+  version: 0.7.8
 platform: ruby
 authors: 
 - Ralf Mueller
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 12:02:48 +01:00
+date: 2011-01-18 14:41:19 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,9 +43,9 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-description: |-
+description: |
   Display functional dependencies in source code (C, Fortran, PHP, Perl).
-  Changes (0.7.7): --debug opton added
+
 email: stark.dreamdetective@gmail.com
 executables: 
 - codegraph