rubydeps 0.2.0 → 0.9.0.pre

data/.gitignore

@@ -17,5 +17,7 @@ tmtags
 coverage
 rdoc
 pkg
+tmp
+*.svg
 
 ## PROJECT::SPECIFIC

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+before_install:
+ - sudo apt-get update
+ - sudo apt-get install graphviz
+rvm:
+  - 1.9.3
+  - 1.9.2

data/Gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gem 'rake-compiler', "~> 0.8.0"
+gem 'rspec', "~> 2.8.0"
+gem 'file_test_helper', "~> 1.0.0"
+gem 'ruby_core_source', "~> 0.1.5"
+gem 'ruby-graphviz', "~> 1.0.5"
+gem 'thor', "~> 0.14.2"

data/Gemfile.lock

@@ -0,0 +1,32 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    diff-lcs (1.1.3)
+    file_test_helper (1.0.2)
+    rake (0.9.2.2)
+    rake-compiler (0.8.0)
+      rake
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    ruby-graphviz (1.0.5)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    thor (0.14.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  file_test_helper (~> 1.0.0)
+  rake-compiler (~> 0.8.0)
+  rspec (~> 2.8.0)
+  ruby-graphviz (~> 1.0.5)
+  ruby_core_source (~> 0.1.5)
+  thor (~> 0.14.2)

data/README.md

@@ -1,8 +1,21 @@
+[![Build Status](https://secure.travis-ci.org/dcadenas/rubydeps.png?branch=master)](http://travis-ci.org/dcadenas/rubydeps)
 rubydeps
 ========
 
 A tool to create class dependency graphs from test suites
 
+Sample output
+-------------
+
+This is the result of running rubydeps on the [Rake](https://github.com/jimweirich/rake) tests:
+
+```bash
+rubydeps testunit --class_name_filter='^Rake'
+```
+
+![Rake dependencies](https://github.com/dcadenas/rubydeps/raw/master/rake-deps.png)
+
+
 Command line usage
 ------------------
 
@@ -12,51 +25,78 @@ Rubydeps will run your test suite to record the call graph of your project and u
 First of all, be sure to step into the root directory of your project, rubydeps searches for ./spec or ./test dirs from there.
 For example, if we want to graph the Rails activemodel dependency graph we'd cd to rails/activemodel and from there we'd write:
 
-    rubydeps testunit #to run Test::Unit tests
+```bash
+rubydeps testunit #to run Test::Unit tests
+```    
+
 or
-    rubydeps rspec #to run RSpec tests
+
+```bash
+rubydeps rspec #to run RSpec tests
+```
+
 or
-    rubydeps rspec2 #to run RSpec 2 tests
+
+```bash
+rubydeps rspec2 #to run RSpec 2 tests
+```
 
 This will output a rubydeps.dot. You can convert the dot file to any image format you like using the dot utility that comes with the graphviz installation e.g.:
 
-    dot -Tsvg rubydeps.dot > rubydeps.svg
+```bash
+dot -Tsvg rubydeps.dot > rubydeps.svg
+```
 
-### Command line options
+Notice that sometimes you may have missing dependencies as we graph the dependencies exercised by your tests so it's a quick bird's eye view to check your project coverage.
 
-The --path-filter option specifies a regexp that matches the path of the files you are interested in analyzing. For example you could have filters like 'project_name/app|project_name/lib' to analyze only code that is located in the 'app' and 'lib' dirs or as an alternative you could just exclude some directory you are not interested using a negative regexp like 'project_name(?!.*test)'
+### Command line options
 
-The --class_name_filter option is similar to the --path_filter options except that the regexp is matched against the class names (i.e. graph node names).
+The `--path_filter` option specifies a regexp that matches the path of the files you are interested in analyzing. For example you could have filters like `'project_name/app|project_name/lib'` to analyze only code that is located in the `app` and `lib` dirs or as an alternative you could just exclude some directory you are not interested using a negative regexp like `'project_name(?!.*test)'`
 
-Library usage
--------------
+The `--class_name_filter` option is similar to the `--path_filter` options except that the regexp is matched against the class names (i.e. graph node names).
 
-Just require rubydeps and pass a block to analyze to the dot_for method.
+The `--to_file` option dumps the dependency graph data to a file so you can do filtering later, it does not create a dot file.
 
-    require 'rubydeps'
+The `--from_file` option is only available when you don't specify a test command. Its argument is the file dumped through `--to_file` in a previous run. When you use this option the tests (or block) are not ran, the dependency graph is loaded directly from the file. This is useful to avoid rerunning code that didn't change just for the purpose of filtering with different combinations e.g.:
 
-    Rubydeps.dot_for(:path_filter => path_filter_regexp, :class_name_filter) do
-      //your code goes here
-    end
+```bash
+rubydeps rspec2 --to_file='dependencies.dump'
+rubydeps --from_file='dependencies.dump' --path_filter='app/models'
+rubydeps --from_file='dependencies.dump' --path_filter='app/models|app/controllers'
+```
 
-Sample output
+Library usage
 -------------
 
-This is the result of running rubydeps on the [Mechanize](http://github.com/tenderlove/mechanize) tests:
+Just require rubydeps and pass a block to analyze to the `analyze` method.
 
-![Mechanize dependencies](https://github.com/dcadenas/rubydeps/raw/master/mechanize-deps.png)
+```ruby
+require 'rubydeps'
 
-Notice that sometimes you may have missing dependencies as we graph the dependencies exercised by your tests so it's a quick bird's eye view to check your project coverage.
+Rubydeps.analyze(:path_filter => path_filter_regexp, :class_name_filter => class_name_filter_regexp, :to_file => "dependencies.dump") do
+    # your code goes here
+end
+```
 
 Installation
 ------------
 
-    gem install rubydeps
+```bash
+gem install rubydeps
+```
+
+Rubydeps now only supports ruby 1.9. If you need 1.8.x support then:
+
+```bash
+gem install rubydeps -v0.2.0
+```
+
+Notice that in 0.2.0 you should use dot_for instead of analyze.
 
 Dependencies
 ------------
 
-* rcov
+* rcov (only for version 0.2.0)
 * graphviz
 * ruby-graphviz
 
@@ -74,6 +114,6 @@ Note on Patches/Pull Requests
 Copyright
 ---------
 
-Copyright (c) 2010 Daniel Cadenas. See LICENSE for details.
+Copyright (c) 2012 Daniel Cadenas. See LICENSE for details.
 
-Development sponsored by [Cubox](http://www.cuboxsa.com)
+Development sponsored by [Cubox](http://www.cuboxlabs.com)

data/Rakefile

@@ -0,0 +1,39 @@
+require 'rubygems'
+require 'rake'
+
+spec = Gem::Specification.new do |s|
+  s.extensions = FileList["ext/**/extconf.rb"]
+  s.name = "rubydeps"
+  s.summary = %Q{A tool to create class dependency graphs from test suites}
+  s.description = %Q{A tool to create class dependency graphs from test suites}
+  s.email = "dcadenas@gmail.com"
+  s.homepage = "http://github.com/dcadenas/rubydeps"
+  s.authors = ["Daniel Cadenas"]
+  s.executables = ["rubydeps"]
+
+  s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+  s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+  s.add_development_dependency(%q<file_test_helper>, ["~> 1.0.0"])
+  s.add_dependency(%q<ruby_core_source>, ["~> 0.1.5"])
+  s.add_dependency(%q<ruby-graphviz>, ["~> 1.0.5"])
+  s.add_dependency(%q<thor>, ["~> 0.14.2"])
+
+  s.version = File.read("VERSION")
+  s.files = `git ls-files`.split
+end
+
+require 'rake/extensiontask'
+Gem::PackageTask.new(spec) do |pkg|
+end
+
+Rake::ExtensionTask.new('call_site_analyzer', spec)
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ["-f progress", "-r ./spec/spec_helper.rb"]
+  t.pattern = 'spec/*_spec.rb'
+end
+
+task :spec => :compile
+
+task :default => :spec

data/VERSION

@@ -0,0 +1 @@
+0.9.0.pre

data/bin/rubydeps

@@ -5,19 +5,28 @@ require 'thor'
 module Rubydeps
   class Runner < Thor
     desc "testunit", "Create the dependency graph after runnning the testunit tests"
+    method_option :to_file, :type => :string
     method_option :path_filter, :type => :string, :default => `pwd`.chomp, :required => true
     method_option :class_name_filter, :type => :string, :default => '', :required => true
     def testunit
-      require 'test/unit'
+      require 'minitest/unit'
+      require 'test/unit/assertions'
+      require 'test/unit/testcase'
+
+      $LOAD_PATH.unshift("#{`pwd`.chomp}/lib")
+
+      #dirty hack so that minitest doesn't install the at_exit hook and we can run the tests in this same process
+      ::MiniTest::Unit.class_variable_set("@@installed_at_exit", true)
 
       (Dir["./test/**/*_test.rb"] + Dir["./test/**/test_*.rb"]).each { |f| load f unless f =~ /^-/  }
 
       create_dependencies_dot_for(options) do
-        ::Test::Unit::AutoRunner.run
+        ::MiniTest::Unit.new.run([])
       end
     end
 
     desc "rspec", "Create the dependency graph after runnning the rspec tests"
+    method_option :to_file, :type => :string
     #TODO: this breaks when using underscores, investigate
     method_option :path_filter, :type => :string, :default => `pwd`.chomp, :required => true
     method_option :class_name_filter, :type => :string, :default => '', :required => true
@@ -33,7 +42,17 @@ module Rubydeps
       end
     end
 
+    desc "", "Loads dependencies saved by a --to_file option in a previous run. Doesn't run tests"
+    method_option :from_file, :type => :string, :required => true
+    method_option :path_filter, :type => :string, :default => `pwd`.chomp, :required => true
+    method_option :class_name_filter, :type => :string, :default => '', :required => true
+    default_task :load_deps
+    def load_deps
+      puts options[:from_file]
+    end
+
     desc "rspec2", "Create the dependency graph after runnning the rspec 2 tests"
+    method_option :to_file, :type => :string
     method_option :path_filter, :type => :string, :default => `pwd`.chomp, :required => true
     method_option :class_name_filter, :type => :string, :default => '', :required => true
     def rspec2
@@ -47,11 +66,14 @@ module Rubydeps
       end
     end
 
-    private 
+  private
 
     def create_dependencies_dot_for(options)
       ARGV.clear
-      Rubydeps.dot_for(:path_filter => Regexp.new(options[:path_filter]), :class_name_filter => Regexp.new(options[:class_name_filter])) do
+      Rubydeps.analyze(:path_filter => Regexp.new(options[:path_filter]),
+                              :class_name_filter => Regexp.new(options[:class_name_filter]),
+                              :to_file => options[:to_file],
+                              :from_file => options[:from_file]) do
         yield
       end
     end
@@ -59,4 +81,3 @@ module Rubydeps
 end
 
 Rubydeps::Runner.start(ARGV)
-

data/ext/call_site_analyzer/call_site_analyzer.c

@@ -0,0 +1,147 @@
+#include <ruby.h>
+#include <vm_core.h>
+#include <iseq.h>
+
+// Fix compile error in ruby 1.9.3
+#ifdef RTYPEDDATA_DATA
+#define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
+#endif
+
+inline static rb_control_frame_t*
+callsite_cfp(rb_control_frame_t* cfp){
+  cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+  if (cfp->iseq != 0 && cfp->pc != 0) {
+    return cfp;
+  }
+  else if (cfp->block_iseq) {
+    while (!cfp->iseq) cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+    return cfp;
+  }
+
+  return NULL;
+}
+
+inline static VALUE
+get_real_class(VALUE klass){
+  if (FL_TEST(klass, FL_SINGLETON)) {
+    VALUE v = rb_iv_get(klass, "__attached__");
+
+    switch (TYPE(v)) {
+      case T_CLASS: case T_MODULE:
+        return v;
+      default:
+        return rb_class_real(klass);
+    }
+  }
+  return rb_class_real(klass);
+}
+
+inline static VALUE
+class_of_obj_or_class(VALUE obj_or_class){
+  switch(TYPE(obj_or_class)){
+    case T_CLASS: case T_MODULE:
+      return obj_or_class;
+    default:
+      return rb_obj_class(obj_or_class);
+  }
+}
+
+static VALUE dependency_array;
+
+inline static void
+add_dependency(VALUE calling_class, VALUE called_class, VALUE called_class_file_path, VALUE is_guess){
+  if(called_class == calling_class){
+    return;
+  }
+
+  const char* called_class_name = rb_class2name(called_class);
+  const char* calling_class_name= rb_class2name(calling_class);
+
+  //update depedency_hash
+  VALUE dependency_hash = rb_ary_entry(dependency_array, 0);
+  VALUE calling_class_array = rb_hash_aref(dependency_hash, rb_str_new2(called_class_name));
+  if(NIL_P(calling_class_array)){
+    calling_class_array = rb_ary_new();
+    rb_hash_aset(dependency_hash, rb_str_new2(called_class_name), calling_class_array);
+  }
+  rb_ary_push(calling_class_array, rb_str_new2(calling_class_name));
+
+  //update class_location_hash
+  if(!NIL_P(called_class_file_path)){
+    VALUE class_location_hash = rb_ary_entry(dependency_array, 1);
+
+    VALUE file_path_array = rb_hash_aref(class_location_hash, rb_str_new2(called_class_name));
+    if(NIL_P(file_path_array)){
+      file_path_array = rb_ary_new();
+      rb_hash_aset(class_location_hash, rb_str_new2(called_class_name), file_path_array);
+    }
+
+    VALUE last_guess = rb_ary_entry(file_path_array, 1);
+    if(last_guess == Qnil || last_guess == Qtrue){
+      rb_ary_store(file_path_array, 0, called_class_file_path);
+      rb_ary_store(file_path_array, 1, is_guess);
+    }
+  }
+}
+
+//NOTE: this function should be as optimized as possible as it's being called on each ruby method call
+static void
+event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE klass){
+  rb_control_frame_t* cfp = GET_THREAD()->cfp;
+  VALUE class_of_called_object = class_of_obj_or_class(self);
+  VALUE called_class = get_real_class(cfp->iseq->klass);
+
+  rb_control_frame_t* previous_cfp = callsite_cfp(cfp);
+  if(previous_cfp != NULL){
+    VALUE calling_class = get_real_class(previous_cfp->iseq->klass);
+
+    if(class_of_called_object != calling_class){
+      if(class_of_called_object != called_class){
+        //we can't assume that the location of class_of_called_object is the same as called_class, so guess == true
+        add_dependency(calling_class, class_of_called_object, cfp->iseq->filepath, Qtrue);
+      } else {
+        add_dependency(calling_class, called_class, cfp->iseq->filepath, Qfalse);
+      }
+    }
+  }
+
+  //this dependency represents inheritance/inclusion/extension
+  if(class_of_called_object != called_class){
+    add_dependency(class_of_called_object, called_class, cfp->iseq->filepath, Qfalse);
+  }
+}
+
+static int uniq_calling_arrays(VALUE called_class, VALUE calling_class_array, VALUE extra){
+  rb_funcall(calling_class_array, rb_intern("uniq!"), 0);
+  return ST_CONTINUE;
+}
+
+static VALUE analyze(VALUE self){
+  if(rb_block_given_p()) {
+    dependency_array = rb_ary_new();
+    rb_global_variable(&dependency_array);
+
+    VALUE dependency_hash = rb_hash_new();
+    rb_ary_push(dependency_array, dependency_hash);
+
+    VALUE class_location_hash = rb_hash_new();
+    rb_ary_push(dependency_array, class_location_hash);
+
+    rb_add_event_hook(event_hook, RUBY_EVENT_CALL, Qnil);
+    rb_yield(Qnil);
+    rb_remove_event_hook(event_hook);
+
+    rb_hash_foreach(rb_ary_entry(dependency_array, 0), uniq_calling_arrays, 0);
+  } else {
+    rb_raise(rb_eArgError, "a block is required");
+  }
+
+  return dependency_array;
+}
+
+static VALUE rb_cCallSiteAnalyzer;
+
+void Init_call_site_analyzer(){
+  rb_cCallSiteAnalyzer = rb_define_module("CallSiteAnalyzer");
+  rb_define_singleton_method(rb_cCallSiteAnalyzer, "analyze", analyze, 0);
+}

data/ext/call_site_analyzer/extconf.rb

@@ -0,0 +1,11 @@
+require 'mkmf'
+require "ruby_core_source"
+
+#comment this line if not debugging
+$CFLAGS='-ggdb -Wall -O0 -pipe'
+
+hdrs = proc { have_header("vm_core.h") and have_header("iseq.h") }
+
+if !Ruby_core_source::create_makefile_with_core(hdrs, "call_site_analyzer")
+  STDERR.print("Makefile creation failed\n")
+end

data/lib/rubydeps.rb

@@ -1,99 +1,91 @@
 require 'graphviz'
 require 'set'
-require 'rcovrt'
-require 'rcov'
+require 'call_site_analyzer'
 
 module Rubydeps
-  def self.dot_for(options = {}, &block_to_analyze)
-    dependencies_hash = hash_for(options, &block_to_analyze)
+  def self.analyze(options = {}, &block_to_analyze)
+    dependency_hash, class_location_hash = dependency_hash_for(options, &block_to_analyze)
 
-    if dependencies_hash
-      g = GraphViz::new( "G", :use => 'dot', :mode => 'major', :rankdir => 'LR', :concentrate => 'true', :fontname => 'Arial')
-      dependencies_hash.each do |k,vs|
-        if !k.empty? && !vs.empty?
-          n1 = g.add_node(k.to_s)
-          if vs.respond_to?(:each)
-            vs.each do |v|
-              unless v.empty?
-                n2 = g.add_node(v.to_s)
-                g.add_edge(n2, n1)
+    if options[:to_file]
+      File.open(options[:to_file], 'wb') do |f|
+        f.write Marshal.dump([dependency_hash, class_location_hash])
+      end
+    else
+      if dependency_hash
+        g = GraphViz::new( "G", :use => 'dot', :mode => 'major', :rankdir => 'LR', :concentrate => 'true', :fontname => 'Arial')
+        dependency_hash.each do |k,vs|
+          if !k.empty? && !vs.empty?
+            n1 = g.add_nodes(k.to_s)
+            if vs.respond_to?(:each)
+              vs.each do |v|
+                unless v.empty?
+                  n2 = g.add_nodes(v.to_s)
+                  g.add_edges(n2, n1)
+                end
               end
             end
           end
         end
-      end
 
-      g.output( :dot => "rubydeps.dot" )
+        g.output( :dot => "rubydeps.dot" )
+      end
     end
   end
 
-  def self.hash_for(options = {}, &block_to_analyze)
-    analyzer = Rcov::CallSiteAnalyzer.new
-    analyzer.run_hooked do
-      block_to_analyze.call
-    end
+  def self.dependency_hash_for(options = {}, &block_to_analyze)
+    dependency_hash, class_location_hash = if options[:from_file]
+                                             Marshal.load(File.binread(options[:from_file]))
+                                           else
+                                             CallSiteAnalyzer.analyze(&block_to_analyze)
+                                           end
 
     path_filter = options.fetch(:path_filter, /.*/)
     class_name_filter = options.fetch(:class_name_filter, /.*/)
+    classes_to_remove = get_classes_to_remove(dependency_hash, class_location_hash, path_filter, class_name_filter)
 
-    dependency_hash = create_dependency_hash(analyzer, path_filter)
-    clean_hash(dependency_hash, class_name_filter)
-  end
+    while(!classes_to_remove.empty?) do
+      klass_to_remove = classes_to_remove.pop
+      classes_calling_class_to_remove = dependency_hash[klass_to_remove]
+      classes_called_by_class_to_remove = dependency_hash.keys.select do |called_class|
+        dependency_hash[called_class].member? klass_to_remove
+      end
 
-private
-  def self.path_filtered_site?(code_site, path_filter)
-    code_site && path_filter =~ File.expand_path(code_site.file)
-  end
+      #transitive dependencies, hmmm, not sure is a good idea
+      #if classes_calling_class_to_remove && !classes_calling_class_to_remove.empty?
+      #  classes_called_by_class_to_remove.each do |called_class|
+      #    dependency_hash[called_class] |= classes_calling_class_to_remove
+      #  end
+      #end
 
-  #we build a hash structured in this way: {"called_class_name1" => ["calling_class_name1", "calling_class_name2"], "called_class_name2" => ...}
-  #TODO: want moar love here
-  def self.create_dependency_hash(analyzer, path_filter)
-    dependency_hash = {}
-    analyzer.analyzed_classes.each do |c|
-      called_class_name = normalize_class_name(c)
-      analyzer.methods_for_class(c).each do |m|
-        called_class_method = "#{c}##{m}"
-        def_site = analyzer.defsite(called_class_method)
-        if path_filtered_site?(def_site, path_filter)
-          calling_class_names = Set.new
-          analyzer.callsites(called_class_method).each do |call_site, _|
-            if path_filtered_site?(call_site, path_filter)
-              calling_class = call_site.calling_class
-              calling_class_name = normalize_class_name(calling_class.to_s)
-              calling_class_names << calling_class_name
-            end
+      dependency_hash.delete(klass_to_remove)
+      classes_called_by_class_to_remove.each do |called_class|
+        if dependency_hash[called_class]
+          dependency_hash[called_class].delete(klass_to_remove)
+
+          if dependency_hash[called_class].empty?
+            dependency_hash.delete(called_class)
           end
-          dependency_hash[called_class_name] ||= Set.new
-          dependency_hash[called_class_name] += calling_class_names
         end
       end
+
     end
 
-    dependency_hash
+    [normalize_class_names(dependency_hash), class_location_hash]
   end
 
-  def self.clean_hash(dependency_hash, class_name_filter)
-    cleaned_hash = {}
-    dependency_hash.each do |called_class_name, calling_class_names|
-      if interesting_class_name(called_class_name) && !dependency_hash[called_class_name].empty? && called_class_name =~ class_name_filter
-        cleaned_hash[called_class_name] = (calling_class_names - [nil]).select do |c|
-          interesting_class_name(c) &&
-          c != called_class_name &&
-          c =~ class_name_filter
-        end
-        cleaned_hash.delete(called_class_name) if cleaned_hash[called_class_name].empty?
-      end
+  def self.get_classes_to_remove(dependency_hash, class_location_hash, path_filter, class_name_filter)
+    (dependency_hash.keys | dependency_hash.values.flatten).reject do |klass|
+      class_name_filter =~ klass &&
+      class_location_hash[klass] && !class_location_hash[klass].empty? && class_location_hash[klass].first =~ path_filter
     end
-
-    cleaned_hash
   end
 
-  def self.interesting_class_name(class_name)
-    !class_name.empty? && class_name != "Rcov::CallSiteAnalyzer" && class_name != "Rcov::DifferentialAnalyzer"
+  def self.normalize_class_names(dependency_hash)
+    Hash[dependency_hash.map { |k,v| [normalize_class_name(k), v.map{|c| c == k ? nil : normalize_class_name(c)}.compact] }]
   end
 
   def self.normalize_class_name(klass)
-    good_class_name = klass.gsub(/#<Class:(.+)>/, '\1')
+    good_class_name = klass.gsub(/#<(.+):(.+)>/, 'Instance of \1')
     good_class_name.gsub!(/\([^\)]*\)/, "")
     good_class_name.gsub(/0x[\da-fA-F]+/, '(hex number)')
   end

data/rubydeps.gemspec

@@ -0,0 +1,57 @@
+Gem::Specification.new do |s|
+  s.name = %q{rubydeps}
+  s.version = "0.9.0.pre"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Daniel Cadenas"]
+  s.date = %q{2010-09-28}
+  s.description = %q{Graphs ruby dependencies}
+  s.email = %q{dcadenas@gmail.com}
+  s.executables = ["rubydeps"]
+  s.extra_rdoc_files = [
+    "LICENSE"
+  ]
+  s.files = [
+    ".document",
+    ".gitignore",
+    "LICENSE",
+    "README.md",
+    "bin/rubydeps",
+    "lib/rubydeps.rb"
+  ]
+  s.homepage = %q{http://github.com/dcadenas/rubydeps}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Graphs ruby depencencies}
+  s.test_files = [
+    "spec/rubydeps_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<file_test_helper>, ["~> 1.0.0"])
+      s.add_dependency(%q<ruby-graphviz>, ["~> 1.0.5"])
+      s.add_dependency(%q<thor>, ["~> 0.14.2"])
+    else
+      s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+      s.add_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_dependency(%q<file_test_helper>, ["~> 1.0.0"])
+      s.add_dependency(%q<ruby-graphviz>, ["~> 1.0.5"])
+      s.add_dependency(%q<thor>, ["~> 0.14.2"])
+    end
+  else
+    s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+    s.add_dependency(%q<rspec>, [">= 2.8.0"])
+    s.add_dependency(%q<file_test_helper>, ["~> 1.0.0"])
+    s.add_dependency(%q<ruby-graphviz>, ["~> 1.0.5"])
+    s.add_dependency(%q<thor>, ["~> 0.14.2"])
+  end
+end
+

data/spec/rubydeps_spec.rb

@@ -1,8 +1,12 @@
 require 'file_test_helper'
 
-class Grandparent
-  def self.class_method
+module GrandparentModule
+  def class_method
   end
+end
+
+class Grandparent
+  extend GrandparentModule
 
   def instance_method
   end
@@ -29,6 +33,14 @@ class Son
   def self.class_method2
   end
 
+  def instance_method_that_calls_parent_class_method
+    Parent.class_method
+  end
+
+  def instance_method_calling_another_instance_method(second_receiver)
+    second_receiver.instance_method
+  end
+
   def instance_method
     Parent.class_method
     Grandparent.class_method
@@ -38,7 +50,7 @@ end
 describe "Rubydeps" do
   include FileTestHelper
   it "should show the class level dependencies" do
-    dependencies = Rubydeps.hash_for do
+    dependencies, _ = ::Rubydeps.dependency_hash_for do
       class IHaveAClassLevelDependency
         Son.class_method
       end
@@ -49,7 +61,7 @@ describe "Rubydeps" do
 
   it "should create a dot file" do
     with_files do
-      dependencies = Rubydeps.dot_for do
+      ::Rubydeps.analyze do
         class IHaveAClassLevelDependency
           Son.class_method
         end
@@ -60,13 +72,13 @@ describe "Rubydeps" do
   end
 
   it "should be idempotent" do
-    Rubydeps.hash_for do
+    ::Rubydeps.dependency_hash_for do
       class IHaveAClassLevelDependency
         Son.class_method
       end
     end
 
-    dependencies = Rubydeps.hash_for do
+    dependencies, _ = ::Rubydeps.dependency_hash_for do
       class IHaveAClassLevelDependency
         Son.class_method
       end
@@ -75,20 +87,34 @@ describe "Rubydeps" do
     dependencies.should == {"Parent"=>["Son"]}
   end
 
+  it "should show the dependency from an object singleton method" do
+    dependencies, _ = ::Rubydeps.dependency_hash_for do
+      s = Son.new
+      def s.attached_method
+        Grandparent.class_method
+      end
+      s.attached_method
+    end
+
+    dependencies.keys.should == ["Grandparent", "GrandparentModule"]
+    dependencies["Grandparent"].should == ["Son"]
+    dependencies["GrandparentModule"].should == ["Grandparent"]
+  end
+
   it "should show the dependencies between the classes inside the block" do
-    dependencies = Rubydeps.hash_for do
-      Son.class_method
+    dependencies, _ = ::Rubydeps.dependency_hash_for do
       Son.new.instance_method
     end
 
-    dependencies.keys.should =~ ["Parent", "Grandparent"]
+    dependencies.keys.should =~ ["Parent", "Grandparent", "GrandparentModule"]
     dependencies["Parent"].should == ["Son"]
     dependencies["Grandparent"].should =~ ["Son", "Parent"]
+    dependencies["GrandparentModule"].should == ["Grandparent"]
   end
 
   sample_dir_structure = {'path1/class_a.rb' => <<-CLASSA,
-                             require 'path1/class_b'
-                             require 'path2/class_c'
+                             require './path1/class_b'
+                             require './path2/class_c'
                              class A
                                def depend_on_b_and_c
                                  B.new.b
@@ -101,9 +127,9 @@ describe "Rubydeps" do
 
   it "should not filter classes when no filter is specified" do
     with_files(sample_dir_structure) do
-      load 'path1/class_a.rb'
+      load './path1/class_a.rb'
 
-      dependencies = Rubydeps.hash_for do
+      dependencies, _ = ::Rubydeps.dependency_hash_for do
         A.new.depend_on_b_and_c
       end
 
@@ -113,9 +139,9 @@ describe "Rubydeps" do
 
   it "should filter classes when a path filter is specified" do
     with_files(sample_dir_structure) do
-      load 'path1/class_a.rb'
+      load './path1/class_a.rb'
 
-      dependencies = Rubydeps.hash_for(:path_filter => /path1/) do
+      dependencies, _ = ::Rubydeps.dependency_hash_for(:path_filter => /path1/) do
         A.new.depend_on_b_and_c
       end
 
@@ -125,13 +151,34 @@ describe "Rubydeps" do
 
   it "should filter classes when a class name filter is specified" do
     with_files(sample_dir_structure) do
-      load 'path1/class_a.rb'
+      load './path1/class_a.rb'
 
-      dependencies = Rubydeps.hash_for(:class_name_filter => /C|A/) do
+      dependencies, _ = ::Rubydeps.dependency_hash_for(:class_name_filter => /C|A/) do
         A.new.depend_on_b_and_c
       end
 
       dependencies.should == {"C"=>["A"]}
     end
   end
+
+  it "should be capable of dumping the whole dependency data into a file for later filtering" do
+    with_files(sample_dir_structure) do
+      load './path1/class_a.rb'
+
+      ::Rubydeps.analyze(:to_file => 'dependencies.file') do
+        A.new.depend_on_b_and_c
+      end
+
+      dependencies, _ = ::Rubydeps.dependency_hash_for(:from_file => 'dependencies.file', :class_name_filter => /C|A/)
+      dependencies.should == {"C"=>["A"]}
+    end
+  end
+
+  it "should create correct dependencies for 2 instance methods called in a row" do
+    dependencies, _ = ::Rubydeps.dependency_hash_for do
+      Son.new.instance_method_calling_another_instance_method(Parent.new)
+    end
+
+    dependencies.should == {"Parent"=>["Son"]}
+  end
 end

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/spec_helper.rb

@@ -2,5 +2,5 @@ require 'rubydeps'
 require 'rspec'
 require 'rspec/autorun'
 
-Rspec.configure do |config|
+RSpec.configure do |config|
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rubydeps
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 6
+  version: 0.9.0.pre
 platform: ruby
 authors: 
 - Daniel Cadenas
@@ -15,113 +10,108 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 -03:00
-default_executable: 
+date: 2012-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake-compiler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 2
-        - 5
-        - 1
-        version: 2.5.1
+        version: 0.8.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: file_test_helper
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 2.8.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ruby-graphviz
+  name: file_test_helper
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        - 17
-        version: 0.9.17
-  type: :runtime
+        version: 1.0.0
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: ruby_core_source
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
+        version: 0.1.5
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: ruby-graphviz
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 0
-        - 14
-        - 2
-        version: 0.14.2
+        version: 1.0.5
   type: :runtime
   version_requirements: *id005
-description: Graphs ruby dependencies
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.14.2
+  type: :runtime
+  version_requirements: *id006
+description: A tool to create class dependency graphs from test suites
 email: dcadenas@gmail.com
 executables: 
 - rubydeps
-extensions: []
+extensions: 
+- ext/call_site_analyzer/extconf.rb
+extra_rdoc_files: []
 
-extra_rdoc_files: 
-- LICENSE
 files: 
 - .document
 - .gitignore
+- .travis.yml
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
+- Rakefile
+- VERSION
 - bin/rubydeps
+- ext/call_site_analyzer/call_site_analyzer.c
+- ext/call_site_analyzer/extconf.rb
+- lib/call_site_analyzer.bundle
 - lib/rubydeps.rb
+- rake-deps.png
+- rubydeps.gemspec
 - spec/rubydeps_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/dcadenas/rubydeps
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -129,26 +119,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
-summary: Graphs ruby depencencies
-test_files: 
-- spec/rubydeps_spec.rb
-- spec/spec_helper.rb
+summary: A tool to create class dependency graphs from test suites
+test_files: []
+