codegraph 0.7.4 → 0.7.5

data/gemspec

@@ -2,15 +2,17 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name              = "codegraph"
-  s.version           = "0.7.4"
+  s.version           = "0.7.5"
   s.date              = Time.new.to_s
   s.platform          = Gem::Platform::RUBY
   s.bindir            = 'bin'
   s.files             = ["lib/codegraph.rb","bin/codegraph"] + ["gemspec","LICENSE"]
   s.executables       << 'codegraph'
   s.add_dependency('rgl')
+  s.add_dependency('asciify')
   s.rubyforge_project = "codegraph"
-  s.description       = "Display functional dependencies in source code (C, Fortran, PHP, Perl)."
+  s.description       = "Display functional dependencies in source code (C, Fortran, PHP, Perl).\n" +
+    "Changes (#{s.version}): Use Asciify to get around non-ASCII chars"
   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

@@ -5,8 +5,10 @@ require 'rgl/dot'
 require 'rgl/rdot'
 require 'rgl/traversal'
 require 'thread'
+require 'asciify'
 
-$KCODE="UTF8"
+
+DEBUG = false
 
 class FunctionGraph < RGL::DirectedAdjacencyGraph
    attr_accessor :funx, :internal
@@ -40,6 +42,7 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
    @@internal_funx      = []
    @@matchBeforFuncName = '[^A-z0-9_]\s*'
    @@matchAfterFuncName = ' *\('
+   @@map = Asciify::Mapping.new(:default) 
    
    # Generate the codegraph storage directory
    if not FileTest.directory?(@@codehomedir) 
@@ -68,7 +71,7 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
           funxFile   = "funxnames"
           ctagsKinds = '--c-kinds=f --fortran-kinds=fsp --php-kinds=f --perl-kinds=f'
 
-          puts "Processing #{file} ..." if false
+          puts "Processing #{file} ..." if DEBUG
           basefile   = File.basename(file)
           temfile    = "_" + basefile
           case File.extname(file)
@@ -86,14 +89,14 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
           gen4ctags  = "ctags -x #{ctagsKinds}  #{codehomedir}/#{basefile} | sort -n -k 3"
           command    = [cppCommand,grep].join(";")
 
-          puts command if false
+          puts command if DEBUG
           system(command)
 
           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 false
+            puts name if DEBUG
             line           = line.to_i
             startLineIndex = line - 1
             endLineIndex   = (i+1 < funxLocations.size) ? funxLocations[i+1][2].to_i - 2 : -1
@@ -123,10 +126,10 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
       names = @funx.keys
       @funx.each_pair {|name,body|
 #        threads << Threads.new(name,body,names) {|name,body|
-          puts "Add func: #{name}" if false
+          puts "Add func: #{name}" if DEBUG
           add_vertex(name)
           (names - [name] + @@internal_funx).each { |func|
-            puts body if true
+            puts body if DEBUG
             add_edge("#{name}","#{func}") if/#@@matchBeforFuncName#{func}#@@matchAfterFuncName/.match(body)
           }
         }
@@ -243,8 +246,9 @@ class UpperFunctionGraph < SingleFunctionGraph
          graph.funx.each_pair {|g,gbody|
             # dont scan a function for itself
             next if g == func
-
-            if/#@@matchBeforFuncName#{func}#@@matchAfterFuncName/.match(gbody)
+            puts g if DEBUG
+            puts gbody if DEBUG
+            if/#@@matchBeforFuncName#{func}#@@matchAfterFuncName/.match(Asciify.new(@@map).convert(gbody))
                graph.add_edge(g,func)
                scan(graph,g)
             end
@@ -274,4 +278,3 @@ class EightFunctionGraph < FunctionGraph
     end
   end
 end
-

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Ralf Mueller
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 16:45:59 +01:00
+date: 2011-01-11 14:26:53 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,22 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: Display functional dependencies in source code (C, Fortran, PHP, Perl).
+- !ruby/object:Gem::Dependency 
+  name: asciify
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+description: |-
+  Display functional dependencies in source code (C, Fortran, PHP, Perl).
+  Changes (0.7.5): Use Asciify to get around non-ASCII chars
 email: stark.dreamdetective@gmail.com
 executables: 
 - codegraph