codegraph 0.7.12 → 0.7.16

data/bin/codegraph

@@ -1,7 +1,4 @@
 #!/usr/bin/env ruby
-require "codegraph"
-require "optparse"
-
 # Which options are availabile ------------------------------------------------
 # Default settings
   $options = {
@@ -14,6 +11,10 @@ require "optparse"
     :excludes => [],
     :debug    => false
   }
+
+require "codegraph"
+require "optparse"
+
 def parse(args)
   OptionParser.new do |opts|
     opts.banner = "Usage: codegraph [options]"
@@ -38,6 +39,15 @@ def parse(args)
       $options[:function] = func
       $options[:mode] = 8
     end
+    opts.on("-C", "--ctags-opts KIND",String) do |opts|
+      $options[:ctagsopts] = opts
+    end
+    opts.on("--match-before REGEXP",String) do |regexp|
+      $options[:matchBefore] = regexp
+    end
+    opts.on("--match-after REGEXP",String) do |regexp|
+      $options[:matchAfter] = regexp
+    end
     opts.on("-F", "--file-list file0,file1,file3", Array,"List of files (alternative \"file0 file1 file3\")") do |filelist|
       filelist.each do |filedesc|
         unless File.exist?(filedesc)
@@ -86,7 +96,7 @@ def parse(args)
 
   if $options[:files].flatten.empty?
     warn 'Please use -F do define input files! Use -h for further help.'
-    exit
+    exit -1
   end
   $options
 end

data/gemspec

@@ -1,8 +1,10 @@
 require 'rubygems'
 
+
+
 spec = Gem::Specification.new do |s|
   s.name              = "codegraph"
-  s.version           = "0.7.12"
+  s.version           = File.open("lib/codegraph.rb").readlines.grep(/VERSION/)[0].split('=').last.chomp.strip.tr("'",'')
   s.date              = Time.new.to_s
   s.platform          = Gem::Platform::RUBY
   s.bindir            = 'bin'

data/lib/codegraph.rb

@@ -4,10 +4,12 @@ require 'rgl/dot'
 require 'rgl/rdot'
 require 'rgl/traversal'
 require 'thread'
+require 'digest'
 require 'asciify'
+require 'json'
 
 module Codegraph
-  VERSION = '0.7.12'
+  VERSION = '0.7.16'
 end
 
 class FunctionGraph < RGL::DirectedAdjacencyGraph
@@ -23,10 +25,14 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
              'label'       => '',
              'fontsize'    => '12'}
 
-   @@home               = `echo $HOME`.chomp
-   @@codehomedir        = "#{@@home}/.codegraph"
-   @@matchBeforFuncName = '[^A-z0-9_]\s*'
-   @@matchAfterFuncName = ' *\('
+   @@home        = ENV['HOME']
+   @@codehomedir = "#{@@home}/.codegraph"
+   @@filesDB     = @@codehomedir+'/filesDB.json'
+   @@funxDB      = @@codehomedir+'/funxDB.json'
+
+   @@matchBeforFuncName = $options[:matchBefor].nil? ? '[^A-z0-9_]\s*': $options[:matchBefor]
+   @@matchAfterFuncName = $options[:matchAfter].nil? ? '( *\(| |$)'   : $options[:matchAfter]
+
    @@map = Asciify::Mapping.new(:default) 
    
    # Generate the codegraph storage directory
@@ -36,10 +42,16 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
 
    def initialize
       super
-      @debug = false
+      @debug   = false
       # the following attribute will hold the functionnames and their bodies
-      @funx = Hash.new
-      @lock = Mutex.new
+      @funx    = Hash.new
+      @lock    = Mutex.new
+      @filesDB = File.exist?(@@filesDB) ? JSON.parse(File.open(@@filesDB).read) : Hash.new
+      @filesCk = @db.hash
+      @funxDB  = File.exist?(@@funxDB) ? JSON.parse(File.open(@@funxDB).read) : Hash.new
+      @funxCk  = @funxDB.hash
+
+      @adds, @excludes = [],[]
    end
    
    # Generates the necessary files:
@@ -52,31 +64,43 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
       filelist.each {|file|
         threads << Thread.new(file, @@codehomedir) {|file,codehomedir|
           funxFile   = "funxnames"
-          ctagsKinds = '--c-kinds=f --fortran-kinds=fsp --php-kinds=f --perl-kinds=f'
+          ctagsKinds = $options[:ctagsopts].nil? ? '--c-kinds=f --fortran-kinds=fsip --php-kinds=f --perl-kinds=f' : $options[:ctagsopts]
 
           puts "Processing #{file} ..." if @debug
-          basefile   = File.basename(file)
-          temfile    = "_" + basefile
-          case File.extname(file)
-          when '.c','.h' 
-            cppCommand = "cpp -w -fpreprocessed -E  -fdirectives-only #{file}  -o #{codehomedir}/#{temfile} 2>/dev/null"
-            cppCommand = "cpp -fpreprocessed #{file}  -o #{codehomedir}/#{temfile} 2>/dev/null"
-            grep       = "grep -v -e '^$' #{codehomedir}/#{temfile} | grep -v -e '^#' > #{codehomedir}/#{basefile}"
-          when '.f','.f77','.f90','.f95'
-            cppCommand = "cp #{file} #{codehomedir}/#{temfile}"
-            grep       = "grep -v -e '^$' #{codehomedir}/#{temfile} | grep -v -e '^ *!' > #{codehomedir}/#{basefile}"
+          checksum = Digest::SHA256.file(file).hexdigest
+          if @filesDB.has_key?(checksum)
+            code,funxLocations = @filesDB[checksum]
           else
-            cppCommand = "cp #{file} #{codehomedir}/#{temfile}"
-            grep       = "grep -v -e '^$' #{codehomedir}/#{temfile} | grep -v -e '^#' > #{codehomedir}/#{basefile}"
-          end
-          gen4ctags  = "ctags -x #{ctagsKinds}  #{codehomedir}/#{basefile} | sort -n -k 3"
-          command    = [cppCommand,grep].join(";")
+            basefile = File.basename(file)
+            tempfile = "_" + basefile
+            case File.extname(file)
+            when '.c','.h' 
+              cppCommand = "cpp -w -fpreprocessed -E  -fdirectives-only #{file}  -o #{codehomedir}/#{tempfile} 2>/dev/null"
+              cppCommand = "cpp -fpreprocessed #{file}  -o #{codehomedir}/#{tempfile} 2>/dev/null"
+              grep       = "grep -v -e '^$' #{codehomedir}/#{tempfile} | grep -v -e '^#' > #{codehomedir}/#{basefile}"
+            when '.f','.f77','.f90','.f95'
+              cppCommand = "cp #{file} #{codehomedir}/#{tempfile}"
+              grep       = "grep -v -e '^$' #{codehomedir}/#{tempfile} | grep -v -e '^ *!' > #{codehomedir}/#{basefile}"
+            else
+              cppCommand = "cp #{file} #{codehomedir}/#{tempfile}"
+              grep       = "grep -v -e '^$' #{codehomedir}/#{tempfile} | grep -v -e '^#' > #{codehomedir}/#{basefile}"
+            end
+            gen4ctags  = "ctags -x #{ctagsKinds}  #{codehomedir}/#{basefile} | sort -n -k 3"
+            command    = [cppCommand,grep].join(";")
 
-          puts command if @debug
-          system(command)
+            puts gen4ctags if @debug
+            puts command if @debug
+            system(command)
+
+            code          = open(codehomedir+'/'+ File.basename(file)).readlines
+            funxLocations = IO.popen(gen4ctags).readlines.map {|l| l.split[0,4]}
+            @lock.synchronize { @filesDB[checksum] = [code,funxLocations] }
+
+            # cleanup
+            FileUtils.rm("#{codehomedir}/#{tempfile}")
+            FileUtils.rm("#{codehomedir}/#{basefile}")
+          end
 
-          code = open(codehomedir+'/'+ File.basename(file)).readlines
-          funxLocations = IO.popen(gen4ctags).readlines.map {|l| l.split[0,4]}
           funxLocations.each_with_index {|ary,i|
             name, kind, line, file = ary
             puts name if @debug
@@ -92,9 +116,12 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
       }
       threads.each {|t| t.join}
 
+      # update the code database in case of anything new
+      updateFilesDB
+
       if @funx.empty?
-         puts "no functions found"
-         exit
+         warn "no functions found"
+         exit -1
       end
    end
    
@@ -108,16 +135,34 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
       # scan functions for the function names
       names = @funx.keys
       @funx.each_pair {|name,body|
-#        threads << Threads.new(name,body,names) {|name,body|
+#        threads=[];threads << Thread.new(name,body,names) {|name,body,names|
           puts "Add func: #{name}" if @debug
-          add_vertex(name)
-          (names - [name] + @adds).each { |func|
-            puts body if @debug
-            add_edge("#{name}","#{func}") if/#@@matchBeforFuncName#{func}#@@matchAfterFuncName/.match(body)
-          }
-        }
-#      }
-#      threads.each {|t| t.join}
+          # Check if this body is in the funx DB
+          bodyCk = Digest::SHA256.hexdigest(body)
+          if @funxDB.has_key?(bodyCk) and @funxDB[name] == body
+            edges = @funxDB[bodyCk]
+            edges.each {|edge| add_edge(*edge)}
+          else
+            edges = []
+            add_vertex(name)
+            (names - [name] + @adds).each { |func|
+              puts body if @debug and false
+              puts func
+              if/#@@matchBeforFuncName#{func}#@@matchAfterFuncName/.match(body)
+                edge = ["#{name}","#{func}"]
+                add_edge(*edge)
+                edges << edge
+              end
+            }
+#            @lock.synchronize { 
+              @funxDB[bodyCk] = edges
+              @funxDB[name]   = body
+#            }
+          end
+#        }
+      }
+      threads.each {|t| t.join}
+     updateFunxDB
    end
 
    def limit(depth)
@@ -134,7 +179,7 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
    # Creates a simple dot file according to the above <Params>. 
    # Parameters for the nodes are not supported by rgl.
    def to_dot(filename)
-      File.open("#{filename}","w") {|f|
+      File.open(filename,"w") {|f|
          print_dotted_on(Params,f)
       }
    end
@@ -165,7 +210,14 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
       dotty(Params)
       system("rm graph.dot") if File.exist?("graph.dot")
    end
-   private :genFiles
+
+   def updateFilesDB
+      File.open(@@filesDB,"w") {|f| f << JSON.generate(@filesDB)} unless @filesCk == @filesDB.hash
+   end
+   def updateFunxDB
+      File.open(@@funxDB,"w") {|f| f << JSON.generate(@funxDB)} unless @funxCk == @filesDB.hash
+   end
+   private :genFiles,:updateFilesDB,:updateFunxDB
 end
 
 class SingleFunctionGraph < FunctionGraph
@@ -194,8 +246,8 @@ class SingleFunctionGraph < FunctionGraph
       else
          names = graph.funx.keys
          if not names.include?(func)
-            puts "Function #{func} not found."
-            exit
+            warn "Function #{func} not found."
+            exit -1
          end
          @scannednames << f
          body = graph.funx[f]
@@ -222,7 +274,7 @@ class UpperFunctionGraph < SingleFunctionGraph
             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."
-            exit
+            exit -1
          end
          @scannednames << func
          graph.funx.each_pair {|g,gbody|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 12
-  version: 0.7.12
+  - 16
+  version: 0.7.16
 platform: ruby
 authors: 
 - Ralf Mueller
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 09:11:26 +01:00
+date: 2011-10-31 16:30:55 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency