kefka 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/app.rb

@@ -12,21 +12,36 @@ end
 get '/callgraph' do
   content_type :json
 
-  path = "examples/sample_a.rb"
+  path = "#{File.expand_path(File.dirname(__FILE__))}/examples/sample_a.rb"
   file = File.open(path)
 
   @tracer = Kefka::Tracer.new
   @tracer.trace(file, :callgraph_handler)
 
+  # input code
+  code = CodeRay.scan(@tracer.code, :ruby).div(:line_numbers => :table)
+
   graph = @tracer.method_graph
+
+  # output call graph using dot if graphviz is installed
+  if graphviz_installed = system("which dot")
+    graph.write_to_graphic_file("png", "#{File.expand_path(File.dirname(__FILE__))}/public/graph")
+  end
+
+  # html code graph
   graph.vertices.each { |method| method.format = :html }
-  graph.to_json
+
+  {
+    :code => code,
+    :graphviz_installed => graphviz_installed,
+    :graph => graph
+  }.to_json
 end
 
 get '/locals' do
   content_type :json
 
-  path = "examples/sample_a.rb"
+  path = "#{File.expand_path(File.dirname(__FILE__))}/examples/sample_a.rb"
   file = File.open(path)
 
   tracer = Kefka::Tracer.new

data/kefka.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "kefka"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reginald Tan"]
-  s.date = "2012-07-30"
+  s.date = "2012-08-12"
   s.description = " It traces the execution path of a program and displays the source code of each method call in the callgraph "
   s.email = "redge.tan@gmail.com"
   s.executables = ["kefka"]

data/lib/kefka.rb

@@ -22,12 +22,10 @@ class Kefka
     end
 
     def source_location
-      return nil unless @file && @line
       [@file,@line]
     end
 
     def end_line
-      return nil unless @line && source
       @line + source.lines.count - 1
     end
 
@@ -61,6 +59,14 @@ class Kefka
       "#{classname} #{id}"
     end
 
+    def eql?(other)
+      self.key == other.key
+    end
+
+    def hash
+      [@file,@line].hash
+    end
+
     def to_json(*a)
       {
         :classname => @classname,
@@ -97,7 +103,8 @@ class Kefka
 
   class Tracer
 
-    attr_reader :method_table, :local_values, :logger, :callstack, :method_graph
+    attr_reader :local_values, :logger, :callstack, :method_graph,
+                :code
 
     def initialize(log_level = Logger::INFO)
       @method_graph = MethodGraph.new
@@ -108,17 +115,21 @@ class Kefka
       @logger.level = log_level
     end
 
+    def get_locals(target)
+      target.eval("local_variables")
+    end
+
+    def deep_copy(val)
+      Marshal.load(Marshal.dump(val))
+    rescue TypeError
+      "_unknown_"
+    end
+
     def get_values_of_locals_from_binding(target)
-      locals = target.eval("local_variables")
+      locals = get_locals(target)
       locals.inject({}) do |result,l|
         val = target.eval(l.to_s)
-        val = begin
-                # deep copy
-                Marshal.load(Marshal.dump(val)) if val
-              rescue TypeError
-                "_unknown_"
-              end
-
+        val = deep_copy(val)
         result.merge!({ l => val })
         result
       end
@@ -193,12 +204,17 @@ class Kefka
       end
     end
 
+    def print_callgraph
+      public_dir = "#{File.expand_path(File.dirname(__FILE__))}/../public"
+      @method_graph.write_to_graphic_file("png", "#{public_dir}/graph")
+    end
+
     def trace(file_path, handler = :callgraph_handler)
       file = File.open(file_path)
 
       thread = Thread.new {
-        code = file.read
-        eval(code, TOPLEVEL_BINDING, file.path, 1)
+        @code = file.read
+        eval(@code, TOPLEVEL_BINDING, file.path, 1)
       }
 
       thread.set_trace_func method(handler).to_proc

data/public/javascripts/app.js

@@ -5,22 +5,31 @@ var jqSelectorEscape = function(text) {
 var createCodeBubbles = function(data) {
   console.log(data);
 
-  var methodGraph = data;
+  var input = data.code;
+
+  $("div#input").last().append(input);
+
+  if (data.graphviz_installed == true) {
+    $("div#callGraph").last().append("<img src='graph.png'/>");
+  } else {
+    $("div#callGraph").last().append("Graphviz visualization not Available. Install Graphviz to enable it.");
+  }
+
+  var codeGraph = data.graph;
 
   var xPos = 0;
-  var yPos = 0;
   var bubbleDiv, $bubble, $code,
       key, header,
       lineCount, column;
 
-  var methods = methodGraph.vertices;
+  var methods = codeGraph.vertices;
 
   for (var i = 0; i < methods.length; i++ )
   {
     bubbleDiv = "<div class='bubble'></div>";
-    $(bubbleDiv).appendTo("#methodGraph");
+    $(bubbleDiv).appendTo("#codeGraph");
 
-    $bubble = $("#methodGraph .bubble").last();
+    $bubble = $("#codeGraph .bubble").last();
     $bubble.append(methods[i].source);
 
     // set id for bubble table
@@ -36,11 +45,8 @@ var createCodeBubbles = function(data) {
     //xPos = $callerBubble.position().left + 200;
 
     // position bubble table
-    $bubble.css("position", "absolute")
-           .css("left", xPos)
-           .css("top",  yPos);
-
-    yPos += $bubble.height();
+    $bubble.css("position", "relative")
+           .css("left", xPos);
 
     // add column for displaying local values
     lineCount = $bubble.find("td.line-numbers a").length;

data/views/index.erb

@@ -11,7 +11,18 @@ Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   </head>
 
   <body>
-    <div id="methodGraph">
+    <h1 id="input_header">Input</h1>
+    <div id="input">
+
+    </div>
+
+    <h1 id="codegraph_header">Graphviz CallGraph</h1>
+    <div id="callGraph">
+
+    </div>
+
+    <h1 id="codegraph_header">CodeGraph</h1>
+    <div id="codeGraph">
 
     </div>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kefka
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70228522339920 !ruby/object:Gem::Requirement
+  requirement: &70273937010140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70228522339920
+  version_requirements: *70273937010140
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70228522338980 !ruby/object:Gem::Requirement
+  requirement: &70273937009600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70228522338980
+  version_requirements: *70273937009600
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70228522338180 !ruby/object:Gem::Requirement
+  requirement: &70273937008940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70228522338180
+  version_requirements: *70273937008940
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &70228522337200 !ruby/object:Gem::Requirement
+  requirement: &70273936990620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70228522337200
+  version_requirements: *70273936990620
 - !ruby/object:Gem::Dependency
   name: rgl
-  requirement: &70228522336240 !ruby/object:Gem::Requirement
+  requirement: &70273936989280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70228522336240
+  version_requirements: *70273936989280
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70228522335260 !ruby/object:Gem::Requirement
+  requirement: &70273936987380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228522335260
+  version_requirements: *70273936987380
 - !ruby/object:Gem::Dependency
   name: pry-doc
-  requirement: &70228522334380 !ruby/object:Gem::Requirement
+  requirement: &70273936986160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228522334380
+  version_requirements: *70273936986160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70228522333560 !ruby/object:Gem::Requirement
+  requirement: &70273936984420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228522333560
+  version_requirements: *70273936984420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70228522332680 !ruby/object:Gem::Requirement
+  requirement: &70273936983420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228522332680
+  version_requirements: *70273936983420
 description: ! ' It traces the execution path of a program and displays the source
   code of each method call in the callgraph '
 email: redge.tan@gmail.com
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2834341029582018531
+      hash: -1427345181685482934
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: