Permalink
Browse files

Fixed rails_generator to be usable without RubyGems #686 [Cristi BALA…

…N]. Moved all active support dependencies into active support

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@838 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
dhh committed Mar 6, 2005
1 parent 25b656f commit 6d566e82b40d636c13ee1ae3b59737e0620196af
@@ -22,16 +22,13 @@
#++
$:.unshift(File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
begin
- require 'active_support'
+ require 'active_support'
rescue LoadError
- begin
- require File.dirname(__FILE__) + '/../../activesupport/lib/active_support'
- rescue LoadError
- require 'rubygems'
- require_gem 'activesupport'
- end
+ require 'rubygems'
+ require_gem 'activesupport'
end
require 'action_controller/base'
@@ -2,9 +2,6 @@
require 'action_controller/response'
require 'action_controller/routing'
require 'action_controller/url_rewriter'
-require 'active_support/class_attribute_accessors'
-require 'active_support/class_inheritable_attributes'
-require 'active_support/inflector'
require 'drb'
module ActionController #:nodoc:
@@ -23,16 +23,13 @@
$:.unshift(File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
begin
- require 'active_support'
+ require 'active_support'
rescue LoadError
- begin
- require File.dirname(__FILE__) + '/../../activesupport/lib/active_support'
- rescue LoadError
- require 'rubygems'
- require_gem 'activesupport'
- end
+ require 'rubygems'
+ require_gem 'activesupport'
end
require 'active_record/base'
@@ -1,6 +1,3 @@
-require 'active_support/class_attribute_accessors'
-require 'active_support/class_inheritable_attributes'
-require 'active_support/inflector'
require 'yaml'
module ActiveRecord #:nodoc:
@@ -1,8 +1,6 @@
require 'erb'
require 'yaml'
require 'csv'
-require 'active_support/class_inheritable_attributes'
-require 'active_support/inflector'
# Fixtures are a way of organizing data that you want to test against; in short, sample data. They come in 3 flavours:
#
@@ -23,6 +23,10 @@
$:.unshift(File.dirname(__FILE__))
+require 'active_support/class_attribute_accessors'
+require 'active_support/class_inheritable_attributes'
+require 'active_support/inflector'
+
require 'active_support/core_ext'
require 'active_support/clean_logger'
require 'active_support/misc'
View
@@ -1,5 +1,7 @@
*SVN*
+* Fixed rails_generator to be usable without RubyGems #686 [Cristi BALAN]
+
* Fixed -h/--help for generate and destroy generators #331
* Added begin/rescue around the FCGI dispatcher so no uncaught exceptions can bubble up to kill the process (logs to log/fastcgi.crash.log)
@@ -22,9 +22,10 @@
#++
$:.unshift(File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
begin
- require 'active_support'
+ require 'active_support'
rescue LoadError
require 'rubygems'
require_gem 'activesupport'

0 comments on commit 6d566e8

Please sign in to comment.