From 64a402676e92082aec4beb8fd9749a31a5e57ab1 Mon Sep 17 00:00:00 2001 From: Adam Meehan Date: Mon, 30 Jun 2008 22:38:30 +1000 Subject: [PATCH] added version display for AR --- spec/spec_helper.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 77f0f52..c438731 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -6,19 +6,20 @@ require 'spec' if File.exists?(File.dirname(__FILE__) + '/../../../../vendor/rails') $:.unshift File.dirname(__FILE__) + '/../../../../vendor/rails' require 'activesupport/lib/active_support' - require 'activerecord/lib/active_record' + require 'activerecord/lib/active_record' + require 'activerecord/lib/active_record/version' require 'railties/lib/rails/version' - - puts "Using vendored Rails version #{Rails::VERSION::STRING}" + vendored = true else gem 'rails', "=#{ENV['VERSION']}" if ENV['VERSION'] require 'rails/version' require 'active_record' require 'active_record/version' - - puts "Using gem Rails version #{Rails::VERSION::STRING}" + vendored = false end +puts "Using #{vendored ? 'vendored' : 'gem'} Rails version #{Rails::VERSION::STRING} (ActiveRecord version #{ActiveRecord::VERSION::STRING})" + RAILS_VER = Rails::VERSION::STRING ActiveRecord::Base.default_timezone = :utc