1 files changed, 18 insertions, 42 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 50e3bb0d48..4b60b77759 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -1,42 +1,30 @@
 require 'rake/testtask'
-require 'rake/packagetask'
 require 'rubygems/package_task'
 
+test_files = Dir.glob('test/**/*_test.rb')
+
 desc "Default Task"
 task :default => :test
 
 # Run the unit tests
-
-desc "Run all unit tests"
-task :test => [:test_action_pack, :test_active_record_integration]
-
-Rake::TestTask.new(:test_action_pack) do |t|
+Rake::TestTask.new do |t|
   t.libs << 'test'
 
   # make sure we include the tests in alphabetical order as on some systems
   # this will not happen automatically and the tests (as a whole) will error
-  t.test_files = Dir.glob('test/{abstract,controller,dispatch,template,assertions}/**/*_test.rb').sort
+  t.test_files = test_files.sort
 
   t.warning = true
   t.verbose = true
+  t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
 end
 
 namespace :test do
-  Rake::TestTask.new(:isolated) do |t|
-    t.libs << 'test'
-    t.pattern = 'test/ts_isolated.rb'
+  task :isolated do
+    test_files.all? do |file|
+      sh(Gem.ruby, '-w', '-Ilib:test', file)
+    end or raise "Failures"
   end
-
-  Rake::TestTask.new(:template) do |t|
-    t.libs << 'test'
-    t.pattern = 'test/template/**/*.rb'
-  end
-end
-
-desc 'ActiveRecord Integration Tests'
-Rake::TestTask.new(:test_active_record_integration) do |t|
-  t.libs << 'test'
-  t.test_files = Dir.glob("test/activerecord/*_test.rb")
 end
 
 spec = eval(File.read('actionpack.gemspec'))
@@ -45,7 +33,7 @@ Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
 end
 
-desc "Release to gemcutter"
+desc "Release to rubygems"
 task :release => :package do
   require 'rake/gemcutter'
   Rake::Gemcutter::Tasks.new(spec).define
@@ -53,25 +41,13 @@ task :release => :package do
 end
 
 task :lines do
-  lines, codelines, total_lines, total_codelines = 0, 0, 0, 0
-
-  FileList["lib/**/*.rb"].each do |file_name|
-    next if file_name =~ /vendor/
-    File.open(file_name, 'r') do |f|
-      while line = f.gets
-        lines += 1
-        next if line =~ /^\s*$/
-        next if line =~ /^\s*#/
-        codelines += 1
-      end
-    end
-    puts "L: #{sprintf("%4d", lines)}, LOC #{sprintf("%4d", codelines)} | #{file_name}"
-
-    total_lines     += lines
-    total_codelines += codelines
-
-    lines, codelines = 0, 0
-  end
+  load File.expand_path('..', File.dirname(__FILE__)) + '/tools/line_statistics'
+  files = FileList["lib/**/*.rb"]
+  CodeTools::LineStatistics.new(files).print_loc
+end
 
-  puts "Total: Lines #{total_lines}, LOC #{total_codelines}"
+rule '.rb' => '.y' do |t|
+  sh "racc -l -o #{t.name} #{t.source}"
 end
+
+task compile: 'lib/action_dispatch/journey/parser.rb'