Move railties/lib/* into railties/lib/*

.gitignore

@@ -28,4 +28,6 @@ railties/guides/output
 *.swp
 *.swo
 actionpack/bin
-*/vendor/gems
+vendor/gems/
+*/vendor/gems/
+bin/

actionpack/lib/action_controller/testing/process.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/conversions'
+require "rack/test"
 
 module ActionController #:nodoc:
   # Essentially generates a modified Tempfile object similar to the object

railties/Rakefile

@@ -81,7 +81,7 @@ end
 
 task :create_rails do
   require File.join(File.dirname(__FILE__), 'lib', 'generators')
-  require 'generators/rails/app/app_generator'
+  require 'rails/generators/rails/app/app_generator'
   Rails::Generators::AppGenerator.start [ File.basename(PKG_DESTINATION), "--quiet" ],
                                         :destination_root => File.expand_path(File.dirname(PKG_DESTINATION))
 end

railties/bin/rails

@@ -1,7 +1,17 @@
-require File.dirname(__FILE__) + '/../lib/ruby_version_check'
+begin
+  require 'rails/ruby_version_check'
+rescue LoadError
+  # If people are not using gems, the load path must still
+  # be correct.
+  # TODO: Remove the begin / rescue block somehow
+  $:.unshift File.dirname(__FILE__) + '/../lib'
+  $:.unshift File.dirname(__FILE__) + '/../../activesupport/lib'
+  retry
+end
+
 Signal.trap("INT") { puts; exit }
 
-require File.dirname(__FILE__) + '/../lib/rails/version'
+require 'rails/version'
 if %w(--version -v).include? ARGV.first
   puts "Rails #{Rails::VERSION::STRING}"
   exit(0)
@@ -9,7 +19,7 @@ end
 
 ARGV << "--help" if ARGV.empty?
 
-require File.dirname(__FILE__) + '/../lib/generators'
-require 'generators/rails/app/app_generator'
+require 'rails/generators'
+require 'rails/generators/rails/app/app_generator'
 
 Rails::Generators::AppGenerator.start

railties/lib/rails/commands/console.rb

@@ -13,9 +13,9 @@ end
 
 libs =  " -r irb/completion"
 libs << %( -r "#{RAILS_ROOT}/config/environment")
-libs << " -r console_app"
-libs << " -r console_sandbox" if options[:sandbox]
-libs << " -r console_with_helpers"
+libs << " -r rails/console_app"
+libs << " -r rails/console_sandbox" if options[:sandbox]
+libs << " -r rails/console_with_helpers"
 
 if options[:debugger]
   begin

railties/lib/rails/fcgi_handler.rb

@@ -1,6 +1,6 @@
 require 'fcgi'
 require 'logger'
-require 'dispatcher'
+require 'rails/dispatcher'
 require 'rbconfig'
 
 class RailsFCGIHandler

railties/lib/rails/generators.rb

@@ -8,10 +8,10 @@ require 'active_support/core_ext/hash'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+# TODO: Do not always push on vendored thor
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/vendor/thor-0.11.6/lib")
-require 'generators/base'
-require 'generators/named_base'
+require 'rails/generators/base'
+require 'rails/generators/named_base'
 
 module Rails
   module Generators

railties/lib/rails/generators/active_record.rb

@@ -1,6 +1,6 @@
-require 'generators/named_base'
-require 'generators/migration'
-require 'generators/active_model'
+require 'rails/generators/named_base'
+require 'rails/generators/migration'
+require 'rails/generators/active_model'
 
 module ActiveRecord
   module Generators

railties/lib/rails/generators/active_record/migration/migration_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

railties/lib/rails/generators/active_record/model/model_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

railties/lib/rails/generators/active_record/observer/observer_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

railties/lib/rails/generators/active_record/session_migration/session_migration_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

railties/lib/rails/generators/base.rb

@@ -1,5 +1,5 @@
 require 'thor'
-require 'generators/actions'
+require 'rails/generators/actions'
 
 module Rails
   module Generators

railties/lib/rails/generators/erb.rb

@@ -1,4 +1,4 @@
-require 'generators/named_base'
+require 'rails/generators/named_base'
 
 module Erb
   module Generators

railties/lib/rails/generators/erb/controller/controller_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
 
 module Erb
   module Generators

railties/lib/rails/generators/erb/mailer/mailer_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
 
 module Erb
   module Generators

railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb

@@ -1,5 +1,5 @@
-require 'generators/erb'
-require 'generators/resource_helpers'
+require 'rails/generators/erb'
+require 'rails/generators/resource_helpers'
 
 module Erb
   module Generators

railties/lib/rails/generators/named_base.rb

@@ -1,5 +1,5 @@
-require 'generators/base'
-require 'generators/generated_attribute'
+require 'rails/generators/base'
+require 'rails/generators/generated_attribute'
 
 module Rails
   module Generators

railties/lib/rails/generators/rails/app/templates/Rakefile

@@ -7,4 +7,4 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-require 'tasks/rails'
+require 'rails/tasks'

railties/lib/rails/generators/rails/app/templates/config/boot.rb

@@ -42,7 +42,11 @@ module Rails
 
   class VendorBoot < Boot
     def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      # activesupport/lib
+      %w(railties/lib).each do |path|
+        $:.unshift("#{RAILS_ROOT}/vendor/rails/#{path}")
+      end
+      require "rails/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
       Rails::GemDependency.add_frozen_gem_path
     end
@@ -52,7 +56,7 @@ module Rails
     def load_initializer
       self.class.load_rubygems
       load_rails_gem
-      require 'initializer'
+      require 'rails/initializer'
     end
 
     def load_rails_gem

railties/lib/rails/generators/rails/app/templates/script/about.tt

@@ -1,4 +1,4 @@
 <%= shebang %>
 require File.expand_path('../../config/boot',  __FILE__)
 $LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
-require 'commands/about'
+require 'rails/commands/about'

railties/lib/rails/generators/rails/app/templates/script/console.tt

@@ -1,3 +1,3 @@
 <%= shebang %>
 require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/console'
+require 'rails/commands/console'