0
@@ -18,6 +18,7 @@ include FileUtils
0
 NAME = "merb-core"
0
 
0
 require "lib/merb-core/version"
0
+require "lib/merb-core/test/run_specs"
0
 
0
 ##############################################################################
0
 # Packaging & Installation
0
@@ -126,37 +127,6 @@ task :aok => [:specs, :rcov]
0
 #   t.spec_files = Dir["spec/**/*_spec.rb"].sort
0
 # end
0
 
0
-require 'open3'
0
-
0
-def run_specs(glob, spec_cmd='spec')
0
-  require "optparse"
0
-  require "spec"
0
-  examples, failures, errors, pending = 0, 0, 0, 0
0
-  Dir[glob].each do |spec|
0
-    response = Open3.popen3("#{spec_cmd} #{File.expand_path(spec)} -f s -c") do |i,o,e|
0
-      while out = o.gets
0
-        STDOUT.puts out
0
-        STDOUT.flush
0
-        if out =~ /\d+ example/
0
-          e, f, p = out.match(/(\d+) examples?, (\d+) failures?(?:, (\d+) pending?)?/)[1..-1]
0
-          examples += e.to_i; failures += f.to_i; pending += p.to_i          
0
-        end
0
-      end
0
-      errors += 1 if e.is_a?(IO)
0
-      STDOUT.puts e.read if e.is_a?(IO)
0
-    end
0
-  end
0
-  puts
0
-  puts "*** TOTALS ***"
0
-  if failures == 0
0
-    print "\e[32m"
0
-  else
0
-    print "\e[31m"
0
-  end
0
-  puts "#{examples} examples, #{failures} failures, #{errors} errors, #{pending} pending"
0
-  print "\e[0m"  
0
-end
0
-
0
 def setup_specs(name, spec_cmd='spec')
0
   desc "Run all specs (#{name})"
0
   task "specs:#{name}" do

0
@@ -22,28 +22,28 @@ class RspecCommandError < StandardError; end
0
 class Autotest::MerbsourceRspec < Autotest
0
   
0
   Autotest.add_hook :initialize do |at|
0
-    %w{.git}.each {|exception| at.exceptions.push exception}
0
-  end
0
-  
0
-  Autotest.add_hook :run do |at|
0
+    at.clear_mappings
0
+    at.add_exception(/\.git/)
0
+
0
     # See above for human-readable descriptions of these rules
0
-      # 1 above
0
-      at.add_mapping(%r{^spec/.*_spec\.rb$}) { |filename, _| filename}
0
+    # 1 above
0
+    at.add_mapping(%r{^spec/.*_spec\.rb$}) { |filename, _| filename}
0
 
0
-      # 2 above
0
-      at.add_mapping(%r{^spec/(.*)/spec_helper\.rb$}) { |_, m| at.files_matching %r{^spec/#{m[1]}/.*_spec\.rb$} }
0
+    # 2 above
0
+    at.add_mapping(%r{^spec/spec_helper\.rb$}) { |_, m| at.files_matching %r{^spec/.*_spec\.rb$} }
0
+    at.add_mapping(%r{^spec/(.*)/spec_helper\.rb$}) { |_, m| at.files_matching %r{^spec/#{m[1]}/.*_spec\.rb$} }
0
 
0
-      # 3 above
0
-      at.add_mapping(%r{^lib/merb-core/controller/([^/]*)\.rb$}) { |_, m| at.files_matching %r{^spec\/(public|private)\/#{m[1]}\/.*_spec\.rb} }
0
+    # 3 above
0
+    at.add_mapping(%r{^lib/merb-core/controller/([^/]*)\.rb$}) { |_, m| at.files_matching %r{^spec/(public|private)/abstract_controller/.*_spec\.rb} }
0
 
0
-      # 4 above
0
-      at.add_mapping(%r{^lib/merb-core/controller/mixins/([^/]*)\.rb$}) { |_, m| at.files_matching %r{^spec/(public|private)/(abstract_)?controller/#{m[1]}_spec\.rb} }
0
+    # 4 above
0
+    at.add_mapping(%r{^lib/merb-core/controller/mixins/([^/]*)\.rb$}) { |_, m| at.files_matching %r{^spec/(public|private)/(abstract_)?controller/#{m[1]}_spec\.rb} }
0
 
0
-      # 5 above
0
-      at.add_mapping(%r{^lib/merb-core/([^/]*)\.rb$}) { |_, m| at.files_matching %r{^spec/(public|private)/#{m[1]}/.*_spec\.rb} }
0
+    # 5 above
0
+    at.add_mapping(%r{^lib/merb-core/([^/]*)\.rb$}) { |_, m| at.files_matching %r{^spec/(public|private)/#{m[1]}/.*_spec\.rb} }
0
 
0
-      # 6 above
0
-      at.add_mapping(%r{^lib/merb\.rb$}) { at.files_matching %r{^spec/[^/]*_spec\.rb$} }
0
+    # 6 above
0
+    at.add_mapping(%r{^lib/merb\.rb$}) { at.files_matching %r{^spec/[^/]*_spec\.rb$} }
0
 
0
   end
0
 
0
@@ -57,12 +57,6 @@ class Autotest::MerbsourceRspec < Autotest
0
   
0
   attr_accessor :failures
0
 
0
-  def tests_for_file(filename)
0
-    super.select { |f| @files.has_key? f }
0
-  end
0
-  
0
-  alias :specs_for_file :tests_for_file
0
-
0
   def failed_results(results)
0
     results.scan(/^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m)
0
   end
0
@@ -83,7 +77,7 @@ class Autotest::MerbsourceRspec < Autotest
0
   def consolidate_failures(failed)
0
     filters = Hash.new { |h,k| h[k] = [] }
0
     failed.each do |spec, failed_trace|
0
-      @files.keys.select { |f| f =~ /spec\// }.each do |f|
0
+      find_files.keys.select { |f| f =~ /spec\// }.each do |f|
0
         if failed_trace =~ Regexp.new(f)
0
           filters[f] << spec
0
           break
0
@@ -98,7 +92,7 @@ class Autotest::MerbsourceRspec < Autotest
0
   end
0
 
0
   def test_cmd_options
0
-    '-O specs/spec.opts' if File.exist?('specs/spec.opts')
0
+    # '-O specs/spec.opts' if File.exist?('specs/spec.opts')
0
   end
0
   
0
   # Finds the proper spec command to use.  Precendence
0
@@ -113,16 +107,8 @@ class Autotest::MerbsourceRspec < Autotest
0
     end
0
   end
0
   
0
-  # Autotest will look for spec commands in the following
0
-  # locations, in this order:
0
-  #
0
-  #   * bin/spec
0
-  #   * default spec bin/loader installed in Rubygems
0
+  # Merb specs must be run 1 at a time, so use our special runner
0
   def spec_commands
0
-    if (spec = `which spec`.chomp) && !spec.empty?
0
-      return [spec]
0
-    end
0
-    [File.join('bin', 'spec'),
0
-     File.join(Config::CONFIG['bindir'], 'spec')]
0
+    [File.join('bin', 'merb-specs')]
0
   end
0
 end
0
\ No newline at end of file