Merge commit 'mainstream/master'

Conflicts:

	activerecord/lib/active_record/associations/association_proxy.rb
	activerecord/lib/active_record/callbacks.rb
	activeresource/lib/active_resource/base.rb

1 files changed, 116 insertions, 0 deletions

diff --git a/ci/ci_build.rb b/ci/ci_build.rb
new file mode 100755
index 0000000000..7b9cdceb27
--- /dev/null
+++ b/ci/ci_build.rb
@@ -0,0 +1,116 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+
+include FileUtils
+
+puts "[CruiseControl] Rails build"
+
+build_results = {}
+root_dir = File.expand_path(File.dirname(__FILE__) + "/..")
+
+# Requires gem home and path to be writeable and/or overridden to be ~/.gem,
+# Will enable when RubyGems supports this properly (in a coming release)
+# build_results[:geminstaller] = system 'geminstaller --exceptions'
+
+# for now, use the no-passwd sudoers approach (documented in ci_setup_notes.txt)
+# A security hole, but there is nothing valuable on rails CI box anyway.
+build_results[:geminstaller] = system "sudo geminstaller --config=#{root_dir}/ci/geminstaller.yml --exceptions"
+
+cd "#{root_dir}/activesupport" do
+  puts
+  puts "[CruiseControl] Building ActiveSupport"
+  puts
+  build_results[:activesupport] = system 'rake'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building ActiveRecord with MySQL"
+  puts
+  build_results[:activerecord_mysql] = system 'rake test_mysql'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building ActiveRecord with PostgreSQL"
+  puts
+  build_results[:activerecord_postgresql8] = system 'rake test_postgresql'
+end
+
+# Sqlite2 is disabled until tests are fixed
+# cd "#{root_dir}/activerecord" do
+#  puts
+#  puts "[CruiseControl] Building ActiveRecord with SQLite 2"
+#  puts
+#  build_results[:activerecord_sqlite] = system 'rake test_sqlite'
+# end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building ActiveRecord with SQLite 3"
+  puts
+  build_results[:activerecord_sqlite3] = system 'rake test_sqlite3'
+end
+
+cd "#{root_dir}/activemodel" do
+  puts
+  puts "[CruiseControl] Building ActiveModel"
+  puts
+  build_results[:activemodel] = system 'rake'
+end
+
+cd "#{root_dir}/activeresource" do
+  puts
+  puts "[CruiseControl] Building ActiveResource"
+  puts
+  build_results[:activeresource] = system 'rake'
+end
+
+cd "#{root_dir}/actionpack" do
+  puts
+  puts "[CruiseControl] Building ActionPack"
+  puts
+  build_results[:actionpack] = system 'rake'
+end
+
+cd "#{root_dir}/actionmailer" do
+  puts
+  puts "[CruiseControl] Building ActionMailer"
+  puts
+  build_results[:actionmailer] = system 'rake'
+end
+
+cd "#{root_dir}/railties" do
+  puts
+  puts "[CruiseControl] Building RailTies"
+  puts
+  build_results[:railties] = system 'rake'
+end
+
+
+puts
+puts "[CruiseControl] Build environment:"
+puts "[CruiseControl]   #{`cat /etc/issue`}"
+puts "[CruiseControl]   #{`uname -a`}"
+puts "[CruiseControl]   #{`ruby -v`}"
+puts "[CruiseControl]   #{`mysql --version`}"
+puts "[CruiseControl]   #{`pg_config --version`}"
+puts "[CruiseControl]   SQLite2: #{`sqlite -version`}"
+puts "[CruiseControl]   SQLite3: #{`sqlite3 -version`}"
+`gem env`.each {|line| print "[CruiseControl]   #{line}"}
+puts "[CruiseControl]   Local gems:"
+`gem list`.each {|line| print "[CruiseControl]     #{line}"}
+
+failures = build_results.select { |key, value| value == false }
+
+if failures.empty?
+  puts
+  puts "[CruiseControl] Rails build finished sucessfully"
+  exit(0)
+else
+  puts
+  puts "[CruiseControl] Rails build FAILED"
+  puts "[CruiseControl] Failed components: #{failures.map { |component| component.first }.join(', ')}"
+  exit(-1)
+end
+