Fixed rails_generator to be usable without RubyGems #686 [Cristi BALAN]. Moved all active support dependencies into active support

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@838 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/lib/action_controller.rb

@@ -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'

actionpack/lib/action_controller/base.rb

@@ -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:

activerecord/lib/active_record.rb

@@ -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'

activerecord/lib/active_record/base.rb

@@ -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:

activerecord/lib/active_record/fixtures.rb

@@ -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:
 #

activesupport/lib/active_support.rb

@@ -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'

railties/CHANGELOG

@@ -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)

railties/lib/rails_generator.rb

@@ -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'