kurangu 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c878be455c92153388c28789fa52dd75cf8af897
-  data.tar.gz: 11199180b1f492e70c92e479c0435ad4e30c594f
+  metadata.gz: 1edac603765e16e67954a8413fb896f5eb29f3c1
+  data.tar.gz: 08ed42aa75aca7d75d52888bab152a1e4824dbba
 SHA512:
-  metadata.gz: c965377a60f1e88885d69b9a5b092534441ab008c3ed3c439c2534e47f83735b53625c7e588254168c26439ef4a0850fe96045371a1440d9bb76fe75a6a70c32
-  data.tar.gz: 860f00f76c6513fff33f7711a85355388339a69cace2a469664442891edd7ac2dc61e4695f844d85dad71031cf4944fcf880f81de3c1f6365435605f97efb2ce
+  metadata.gz: b9b0bb828692c4f30dfbd53569c97e6f441716e4bc49c89fa028da82e243b4383f87bc7203945632c06f1fcf47d064a951c6ed170ec714f49c1d91d9a0fb6f2a
+  data.tar.gz: 82c27311d8eb3ce022052d5ce04e07f0df6adf9c06efdb961716db9b8dd689bd128df7bfdf01468590e45ccc05722ae82d43dbed2d7fd148e33074d1b212cf7a

data/lib/kurangu.rb

@@ -1,12 +1,15 @@
 require 'rbconfig'
 require 'fileutils'
+require 'open3'
 
 class Kurangu
   def generate_annotations(input_file)
     ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
     trace_file = File.expand_path("lib/trace.rb")
     puts "\ngenerating annotations\n"
-    system(ruby, "-r", trace_file, input_file)
+    Open3.popen2("#{ruby} -r #{trace_file} #{input_file}") {|stdin, stdout, wait_thr|
+      stdin.puts(input_file)
+    }
   end
 
   def print_annotations(paths_file)
@@ -31,7 +34,6 @@ class Kurangu
         original_path = annotation_path.chomp('.annotations')
         annotated_path = "#{original_path}.annotated"
         puts "\ngenerating annotated file #{annotated_path}\n"
-        lines = ["require 'rdl'\n", "require 'types/core'\n"]
         annotations = Hash.new
         File.open(annotation_path, "r") do |f|
           f.each_line do |line|
@@ -40,17 +42,27 @@ class Kurangu
             annotations[index] = "#{split[1]}\n"
           end
         end
-        lines << "\n"
+        lines = []
+        has_types = false
         File.open(original_path, "r") do |f|
           f.each_line.with_index do |line, index|
             whitespace = line.chomp(line.lstrip)
             if annotations.key?(index + 1)
-              lines << "#{whitespace}extend RDL::Annotate\n"
-              lines << "#{whitespace}#{annotations[index + 1]}"
+              if lines.last and lines.last.start_with?('type')
+                has_types = true
+                lines.last = "#{whitespace}#{annotations[index + 1]}"
+              else
+                lines << "#{whitespace}extend RDL::Annotate\n"
+                lines << "#{whitespace}#{annotations[index + 1]}"
+              end
             end
             lines << line
           end
         end
+        if !has_types
+          lines.unshift "require 'types/core'\n\n"
+          lines.unshift "require 'rdl'\n"
+        end
         IO.write(annotated_path, lines.join())
       end
     end

data/lib/trace.rb

@@ -1,16 +1,17 @@
 require 'set'
-require 'yaml'
+
+INPUT_FILE = $stdin.readline.chomp
 
 stack = Hash.new Array.new
 parameter_types = Hash.new Hash.new Set.new
-return_types = Hash.new Array.new
+return_types = Hash.new Set.new
 parameter_list = Hash.new Array.new
 signatures = Hash.new
 paths = Set.new
 
 def generate_signature(line, parameters, parameter_types, return_types)
   joined_parameters = parameters.map { |arg| parameter_types[arg].to_a.join(" or ") }
-  "#{line} type '(#{joined_parameters.join(", ")}) -> #{return_types.join(" or ")}'"
+  "#{line} type '(#{joined_parameters.join(", ")}) -> #{return_types.to_a.join(" or ")}'"
 end
 
 def write_annotations_paths(dir, paths)
@@ -23,31 +24,35 @@ def write_annotations(path, signatures)
 end
 
 trace_return = TracePoint.new(:return) do |t|
-  s = "#{t.defined_class}, :#{t.method_id}"
-  args = stack[s].pop
-  if args
-    args.each do |arg, type|
-      parameter_types[s][arg].add(type)
+  if File.dirname(t.path) == File.dirname(INPUT_FILE)
+    s = "#{t.defined_class}, :#{t.method_id}"
+    args = stack[s].pop
+    if args
+      args.each do |arg, type|
+        parameter_types[s][arg].add(type)
+      end
+      return_types[s].add(t.return_value.class)
+      parameter_list[s] = t.self.method(t.method_id).parameters.map { |a | a[1] }
+      line = t.self.method(t.method_id).source_location[1]
+      signatures[s] = generate_signature(line, parameter_list[s], parameter_types[s], return_types[s])
+      path = "#{t.path}.annotations"
+      dir = File.dirname(t.path)
+      write_annotations_paths(dir, paths.add(path))
+      write_annotations(path, signatures)
     end
-    return_types[s] << t.return_value.class
-    parameter_list[s] = t.self.method(t.method_id).parameters.map { |a | a[1] }
-    line = t.self.method(t.method_id).source_location[1]
-    signatures[s] = generate_signature(line, parameter_list[s], parameter_types[s], return_types[s])
-    path = "#{t.path}.annotations"
-    dir = File.dirname(t.path)
-    write_annotations_paths(dir, paths.add(path))
-    write_annotations(path, signatures)
   end
 end
 
 trace_call = TracePoint.new(:call) do |t|
-  s = "#{t.defined_class}, :#{t.method_id}"
-  args = t.binding.eval("local_variables").inject({}) do |vars, name|
-    value = t.binding.eval name.to_s
-    vars[name] = value.class
-    vars
+  if File.dirname(t.path) == File.dirname(INPUT_FILE)
+    s = "#{t.defined_class}, :#{t.method_id}"
+    args = t.binding.eval("local_variables").inject({}) do |vars, name|
+      value = t.binding.eval name.to_s
+      vars[name] = value.class
+      vars
+    end
+    stack[s] << args
   end
-  stack[s] << args
 end
 
 trace_return.enable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kurangu
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Arpith Siromoney