test_parser 0.0.3 → 0.0.4

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
 .bundle
+.rvmrc
 Gemfile.lock
 pkg/*

data/.rvmrc.example

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="ruby-1.9.2-p180@test_parser"
+
+#
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficicent compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]] ; then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create use  "$environment_id"
+fi
+
+#
+# If you use an RVM gemset file to install a list of gems (*.gems), you can have
+# it be automatically loaded. Uncomment the following and adjust the filename if
+# necessary.
+#
+# filename=".gems"
+# if [[ -s "$filename" ]] ; then
+#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+# fi
+
+#
+# If you use bundler and would like to run bundle each time you enter the
+# directory, you can uncomment the following code.
+#
+#   # Ensure that Bundler is installed. Install it if it is not.
+#   if ! command -v bundle >/dev/null; then
+#      printf "The rubygem 'bundler' is not installed. Installing it now.\n"
+#      gem install bundler
+#   fi
+#
+#   # Bundle while reducing excess noise.
+#   printf "Bundling your gems. This may take a few minutes on a fresh clone.\n"
+#   bundle | grep -v '^Using ' | grep -v ' is complete' | sed '/^$/d'
+#
+

data/bin/test_parser

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require "test_parser"
-require 'yaml'
+require "test_parser/command_line"
 
-$stdout << TestParser.all_tests(ARGV.last).to_yaml
+TestParser::CommandLine.new(ARGV).run

data/lib/test_parser.rb

@@ -1,25 +1,22 @@
-require 'test_parser/common'
-require 'test_parser/minitest'
-require 'test_parser/rspec'
+require 'test_parser/parser/common'
+require 'test_parser/parser/minitest'
+require 'test_parser/parser/rspec'
 
 module TestParser
 
+  DEFAULT_PARSERS = [Parser::MiniTest, Parser::RSpec]
+
   def all_tests(path, options = {})
-    frameworks = options[:frameworks] ||= [:rspec, :minitest]
-    path = sanitize_path(path)
-    frameworks.collect_concat do |framework|
-      send "#{framework}_tests", path, options[framework]
-    end
-  end
+    parsers = options[:parsers] ||= DEFAULT_PARSERS
+    path    = sanitize_path(path)
+    libs    = options[:libs] || []
 
-  def minitest_tests(path, options = nil)
-    options ||= {}
-    MiniTest.find_tests!(path, options)
-  end
+    libs << 'spec'
+    add_libs_to_load_path(path, libs)
 
-  def rspec_tests(path, options = nil)
-    options ||= {}
-    RSpec.find_tests!(path, options)
+    parsers.collect_concat do |parser|
+      parser.find_tests(path, options[parser.type] || {})
+    end
   end
 
   def require_all(path, glob)
@@ -28,8 +25,19 @@ module TestParser
 
   def sanitize_path(path)
     return path if path.is_a? Pathname
+
     Pathname.new(path).expand_path
   end
 
   extend self
+  
+  private
+  
+  def add_libs_to_load_path(path, libs)
+    libs.each do |lib|
+      dir = (path + lib).expand_path.to_s
+      $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir)
+    end
+  end
+  
 end

data/lib/test_parser/command_line.rb

@@ -0,0 +1,101 @@
+require 'optparse'
+require 'test_parser'
+
+require 'test_parser/test_formatter/yaml'
+
+module TestParser
+  class CommandLine
+
+    attr_reader :stdout, :stderr
+
+    def initialize(options, stdout = $stdout, stderr = $stderr)
+      @stdout, @stderr   = stdout, stderr
+      @registered_values = []
+      @libs              = []
+      configure_options(options)
+    end
+
+    def run
+      tests = TestParser.all_tests(test_suite_path, parse_options)
+      output_stream << format_tests(tests)
+    end
+
+    def parse_options
+      {
+        :libs => @libs
+      }
+    end
+
+    def test_suite_path
+      @test_suite_path || '.'
+    end
+
+    def output_stream
+      $stdout
+    end
+
+    def format_tests(tests)
+      @formater ||= yaml_formatter
+      @formater.format(tests)
+    end
+
+    private
+
+    def yaml_formatter
+      TestFormatter::YAML
+    end
+
+    def configure_options(options)
+      OptionParser.new do |parser|
+        parser.banner = "Usage: test_parser [options] [directory]"
+        
+        parser.on('-I DIRECTORY', 'specify $LOAD_PATH directory (may be used more than once)') do |dir|
+          append_libs(dir)
+        end
+
+        parser.on('-f', '--format FORMATTER', 'Choose a formatter',
+                  '  y[aml] - YAML format') do |o|
+          set_formater(o)
+        end
+
+        parser.on_tail('-h', '--help', "This is it!") do
+          puts parser
+          exit
+        end
+        
+      end.parse!(options)
+
+      extract_test_suite_path(options)
+    end
+
+    def append_libs(libs)
+      @libs += libs.split(':')
+    end
+
+    def extract_test_suite_path(args)
+      @test_suite_path = args.pop
+
+      unless args.empty?
+        log_err "Unknown use for values: #{args.inspect}"
+      end
+    end
+
+    def puts(*args)
+      stdout.puts *args
+    end
+
+    def log_err(*args)
+      stderr.puts *args 
+    end
+
+    def set_formater(format)
+      case format
+      when /y(aml)?/i
+        @formatter = yaml_formatter
+      else
+        log_err "Unknown formatter #{format}"
+      end
+    end
+    
+  end
+end

data/lib/test_parser/parser/common.rb

@@ -0,0 +1,17 @@
+require 'test_parser/test_information'
+
+module TestParser
+  module Parser
+    module Common
+
+      def build_test
+        TestInformation.new(parser_type, identification, snippet_source)
+      end
+
+      def parser_type
+        self.class.type
+      end
+
+    end
+  end
+end

data/lib/test_parser/parser/minitest.rb

@@ -0,0 +1,51 @@
+require 'minitest/unit'
+
+require 'test_parser/parser/common'
+require 'test_parser/extensions/minitest'
+require 'test_parser/snippet_source/method'
+
+module TestParser
+  module Parser
+    class MiniTest
+
+      attr_reader :klass, :test_method
+
+      def self.type
+        :minitest
+      end
+
+      def self.find_tests(path, options = {})
+        glob = options[:glob] || 'test/**/*_test.rb'
+
+        ::MiniTest::Unit.dont_install_at_exit!
+      
+        TestParser.require_all(path, glob)
+
+        ::MiniTest::Unit::TestCase.test_suites.collect_concat do |klass|
+          klass.test_methods.map do |test| 
+            new(klass, test).build_test
+          end
+        end
+      end
+
+      include Common
+
+      def initialize(klass, test_method)
+        @klass, @test_method = klass, test_method
+      end
+
+      def identification
+        "#{klass.name}##{test_method}"
+      end
+
+      def file_name
+        klass.instance_method(test_method).source_location.first
+      end
+
+      def snippet_source
+        @snippet_source ||= SnippetSource::Method.new(file_name, test_method)
+      end
+
+    end
+  end
+end

data/lib/test_parser/parser/rspec.rb

@@ -0,0 +1,78 @@
+require 'rspec/core'
+
+require 'test_parser/parser/common'
+require 'test_parser/extensions/rspec'
+require 'test_parser/snippet_source/line_number'
+
+module TestParser
+  module Parser
+    class RSpec
+
+      attr_reader :example
+
+      def self.type
+        :rspec2
+      end
+
+      def self.find_tests(path, options = {})
+        glob = options[:glob] || 'spec/**/*_spec.rb'
+
+        ::RSpec.with_world ::RSpec::Core::World.new do |world|
+
+          TestParser.require_all(path, glob)
+
+          groups   = world.example_groups
+          examples = groups.collect_concat(&:descendant_filtered_examples)
+          examples.map do |example|
+            new(example).build_test
+          end
+        end
+      end
+
+      include Common
+
+      def initialize(example)
+        @example = example
+      end
+
+      def identification
+        @identification ||= path_to_example.join('/')
+      end
+
+      def snippet_source
+        @snippet_source ||= SnippetSource::LineNumber.new(file_name, line_number)
+      end
+
+      def snippet
+        @snippet ||= snippet_source.snippet
+      end
+
+      def file_name
+        example.file_path
+      end
+
+      def line_number
+        example.metadata[:line_number]
+      end
+
+      private
+
+      def path_to_example
+        example_groups_names + [example_description]
+      end
+
+      def example_groups_names
+        example.example_group.ancestors.map(&:display_name).reverse
+      end
+
+      def example_description
+        unless example.description.empty?
+          example.description
+        else
+          snippet.get_block.to_code
+        end
+      end
+
+    end
+  end
+end

data/lib/test_parser/snippet.rb

@@ -1,10 +1,17 @@
 require 'ruby2ruby'
 
 module TestParser
-  class Snippet < Struct.new(:sexp)
+  class Snippet
+
+    attr_reader :sexp
+
+    def initialize(sexp)
+      raise ArgumentError unless sexp
+      @sexp = sexp
+    end
 
     def to_code
-      @to_code ||= Ruby2Ruby.new.process(self.sexp.deep_clone)
+      @to_code ||= Ruby2Ruby.new.process(sexp.deep_clone)
     end
 
     def get_block

data/lib/test_parser/snippet_source/common.rb

@@ -0,0 +1,13 @@
+require 'test_parser/source_code'
+
+module TestParser
+  module SnippetSource
+    module Common
+
+      def source_code
+        SourceCode.for(file)
+      end
+
+    end  
+  end
+end

data/lib/test_parser/snippet_source/line_number.rb

@@ -0,0 +1,23 @@
+require_relative 'common'
+
+module TestParser
+  module SnippetSource
+    class LineNumber
+      
+      attr_reader :file, :line_number
+
+      include Common
+
+      def initialize(file, line_number)
+        @file, @line_number = file, line_number
+      end
+      
+      def snippet
+        source_code.extract_code_from_line(line_number)
+      rescue NoCodeInLineError
+        raise "File: #{@file}:#{@line_number}"
+      end
+
+    end
+  end
+end

data/lib/test_parser/snippet_source/method.rb

@@ -0,0 +1,22 @@
+require_relative 'common'
+
+module TestParser
+  module SnippetSource
+    class Method
+      
+      attr_reader :file, :method_name
+
+      include Common
+
+      def initialize(file, method_name)
+        @file, @method_name = file, method_name
+      end
+      
+      def snippet
+        source_code.extract_method(method_name)
+      end
+      
+    end
+  end
+end
+

data/lib/test_parser/source_code.rb

@@ -3,6 +3,10 @@ require 'test_parser/snippet'
 
 module TestParser
 
+  SourceCodeError    = Class.new(StandardError)
+  NoMethodFoundError = Class.new(SourceCodeError)
+  NoCodeInLineError  = Class.new(SourceCodeError)
+
   class SourceCode < Snippet
 
     def self.source_codes
@@ -26,15 +30,36 @@ module TestParser
       name        = name.to_sym
       definitions = sexp.enum_for(:each_of_type, :defn)
       method_sexp = definitions.find {|def_sexp| def_sexp[1] == name }
+
+      raise NoMethodFoundError unless method_sexp
+
       Snippet.new(method_sexp)
     end
 
     def extract_code_from_line(line_number)
-      method_calls = sexp.enum_for(:each_of_type, :iter)
-      code_sexp    = method_calls.find {|sexp| sexp[1].line == line_number }
+      
+      code_sexp = find_method_call_with_block(line_number)
+      code_sexp ||= find_method_call_without_block(line_number)
+
+      raise NoCodeInLineError unless code_sexp
+
       Snippet.new(code_sexp)
     end
 
+    private
+    
+    def find_method_call_with_block(line_number)
+      method_calls = sexp.enum_for(:each_of_type, :iter)
+      method_calls.find {|sexp| sexp[1].line == line_number }
+    end
+    
+    def find_method_call_without_block(line_number)
+      method_calls = sexp.enum_for(:each_of_type, :call)
+      method_calls.find do |sexp| 
+        sexp[3][1] && sexp[3][1].line == line_number
+      end
+    end
+    
   end
 
 end

data/lib/test_parser/test_formatter/yaml.rb

@@ -0,0 +1,11 @@
+require 'yaml'
+
+module TestFormatter
+  module YAML
+    extend self
+    
+    def format(tests)
+      tests.to_yaml
+    end
+  end
+end

data/lib/test_parser/test_information.rb

@@ -1,14 +1,20 @@
 module TestParser
-  class TestInformation < Struct.new(:type, :identification, :file, :extras)
+  class TestInformation
+
+    attr_reader :type, :identification, :snippet_source
+
+    def initialize(type, identification, snippet_source)
+      @type           = type
+      @identification = identification
+      @snippet_source = snippet_source
+    end
 
     def snippet
-      source_code = SourceCode.for(file)
-      case type
-      when :rspec2
-        source_code.extract_code_from_line(extras[:line_number])
-      when :minitest
-        source_code.extract_method(extras[:method_name])
-      end
+      snippet_source.snippet
+    end
+
+    def file
+      snippet_source.file
     end
 
   end

data/lib/test_parser/version.rb

@@ -1,3 +1,3 @@
 module TestParser
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/source_code_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'test_parser/source_code'
 
 describe TestParser::SourceCode do
+
   include FakeFS::SpecHelpers
 
   before(:each) do
@@ -18,13 +19,16 @@ describe TestParser::SourceCode do
   end
 
   it 'has the sexp of the original file' do
-    sexp = RubyParser.new.parse standard_class_source
-    TestParser::SourceCode.for('standard_class_source.rb').sexp.should == sexp
+    sexp        = RubyParser.new.parse standard_class_source
+    source_code = TestParser::SourceCode.for('standard_class_source.rb')
+
+    source_code.sexp.should == sexp
   end
 
   describe '.extract_method' do
     it 'finds the method definition from the method name' do
-      snippet = TestParser::SourceCode.for('standard_class_source.rb').extract_method('method')
+      source_code = TestParser::SourceCode.for('standard_class_source.rb')
+      snippet     = source_code.extract_method('method')
       snippet.to_code.should match_code(<<-METHOD)
         def method(some)
           puts some
@@ -35,13 +39,19 @@ describe TestParser::SourceCode do
 
   describe '.extract_code_from_line' do
     it 'finds the line with its block' do
-      snippet = TestParser::SourceCode.for('dsl_source.rb').extract_code_from_line(2)
+      source_code = TestParser::SourceCode.for('dsl_source.rb')
+      snippet     = source_code.extract_code_from_line(2)
       snippet.to_code.should match_code(<<-METHOD)
         method 'ble' do
           testing_something
         end
       METHOD
     end
+    it 'finds the line without its block' do
+      source_code = TestParser::SourceCode.for('dsl_source.rb')
+      snippet     = source_code.extract_code_from_line(5)
+      snippet.to_code.should match_code(%{pending 'ble'})
+    end
   end
 
   def standard_class_source
@@ -60,6 +70,7 @@ describe TestParser::SourceCode do
         method 'ble' do
           testing_something
         end
+        pending "ble"
       end
     SOURCE
   end

data/spec/spec_helper.rb

@@ -2,7 +2,8 @@ require 'bundler'
 Bundler.setup
 Bundler.require :default, :test
 
-Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each {|f| require f }
+support_glob = File.join(File.dirname(__FILE__), 'support', '**', '*.rb')
+Dir[support_glob].each {|f| require f }
 
 require 'fakefs/spec_helpers'
 

data/spec/support/matchers/match_code.rb

@@ -1,10 +1,13 @@
 RSpec::Matchers.define :match_code do |expected|
-  expected_sexp = RubyParser.new.parse(expected)
 
   match do |actual|
-    actual_sexp = actual.sexp if actual.respond_to? :sexp
-    actual_sexp ||= RubyParser.new.parse(actual)
-    expected_sexp == actual_sexp
+    sexp_from(expected) == sexp_from(actual)
+  end
+
+  def sexp_from(obj)
+    return obj.sexp if obj.respond_to? :sexp
+    
+    RubyParser.new.parse(obj)
   end
 
 end

data/spec/test_parser/minitest_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+require 'test_parser/parser/minitest'
+
+describe TestParser::Parser::MiniTest do
+
+  include TestParser::Parser
+
+  describe '.find_tests!' do
+
+    context 'within test_project' do
+
+      before(:all) do
+        @tests = MiniTest.find_tests path_for_test_project
+        @test_identifications = @tests.map(&:identification)
+      end
+
+      it 'finds all the tests' do
+        @tests.should have(2).tests
+      end
+
+      it 'finds normally declared test' do
+        @test_identifications.should include('TestSomething#test_foo')
+        test = @tests[@test_identifications.index('TestSomething#test_foo')]
+
+        expected_file = 'test/example_test.rb'
+
+        test.file.should    == path_for(expected_file)
+        test.snippet.should match_code(snippet_for(expected_file, 'test_foo'))
+      end
+
+      it 'finds module shared tests' do
+        @test_identifications.should include('TestSomething#test_truth')
+        test = @tests[@test_identifications.index('TestSomething#test_truth')]
+
+        expected_file = 'test/test_helper.rb'
+
+        test.file.should    == path_for(expected_file)
+        test.snippet.should match_code(snippet_for(expected_file, 'test_truth'))
+      end
+
+      def path_for(file)
+        path_for_test_project(file).to_s
+      end
+      
+      def snippet_for(file, method_name)
+        TestParser::SourceCode.for(path_for(file)).extract_method(method_name)
+      end
+
+    end
+  end
+end

data/spec/test_parser/rspec_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+require 'test_parser/parser/rspec'
+
+describe TestParser::Parser::RSpec do
+  describe '.find_tests' do
+    context 'within test_project' do
+
+      include TestParser::Parser
+
+      before(:all) do
+        @test_suite = RSpec.find_tests(path_for_test_project)
+        @test_names = @test_suite.map(&:identification)
+      end
+
+      it 'finds all the test_suite' do
+        @test_suite.should have(2).test_suite
+      end
+
+      it 'finds nested test_suite' do
+        @test_names.should include('Life/with death sentence/should(be_alive)')
+        test = @test_suite[@test_names.index('Life/with death sentence/should(be_alive)')]
+
+        test.file.should    == path_for('spec/example_spec.rb')
+        test.snippet.should match_code(snippet_for('spec/example_spec.rb', 11))
+      end
+
+      it 'finds not nested test_suite' do
+        @test_names.should include('Life/actually lives')
+        test = @test_suite[@test_names.index('Life/actually lives')]
+  
+        test.file.should    == path_for('spec/example_spec.rb')
+        test.snippet.should match_code(snippet_for('spec/example_spec.rb', 5))
+      end
+
+      def path_for(file)
+        path_for_test_project(file).to_s
+      end
+      
+      def snippet_for(file, line_number)
+        TestParser::SourceCode.for(path_for(file)).extract_code_from_line(line_number)
+      end
+
+    end
+  end
+end

data/spec/test_parser_spec.rb

@@ -3,58 +3,30 @@ require 'spec_helper'
 require 'test_parser'
 
 describe TestParser do
-  
-  describe ".minitest_tests" do
-    it 'delegates test finding to TestParser::MiniTest' do
-      TestParser::MiniTest.should_receive(:find_tests!).
-        with(path_for_test_project, {}).and_return []
-        
-      TestParser.minitest_tests(path_for_test_project)
-    end
-    it 'passes extra options to TestParser::Minitest' do
-      TestParser::MiniTest.should_receive(:find_tests!).
-        with(path_for_test_project, {:some_option => true}).and_return []
-        
-      TestParser.minitest_tests(path_for_test_project, {:some_option => true})
-    end
-  end
-  
-  describe ".rspec_tests" do
-    it 'delegates test finding to TestParser::RSpec' do
-      TestParser::RSpec.should_receive(:find_tests!).
-        with(path_for_test_project, {}).and_return []
-        
-      TestParser.rspec_tests(path_for_test_project)
-    end
-    it 'passes extra options to TestParser::RSpec' do
-      TestParser::RSpec.should_receive(:find_tests!).
-        with(path_for_test_project, {:some_option => true}).and_return []
-
-      TestParser.rspec_tests(path_for_test_project, {:some_option => true})
-    end
-  end
-
+    
   describe ".all_tests" do
+
     it "collects all the test from the default frameworks" do
-      stub_frameworks
+      stub_frameworks!
 
       tests = TestParser.all_tests(path_for_test_project)
-      tests.should == [:rspec, :minitest]
+      tests.should =~ [:rspec, :minitest]
     end
     
-    context "when :frameworks are specified" do
-      it 'collects only for the given frameworks' do
-        stub_frameworks
+    context "when :parsers are specified" do
+      it 'collects only for the given parsers' do
+        stub_frameworks!
         
-        options = {:frameworks => [:rspec]}
+        options = {:parsers => [TestParser::Parser::RSpec]}
         tests   = TestParser.all_tests(path_for_test_project, options)
         tests.should == [:rspec]
       end
     end
     
-    def stub_frameworks
-      TestParser::RSpec.stub(:find_tests!) { [:rspec]}
-      TestParser::MiniTest.stub(:find_tests!) {[:minitest]}
+    def stub_frameworks!
+      TestParser::Parser::RSpec.stub(:find_tests) { [:rspec]}
+      TestParser::Parser::MiniTest.stub(:find_tests) {[:minitest]}
     end
+
   end
 end

data/test/rspec_test.rb

@@ -14,11 +14,10 @@ class RSpecTest < MiniTest::Unit::TestCase
   include ProjectsPaths
   
   def test_rspec_parsing
-    tests = TestParser::RSpec.find_tests!(path_for_test_project)
+    tests = TestParser::Parser::RSpec.find_tests(path_for_test_project)
     test = tests.first
     assert_equal 'Life/actually lives', test.identification
     assert_equal path_for_test_project('spec/example_spec.rb').to_s, test.file
-    assert_equal 5, test.extras[:line_number]
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: test_parser
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Juan Manuel Barreneche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 -03:00
+date: 2011-02-27 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,25 +69,31 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rvmrc
+- .rvmrc.example
 - Gemfile
 - Rakefile
 - bin/test_parser
 - lib/test_parser.rb
-- lib/test_parser/common.rb
+- lib/test_parser/command_line.rb
 - lib/test_parser/extensions/minitest.rb
 - lib/test_parser/extensions/rspec.rb
-- lib/test_parser/minitest.rb
-- lib/test_parser/rspec.rb
+- lib/test_parser/parser/common.rb
+- lib/test_parser/parser/minitest.rb
+- lib/test_parser/parser/rspec.rb
 - lib/test_parser/snippet.rb
+- lib/test_parser/snippet_source/common.rb
+- lib/test_parser/snippet_source/line_number.rb
+- lib/test_parser/snippet_source/method.rb
 - lib/test_parser/source_code.rb
+- lib/test_parser/test_formatter/yaml.rb
 - lib/test_parser/test_information.rb
 - lib/test_parser/version.rb
-- spec/minitest_spec.rb
-- spec/rspec_spec.rb
 - spec/source_code_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/match_code.rb
 - spec/support/projects_paths.rb
+- spec/test_parser/minitest_spec.rb
+- spec/test_parser/rspec_spec.rb
 - spec/test_parser_spec.rb
 - test/rspec_test.rb
 - test_parser.gemspec
@@ -126,11 +132,11 @@ signing_key:
 specification_version: 3
 summary: Retrieves information of your test suite
 test_files: 
-- spec/minitest_spec.rb
-- spec/rspec_spec.rb
 - spec/source_code_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/match_code.rb
 - spec/support/projects_paths.rb
+- spec/test_parser/minitest_spec.rb
+- spec/test_parser/rspec_spec.rb
 - spec/test_parser_spec.rb
 - test/rspec_test.rb

data/lib/test_parser/common.rb

@@ -1,17 +0,0 @@
-require 'test_parser/source_code'
-require 'test_parser/test_information'
-
-module TestParser
-
-  module Common
-
-    def build_test(extras = {})
-      TestInformation.new(parser_type, test_identification, test_file_name, extras)
-    end
-
-    def test_source_code
-      SourceCode.for(test_file_name)
-    end
-
-  end
-end

data/lib/test_parser/minitest.rb

@@ -1,48 +0,0 @@
-require 'minitest/unit'
-require_relative 'extensions/minitest'
-
-require 'test_parser'
-
-module TestParser
-  class MiniTest
-    attr_reader :klass, :test_method
-
-    def self.find_tests!(path, options = {})
-      glob = options[:glob] || 'test/**/*_test.rb'
-
-      ::MiniTest::Unit.dont_install_at_exit!
-      
-      TestParser.require_all(path, glob)
-
-      ::MiniTest::Unit::TestCase.test_suites.collect_concat do |klass|
-        klass.test_methods.map do |test| 
-          new(klass, test).test_info
-        end
-      end
-    end
-
-    include Common
-
-    def parser_type
-      :minitest
-    end
-
-    def initialize(klass, test_method)
-      @klass, @test_method = klass, test_method
-    end
-
-    def test_info
-      build_test(:method_name => test_method)
-    end
-
-    def test_identification
-      "#{klass.name}##{test_method}"
-    end
-
-    def test_file_name
-      klass.instance_method(test_method).source_location.first
-    end
-
-  end
-
-end

data/lib/test_parser/rspec.rb

@@ -1,68 +0,0 @@
-require 'rspec/core'
-require_relative 'extensions/rspec'
-
-require 'test_parser'
-
-module TestParser
-  class RSpec
-    attr_reader :example
-
-    def self.find_tests!(path, options = {})
-      glob = options[:glob] || 'spec/**/*_spec.rb'
-
-      ::RSpec.with_world ::RSpec::Core::World.new do |world|
-
-        TestParser.require_all(path, glob)
-
-        groups   = world.example_groups
-        examples = groups.collect_concat(&:descendant_filtered_examples)
-        examples.map do |example|
-          new(example).test_info
-        end
-      end
-    end
-
-    include Common
-    
-    def initialize(example)
-      @example = example
-    end
-
-    def parser_type
-      :rspec2
-    end
-
-    def test_info
-      build_test(:line_number => line_number)
-    end
-
-    def test_snippet
-      @test_snippet ||= test_source_code.extract_code_from_line(line_number)
-    end
-
-    def test_file_name
-      example.file_path
-    end
-
-    def test_identification
-      (example_group_names.reverse + [example_description]).join('/')
-    end
-
-    def line_number
-      example.metadata[:line_number]
-    end
-
-    def example_group_names
-      example.example_group.ancestors.map(&:display_name)
-    end
-
-    def example_description
-      unless example.description.empty? 
-        example.description
-      else
-        test_snippet.get_block.to_code
-      end
-    end
-
-  end
-end

data/spec/minitest_spec.rb

@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-require 'test_parser'
-describe TestParser::MiniTest do
-  before(:all) do
-    MiniTest::Unit::TestCase.reset
-  end
-  after(:all) do
-    MiniTest::Unit::TestCase.reset
-  end
-
-  describe '.find_tests!' do
-
-    context 'within test_project' do
-      before(:all) do
-        @tests = TestParser::MiniTest.find_tests! path_for_test_project
-        @test_identifications = @tests.map(&:identification)
-      end
-
-      it 'finds all the tests' do
-        @tests.should have(2).tests
-      end
-
-      it 'finds normally declared test' do
-        @test_identifications.should include('TestSomething#test_foo')
-        test = @tests[@test_identifications.index('TestSomething#test_foo')]
-        test.file.should == (path_for_test_project('test/example_test.rb')).to_s
-        test.extras[:method_name].should == 'test_foo'
-      end
-
-      it 'finds module shared tests' do
-        @test_identifications.should include('TestSomething#test_truth')
-        test = @tests[@test_identifications.index('TestSomething#test_truth')]
-        test.file.should == (path_for_test_project('test/test_helper.rb')).to_s
-        test.extras[:method_name].should == 'test_truth'
-      end
-    end
-  end
-end

data/spec/rspec_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-require 'test_parser/rspec'
-
-describe TestParser::RSpec do
-  describe '.find_test_suite!' do
-    context 'within test_project' do
-
-      before(:all) do
-        @test_suite = TestParser::RSpec.find_tests!(path_for_test_project)
-        @test_names = @test_suite.map(&:identification)
-      end
-
-      it 'finds all the test_suite' do
-        @test_suite.should have(2).test_suite
-      end
-
-      it 'finds nested test_suite' do
-        @test_names.should include('Life/with death sentence/should(be_alive)')
-        test = @test_suite[@test_names.index('Life/with death sentence/should(be_alive)')]
-        test.file.should == (path_for_test_project('spec/example_spec.rb')).to_s
-        test.extras[:line_number].should == 11
-      end
-
-      it 'finds not nested test_suite' do
-        @test_names.should include('Life/actually lives')
-        test = @test_suite[@test_names.index('Life/actually lives')]
-    
-        test.file.should == (path_for_test_project('spec/example_spec.rb')).to_s
-        test.extras[:line_number].should == 5
-      end
-
-    end
-  end
-end