rails 1.0.0 → 2.0.0

data/lib/tasks/framework.rake

@@ -1,71 +1,112 @@
-desc "Lock this application to the current gems (by unpacking them into vendor/rails)"
-task :freeze_gems do
-  deps = %w(actionpack activerecord actionmailer activesupport actionwebservice)
-  require 'rubygems'
-
-  rails = if version = ENV['VERSION']
-            Gem.cache.search('rails', "= #{version}").first
-          else
-            Gem.cache.search('rails').sort_by { |g| g.version }.last
-          end
-  version ||= rails.version
-
-  unless rails
-    puts "No rails gem #{version} is installed.  Do 'gem list rails' to see what you have available."
-    exit
-  end
+namespace :rails do
+  namespace :freeze do
+    desc "Lock this application to the current gems (by unpacking them into vendor/rails)"
+    task :gems do
+      deps = %w(actionpack activerecord actionmailer activesupport activeresource)
+      require 'rubygems'
+      Gem.manage_gems
 
-  puts "Freezing to the gems for Rails #{rails.version}"
-  rm_rf   "vendor/rails"
-  mkdir_p "vendor/rails"
+      rails = (version = ENV['VERSION']) ?
+        Gem.cache.find_name('rails', "= #{version}").first :
+        Gem.cache.find_name('rails').sort_by { |g| g.version }.last
 
-  rails.dependencies.select { |g| deps.include? g.name }.each do |g|
-    system "cd vendor/rails; gem unpack -v '#{g.version_requirements}' #{g.name}; mv #{g.name}* #{g.name}"
-  end
-  system "cd vendor/rails; gem unpack -v '=#{version}' rails"
-  
-  FileUtils.mv(Dir.glob("vendor/rails/rails*").first, "vendor/rails/railties")
-end
+      version ||= rails.version
 
-desc "Lock this application to the Edge Rails (by exporting from Subversion).  Defaults to svn HEAD; do 'rake freeze_edge REVISION=1234' to lock to a specific revision."
-task :freeze_edge do
-  $verbose = false
-  `svn --version` rescue nil
-  unless !$?.nil? && $?.success?
-    $stderr.puts "ERROR: Must have subversion (svn) available in the PATH to lock this application to Edge Rails"
-    exit 1
-  end
+      unless rails
+        puts "No rails gem #{version} is installed.  Do 'gem list rails' to see what you have available."
+        exit
+      end
+
+      puts "Freezing to the gems for Rails #{rails.version}"
+      rm_rf   "vendor/rails"
+      mkdir_p "vendor/rails"
+
+      chdir("vendor/rails") do
+        rails.dependencies.select { |g| deps.include? g.name }.each do |g|
+          Gem::GemRunner.new.run(["unpack", "-v", "#{g.version_requirements}", "#{g.name}"])
+          mv(Dir.glob("#{g.name}*").first, g.name)
+        end
+
+        Gem::GemRunner.new.run(["unpack", "-v", "=#{version}", "rails"])
+        FileUtils.mv(Dir.glob("rails*").first, "railties")
+      end
+    end
+
+    desc "Lock to latest Edge Rails or a specific revision with REVISION=X (ex: REVISION=4021) or a tag with TAG=Y (ex: TAG=rel_1-1-0)"
+    task :edge do
+      $verbose = false
+      `svn --version` rescue nil
+      unless !$?.nil? && $?.success?
+        $stderr.puts "ERROR: Must have subversion (svn) available in the PATH to lock this application to Edge Rails"
+        exit 1
+      end
+            
+      rm_rf   "vendor/rails"
+      mkdir_p "vendor/rails"
+      
+      svn_root = "http://dev.rubyonrails.org/svn/rails/"
+
+      if ENV['TAG']
+        rails_svn = "#{svn_root}/tags/#{ENV['TAG']}"
+        touch "vendor/rails/TAG_#{ENV['TAG']}"
+      else
+        rails_svn = "#{svn_root}/trunk"
 
-  rm_rf   "vendor/rails"
-  mkdir_p "vendor/rails"
+        if ENV['REVISION'].nil?
+          ENV['REVISION'] = /^r(\d+)/.match(%x{svn -qr HEAD log #{svn_root}})[1]
+          puts "REVISION not set. Using HEAD, which is revision #{ENV['REVISION']}."
+        end
 
-  revision_switch = ENV['REVISION'] ? " -r #{ENV['REVISION']}" : ''
-  for framework in %w( railties actionpack activerecord actionmailer activesupport actionwebservice )
-    mkdir_p "vendor/rails/#{framework}"
-    system  "svn export http://dev.rubyonrails.org/svn/rails/trunk/#{framework}/lib vendor/rails/#{framework}/lib #{revision_switch}"
+        touch "vendor/rails/REVISION_#{ENV['REVISION']}"
+      end
+
+      for framework in %w(railties actionpack activerecord actionmailer activesupport activeresource)
+        system "svn export #{rails_svn}/#{framework} vendor/rails/#{framework}" + (ENV['REVISION'] ? " -r #{ENV['REVISION']}" : "")
+      end
+    end
   end
-end
 
-desc "Unlock this application from freeze of gems or edge and return to a fluid use of system gems"
-task :unfreeze_rails do
-  rm_rf "vendor/rails"
-end
+  desc "Unlock this application from freeze of gems or edge and return to a fluid use of system gems"
+  task :unfreeze do
+    rm_rf "vendor/rails"
+  end
 
-desc "Add new scripts to the application script/ directory"
-task :add_new_scripts do
-  local_base = "script"
-  edge_base  = "#{File.dirname(__FILE__)}/../../bin"
+  desc "Update both configs, scripts and public/javascripts from Rails"
+  task :update => [ "update:scripts", "update:javascripts", "update:configs" ]
 
-  local = Dir["#{local_base}/**/*"].reject { |path| File.directory?(path) }
-  edge  = Dir["#{edge_base}/**/*"].reject { |path| File.directory?(path) }
+  namespace :update do
+    desc "Add new scripts to the application script/ directory"
+    task :scripts do
+      local_base = "script"
+      edge_base  = "#{File.dirname(__FILE__)}/../../bin"
+
+      local = Dir["#{local_base}/**/*"].reject { |path| File.directory?(path) }
+      edge  = Dir["#{edge_base}/**/*"].reject { |path| File.directory?(path) }
   
-  edge.each do |script|
-    base_name = script[(edge_base.length+1)..-1]
-    next if base_name == "rails"
-    next if local.detect { |path| base_name == path[(local_base.length+1)..-1] }
-    if !File.directory?("#{local_base}/#{File.dirname(base_name)}")
-      mkdir_p "#{local_base}/#{File.dirname(base_name)}"
+      edge.each do |script|
+        base_name = script[(edge_base.length+1)..-1]
+        next if base_name == "rails"
+        next if local.detect { |path| base_name == path[(local_base.length+1)..-1] }
+        if !File.directory?("#{local_base}/#{File.dirname(base_name)}")
+          mkdir_p "#{local_base}/#{File.dirname(base_name)}"
+        end
+        install script, "#{local_base}/#{base_name}", :mode => 0755
+      end
+    end
+
+    desc "Update your javascripts from your current rails install"
+    task :javascripts do
+      require 'railties_path'  
+      project_dir = RAILS_ROOT + '/public/javascripts/'
+      scripts = Dir[RAILTIES_PATH + '/html/javascripts/*.js']
+      scripts.reject!{|s| File.basename(s) == 'application.js'} if File.exists?(project_dir + 'application.js')
+      FileUtils.cp(scripts, project_dir)
+    end
+
+    desc "Update config/boot.rb from your current rails install"
+    task :configs do
+      require 'railties_path'  
+      FileUtils.cp(RAILTIES_PATH + '/environments/boot.rb', RAILS_ROOT + '/config/boot.rb')
     end
-    install script, "#{local_base}/#{base_name}", :mode => 0755
   end
 end

data/lib/tasks/log.rake

@@ -0,0 +1,9 @@
+namespace :log do
+  desc "Truncates all *.log files in log/ to zero bytes"
+  task :clear do
+    FileList["log/*.log"].each do |log_file|
+      f = File.open(log_file, "w")
+      f.close
+    end
+  end
+end

data/lib/tasks/misc.rake

@@ -1,19 +1,4 @@
-desc "Run all the tests on a fresh test database"
-task :default do
-  Rake::Task[:test_units].invoke      rescue got_error = true
-  Rake::Task[:test_functional].invoke rescue got_error = true
-  raise "Test failures" if got_error
-end
-
+task :default => :test
 task :environment do
   require(File.join(RAILS_ROOT, 'config', 'environment'))
-end
-
-
-desc "Clears all *.log files in log/"
-task :clear_logs do
-  FileList["log/*.log"].each do |log_file|
-    f = File.open(log_file, "w")
-    f.close
-  end
-end
+end

data/lib/tasks/rails.rb

@@ -4,5 +4,5 @@ $VERBOSE = nil
 Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
 
 # Load any custom rakefile extensions
-Dir["./lib/tasks/**/*.rake"].sort.each { |ext| load ext }
-Dir["./vendor/plugins/*/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }

data/lib/tasks/routes.rake

@@ -0,0 +1,17 @@
+desc 'Print out all defined routes in match order, with names.'
+task :routes => :environment do
+  routes = ActionController::Routing::Routes.routes.collect do |route|
+    name = ActionController::Routing::Routes.named_routes.routes.index(route).to_s
+    verb = route.conditions[:method].to_s.upcase
+    segs = route.segments.inject("") { |str,s| str << s.to_s }
+    segs.chop! if segs.length > 1
+    reqs = route.requirements.empty? ? "" : route.requirements.inspect
+    {:name => name, :verb => verb, :segs => segs, :reqs => reqs}
+  end
+  name_width = routes.collect {|r| r[:name]}.collect {|n| n.length}.max
+  verb_width = routes.collect {|r| r[:verb]}.collect {|v| v.length}.max
+  segs_width = routes.collect {|r| r[:segs]}.collect {|s| s.length}.max
+  routes.each do |r|
+    puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:segs].ljust(segs_width)} #{r[:reqs]}"
+  end
+end

data/lib/tasks/statistics.rake

@@ -1,12 +1,14 @@
 STATS_DIRECTORIES = [
-  %w(Helpers           app/helpers), 
-  %w(Controllers       app/controllers), 
-  %w(APIs              app/apis),
-  %w(Components        components),
-  %w(Functional\ tests test/functional),
-  %w(Models            app/models),
-  %w(Unit\ tests       test/unit),
-  %w(Libraries         lib/)
+  %w(Controllers        app/controllers),
+  %w(Helpers            app/helpers), 
+  %w(Models             app/models),
+  %w(Libraries          lib/),
+  %w(APIs               app/apis),
+  %w(Components         components),
+  %w(Integration\ tests test/integration),
+  %w(Functional\ tests  test/functional),
+  %w(Unit\ tests        test/unit)
+
 ].collect { |name, dir| [ name, "#{RAILS_ROOT}/#{dir}" ] }.select { |name, dir| File.directory?(dir) }
 
 desc "Report code statistics (KLOCs, etc) from the application"

data/lib/tasks/testing.rake

@@ -4,47 +4,115 @@ TEST_CHANGES_SINCE = Time.now - 600
 def recent_tests(source_pattern, test_path, touched_since = 10.minutes.ago)
   FileList[source_pattern].map do |path|
     if File.mtime(path) > touched_since
-      test = "#{test_path}/#{File.basename(path, '.rb')}_test.rb"
-      test if File.exists?(test)
+      tests = []
+      source_dir = File.dirname(path).split("/")
+      source_file = File.basename(path, '.rb')
+      
+      # Support subdirs in app/models and app/controllers
+      modified_test_path = source_dir.length > 2 ? "#{test_path}/" << source_dir[1..source_dir.length].join('/') : test_path
+
+      # For modified files in app/ run the tests for it. ex. /test/functional/account_controller.rb
+      test = "#{modified_test_path}/#{source_file}_test.rb"
+      tests.push test if File.exists?(test)
+
+      # For modified files in app, run tests in subdirs too. ex. /test/functional/account/*_test.rb
+      test = "#{modified_test_path}/#{File.basename(path, '.rb').sub("_controller","")}"
+      FileList["#{test}/*_test.rb"].each { |f| tests.push f } if File.exists?(test)
+		
+      return tests
+
     end
-  end.compact
+  end.flatten.compact
 end
 
-desc 'Test recent changes'
-Rake::TestTask.new(:recent => [ :prepare_test_database ]) do |t|
-  since = TEST_CHANGES_SINCE
-  touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
-    recent_tests('app/models/*.rb', 'test/unit', since) +
-    recent_tests('app/controllers/*.rb', 'test/functional', since)
 
-  t.libs << 'test'
-  t.verbose = true
-  t.test_files = touched.uniq
+# Recreated here from ActiveSupport because :uncommitted needs it before Rails is available
+module Kernel
+  def silence_stderr
+    old_stderr = STDERR.dup
+    STDERR.reopen(RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'NUL:' : '/dev/null')
+    STDERR.sync = true
+    yield
+  ensure
+    STDERR.reopen(old_stderr)
+  end
 end
 
-desc "Run the unit tests in test/unit"
-Rake::TestTask.new(:test_units => [ :prepare_test_database ]) do |t|
-  t.libs << "test"
-  t.pattern = 'test/unit/**/*_test.rb'
-  t.verbose = true
+desc 'Test all units and functionals'
+task :test do
+  errors = %w(test:units test:functionals test:integration).collect do |task|
+    begin
+      Rake::Task[task].invoke
+      nil
+    rescue => e
+      task
+    end
+  end.compact
+  abort "Errors running #{errors.to_sentence}!" if errors.any?
 end
 
-desc "Run the functional tests in test/functional"
-Rake::TestTask.new(:test_functional => [ :prepare_test_database ]) do |t|
-  t.libs << "test"
-  t.pattern = 'test/functional/**/*_test.rb'
-  t.verbose = true
-end
+namespace :test do
+  Rake::TestTask.new(:recent => "db:test:prepare") do |t|
+    since = TEST_CHANGES_SINCE
+    touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
+      recent_tests('app/models/**/*.rb', 'test/unit', since) +
+      recent_tests('app/controllers/**/*.rb', 'test/functional', since)
 
-desc "Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name)"
-Rake::TestTask.new(:test_plugins => :environment) do |t|
-  t.libs << "test"
+    t.libs << 'test'
+    t.verbose = true
+    t.test_files = touched.uniq
+  end
+  Rake::Task['test:recent'].comment = "Test recent changes"
   
-  if ENV['PLUGIN']
-    t.pattern = "vendor/plugins/#{ENV['PLUGIN']}/test/**/*_test.rb"
-  else
-    t.pattern = 'vendor/plugins/**/test/**/*_test.rb'
+  Rake::TestTask.new(:uncommitted => "db:test:prepare") do |t|
+    def t.file_list
+      changed_since_checkin = silence_stderr { `svn status` }.map { |path| path.chomp[7 .. -1] }
+
+      models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb/ }
+      controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb/ }  
+
+      unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
+      functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
+
+      unit_tests.uniq + functional_tests.uniq
+    end
+    
+    t.libs << 'test'
+    t.verbose = true
+  end
+  Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion)"
+
+  Rake::TestTask.new(:units => "db:test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = 'test/unit/**/*_test.rb'
+    t.verbose = true
   end
+  Rake::Task['test:units'].comment = "Run the unit tests in test/unit"
 
-  t.verbose = true
+  Rake::TestTask.new(:functionals => "db:test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = 'test/functional/**/*_test.rb'
+    t.verbose = true
+  end
+  Rake::Task['test:functionals'].comment = "Run the functional tests in test/functional"
+
+  Rake::TestTask.new(:integration => "db:test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = 'test/integration/**/*_test.rb'
+    t.verbose = true
+  end
+  Rake::Task['test:integration'].comment = "Run the integration tests in test/integration"
+
+  Rake::TestTask.new(:plugins => :environment) do |t|
+    t.libs << "test"
+
+    if ENV['PLUGIN']
+      t.pattern = "vendor/plugins/#{ENV['PLUGIN']}/test/**/*_test.rb"
+    else
+      t.pattern = 'vendor/plugins/*/**/test/**/*_test.rb'
+    end
+
+    t.verbose = true
+  end
+  Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/*/**/test (or specify with PLUGIN=name)"
 end

data/lib/tasks/tmp.rake

@@ -0,0 +1,37 @@
+namespace :tmp do
+  desc "Clear session, cache, and socket files from tmp/"
+  task :clear => [ "tmp:sessions:clear",  "tmp:cache:clear", "tmp:sockets:clear"]
+
+  desc "Creates tmp directories for sessions, cache, and sockets"
+  task :create do
+    FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets tmp/pids ))
+  end
+
+  namespace :sessions do
+    desc "Clears all files in tmp/sessions"
+    task :clear do
+      FileUtils.rm(Dir['tmp/sessions/[^.]*'])
+    end
+  end
+
+  namespace :cache do
+    desc "Clears all files and directories in tmp/cache"
+    task :clear do
+      FileUtils.rm_rf(Dir['tmp/cache/[^.]*'])
+    end
+  end
+
+  namespace :sockets do
+    desc "Clears all files in tmp/sockets"
+    task :clear do
+      FileUtils.rm(Dir['tmp/sockets/[^.]*'])
+    end
+  end
+
+  namespace :pids do
+    desc "Clears all files in tmp/pids"
+    task :clear do
+      FileUtils.rm(Dir['tmp/pids/[^.]*'])
+    end
+  end
+end

data/lib/test_help.rb

@@ -1,17 +1,20 @@
-require 'application'
+require_dependency 'application'
 
-# Make double-sure the RAILS_ENV is set to test, 
+# Make double-sure the RAILS_ENV is set to test,
 # so fixtures are loaded to the right database
 silence_warnings { RAILS_ENV = "test" }
 
 require 'test/unit'
+require 'active_support/test_case'
 require 'active_record/fixtures'
+require 'action_controller/test_case'
 require 'action_controller/test_process'
-require 'action_web_service/test_invoke'
-require 'breakpoint'
+require 'action_controller/integration'
+require 'action_mailer/test_case' if defined?(ActionMailer)
 
 Test::Unit::TestCase.fixture_path = RAILS_ROOT + "/test/fixtures/"
+ActionController::IntegrationTest.fixture_path = Test::Unit::TestCase.fixture_path
 
 def create_fixtures(*table_names)
-  Fixtures.create_fixtures(RAILS_ROOT + "/test/fixtures", table_names)
+  Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
 end

data/lib/webrick_server.rb

@@ -3,13 +3,10 @@
 require 'webrick'
 require 'cgi'
 require 'stringio'
+require 'dispatcher'
 
 include WEBrick
 
-ABSOLUTE_RAILS_ROOT = File.expand_path(RAILS_ROOT)
-
-ActiveRecord::Base.threaded_connections = false
-
 class CGI #:nodoc:
   def stdinput
     @stdin || $stdin
@@ -62,31 +59,29 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
     server.mount('/', DispatchServlet, options)
 
     trap("INT") { server.shutdown }
-
-    require File.join(@server_options[:server_root], "..", "config", "environment") unless defined?(RAILS_ROOT)
-    require "dispatcher"
-
     server.start
   end
 
   def initialize(server, options) #:nodoc:
     @server_options = options
     @file_handler = WEBrick::HTTPServlet::FileHandler.new(server, options[:server_root])
-    Dir.chdir(ABSOLUTE_RAILS_ROOT)
+    # Change to the RAILS_ROOT, since Webrick::Daemon.start does a Dir::cwd("/")
+    # OPTIONS['working_directory'] is an absolute path of the RAILS_ROOT, set in railties/lib/commands/servers/webrick.rb
+    Dir.chdir(OPTIONS['working_directory']) if defined?(OPTIONS) && File.directory?(OPTIONS['working_directory'])
     super
   end
 
   def service(req, res) #:nodoc:
-    begin
-      unless handle_file(req, res)
+    unless handle_file(req, res)
+      begin
         REQUEST_MUTEX.lock unless ActionController::Base.allow_concurrency
         unless handle_dispatch(req, res)
           raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found."
         end
-      end
-    ensure
-      unless ActionController::Base.allow_concurrency
-        REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?
+      ensure
+        unless ActionController::Base.allow_concurrency
+          REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?
+        end
       end
     end
   end
@@ -147,7 +142,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
       data.rewind
       data = data.read
 
-      raw_header, body = *data.split(/^[\xd\xa]+/on, 2)
+      raw_header, body = *data.split(/^[\xd\xa]{2}/on, 2)
       header = WEBrick::HTTPUtils::parse_header(raw_header)
       
       return header, body