diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2009-09-30 22:27:02 +0100 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-09-30 22:27:02 +0100 |
commit | dd2779e1b83b4d867d47dd286ec0c919f5df12a9 (patch) | |
tree | 6e52ea0a329c24429f4d1d41b065e082f0ed6baa /railties/lib | |
parent | 329b14aa8fdd291a00d17ba12c2e0ab4c3a157cc (diff) | |
parent | 420004e030e96f2ace6e27fd622c90ee9e986677 (diff) | |
download | rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.tar.gz rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.tar.bz2 rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.zip |
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/generators/rails/app/templates/dispatchers/config.ru | 7 | ||||
-rw-r--r-- | railties/lib/rails.rb | 1 | ||||
-rw-r--r-- | railties/lib/rails/application.rb | 29 | ||||
-rw-r--r-- | railties/lib/rails/backtrace_cleaner.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/code_statistics.rb (renamed from railties/lib/code_statistics.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands.rb (renamed from railties/lib/commands.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/about.rb (renamed from railties/lib/commands/about.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/console.rb (renamed from railties/lib/commands/console.rb) | 6 | ||||
-rw-r--r-- | railties/lib/rails/commands/dbconsole.rb (renamed from railties/lib/commands/dbconsole.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/destroy.rb (renamed from railties/lib/commands/destroy.rb) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/commands/generate.rb (renamed from railties/lib/commands/generate.rb) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/commands/ncgi/listener (renamed from railties/lib/commands/ncgi/listener) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/commands/ncgi/tracker (renamed from railties/lib/commands/ncgi/tracker) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/performance/benchmarker.rb (renamed from railties/lib/commands/performance/benchmarker.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/performance/profiler.rb (renamed from railties/lib/commands/performance/profiler.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/plugin.rb (renamed from railties/lib/commands/plugin.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/runner.rb (renamed from railties/lib/commands/runner.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/server.rb (renamed from railties/lib/commands/server.rb) | 39 | ||||
-rw-r--r-- | railties/lib/rails/commands/update.rb (renamed from railties/lib/commands/update.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/configuration.rb | 12 | ||||
-rw-r--r-- | railties/lib/rails/console_app.rb (renamed from railties/lib/console_app.rb) | 7 | ||||
-rw-r--r-- | railties/lib/rails/console_sandbox.rb (renamed from railties/lib/console_sandbox.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/console_with_helpers.rb (renamed from railties/lib/console_with_helpers.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/core.rb | 8 | ||||
-rw-r--r-- | railties/lib/rails/dispatcher.rb (renamed from railties/lib/dispatcher.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/fcgi_handler.rb (renamed from railties/lib/fcgi_handler.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators.rb (renamed from railties/lib/generators.rb) | 6 | ||||
-rw-r--r-- | railties/lib/rails/generators/actions.rb (renamed from railties/lib/generators/actions.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_model.rb (renamed from railties/lib/generators/active_model.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record.rb (renamed from railties/lib/generators/active_record.rb) | 6 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/migration/migration_generator.rb (renamed from railties/lib/generators/active_record/migration/migration_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/migration/templates/migration.rb (renamed from railties/lib/generators/active_record/migration/templates/migration.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/model/model_generator.rb (renamed from railties/lib/generators/active_record/model/model_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/model/templates/migration.rb (renamed from railties/lib/generators/active_record/model/templates/migration.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/model/templates/model.rb (renamed from railties/lib/generators/active_record/model/templates/model.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/observer/observer_generator.rb (renamed from railties/lib/generators/active_record/observer/observer_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/observer/templates/observer.rb (renamed from railties/lib/generators/active_record/observer/templates/observer.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/session_migration/session_migration_generator.rb (renamed from railties/lib/generators/active_record/session_migration/session_migration_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/session_migration/templates/migration.rb (renamed from railties/lib/generators/active_record/session_migration/templates/migration.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/base.rb (renamed from railties/lib/generators/base.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb.rb (renamed from railties/lib/generators/erb.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/controller/controller_generator.rb (renamed from railties/lib/generators/erb/controller/controller_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/controller/templates/view.html.erb (renamed from railties/lib/generators/erb/controller/templates/view.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/mailer/mailer_generator.rb (renamed from railties/lib/generators/erb/mailer/mailer_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/mailer/templates/view.erb (renamed from railties/lib/generators/erb/mailer/templates/view.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb (renamed from railties/lib/generators/erb/scaffold/scaffold_generator.rb) | 4 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb (renamed from railties/lib/generators/erb/scaffold/templates/_form.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb (renamed from railties/lib/generators/erb/scaffold/templates/edit.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/index.html.erb (renamed from railties/lib/generators/erb/scaffold/templates/index.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/layout.html.erb (renamed from railties/lib/generators/erb/scaffold/templates/layout.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/new.html.erb (renamed from railties/lib/generators/erb/scaffold/templates/new.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/show.html.erb (renamed from railties/lib/generators/erb/scaffold/templates/show.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/generated_attribute.rb (renamed from railties/lib/generators/generated_attribute.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/migration.rb (renamed from railties/lib/generators/migration.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/named_base.rb (renamed from railties/lib/generators/named_base.rb) | 4 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/USAGE (renamed from railties/lib/generators/rails/app/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb (renamed from railties/lib/generators/rails/app/app_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/README (renamed from railties/lib/generators/rails/app/templates/README) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/Rakefile (renamed from railties/lib/generators/rails/app/templates/Rakefile) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb (renamed from railties/lib/generators/rails/app/templates/app/controllers/application_controller.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/helpers/application_helper.rb (renamed from railties/lib/generators/rails/app/templates/app/helpers/application_helper.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/models/.empty_directory (renamed from railties/lib/generators/rails/app/templates/app/models/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/views/layouts/.empty_directory (renamed from railties/lib/generators/rails/app/templates/app/views/layouts/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config.ru | 5 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/boot.rb (renamed from railties/lib/generators/rails/app/templates/config/boot.rb) | 47 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml (renamed from railties/lib/generators/rails/app/templates/config/databases/frontbase.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml (renamed from railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml (renamed from railties/lib/generators/rails/app/templates/config/databases/mysql.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml (renamed from railties/lib/generators/rails/app/templates/config/databases/oracle.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml (renamed from railties/lib/generators/rails/app/templates/config/databases/postgresql.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml (renamed from railties/lib/generators/rails/app/templates/config/databases/sqlite3.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environment.rb (renamed from railties/lib/generators/rails/app/templates/config/environment.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/development.rb (renamed from railties/lib/generators/rails/app/templates/config/environments/development.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb (renamed from railties/lib/generators/rails/app/templates/config/environments/production.rb) | 6 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/test.rb (renamed from railties/lib/generators/rails/app/templates/config/environments/test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb (renamed from railties/lib/generators/rails/app/templates/config/initializers/backtrace_silencers.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb (renamed from railties/lib/generators/rails/app/templates/config/initializers/inflections.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb (renamed from railties/lib/generators/rails/app/templates/config/initializers/mime_types.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb (renamed from railties/lib/generators/rails/app/templates/config/initializers/new_rails_defaults.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt (renamed from railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/locales/en.yml (renamed from railties/lib/generators/rails/app/templates/config/locales/en.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/routes.rb (renamed from railties/lib/generators/rails/app/templates/config/routes.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/db/seeds.rb (renamed from railties/lib/generators/rails/app/templates/db/seeds.rb) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/dispatchers/dispatch.fcgi (renamed from railties/lib/generators/rails/app/templates/dispatchers/dispatch.fcgi) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/dispatchers/dispatch.rb (renamed from railties/lib/generators/rails/app/templates/dispatchers/dispatch.rb) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/dispatchers/gateway.cgi (renamed from railties/lib/generators/rails/app/templates/dispatchers/gateway.cgi) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/doc/README_FOR_APP (renamed from railties/lib/generators/rails/app/templates/doc/README_FOR_APP) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/404.html (renamed from railties/lib/generators/rails/app/templates/public/404.html) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/422.html (renamed from railties/lib/generators/rails/app/templates/public/422.html) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/500.html (renamed from railties/lib/generators/rails/app/templates/public/500.html) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/favicon.ico (renamed from railties/lib/generators/rails/app/templates/public/favicon.ico) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/images/rails.png (renamed from railties/lib/generators/rails/app/templates/public/images/rails.png) | bin | 6646 -> 6646 bytes | |||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/index.html (renamed from railties/lib/generators/rails/app/templates/public/index.html) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/javascripts/application.js (renamed from railties/lib/generators/rails/app/templates/public/javascripts/application.js) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/javascripts/controls.js (renamed from railties/lib/generators/rails/app/templates/public/javascripts/controls.js) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/javascripts/dragdrop.js (renamed from railties/lib/generators/rails/app/templates/public/javascripts/dragdrop.js) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/javascripts/effects.js (renamed from railties/lib/generators/rails/app/templates/public/javascripts/effects.js) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/javascripts/prototype.js (renamed from railties/lib/generators/rails/app/templates/public/javascripts/prototype.js) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/robots.txt (renamed from railties/lib/generators/rails/app/templates/public/robots.txt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory (renamed from railties/lib/generators/rails/app/templates/public/stylesheets/.empty_directory) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/about.tt (renamed from railties/lib/generators/rails/app/templates/script/about.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/console.tt (renamed from railties/lib/generators/rails/app/templates/script/console.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt (renamed from railties/lib/generators/rails/app/templates/script/dbconsole.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/destroy.tt (renamed from railties/lib/generators/rails/app/templates/script/destroy.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/generate.tt (renamed from railties/lib/generators/rails/app/templates/script/generate.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker.tt (renamed from railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/performance/profiler.tt (renamed from railties/lib/generators/rails/app/templates/script/performance/profiler.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/plugin.tt (renamed from railties/lib/generators/rails/app/templates/script/plugin.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/runner.tt (renamed from railties/lib/generators/rails/app/templates/script/runner.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/server.tt (renamed from railties/lib/generators/rails/app/templates/script/server.tt) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory (renamed from railties/lib/generators/rails/app/templates/test/fixtures/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory (renamed from railties/lib/generators/rails/app/templates/test/functional/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory (renamed from railties/lib/generators/rails/app/templates/test/integration/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb (renamed from railties/lib/generators/rails/app/templates/test/performance/browsing_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/test_helper.rb (renamed from railties/lib/generators/rails/app/templates/test/test_helper.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory (renamed from railties/lib/generators/rails/app/templates/test/unit/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/controller/USAGE (renamed from railties/lib/generators/rails/controller/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/controller/controller_generator.rb (renamed from railties/lib/generators/rails/controller/controller_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/controller/templates/controller.rb (renamed from railties/lib/generators/rails/controller/templates/controller.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/generator/USAGE (renamed from railties/lib/generators/rails/generator/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/generator/generator_generator.rb (renamed from railties/lib/generators/rails/generator/generator_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt (renamed from railties/lib/generators/rails/generator/templates/%file_name%_generator.rb.tt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/generator/templates/USAGE.tt (renamed from railties/lib/generators/rails/generator/templates/USAGE.tt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/generator/templates/templates/.empty_directory (renamed from railties/lib/generators/rails/generator/templates/templates/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/helper/USAGE (renamed from railties/lib/generators/rails/helper/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/helper/helper_generator.rb (renamed from railties/lib/generators/rails/helper/helper_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/helper/templates/helper.rb (renamed from railties/lib/generators/rails/helper/templates/helper.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/integration_test/USAGE (renamed from railties/lib/generators/rails/integration_test/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/integration_test/integration_test_generator.rb (renamed from railties/lib/generators/rails/integration_test/integration_test_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/mailer/USAGE (renamed from railties/lib/generators/rails/mailer/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/mailer/mailer_generator.rb (renamed from railties/lib/generators/rails/mailer/mailer_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/mailer/templates/mailer.rb (renamed from railties/lib/generators/rails/mailer/templates/mailer.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/metal/USAGE (renamed from railties/lib/generators/rails/metal/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/metal/metal_generator.rb (renamed from railties/lib/generators/rails/metal/metal_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/metal/templates/metal.rb (renamed from railties/lib/generators/rails/metal/templates/metal.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/migration/USAGE (renamed from railties/lib/generators/rails/migration/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/migration/migration_generator.rb (renamed from railties/lib/generators/rails/migration/migration_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/model/USAGE (renamed from railties/lib/generators/rails/model/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/model/model_generator.rb (renamed from railties/lib/generators/rails/model/model_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/model_subclass/model_subclass_generator.rb (renamed from railties/lib/generators/rails/model_subclass/model_subclass_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/observer/USAGE (renamed from railties/lib/generators/rails/observer/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/observer/observer_generator.rb (renamed from railties/lib/generators/rails/observer/observer_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/performance_test/USAGE (renamed from railties/lib/generators/rails/performance_test/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb (renamed from railties/lib/generators/rails/performance_test/performance_test_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/USAGE (renamed from railties/lib/generators/rails/plugin/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/plugin_generator.rb (renamed from railties/lib/generators/rails/plugin/plugin_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/MIT-LICENSE (renamed from railties/lib/generators/rails/plugin/templates/MIT-LICENSE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/README (renamed from railties/lib/generators/rails/plugin/templates/README) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/Rakefile (renamed from railties/lib/generators/rails/plugin/templates/Rakefile) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/init.rb (renamed from railties/lib/generators/rails/plugin/templates/init.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/install.rb (renamed from railties/lib/generators/rails/plugin/templates/install.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/lib/%file_name%.rb.tt (renamed from railties/lib/generators/rails/plugin/templates/lib/%file_name%.rb.tt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt (renamed from railties/lib/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/uninstall.rb (renamed from railties/lib/generators/rails/plugin/templates/uninstall.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/resource/USAGE (renamed from railties/lib/generators/rails/resource/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/resource/resource_generator.rb (renamed from railties/lib/generators/rails/resource/resource_generator.rb) | 4 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/scaffold/USAGE (renamed from railties/lib/generators/rails/scaffold/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb (renamed from railties/lib/generators/rails/scaffold/scaffold_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/scaffold_controller/USAGE (renamed from railties/lib/generators/rails/scaffold_controller/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb (renamed from railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb (renamed from railties/lib/generators/rails/scaffold_controller/templates/controller.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/session_migration/USAGE (renamed from railties/lib/generators/rails/session_migration/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/session_migration/session_migration_generator.rb (renamed from railties/lib/generators/rails/session_migration/session_migration_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/stylesheets/USAGE (renamed from railties/lib/generators/rails/stylesheets/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/stylesheets/stylesheets_generator.rb (renamed from railties/lib/generators/rails/stylesheets/stylesheets_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css (renamed from railties/lib/generators/rails/stylesheets/templates/scaffold.css) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/resource_helpers.rb (renamed from railties/lib/generators/resource_helpers.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit.rb (renamed from railties/lib/generators/test_unit.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/controller/controller_generator.rb (renamed from railties/lib/generators/test_unit/controller/controller_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb (renamed from railties/lib/generators/test_unit/controller/templates/functional_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/helper/helper_generator.rb (renamed from railties/lib/generators/test_unit/helper/helper_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/helper/templates/helper_test.rb (renamed from railties/lib/generators/test_unit/helper/templates/helper_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/integration/integration_generator.rb (renamed from railties/lib/generators/test_unit/integration/integration_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb (renamed from railties/lib/generators/test_unit/integration/templates/integration_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb (renamed from railties/lib/generators/test_unit/mailer/mailer_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/mailer/templates/fixture (renamed from railties/lib/generators/test_unit/mailer/templates/fixture) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/mailer/templates/unit_test.rb (renamed from railties/lib/generators/test_unit/mailer/templates/unit_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/model/model_generator.rb (renamed from railties/lib/generators/test_unit/model/model_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/model/templates/fixtures.yml (renamed from railties/lib/generators/test_unit/model/templates/fixtures.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/model/templates/unit_test.rb (renamed from railties/lib/generators/test_unit/model/templates/unit_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/observer/observer_generator.rb (renamed from railties/lib/generators/test_unit/observer/observer_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/observer/templates/unit_test.rb (renamed from railties/lib/generators/test_unit/observer/templates/unit_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/performance/performance_generator.rb (renamed from railties/lib/generators/test_unit/performance/performance_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb (renamed from railties/lib/generators/test_unit/performance/templates/performance_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb (renamed from railties/lib/generators/test_unit/plugin/plugin_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/plugin/templates/%file_name%_test.rb.tt (renamed from railties/lib/generators/test_unit/plugin/templates/%file_name%_test.rb.tt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb (renamed from railties/lib/generators/test_unit/plugin/templates/test_helper.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb (renamed from railties/lib/generators/test_unit/scaffold/scaffold_generator.rb) | 4 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb (renamed from railties/lib/generators/test_unit/scaffold/templates/functional_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/initializer.rb (renamed from railties/lib/initializer.rb) | 87 | ||||
-rw-r--r-- | railties/lib/rails/initializer_old.rb (renamed from railties/lib/initializer_old.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/performance_test_help.rb (renamed from railties/lib/performance_test_help.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/rack/static.rb | 47 | ||||
-rw-r--r-- | railties/lib/rails/railties_path.rb (renamed from railties/lib/railties_path.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/ruby_version_check.rb (renamed from railties/lib/ruby_version_check.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/rubyprof_ext.rb (renamed from railties/lib/rubyprof_ext.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/source_annotation_extractor.rb (renamed from railties/lib/source_annotation_extractor.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks.rb (renamed from railties/lib/tasks/rails.rb) | 18 | ||||
-rw-r--r-- | railties/lib/rails/tasks/annotations.rake (renamed from railties/lib/tasks/annotations.rake) | 2 | ||||
-rw-r--r-- | railties/lib/rails/tasks/databases.rake (renamed from railties/lib/tasks/databases.rake) | 4 | ||||
-rw-r--r-- | railties/lib/rails/tasks/documentation.rake (renamed from railties/lib/tasks/documentation.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks/framework.rake (renamed from railties/lib/tasks/framework.rake) | 2 | ||||
-rw-r--r-- | railties/lib/rails/tasks/gems.rake (renamed from railties/lib/tasks/gems.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks/log.rake (renamed from railties/lib/tasks/log.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks/middleware.rake (renamed from railties/lib/tasks/middleware.rake) | 4 | ||||
-rw-r--r-- | railties/lib/rails/tasks/misc.rake (renamed from railties/lib/tasks/misc.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks/routes.rake (renamed from railties/lib/tasks/routes.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks/statistics.rake (renamed from railties/lib/tasks/statistics.rake) | 2 | ||||
-rw-r--r-- | railties/lib/rails/tasks/testing.rake (renamed from railties/lib/tasks/testing.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks/tmp.rake (renamed from railties/lib/tasks/tmp.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/test_help.rb (renamed from railties/lib/test_help.rb) | 4 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/LICENSE (renamed from railties/lib/vendor/bundler/LICENSE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/README.markdown (renamed from railties/lib/vendor/bundler/README.markdown) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/Rakefile (renamed from railties/lib/vendor/bundler/Rakefile) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler.rb (renamed from railties/lib/vendor/bundler/lib/bundler.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/cli.rb (renamed from railties/lib/vendor/bundler/lib/bundler/cli.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/commands/bundle_command.rb (renamed from railties/lib/vendor/bundler/lib/bundler/commands/bundle_command.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/commands/exec_command.rb (renamed from railties/lib/vendor/bundler/lib/bundler/commands/exec_command.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/dependency.rb (renamed from railties/lib/vendor/bundler/lib/bundler/dependency.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/dsl.rb (renamed from railties/lib/vendor/bundler/lib/bundler/dsl.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/environment.rb (renamed from railties/lib/vendor/bundler/lib/bundler/environment.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/finder.rb (renamed from railties/lib/vendor/bundler/lib/bundler/finder.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/gem_bundle.rb (renamed from railties/lib/vendor/bundler/lib/bundler/gem_bundle.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/gem_ext.rb (renamed from railties/lib/vendor/bundler/lib/bundler/gem_ext.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/repository.rb (renamed from railties/lib/vendor/bundler/lib/bundler/repository.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/repository/directory_repository.rb (renamed from railties/lib/vendor/bundler/lib/bundler/repository/directory_repository.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/repository/gem_repository.rb (renamed from railties/lib/vendor/bundler/lib/bundler/repository/gem_repository.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/resolver.rb (renamed from railties/lib/vendor/bundler/lib/bundler/resolver.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/runtime.rb (renamed from railties/lib/vendor/bundler/lib/bundler/runtime.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/source.rb (renamed from railties/lib/vendor/bundler/lib/bundler/source.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/templates/app_script.erb (renamed from railties/lib/vendor/bundler/lib/bundler/templates/app_script.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/templates/environment.erb (renamed from railties/lib/vendor/bundler/lib/bundler/templates/environment.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/CHANGELOG.rdoc (renamed from railties/lib/vendor/thor-0.11.6/CHANGELOG.rdoc) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/LICENSE (renamed from railties/lib/vendor/thor-0.11.6/LICENSE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/README.rdoc (renamed from railties/lib/vendor/thor-0.11.6/README.rdoc) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/vendor/thor-0.11.6/bin/rake2thor (renamed from railties/lib/vendor/thor-0.11.6/bin/rake2thor) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/vendor/thor-0.11.6/bin/thor (renamed from railties/lib/vendor/thor-0.11.6/bin/thor) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/actions.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/create_file.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/actions/create_file.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/directory.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/actions/directory.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/base.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/base.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/error.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/error.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/group.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/group.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/invocation.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/invocation.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/parser.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/argument.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/parser/argument.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/arguments.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/parser/arguments.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/option.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/parser/option.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/options.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/parser/options.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/rake_compat.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/rake_compat.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/runner.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/runner.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/shell.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell/basic.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/shell/basic.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell/color.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/shell/color.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/task.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/task.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/util.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/util.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/webrick_server.rb (renamed from railties/lib/webrick_server.rb) | 0 |
263 files changed, 233 insertions, 208 deletions
diff --git a/railties/lib/generators/rails/app/templates/dispatchers/config.ru b/railties/lib/generators/rails/app/templates/dispatchers/config.ru deleted file mode 100644 index acbfe4e9ae..0000000000 --- a/railties/lib/generators/rails/app/templates/dispatchers/config.ru +++ /dev/null @@ -1,7 +0,0 @@ -# Rack Dispatcher - -# Require your environment file to bootstrap Rails -require File.dirname(__FILE__) + '/config/environment' - -# Dispatch the request -run ActionController::Dispatcher.new diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb new file mode 100644 index 0000000000..43ece14a49 --- /dev/null +++ b/railties/lib/rails.rb @@ -0,0 +1 @@ +require 'rails/initializer' diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb new file mode 100644 index 0000000000..6139e20e95 --- /dev/null +++ b/railties/lib/rails/application.rb @@ -0,0 +1,29 @@ +module Rails + class Application + + def self.config + @config ||= Configuration.new + end + + def self.config=(config) + @config = config + end + + def config + self.class.config + end + + def routes + ActionController::Routing::Routes + end + + def middleware + config.middleware + end + + def call(env) + @app ||= middleware.build(routes) + @app.call(env) + end + end +end diff --git a/railties/lib/rails/backtrace_cleaner.rb b/railties/lib/rails/backtrace_cleaner.rb index 1605429e8b..9ff8367807 100644 --- a/railties/lib/rails/backtrace_cleaner.rb +++ b/railties/lib/rails/backtrace_cleaner.rb @@ -32,7 +32,7 @@ module Rails private def add_gem_filters - Gem.path.each do |path| + (Gem.path + [Gem.default_dir]).uniq.each do |path| # http://gist.github.com/30430 add_filter { |line| line.sub(/(#{path})\/gems\/([a-z]+)-([0-9.]+)\/(.*)/, '\2 (\3) \4')} end diff --git a/railties/lib/code_statistics.rb b/railties/lib/rails/code_statistics.rb index 740d8a1767..740d8a1767 100644 --- a/railties/lib/code_statistics.rb +++ b/railties/lib/rails/code_statistics.rb diff --git a/railties/lib/commands.rb b/railties/lib/rails/commands.rb index 841e98a0dc..841e98a0dc 100644 --- a/railties/lib/commands.rb +++ b/railties/lib/rails/commands.rb diff --git a/railties/lib/commands/about.rb b/railties/lib/rails/commands/about.rb index bc2cfcb948..bc2cfcb948 100644 --- a/railties/lib/commands/about.rb +++ b/railties/lib/rails/commands/about.rb diff --git a/railties/lib/commands/console.rb b/railties/lib/rails/commands/console.rb index 63df834639..31448bdf1a 100644 --- a/railties/lib/commands/console.rb +++ b/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 diff --git a/railties/lib/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index e6f11a45db..e6f11a45db 100644 --- a/railties/lib/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb diff --git a/railties/lib/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb index 5013d30b83..5013d30b83 100644 --- a/railties/lib/commands/destroy.rb +++ b/railties/lib/rails/commands/destroy.rb diff --git a/railties/lib/commands/generate.rb b/railties/lib/rails/commands/generate.rb index 32cabcab10..32cabcab10 100755 --- a/railties/lib/commands/generate.rb +++ b/railties/lib/rails/commands/generate.rb diff --git a/railties/lib/commands/ncgi/listener b/railties/lib/rails/commands/ncgi/listener index 7079ef78a6..7079ef78a6 100755 --- a/railties/lib/commands/ncgi/listener +++ b/railties/lib/rails/commands/ncgi/listener diff --git a/railties/lib/commands/ncgi/tracker b/railties/lib/rails/commands/ncgi/tracker index 4ca12d779b..4ca12d779b 100755 --- a/railties/lib/commands/ncgi/tracker +++ b/railties/lib/rails/commands/ncgi/tracker diff --git a/railties/lib/commands/performance/benchmarker.rb b/railties/lib/rails/commands/performance/benchmarker.rb index e8804fe1bf..e8804fe1bf 100644 --- a/railties/lib/commands/performance/benchmarker.rb +++ b/railties/lib/rails/commands/performance/benchmarker.rb diff --git a/railties/lib/commands/performance/profiler.rb b/railties/lib/rails/commands/performance/profiler.rb index 7df840f197..7df840f197 100644 --- a/railties/lib/commands/performance/profiler.rb +++ b/railties/lib/rails/commands/performance/profiler.rb diff --git a/railties/lib/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb index 159db707e7..159db707e7 100644 --- a/railties/lib/commands/plugin.rb +++ b/railties/lib/rails/commands/plugin.rb diff --git a/railties/lib/commands/runner.rb b/railties/lib/rails/commands/runner.rb index 510128318a..510128318a 100644 --- a/railties/lib/commands/runner.rb +++ b/railties/lib/rails/commands/runner.rb diff --git a/railties/lib/commands/server.rb b/railties/lib/rails/commands/server.rb index 823916b1dc..c138cbc9bf 100644 --- a/railties/lib/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -9,8 +9,7 @@ options = { :environment => (ENV['RAILS_ENV'] || "development").dup, :config => RAILS_ROOT + "/config.ru", :detach => false, - :debugger => false, - :path => nil + :debugger => false } ARGV.clone.options do |opts| @@ -25,7 +24,6 @@ ARGV.clone.options do |opts| opts.on("-e", "--environment=name", String, "Specifies the environment to run this server under (test/development/production).", "Default: #{options[:environment]}") { |v| options[:environment] = v } - opts.on("-P", "--path=/path", String, "Runs Rails app mounted at a specific path.", "Default: #{options[:path]}") { |v| options[:path] = v } opts.separator "" @@ -44,11 +42,7 @@ unless server end puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}" -puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}#{options[:path]}" - -%w(cache pids sessions sockets).each do |dir_to_make| - FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make)) -end +puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}}" if options[:detach] Process.daemon @@ -60,37 +54,10 @@ end ENV["RAILS_ENV"] = options[:environment] RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV) -if File.exist?(options[:config]) - config = options[:config] - if config =~ /\.ru$/ - cfgfile = File.read(config) - if cfgfile[/^#\\(.*)/] - opts.parse!($1.split(/\s+/)) - end - inner_app = eval("Rack::Builder.new {( " + cfgfile + "\n )}.to_app", nil, config) - else - require config - inner_app = Object.const_get(File.basename(config, '.rb').capitalize) - end -else - require RAILS_ROOT + "/config/environment" - inner_app = ActionController::Dispatcher.new -end - -if options[:path].nil? - map_path = "/" -else - ActionController::Base.relative_url_root = options[:path] - map_path = options[:path] -end - app = Rack::Builder.new { use Rails::Rack::LogTailer unless options[:detach] use Rails::Rack::Debugger if options[:debugger] - map map_path do - use Rails::Rack::Static - run inner_app - end + run ActionDispatch::Utils.parse_config(options[:config]) }.to_app puts "=> Call with -d to detach" diff --git a/railties/lib/commands/update.rb b/railties/lib/rails/commands/update.rb index f3b3ad0775..f3b3ad0775 100644 --- a/railties/lib/commands/update.rb +++ b/railties/lib/rails/commands/update.rb diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index 2b362a9c50..4a70a4800e 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -10,7 +10,7 @@ module Rails :log_path, :log_level, :logger, :preload_frameworks, :database_configuration_file, :cache_store, :time_zone, :view_path, :metals, :controller_paths, :routes_configuration_file, - :eager_load_paths, :dependency_loading, :paths + :eager_load_paths, :dependency_loading, :paths, :serve_static_assets def initialize set_root_path! @@ -35,6 +35,7 @@ module Rails @controller_paths = default_controller_paths @routes_configuration_file = default_routes_configuration_file @database_configuration_file = default_database_configuration_file + @serve_static_assets = default_serve_static_assets for framework in default_frameworks self.send("#{framework}=", Rails::OrderedOptions.new) @@ -107,10 +108,9 @@ module Rails defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{root_path}/vendor/rails" end - # TODO: Fix this when there is an application object def middleware - require 'action_controller' - ActionController::Dispatcher.middleware + require 'action_dispatch' + @middleware ||= ActionDispatch::MiddlewareStack.new end # Loads and returns the contents of the #database_configuration_file. The @@ -225,6 +225,10 @@ module Rails i18n end + def default_serve_static_assets + true + end + # Adds a single Gem dependency to the rails application. By default, it will require # the library with the same name as the gem. Use :lib to specify a different name. # diff --git a/railties/lib/console_app.rb b/railties/lib/rails/console_app.rb index 75e6f11ea3..1ad62e5058 100644 --- a/railties/lib/console_app.rb +++ b/railties/lib/rails/console_app.rb @@ -17,7 +17,8 @@ end # create a new session. If a block is given, the new session will be yielded # to the block before being returned. def new_session - session = ActionController::Integration::Session.new + app = ActionController::Dispatcher.new + session = ActionController::Integration::Session.new(app) yield session if block_given? session end @@ -25,7 +26,7 @@ end #reloads the environment def reload! puts "Reloading..." - ActionController::Dispatcher.new - ActionController::Dispatcher.router.reload + ActionDispatch::Callbacks.new(lambda {}, true) + ActionController::Routing::Routes.reload true end diff --git a/railties/lib/console_sandbox.rb b/railties/lib/rails/console_sandbox.rb index 65a3d68619..65a3d68619 100644 --- a/railties/lib/console_sandbox.rb +++ b/railties/lib/rails/console_sandbox.rb diff --git a/railties/lib/console_with_helpers.rb b/railties/lib/rails/console_with_helpers.rb index 039db667c4..039db667c4 100644 --- a/railties/lib/console_with_helpers.rb +++ b/railties/lib/rails/console_with_helpers.rb diff --git a/railties/lib/rails/core.rb b/railties/lib/rails/core.rb index 33695a27b9..4be90de792 100644 --- a/railties/lib/rails/core.rb +++ b/railties/lib/rails/core.rb @@ -5,6 +5,14 @@ module Rails # --- # TODO: w0t? class << self + def application + @@application + end + + def application=(application) + @@application = application + end + # The Configuration instance used to configure the Rails environment def configuration @@configuration diff --git a/railties/lib/dispatcher.rb b/railties/lib/rails/dispatcher.rb index 7f9a6221d9..7f9a6221d9 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/rails/dispatcher.rb diff --git a/railties/lib/fcgi_handler.rb b/railties/lib/rails/fcgi_handler.rb index 0cd2dc51c6..ef6f3b094c 100644 --- a/railties/lib/fcgi_handler.rb +++ b/railties/lib/rails/fcgi_handler.rb @@ -1,6 +1,6 @@ require 'fcgi' require 'logger' -require 'dispatcher' +require 'rails/dispatcher' require 'rbconfig' class RailsFCGIHandler diff --git a/railties/lib/generators.rb b/railties/lib/rails/generators.rb index 2a196f65ea..0419a4e36c 100644 --- a/railties/lib/generators.rb +++ b/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 diff --git a/railties/lib/generators/actions.rb b/railties/lib/rails/generators/actions.rb index c4552dd399..c4552dd399 100644 --- a/railties/lib/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb diff --git a/railties/lib/generators/active_model.rb b/railties/lib/rails/generators/active_model.rb index 1a849a0e02..1a849a0e02 100644 --- a/railties/lib/generators/active_model.rb +++ b/railties/lib/rails/generators/active_model.rb diff --git a/railties/lib/generators/active_record.rb b/railties/lib/rails/generators/active_record.rb index ff3093f356..c03ea59c1b 100644 --- a/railties/lib/generators/active_record.rb +++ b/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 diff --git a/railties/lib/generators/active_record/migration/migration_generator.rb b/railties/lib/rails/generators/active_record/migration/migration_generator.rb index 7939977f72..f6159deeeb 100644 --- a/railties/lib/generators/active_record/migration/migration_generator.rb +++ b/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 diff --git a/railties/lib/generators/active_record/migration/templates/migration.rb b/railties/lib/rails/generators/active_record/migration/templates/migration.rb index bbb7c53d86..bbb7c53d86 100644 --- a/railties/lib/generators/active_record/migration/templates/migration.rb +++ b/railties/lib/rails/generators/active_record/migration/templates/migration.rb diff --git a/railties/lib/generators/active_record/model/model_generator.rb b/railties/lib/rails/generators/active_record/model/model_generator.rb index 2641083e0d..3e72fbeca8 100644 --- a/railties/lib/generators/active_record/model/model_generator.rb +++ b/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 diff --git a/railties/lib/generators/active_record/model/templates/migration.rb b/railties/lib/rails/generators/active_record/model/templates/migration.rb index 1f68487304..1f68487304 100644 --- a/railties/lib/generators/active_record/model/templates/migration.rb +++ b/railties/lib/rails/generators/active_record/model/templates/migration.rb diff --git a/railties/lib/generators/active_record/model/templates/model.rb b/railties/lib/rails/generators/active_record/model/templates/model.rb index 21ae29e9f2..21ae29e9f2 100644 --- a/railties/lib/generators/active_record/model/templates/model.rb +++ b/railties/lib/rails/generators/active_record/model/templates/model.rb diff --git a/railties/lib/generators/active_record/observer/observer_generator.rb b/railties/lib/rails/generators/active_record/observer/observer_generator.rb index a6b57423b8..c1c0e3f25b 100644 --- a/railties/lib/generators/active_record/observer/observer_generator.rb +++ b/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 diff --git a/railties/lib/generators/active_record/observer/templates/observer.rb b/railties/lib/rails/generators/active_record/observer/templates/observer.rb index b9a3004161..b9a3004161 100644 --- a/railties/lib/generators/active_record/observer/templates/observer.rb +++ b/railties/lib/rails/generators/active_record/observer/templates/observer.rb diff --git a/railties/lib/generators/active_record/session_migration/session_migration_generator.rb b/railties/lib/rails/generators/active_record/session_migration/session_migration_generator.rb index 59c4792066..afcda2a98a 100644 --- a/railties/lib/generators/active_record/session_migration/session_migration_generator.rb +++ b/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 diff --git a/railties/lib/generators/active_record/session_migration/templates/migration.rb b/railties/lib/rails/generators/active_record/session_migration/templates/migration.rb index 919822af7b..919822af7b 100644 --- a/railties/lib/generators/active_record/session_migration/templates/migration.rb +++ b/railties/lib/rails/generators/active_record/session_migration/templates/migration.rb diff --git a/railties/lib/generators/base.rb b/railties/lib/rails/generators/base.rb index cb6a129264..720caa5b3f 100644 --- a/railties/lib/generators/base.rb +++ b/railties/lib/rails/generators/base.rb @@ -1,5 +1,5 @@ require 'thor' -require 'generators/actions' +require 'rails/generators/actions' module Rails module Generators diff --git a/railties/lib/generators/erb.rb b/railties/lib/rails/generators/erb.rb index 43d47109c7..d468d012dc 100644 --- a/railties/lib/generators/erb.rb +++ b/railties/lib/rails/generators/erb.rb @@ -1,4 +1,4 @@ -require 'generators/named_base' +require 'rails/generators/named_base' module Erb module Generators diff --git a/railties/lib/generators/erb/controller/controller_generator.rb b/railties/lib/rails/generators/erb/controller/controller_generator.rb index ab7b273662..f8780d9c33 100644 --- a/railties/lib/generators/erb/controller/controller_generator.rb +++ b/railties/lib/rails/generators/erb/controller/controller_generator.rb @@ -1,4 +1,4 @@ -require 'generators/erb' +require 'rails/generators/erb' module Erb module Generators diff --git a/railties/lib/generators/erb/controller/templates/view.html.erb b/railties/lib/rails/generators/erb/controller/templates/view.html.erb index cd54d13d83..cd54d13d83 100644 --- a/railties/lib/generators/erb/controller/templates/view.html.erb +++ b/railties/lib/rails/generators/erb/controller/templates/view.html.erb diff --git a/railties/lib/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb index 4ec2f4c9f4..5266259e2f 100644 --- a/railties/lib/generators/erb/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb @@ -1,4 +1,4 @@ -require 'generators/erb' +require 'rails/generators/erb' module Erb module Generators diff --git a/railties/lib/generators/erb/mailer/templates/view.erb b/railties/lib/rails/generators/erb/mailer/templates/view.erb index fcce7bd805..fcce7bd805 100644 --- a/railties/lib/generators/erb/mailer/templates/view.erb +++ b/railties/lib/rails/generators/erb/mailer/templates/view.erb diff --git a/railties/lib/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb index d51dc7d725..de5b0e9c5d 100644 --- a/railties/lib/generators/erb/scaffold/scaffold_generator.rb +++ b/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 diff --git a/railties/lib/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb index d02028d983..d02028d983 100644 --- a/railties/lib/generators/erb/scaffold/templates/_form.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb diff --git a/railties/lib/generators/erb/scaffold/templates/edit.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb index 5bc507ffc8..5bc507ffc8 100644 --- a/railties/lib/generators/erb/scaffold/templates/edit.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb diff --git a/railties/lib/generators/erb/scaffold/templates/index.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb index 5e6a4af9e0..5e6a4af9e0 100644 --- a/railties/lib/generators/erb/scaffold/templates/index.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb diff --git a/railties/lib/generators/erb/scaffold/templates/layout.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/layout.html.erb index 6460e5b599..6460e5b599 100644 --- a/railties/lib/generators/erb/scaffold/templates/layout.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/layout.html.erb diff --git a/railties/lib/generators/erb/scaffold/templates/new.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb index 9a1c489331..9a1c489331 100644 --- a/railties/lib/generators/erb/scaffold/templates/new.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb diff --git a/railties/lib/generators/erb/scaffold/templates/show.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb index 25567957be..25567957be 100644 --- a/railties/lib/generators/erb/scaffold/templates/show.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb diff --git a/railties/lib/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb index e962308585..e962308585 100644 --- a/railties/lib/generators/generated_attribute.rb +++ b/railties/lib/rails/generators/generated_attribute.rb diff --git a/railties/lib/generators/migration.rb b/railties/lib/rails/generators/migration.rb index 0a9151ecdf..0a9151ecdf 100644 --- a/railties/lib/generators/migration.rb +++ b/railties/lib/rails/generators/migration.rb diff --git a/railties/lib/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb index b6ac05f482..0e5976f915 100644 --- a/railties/lib/generators/named_base.rb +++ b/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 diff --git a/railties/lib/generators/rails/app/USAGE b/railties/lib/rails/generators/rails/app/USAGE index 36d6061a59..36d6061a59 100644 --- a/railties/lib/generators/rails/app/USAGE +++ b/railties/lib/rails/generators/rails/app/USAGE diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 24c9a969f9..b2322f90b4 100644 --- a/railties/lib/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -56,6 +56,7 @@ module Rails::Generators def create_root_files copy_file "Rakefile" copy_file "README" + copy_file "config.ru" end def create_app_files @@ -114,7 +115,6 @@ module Rails::Generators def create_dispatch_files return unless options[:with_dispatchers] - copy_file "dispatchers/config.ru", "config.ru" template "dispatchers/dispatch.rb", "public/dispatch.rb" chmod "public/dispatch.rb", 0755, :verbose => false diff --git a/railties/lib/generators/rails/app/templates/README b/railties/lib/rails/generators/rails/app/templates/README index 37ec8ea211..37ec8ea211 100644 --- a/railties/lib/generators/rails/app/templates/README +++ b/railties/lib/rails/generators/rails/app/templates/README diff --git a/railties/lib/generators/rails/app/templates/Rakefile b/railties/lib/rails/generators/rails/app/templates/Rakefile index 3bb0e8592a..bd4dec5389 100755 --- a/railties/lib/generators/rails/app/templates/Rakefile +++ b/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' diff --git a/railties/lib/generators/rails/app/templates/app/controllers/application_controller.rb b/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb index 6635a3f487..6635a3f487 100644 --- a/railties/lib/generators/rails/app/templates/app/controllers/application_controller.rb +++ b/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb diff --git a/railties/lib/generators/rails/app/templates/app/helpers/application_helper.rb b/railties/lib/rails/generators/rails/app/templates/app/helpers/application_helper.rb index 22a7940eb2..22a7940eb2 100644 --- a/railties/lib/generators/rails/app/templates/app/helpers/application_helper.rb +++ b/railties/lib/rails/generators/rails/app/templates/app/helpers/application_helper.rb diff --git a/railties/lib/generators/rails/app/templates/app/models/.empty_directory b/railties/lib/rails/generators/rails/app/templates/app/models/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/app/models/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/app/models/.empty_directory diff --git a/railties/lib/generators/rails/app/templates/app/views/layouts/.empty_directory b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/app/views/layouts/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/.empty_directory diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru b/railties/lib/rails/generators/rails/app/templates/config.ru new file mode 100644 index 0000000000..50ee033d44 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/config.ru @@ -0,0 +1,5 @@ +# Require your environment file to bootstrap Rails +require ::File.dirname(__FILE__) + '/config/environment' + +# Dispatch the request +run Rails.application.new diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb index dd5e3b6916..52086fbc7d 100644 --- a/railties/lib/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -4,6 +4,11 @@ RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT) module Rails + # Mark the version of Rails that generated the boot.rb file. This is + # a temporary solution and will most likely be removed as Rails 3.0 + # comes closer. + BOOTSTRAP_VERSION = "3.0" + class << self def boot! unless booted? @@ -36,23 +41,57 @@ module Rails class Boot def run load_initializer - Rails::Initializer.run(:set_load_path) + set_load_paths + end + + def set_load_paths + %w( + railties + railties/lib + activesupport/lib + actionpack/lib + activerecord/lib + actionmailer/lib + activeresource/lib + actionwebservice/lib + ).reverse_each do |path| + path = "#{framework_root_path}/#{path}" + $LOAD_PATH.unshift(path) if File.directory?(path) + $LOAD_PATH.uniq! + end + end + + def framework_root_path + defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{RAILS_ROOT}/vendor/rails" end end class VendorBoot < Boot def load_initializer - require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" - Rails::Initializer.run(:install_gem_spec_stubs) + $:.unshift("#{framework_root_path}/railties/lib") + require "rails" + install_gem_spec_stubs Rails::GemDependency.add_frozen_gem_path end + + def install_gem_spec_stubs + begin; require "rubygems"; rescue LoadError; return; end + + %w(rails activesupport activerecord actionpack actionmailer activeresource).each do |stub| + Gem.loaded_specs[stub] ||= Gem::Specification.new do |s| + s.name = stub + s.version = Rails::VERSION::STRING + s.loaded_from = "" + end + end + end end class GemBoot < Boot def load_initializer self.class.load_rubygems load_rails_gem - require 'initializer' + require 'rails' end def load_rails_gem diff --git a/railties/lib/generators/rails/app/templates/config/databases/frontbase.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml index c0c3588be1..c0c3588be1 100644 --- a/railties/lib/generators/rails/app/templates/config/databases/frontbase.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml diff --git a/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml index a9716ddb44..a9716ddb44 100644 --- a/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml diff --git a/railties/lib/generators/rails/app/templates/config/databases/mysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml index 6bf2f7b1fd..6bf2f7b1fd 100644 --- a/railties/lib/generators/rails/app/templates/config/databases/mysql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml diff --git a/railties/lib/generators/rails/app/templates/config/databases/oracle.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml index a1883f6256..a1883f6256 100644 --- a/railties/lib/generators/rails/app/templates/config/databases/oracle.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml diff --git a/railties/lib/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml index f600e054cf..f600e054cf 100644 --- a/railties/lib/generators/rails/app/templates/config/databases/postgresql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml diff --git a/railties/lib/generators/rails/app/templates/config/databases/sqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml index 025d62a8d8..025d62a8d8 100644 --- a/railties/lib/generators/rails/app/templates/config/databases/sqlite3.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml diff --git a/railties/lib/generators/rails/app/templates/config/environment.rb b/railties/lib/rails/generators/rails/app/templates/config/environment.rb index adb3a3060a..adb3a3060a 100644 --- a/railties/lib/generators/rails/app/templates/config/environment.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/environment.rb diff --git a/railties/lib/generators/rails/app/templates/config/environments/development.rb b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb index 85c9a6080e..85c9a6080e 100644 --- a/railties/lib/generators/rails/app/templates/config/environments/development.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb diff --git a/railties/lib/generators/rails/app/templates/config/environments/production.rb b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb index 1fc9f6b923..377b9207c7 100644 --- a/railties/lib/generators/rails/app/templates/config/environments/production.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb @@ -17,6 +17,10 @@ config.action_controller.perform_caching = true # Use a different cache store in production # config.cache_store = :mem_cache_store +# Disable Rails's static asset server +# In production, Apache or nginx will already do this +config.serve_static_assets = false + # Enable serving of images, stylesheets, and javascripts from an asset server # config.action_controller.asset_host = "http://assets.example.com" @@ -24,4 +28,4 @@ config.action_controller.perform_caching = true # config.action_mailer.raise_delivery_errors = false # Enable threaded mode -# config.threadsafe!
\ No newline at end of file +# config.threadsafe! diff --git a/railties/lib/generators/rails/app/templates/config/environments/test.rb b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb index 496eb9572b..496eb9572b 100644 --- a/railties/lib/generators/rails/app/templates/config/environments/test.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb diff --git a/railties/lib/generators/rails/app/templates/config/initializers/backtrace_silencers.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb index 839d4cde19..839d4cde19 100644 --- a/railties/lib/generators/rails/app/templates/config/initializers/backtrace_silencers.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb diff --git a/railties/lib/generators/rails/app/templates/config/initializers/inflections.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb index d531b8bb82..d531b8bb82 100644 --- a/railties/lib/generators/rails/app/templates/config/initializers/inflections.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb diff --git a/railties/lib/generators/rails/app/templates/config/initializers/mime_types.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb index 72aca7e441..72aca7e441 100644 --- a/railties/lib/generators/rails/app/templates/config/initializers/mime_types.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb diff --git a/railties/lib/generators/rails/app/templates/config/initializers/new_rails_defaults.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb index 8ec3186c84..8ec3186c84 100644 --- a/railties/lib/generators/rails/app/templates/config/initializers/new_rails_defaults.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb diff --git a/railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt index 4499ab84b6..4499ab84b6 100644 --- a/railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt diff --git a/railties/lib/generators/rails/app/templates/config/locales/en.yml b/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml index f265c068d8..f265c068d8 100644 --- a/railties/lib/generators/rails/app/templates/config/locales/en.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml diff --git a/railties/lib/generators/rails/app/templates/config/routes.rb b/railties/lib/rails/generators/rails/app/templates/config/routes.rb index ea14ce1bfc..ea14ce1bfc 100644 --- a/railties/lib/generators/rails/app/templates/config/routes.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/routes.rb diff --git a/railties/lib/generators/rails/app/templates/db/seeds.rb b/railties/lib/rails/generators/rails/app/templates/db/seeds.rb index bc8695e6f0..bc8695e6f0 100644 --- a/railties/lib/generators/rails/app/templates/db/seeds.rb +++ b/railties/lib/rails/generators/rails/app/templates/db/seeds.rb diff --git a/railties/lib/generators/rails/app/templates/dispatchers/dispatch.fcgi b/railties/lib/rails/generators/rails/app/templates/dispatchers/dispatch.fcgi index f5b3b71875..f5b3b71875 100755 --- a/railties/lib/generators/rails/app/templates/dispatchers/dispatch.fcgi +++ b/railties/lib/rails/generators/rails/app/templates/dispatchers/dispatch.fcgi diff --git a/railties/lib/generators/rails/app/templates/dispatchers/dispatch.rb b/railties/lib/rails/generators/rails/app/templates/dispatchers/dispatch.rb index 48e888113a..48e888113a 100755 --- a/railties/lib/generators/rails/app/templates/dispatchers/dispatch.rb +++ b/railties/lib/rails/generators/rails/app/templates/dispatchers/dispatch.rb diff --git a/railties/lib/generators/rails/app/templates/dispatchers/gateway.cgi b/railties/lib/rails/generators/rails/app/templates/dispatchers/gateway.cgi index bdc1055a22..bdc1055a22 100755 --- a/railties/lib/generators/rails/app/templates/dispatchers/gateway.cgi +++ b/railties/lib/rails/generators/rails/app/templates/dispatchers/gateway.cgi diff --git a/railties/lib/generators/rails/app/templates/doc/README_FOR_APP b/railties/lib/rails/generators/rails/app/templates/doc/README_FOR_APP index fe41f5cc24..fe41f5cc24 100644 --- a/railties/lib/generators/rails/app/templates/doc/README_FOR_APP +++ b/railties/lib/rails/generators/rails/app/templates/doc/README_FOR_APP diff --git a/railties/lib/generators/rails/app/templates/public/404.html b/railties/lib/rails/generators/rails/app/templates/public/404.html index 88ee108e90..88ee108e90 100644 --- a/railties/lib/generators/rails/app/templates/public/404.html +++ b/railties/lib/rails/generators/rails/app/templates/public/404.html diff --git a/railties/lib/generators/rails/app/templates/public/422.html b/railties/lib/rails/generators/rails/app/templates/public/422.html index 9c3c96670b..9c3c96670b 100644 --- a/railties/lib/generators/rails/app/templates/public/422.html +++ b/railties/lib/rails/generators/rails/app/templates/public/422.html diff --git a/railties/lib/generators/rails/app/templates/public/500.html b/railties/lib/rails/generators/rails/app/templates/public/500.html index f71c86e652..f71c86e652 100644 --- a/railties/lib/generators/rails/app/templates/public/500.html +++ b/railties/lib/rails/generators/rails/app/templates/public/500.html diff --git a/railties/lib/generators/rails/app/templates/public/favicon.ico b/railties/lib/rails/generators/rails/app/templates/public/favicon.ico index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/public/favicon.ico +++ b/railties/lib/rails/generators/rails/app/templates/public/favicon.ico diff --git a/railties/lib/generators/rails/app/templates/public/images/rails.png b/railties/lib/rails/generators/rails/app/templates/public/images/rails.png Binary files differindex d5edc04e65..d5edc04e65 100644 --- a/railties/lib/generators/rails/app/templates/public/images/rails.png +++ b/railties/lib/rails/generators/rails/app/templates/public/images/rails.png diff --git a/railties/lib/generators/rails/app/templates/public/index.html b/railties/lib/rails/generators/rails/app/templates/public/index.html index ff2dfd3193..ff2dfd3193 100644 --- a/railties/lib/generators/rails/app/templates/public/index.html +++ b/railties/lib/rails/generators/rails/app/templates/public/index.html diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/application.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/application.js index fe4577696b..fe4577696b 100644 --- a/railties/lib/generators/rails/app/templates/public/javascripts/application.js +++ b/railties/lib/rails/generators/rails/app/templates/public/javascripts/application.js diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/controls.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/controls.js index ca29aefdd1..ca29aefdd1 100644 --- a/railties/lib/generators/rails/app/templates/public/javascripts/controls.js +++ b/railties/lib/rails/generators/rails/app/templates/public/javascripts/controls.js diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/dragdrop.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/dragdrop.js index 07229f986f..07229f986f 100644 --- a/railties/lib/generators/rails/app/templates/public/javascripts/dragdrop.js +++ b/railties/lib/rails/generators/rails/app/templates/public/javascripts/dragdrop.js diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/effects.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/effects.js index 5a639d2dea..5a639d2dea 100644 --- a/railties/lib/generators/rails/app/templates/public/javascripts/effects.js +++ b/railties/lib/rails/generators/rails/app/templates/public/javascripts/effects.js diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/prototype.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/prototype.js index dfe8ab4e13..dfe8ab4e13 100644 --- a/railties/lib/generators/rails/app/templates/public/javascripts/prototype.js +++ b/railties/lib/rails/generators/rails/app/templates/public/javascripts/prototype.js diff --git a/railties/lib/generators/rails/app/templates/public/robots.txt b/railties/lib/rails/generators/rails/app/templates/public/robots.txt index 085187fa58..085187fa58 100644 --- a/railties/lib/generators/rails/app/templates/public/robots.txt +++ b/railties/lib/rails/generators/rails/app/templates/public/robots.txt diff --git a/railties/lib/generators/rails/app/templates/public/stylesheets/.empty_directory b/railties/lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/public/stylesheets/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory diff --git a/railties/lib/generators/rails/app/templates/script/about.tt b/railties/lib/rails/generators/rails/app/templates/script/about.tt index afbab8b533..1220676c08 100755 --- a/railties/lib/generators/rails/app/templates/script/about.tt +++ b/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' diff --git a/railties/lib/generators/rails/app/templates/script/console.tt b/railties/lib/rails/generators/rails/app/templates/script/console.tt index 2f8b95c923..5aec193853 100755 --- a/railties/lib/generators/rails/app/templates/script/console.tt +++ b/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' diff --git a/railties/lib/generators/rails/app/templates/script/dbconsole.tt b/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt index 7dce6d16dd..632563f470 100755 --- a/railties/lib/generators/rails/app/templates/script/dbconsole.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/dbconsole' +require 'rails/commands/dbconsole' diff --git a/railties/lib/generators/rails/app/templates/script/destroy.tt b/railties/lib/rails/generators/rails/app/templates/script/destroy.tt index 053d3dea39..c5f94862c3 100755 --- a/railties/lib/generators/rails/app/templates/script/destroy.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/destroy.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/destroy' +require 'rails/commands/destroy' diff --git a/railties/lib/generators/rails/app/templates/script/generate.tt b/railties/lib/rails/generators/rails/app/templates/script/generate.tt index ea4a0efd43..d466c94767 100755 --- a/railties/lib/generators/rails/app/templates/script/generate.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/generate.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/generate' +require 'rails/commands/generate' diff --git a/railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt b/railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker.tt index da9df7fab9..3e03aaa767 100755 --- a/railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../../config/boot', __FILE__) -require 'commands/performance/benchmarker' +require 'rails/commands/performance/benchmarker' diff --git a/railties/lib/generators/rails/app/templates/script/performance/profiler.tt b/railties/lib/rails/generators/rails/app/templates/script/performance/profiler.tt index 5a0e2b0c28..deada2f561 100755 --- a/railties/lib/generators/rails/app/templates/script/performance/profiler.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/performance/profiler.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../../config/boot', __FILE__) -require 'commands/performance/profiler' +require 'rails/commands/performance/profiler' diff --git a/railties/lib/generators/rails/app/templates/script/plugin.tt b/railties/lib/rails/generators/rails/app/templates/script/plugin.tt index 68b2148bba..f4081f56b6 100755 --- a/railties/lib/generators/rails/app/templates/script/plugin.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/plugin.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/plugin' +require 'rails/commands/plugin' diff --git a/railties/lib/generators/rails/app/templates/script/runner.tt b/railties/lib/rails/generators/rails/app/templates/script/runner.tt index a2b313fa32..60c8c0bba1 100755 --- a/railties/lib/generators/rails/app/templates/script/runner.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/runner.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/runner' +require 'rails/commands/runner' diff --git a/railties/lib/generators/rails/app/templates/script/server.tt b/railties/lib/rails/generators/rails/app/templates/script/server.tt index c8868155f3..54e3346bec 100755 --- a/railties/lib/generators/rails/app/templates/script/server.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/server.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/server' +require 'rails/commands/server' diff --git a/railties/lib/generators/rails/app/templates/test/fixtures/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/test/fixtures/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory diff --git a/railties/lib/generators/rails/app/templates/test/functional/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/test/functional/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory diff --git a/railties/lib/generators/rails/app/templates/test/integration/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/test/integration/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory diff --git a/railties/lib/generators/rails/app/templates/test/performance/browsing_test.rb b/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb index 4b60558b43..4b60558b43 100644 --- a/railties/lib/generators/rails/app/templates/test/performance/browsing_test.rb +++ b/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb diff --git a/railties/lib/generators/rails/app/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb index b9fe2517c8..a16f587d8b 100644 --- a/railties/lib/generators/rails/app/templates/test/test_helper.rb +++ b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb @@ -1,6 +1,6 @@ ENV["RAILS_ENV"] = "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") -require 'test_help' +require 'rails/test_help' class ActiveSupport::TestCase # Transactional fixtures accelerate your tests by wrapping each test method diff --git a/railties/lib/generators/rails/app/templates/test/unit/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/test/unit/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory diff --git a/railties/lib/generators/rails/controller/USAGE b/railties/lib/rails/generators/rails/controller/USAGE index 6ed4b2edfc..6ed4b2edfc 100644 --- a/railties/lib/generators/rails/controller/USAGE +++ b/railties/lib/rails/generators/rails/controller/USAGE diff --git a/railties/lib/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb index 91470be833..91470be833 100644 --- a/railties/lib/generators/rails/controller/controller_generator.rb +++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb diff --git a/railties/lib/generators/rails/controller/templates/controller.rb b/railties/lib/rails/generators/rails/controller/templates/controller.rb index cda2659e69..cda2659e69 100644 --- a/railties/lib/generators/rails/controller/templates/controller.rb +++ b/railties/lib/rails/generators/rails/controller/templates/controller.rb diff --git a/railties/lib/generators/rails/generator/USAGE b/railties/lib/rails/generators/rails/generator/USAGE index ca7d3f62d0..ca7d3f62d0 100644 --- a/railties/lib/generators/rails/generator/USAGE +++ b/railties/lib/rails/generators/rails/generator/USAGE diff --git a/railties/lib/generators/rails/generator/generator_generator.rb b/railties/lib/rails/generators/rails/generator/generator_generator.rb index 5b5d1884bc..5b5d1884bc 100644 --- a/railties/lib/generators/rails/generator/generator_generator.rb +++ b/railties/lib/rails/generators/rails/generator/generator_generator.rb diff --git a/railties/lib/generators/rails/generator/templates/%file_name%_generator.rb.tt b/railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt index 675f00043f..675f00043f 100644 --- a/railties/lib/generators/rails/generator/templates/%file_name%_generator.rb.tt +++ b/railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt diff --git a/railties/lib/generators/rails/generator/templates/USAGE.tt b/railties/lib/rails/generators/rails/generator/templates/USAGE.tt index ea9f4f12cc..ea9f4f12cc 100644 --- a/railties/lib/generators/rails/generator/templates/USAGE.tt +++ b/railties/lib/rails/generators/rails/generator/templates/USAGE.tt diff --git a/railties/lib/generators/rails/generator/templates/templates/.empty_directory b/railties/lib/rails/generators/rails/generator/templates/templates/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/generator/templates/templates/.empty_directory +++ b/railties/lib/rails/generators/rails/generator/templates/templates/.empty_directory diff --git a/railties/lib/generators/rails/helper/USAGE b/railties/lib/rails/generators/rails/helper/USAGE index 531c9b390a..531c9b390a 100644 --- a/railties/lib/generators/rails/helper/USAGE +++ b/railties/lib/rails/generators/rails/helper/USAGE diff --git a/railties/lib/generators/rails/helper/helper_generator.rb b/railties/lib/rails/generators/rails/helper/helper_generator.rb index ad66388591..ad66388591 100644 --- a/railties/lib/generators/rails/helper/helper_generator.rb +++ b/railties/lib/rails/generators/rails/helper/helper_generator.rb diff --git a/railties/lib/generators/rails/helper/templates/helper.rb b/railties/lib/rails/generators/rails/helper/templates/helper.rb index 3fe2ecdc74..3fe2ecdc74 100644 --- a/railties/lib/generators/rails/helper/templates/helper.rb +++ b/railties/lib/rails/generators/rails/helper/templates/helper.rb diff --git a/railties/lib/generators/rails/integration_test/USAGE b/railties/lib/rails/generators/rails/integration_test/USAGE index b76c35a702..b76c35a702 100644 --- a/railties/lib/generators/rails/integration_test/USAGE +++ b/railties/lib/rails/generators/rails/integration_test/USAGE diff --git a/railties/lib/generators/rails/integration_test/integration_test_generator.rb b/railties/lib/rails/generators/rails/integration_test/integration_test_generator.rb index 363a327fcb..363a327fcb 100644 --- a/railties/lib/generators/rails/integration_test/integration_test_generator.rb +++ b/railties/lib/rails/generators/rails/integration_test/integration_test_generator.rb diff --git a/railties/lib/generators/rails/mailer/USAGE b/railties/lib/rails/generators/rails/mailer/USAGE index c56095b2c8..c56095b2c8 100644 --- a/railties/lib/generators/rails/mailer/USAGE +++ b/railties/lib/rails/generators/rails/mailer/USAGE diff --git a/railties/lib/generators/rails/mailer/mailer_generator.rb b/railties/lib/rails/generators/rails/mailer/mailer_generator.rb index 33f1665b83..33f1665b83 100644 --- a/railties/lib/generators/rails/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/rails/mailer/mailer_generator.rb diff --git a/railties/lib/generators/rails/mailer/templates/mailer.rb b/railties/lib/rails/generators/rails/mailer/templates/mailer.rb index 90e0b712d6..90e0b712d6 100644 --- a/railties/lib/generators/rails/mailer/templates/mailer.rb +++ b/railties/lib/rails/generators/rails/mailer/templates/mailer.rb diff --git a/railties/lib/generators/rails/metal/USAGE b/railties/lib/rails/generators/rails/metal/USAGE index 123ec6c03f..123ec6c03f 100644 --- a/railties/lib/generators/rails/metal/USAGE +++ b/railties/lib/rails/generators/rails/metal/USAGE diff --git a/railties/lib/generators/rails/metal/metal_generator.rb b/railties/lib/rails/generators/rails/metal/metal_generator.rb index fe4f945cad..fe4f945cad 100644 --- a/railties/lib/generators/rails/metal/metal_generator.rb +++ b/railties/lib/rails/generators/rails/metal/metal_generator.rb diff --git a/railties/lib/generators/rails/metal/templates/metal.rb b/railties/lib/rails/generators/rails/metal/templates/metal.rb index e94982b69a..e94982b69a 100644 --- a/railties/lib/generators/rails/metal/templates/metal.rb +++ b/railties/lib/rails/generators/rails/metal/templates/metal.rb diff --git a/railties/lib/generators/rails/migration/USAGE b/railties/lib/rails/generators/rails/migration/USAGE index d91127aac3..d91127aac3 100644 --- a/railties/lib/generators/rails/migration/USAGE +++ b/railties/lib/rails/generators/rails/migration/USAGE diff --git a/railties/lib/generators/rails/migration/migration_generator.rb b/railties/lib/rails/generators/rails/migration/migration_generator.rb index 39fa5b63b1..39fa5b63b1 100644 --- a/railties/lib/generators/rails/migration/migration_generator.rb +++ b/railties/lib/rails/generators/rails/migration/migration_generator.rb diff --git a/railties/lib/generators/rails/model/USAGE b/railties/lib/rails/generators/rails/model/USAGE index b056d5df8b..b056d5df8b 100644 --- a/railties/lib/generators/rails/model/USAGE +++ b/railties/lib/rails/generators/rails/model/USAGE diff --git a/railties/lib/generators/rails/model/model_generator.rb b/railties/lib/rails/generators/rails/model/model_generator.rb index 629d5eed3f..629d5eed3f 100644 --- a/railties/lib/generators/rails/model/model_generator.rb +++ b/railties/lib/rails/generators/rails/model/model_generator.rb diff --git a/railties/lib/generators/rails/model_subclass/model_subclass_generator.rb b/railties/lib/rails/generators/rails/model_subclass/model_subclass_generator.rb index 4649709780..4649709780 100644 --- a/railties/lib/generators/rails/model_subclass/model_subclass_generator.rb +++ b/railties/lib/rails/generators/rails/model_subclass/model_subclass_generator.rb diff --git a/railties/lib/generators/rails/observer/USAGE b/railties/lib/rails/generators/rails/observer/USAGE index 9a20f55a89..9a20f55a89 100644 --- a/railties/lib/generators/rails/observer/USAGE +++ b/railties/lib/rails/generators/rails/observer/USAGE diff --git a/railties/lib/generators/rails/observer/observer_generator.rb b/railties/lib/rails/generators/rails/observer/observer_generator.rb index f5cedee91f..f5cedee91f 100644 --- a/railties/lib/generators/rails/observer/observer_generator.rb +++ b/railties/lib/rails/generators/rails/observer/observer_generator.rb diff --git a/railties/lib/generators/rails/performance_test/USAGE b/railties/lib/rails/generators/rails/performance_test/USAGE index ee82578cdb..ee82578cdb 100644 --- a/railties/lib/generators/rails/performance_test/USAGE +++ b/railties/lib/rails/generators/rails/performance_test/USAGE diff --git a/railties/lib/generators/rails/performance_test/performance_test_generator.rb b/railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb index d1c71ab8ed..d1c71ab8ed 100644 --- a/railties/lib/generators/rails/performance_test/performance_test_generator.rb +++ b/railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb diff --git a/railties/lib/generators/rails/plugin/USAGE b/railties/lib/rails/generators/rails/plugin/USAGE index 8a17fa4dec..8a17fa4dec 100644 --- a/railties/lib/generators/rails/plugin/USAGE +++ b/railties/lib/rails/generators/rails/plugin/USAGE diff --git a/railties/lib/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb index ee785caf7d..bc614bc5d3 100644 --- a/railties/lib/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb @@ -1,4 +1,4 @@ -require 'generators/rails/generator/generator_generator' +require 'rails/generators/rails/generator/generator_generator' module Rails module Generators diff --git a/railties/lib/generators/rails/plugin/templates/MIT-LICENSE b/railties/lib/rails/generators/rails/plugin/templates/MIT-LICENSE index 8717df053d..8717df053d 100644 --- a/railties/lib/generators/rails/plugin/templates/MIT-LICENSE +++ b/railties/lib/rails/generators/rails/plugin/templates/MIT-LICENSE diff --git a/railties/lib/generators/rails/plugin/templates/README b/railties/lib/rails/generators/rails/plugin/templates/README index 702db07cb1..702db07cb1 100644 --- a/railties/lib/generators/rails/plugin/templates/README +++ b/railties/lib/rails/generators/rails/plugin/templates/README diff --git a/railties/lib/generators/rails/plugin/templates/Rakefile b/railties/lib/rails/generators/rails/plugin/templates/Rakefile index 85e8ff1834..85e8ff1834 100644 --- a/railties/lib/generators/rails/plugin/templates/Rakefile +++ b/railties/lib/rails/generators/rails/plugin/templates/Rakefile diff --git a/railties/lib/generators/rails/plugin/templates/init.rb b/railties/lib/rails/generators/rails/plugin/templates/init.rb index 3c19a743c9..3c19a743c9 100644 --- a/railties/lib/generators/rails/plugin/templates/init.rb +++ b/railties/lib/rails/generators/rails/plugin/templates/init.rb diff --git a/railties/lib/generators/rails/plugin/templates/install.rb b/railties/lib/rails/generators/rails/plugin/templates/install.rb index f7732d3796..f7732d3796 100644 --- a/railties/lib/generators/rails/plugin/templates/install.rb +++ b/railties/lib/rails/generators/rails/plugin/templates/install.rb diff --git a/railties/lib/generators/rails/plugin/templates/lib/%file_name%.rb.tt b/railties/lib/rails/generators/rails/plugin/templates/lib/%file_name%.rb.tt index d8d908a959..d8d908a959 100644 --- a/railties/lib/generators/rails/plugin/templates/lib/%file_name%.rb.tt +++ b/railties/lib/rails/generators/rails/plugin/templates/lib/%file_name%.rb.tt diff --git a/railties/lib/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt b/railties/lib/rails/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt index 72920a9d3a..72920a9d3a 100644 --- a/railties/lib/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt +++ b/railties/lib/rails/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt diff --git a/railties/lib/generators/rails/plugin/templates/uninstall.rb b/railties/lib/rails/generators/rails/plugin/templates/uninstall.rb index 9738333463..9738333463 100644 --- a/railties/lib/generators/rails/plugin/templates/uninstall.rb +++ b/railties/lib/rails/generators/rails/plugin/templates/uninstall.rb diff --git a/railties/lib/generators/rails/resource/USAGE b/railties/lib/rails/generators/rails/resource/USAGE index 936619b0db..936619b0db 100644 --- a/railties/lib/generators/rails/resource/USAGE +++ b/railties/lib/rails/generators/rails/resource/USAGE diff --git a/railties/lib/generators/rails/resource/resource_generator.rb b/railties/lib/rails/generators/rails/resource/resource_generator.rb index 9abb8bbeaf..e49f9aea1b 100644 --- a/railties/lib/generators/rails/resource/resource_generator.rb +++ b/railties/lib/rails/generators/rails/resource/resource_generator.rb @@ -1,5 +1,5 @@ -require 'generators/rails/model/model_generator' -require 'generators/resource_helpers' +require 'rails/generators/rails/model/model_generator' +require 'rails/generators/resource_helpers' module Rails module Generators diff --git a/railties/lib/generators/rails/scaffold/USAGE b/railties/lib/rails/generators/rails/scaffold/USAGE index 71edd2f469..71edd2f469 100644 --- a/railties/lib/generators/rails/scaffold/USAGE +++ b/railties/lib/rails/generators/rails/scaffold/USAGE diff --git a/railties/lib/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb index fdea5bf52b..779f933785 100644 --- a/railties/lib/generators/rails/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb @@ -1,4 +1,4 @@ -require 'generators/rails/resource/resource_generator' +require 'rails/generators/rails/resource/resource_generator' module Rails module Generators diff --git a/railties/lib/generators/rails/scaffold_controller/USAGE b/railties/lib/rails/generators/rails/scaffold_controller/USAGE index d60a3c3680..d60a3c3680 100644 --- a/railties/lib/generators/rails/scaffold_controller/USAGE +++ b/railties/lib/rails/generators/rails/scaffold_controller/USAGE diff --git a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb index 228cdecb14..e544e29892 100644 --- a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb +++ b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb @@ -1,4 +1,4 @@ -require 'generators/resource_helpers' +require 'rails/generators/resource_helpers' module Rails module Generators diff --git a/railties/lib/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb index 3cc8bbf8e7..3cc8bbf8e7 100644 --- a/railties/lib/generators/rails/scaffold_controller/templates/controller.rb +++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb diff --git a/railties/lib/generators/rails/session_migration/USAGE b/railties/lib/rails/generators/rails/session_migration/USAGE index e106f6ecc8..e106f6ecc8 100644 --- a/railties/lib/generators/rails/session_migration/USAGE +++ b/railties/lib/rails/generators/rails/session_migration/USAGE diff --git a/railties/lib/generators/rails/session_migration/session_migration_generator.rb b/railties/lib/rails/generators/rails/session_migration/session_migration_generator.rb index 258cc5b4a0..258cc5b4a0 100644 --- a/railties/lib/generators/rails/session_migration/session_migration_generator.rb +++ b/railties/lib/rails/generators/rails/session_migration/session_migration_generator.rb diff --git a/railties/lib/generators/rails/stylesheets/USAGE b/railties/lib/rails/generators/rails/stylesheets/USAGE index d6a81e51d0..d6a81e51d0 100644 --- a/railties/lib/generators/rails/stylesheets/USAGE +++ b/railties/lib/rails/generators/rails/stylesheets/USAGE diff --git a/railties/lib/generators/rails/stylesheets/stylesheets_generator.rb b/railties/lib/rails/generators/rails/stylesheets/stylesheets_generator.rb index ce68443c39..ce68443c39 100644 --- a/railties/lib/generators/rails/stylesheets/stylesheets_generator.rb +++ b/railties/lib/rails/generators/rails/stylesheets/stylesheets_generator.rb diff --git a/railties/lib/generators/rails/stylesheets/templates/scaffold.css b/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css index d9fa2cf2dc..d9fa2cf2dc 100644 --- a/railties/lib/generators/rails/stylesheets/templates/scaffold.css +++ b/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css diff --git a/railties/lib/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb index ba1444652d..d4b0d4b945 100644 --- a/railties/lib/generators/resource_helpers.rb +++ b/railties/lib/rails/generators/resource_helpers.rb @@ -54,7 +54,7 @@ module Rails begin klass = active_model.constantize rescue NameError - require "generators/#{options[:orm]}" + require "rails/generators/#{options[:orm]}" end # Try once again after loading the file with success. diff --git a/railties/lib/generators/test_unit.rb b/railties/lib/rails/generators/test_unit.rb index 2763feb017..62b9afaa2c 100644 --- a/railties/lib/generators/test_unit.rb +++ b/railties/lib/rails/generators/test_unit.rb @@ -1,4 +1,4 @@ -require 'generators/named_base' +require 'rails/generators/named_base' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/controller/controller_generator.rb b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb index b57a6e794f..39816d9990 100644 --- a/railties/lib/generators/test_unit/controller/controller_generator.rb +++ b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/controller/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb index 62fa5d86fd..62fa5d86fd 100644 --- a/railties/lib/generators/test_unit/controller/templates/functional_test.rb +++ b/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb diff --git a/railties/lib/generators/test_unit/helper/helper_generator.rb b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb index 9ecfaa45ab..4ea80bf7be 100644 --- a/railties/lib/generators/test_unit/helper/helper_generator.rb +++ b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/helper/templates/helper_test.rb b/railties/lib/rails/generators/test_unit/helper/templates/helper_test.rb index 591e40900e..591e40900e 100644 --- a/railties/lib/generators/test_unit/helper/templates/helper_test.rb +++ b/railties/lib/rails/generators/test_unit/helper/templates/helper_test.rb diff --git a/railties/lib/generators/test_unit/integration/integration_generator.rb b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb index d9d9b3bf1d..32d0fac029 100644 --- a/railties/lib/generators/test_unit/integration/integration_generator.rb +++ b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/integration/templates/integration_test.rb b/railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb index 2c57158b1c..2c57158b1c 100644 --- a/railties/lib/generators/test_unit/integration/templates/integration_test.rb +++ b/railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb diff --git a/railties/lib/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb index ef350a6224..7353e5d61a 100644 --- a/railties/lib/generators/test_unit/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/mailer/templates/fixture b/railties/lib/rails/generators/test_unit/mailer/templates/fixture index fcce7bd805..fcce7bd805 100644 --- a/railties/lib/generators/test_unit/mailer/templates/fixture +++ b/railties/lib/rails/generators/test_unit/mailer/templates/fixture diff --git a/railties/lib/generators/test_unit/mailer/templates/unit_test.rb b/railties/lib/rails/generators/test_unit/mailer/templates/unit_test.rb index 4de94076e9..4de94076e9 100644 --- a/railties/lib/generators/test_unit/mailer/templates/unit_test.rb +++ b/railties/lib/rails/generators/test_unit/mailer/templates/unit_test.rb diff --git a/railties/lib/generators/test_unit/model/model_generator.rb b/railties/lib/rails/generators/test_unit/model/model_generator.rb index 469306e6c5..609b815683 100644 --- a/railties/lib/generators/test_unit/model/model_generator.rb +++ b/railties/lib/rails/generators/test_unit/model/model_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/model/templates/fixtures.yml b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml index c21035113e..c21035113e 100644 --- a/railties/lib/generators/test_unit/model/templates/fixtures.yml +++ b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml diff --git a/railties/lib/generators/test_unit/model/templates/unit_test.rb b/railties/lib/rails/generators/test_unit/model/templates/unit_test.rb index 3e0bc29d3a..3e0bc29d3a 100644 --- a/railties/lib/generators/test_unit/model/templates/unit_test.rb +++ b/railties/lib/rails/generators/test_unit/model/templates/unit_test.rb diff --git a/railties/lib/generators/test_unit/observer/observer_generator.rb b/railties/lib/rails/generators/test_unit/observer/observer_generator.rb index 14181f4e49..6cc1158c21 100644 --- a/railties/lib/generators/test_unit/observer/observer_generator.rb +++ b/railties/lib/rails/generators/test_unit/observer/observer_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/observer/templates/unit_test.rb b/railties/lib/rails/generators/test_unit/observer/templates/unit_test.rb index 03f6d5666e..03f6d5666e 100644 --- a/railties/lib/generators/test_unit/observer/templates/unit_test.rb +++ b/railties/lib/rails/generators/test_unit/observer/templates/unit_test.rb diff --git a/railties/lib/generators/test_unit/performance/performance_generator.rb b/railties/lib/rails/generators/test_unit/performance/performance_generator.rb index 0d9c646b26..99edda5461 100644 --- a/railties/lib/generators/test_unit/performance/performance_generator.rb +++ b/railties/lib/rails/generators/test_unit/performance/performance_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/performance/templates/performance_test.rb b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb index 27c91b0fca..27c91b0fca 100644 --- a/railties/lib/generators/test_unit/performance/templates/performance_test.rb +++ b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb diff --git a/railties/lib/generators/test_unit/plugin/plugin_generator.rb b/railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb index 05adf58c4f..4d65cd7d89 100644 --- a/railties/lib/generators/test_unit/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/plugin/templates/%file_name%_test.rb.tt b/railties/lib/rails/generators/test_unit/plugin/templates/%file_name%_test.rb.tt index 3e0bc29d3a..3e0bc29d3a 100644 --- a/railties/lib/generators/test_unit/plugin/templates/%file_name%_test.rb.tt +++ b/railties/lib/rails/generators/test_unit/plugin/templates/%file_name%_test.rb.tt diff --git a/railties/lib/generators/test_unit/plugin/templates/test_helper.rb b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb index 348ec33582..348ec33582 100644 --- a/railties/lib/generators/test_unit/plugin/templates/test_helper.rb +++ b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb diff --git a/railties/lib/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb index a8f9c8bd79..c0315c7fe6 100644 --- a/railties/lib/generators/test_unit/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb @@ -1,5 +1,5 @@ -require 'generators/test_unit' -require 'generators/resource_helpers' +require 'rails/generators/test_unit' +require 'rails/generators/resource_helpers' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/scaffold/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb index e4bf4035da..e4bf4035da 100644 --- a/railties/lib/generators/test_unit/scaffold/templates/functional_test.rb +++ b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb diff --git a/railties/lib/initializer.rb b/railties/lib/rails/initializer.rb index d882a6714a..2d63ac4d39 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/rails/initializer.rb @@ -1,7 +1,7 @@ require "pathname" -$LOAD_PATH.unshift File.dirname(__FILE__) -require 'railties_path' +require 'rails/application' +require 'rails/railties_path' require 'rails/version' require 'rails/gem_dependency' require 'rails/rack' @@ -30,7 +30,7 @@ module Rails end def config - @@config + @@config || Configuration.new end alias configuration config @@ -104,46 +104,35 @@ module Rails end def self.run(initializer = nil, config = nil) - default.config = config if config - default.config ||= Configuration.new - yield default.config if block_given? - default.run(initializer) + # TODO: Clean this all up + if initializer + default.config = config + default.run(initializer) + else + Rails.application = Class.new(Application) + yield Rails.application.config if block_given? + default.config = Rails.application.config + default.run + end end end # Check for valid Ruby version (1.8.2 or 1.8.4 or higher). This is done in an # external file, so we can use it from the `rails` program as well without duplication. Initializer.default.add :check_ruby_version do - require 'ruby_version_check' + require 'rails/ruby_version_check' end - # If Rails is vendored and RubyGems is available, install stub GemSpecs - # for Rails, Active Support, Active Record, Action Pack, Action Mailer, and - # Active Resource. This allows Gem plugins to depend on Rails even when - # the Gem version of Rails shouldn't be loaded. - Initializer.default.add :install_gem_spec_stubs do - unless Rails.respond_to?(:vendor_rails?) + # Bail if boot.rb is outdated + Initializer.default.add :freak_out_if_boot_rb_is_outdated do + unless defined?(Rails::BOOTSTRAP_VERSION) abort %{Your config/boot.rb is outdated: Run "rake rails:update".} end - - if Rails.vendor_rails? - begin; require "rubygems"; rescue LoadError; return; end - - %w(rails activesupport activerecord actionpack actionmailer activeresource).each do |stub| - Gem.loaded_specs[stub] ||= Gem::Specification.new do |s| - s.name = stub - s.version = Rails::VERSION::STRING - s.loaded_from = "" - end - end - end end # Set the <tt>$LOAD_PATH</tt> based on the value of # Configuration#load_paths. Duplicates are removed. Initializer.default.add :set_load_path do - # TODO: Think about unifying this with the general Rails paths - configuration.framework_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) } configuration.paths.add_to_load_path $LOAD_PATH.uniq! end @@ -192,6 +181,13 @@ module Rails plugin_loader.add_plugin_load_paths end + # Create tmp directories + Initializer.default.add :ensure_tmp_directories_exist do + %w(cache pids sessions sockets).each do |dir_to_make| + FileUtils.mkdir_p(File.join(configuration.root_path, 'tmp', dir_to_make)) + end + end + # Loads the environment specified by Configuration#environment_path, which # is typically one of development, test, or production. Initializer.default.add :load_environment do @@ -259,6 +255,25 @@ module Rails end end + # Include middleware to serve up static assets + Initializer.default.add :initialize_static_server do + if configuration.frameworks.include?(:action_controller) && configuration.serve_static_assets + configuration.middleware.use(ActionDispatch::Static, Rails.public_path) + end + end + + Initializer.default.add :initialize_middleware_stack do + if configuration.frameworks.include?(:action_controller) + configuration.middleware.use(::Rack::Lock) unless ActionController::Base.allow_concurrency + configuration.middleware.use(ActionDispatch::ShowExceptions, ActionController::Base.consider_all_requests_local) + configuration.middleware.use(ActionDispatch::Callbacks, ActionController::Dispatcher.prepare_each_request) + configuration.middleware.use(lambda { ActionController::Base.session_store }, lambda { ActionController::Base.session_options }) + configuration.middleware.use(ActionDispatch::ParamsParser) + configuration.middleware.use(::Rack::MethodOverride) + configuration.middleware.use(::Rack::Head) + end + end + Initializer.default.add :initialize_cache do unless defined?(RAILS_CACHE) silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(configuration.cache_store) } @@ -446,18 +461,6 @@ Run `rake gems:build` to build the unbuilt gems. plugin_loader.load_plugins end - # - # # pick up any gems that plugins depend on - Initializer.default.add :add_gem_load_paths do - require 'rails/gem_dependency' - # TODO: This seems extraneous - Rails::GemDependency.add_frozen_gem_path - unless config.gems.empty? - require "rubygems" - config.gems.each { |gem| gem.add_load_paths } - end - end - # TODO: Figure out if this needs to run a second time # load_gems @@ -507,7 +510,7 @@ Run `rake gems:install` to install the missing gems. # # Setup database middleware after initializers have run Initializer.default.add :initialize_database_middleware do if configuration.frameworks.include?(:active_record) - if configuration.frameworks.include?(:action_controller) && + if configuration.frameworks.include?(:action_controller) && ActionController::Base.session_store && ActionController::Base.session_store.name == 'ActiveRecord::SessionStore' configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache @@ -523,7 +526,7 @@ Run `rake gems:install` to install the missing gems. # # Prepare dispatcher callbacks and run 'prepare' callbacks Initializer.default.add :prepare_dispatcher do next unless configuration.frameworks.include?(:action_controller) - require 'dispatcher' unless defined?(::Dispatcher) + require 'rails/dispatcher' unless defined?(::Dispatcher) Dispatcher.define_dispatcher_callbacks(configuration.cache_classes) end diff --git a/railties/lib/initializer_old.rb b/railties/lib/rails/initializer_old.rb index cee5c7bcb6..cee5c7bcb6 100644 --- a/railties/lib/initializer_old.rb +++ b/railties/lib/rails/initializer_old.rb diff --git a/railties/lib/performance_test_help.rb b/railties/lib/rails/performance_test_help.rb index 2aaa21e85f..4ac38981d0 100644 --- a/railties/lib/performance_test_help.rb +++ b/railties/lib/rails/performance_test_help.rb @@ -1,5 +1,3 @@ -require 'action_controller/testing/performance_test' - ActionController::Base.perform_caching = true ActiveSupport::Dependencies.mechanism = :require Rails.logger.level = ActiveSupport::BufferedLogger::INFO diff --git a/railties/lib/rails/rack/static.rb b/railties/lib/rails/rack/static.rb index f07c6beb5e..d6b8face27 100644 --- a/railties/lib/rails/rack/static.rb +++ b/railties/lib/rails/rack/static.rb @@ -1,46 +1,5 @@ -require 'rack/utils' +require 'action_dispatch' -module Rails - module Rack - class Static - FILE_METHODS = %w(GET HEAD).freeze - - def initialize(app) - @app = app - @file_server = ::Rack::File.new(File.join(RAILS_ROOT, "public")) - end - - def call(env) - path = env['PATH_INFO'].chomp('/') - method = env['REQUEST_METHOD'] - - if FILE_METHODS.include?(method) - if file_exist?(path) - return @file_server.call(env) - else - cached_path = directory_exist?(path) ? "#{path}/index" : path - cached_path += ::ActionController::Base.page_cache_extension - - if file_exist?(cached_path) - env['PATH_INFO'] = cached_path - return @file_server.call(env) - end - end - end - - @app.call(env) - end - - private - def file_exist?(path) - full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path)) - File.file?(full_path) && File.readable?(full_path) - end - - def directory_exist?(path) - full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path)) - File.directory?(full_path) && File.readable?(full_path) - end - end - end +module Rails::Rack + Static = Deprecation::DeprecatedConstantProxy.new('Rails::Rack::Static', ActionDispatch::Static) end diff --git a/railties/lib/railties_path.rb b/railties/lib/rails/railties_path.rb index b729c095c8..e291fc23ea 100644 --- a/railties/lib/railties_path.rb +++ b/railties/lib/rails/railties_path.rb @@ -1 +1 @@ -RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..')) +RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')) diff --git a/railties/lib/ruby_version_check.rb b/railties/lib/rails/ruby_version_check.rb index 68d3acc876..68d3acc876 100644 --- a/railties/lib/ruby_version_check.rb +++ b/railties/lib/rails/ruby_version_check.rb diff --git a/railties/lib/rubyprof_ext.rb b/railties/lib/rails/rubyprof_ext.rb index f6e90357ce..f6e90357ce 100644 --- a/railties/lib/rubyprof_ext.rb +++ b/railties/lib/rails/rubyprof_ext.rb diff --git a/railties/lib/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb index 591fd6f6bd..591fd6f6bd 100644 --- a/railties/lib/source_annotation_extractor.rb +++ b/railties/lib/rails/source_annotation_extractor.rb diff --git a/railties/lib/tasks/rails.rb b/railties/lib/rails/tasks.rb index 8c2b7f9bde..aad965306c 100644 --- a/railties/lib/tasks/rails.rb +++ b/railties/lib/rails/tasks.rb @@ -1,8 +1,24 @@ $VERBOSE = nil # Load Rails rakefile extensions -Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext } +%w( + annotations + databases + documentation + framework + gems + log + middleware + misc + routes + statistics + testing + tmp +).each do |task| + load "rails/tasks/#{task}.rake" +end # Load any custom rakefile extensions +# TODO: Don't hardcode these paths. Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext } Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext } diff --git a/railties/lib/tasks/annotations.rake b/railties/lib/rails/tasks/annotations.rake index 48ac40099a..79973b3145 100644 --- a/railties/lib/tasks/annotations.rake +++ b/railties/lib/rails/tasks/annotations.rake @@ -1,4 +1,4 @@ -require 'source_annotation_extractor' +require 'rails/source_annotation_extractor' desc "Enumerate all annotations" task :notes do diff --git a/railties/lib/tasks/databases.rake b/railties/lib/rails/tasks/databases.rake index 8401cf0590..ed015e7a67 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/rails/tasks/databases.rake @@ -426,8 +426,8 @@ namespace :db do desc "Creates a sessions migration for use with ActiveRecord::SessionStore" task :create => :environment do raise "Task unavailable to this database (no migration support)" unless ActiveRecord::Base.connection.supports_migrations? - require 'generators' - require 'generators/rails/session_migration/session_migration_generator' + require 'rails/generators' + require 'rails/generators/rails/session_migration/session_migration_generator' Rails::Generators::SessionMigrationGenerator.start [ ENV["MIGRATION"] || "add_sessions_table" ] end diff --git a/railties/lib/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake index db1939c45f..db1939c45f 100644 --- a/railties/lib/tasks/documentation.rake +++ b/railties/lib/rails/tasks/documentation.rake diff --git a/railties/lib/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake index a084af7e11..17e16f26fd 100644 --- a/railties/lib/tasks/framework.rake +++ b/railties/lib/rails/tasks/framework.rake @@ -93,7 +93,7 @@ namespace :rails do namespace :update do def invoke_from_app_generator(method) require 'generators' - require 'generators/rails/app/app_generator' + require 'rails/generators/rails/app/app_generator' generator = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true }, :destination_root => RAILS_ROOT diff --git a/railties/lib/tasks/gems.rake b/railties/lib/rails/tasks/gems.rake index f1c34c7cca..f1c34c7cca 100644 --- a/railties/lib/tasks/gems.rake +++ b/railties/lib/rails/tasks/gems.rake diff --git a/railties/lib/tasks/log.rake b/railties/lib/rails/tasks/log.rake index 6e1334692e..6e1334692e 100644 --- a/railties/lib/tasks/log.rake +++ b/railties/lib/rails/tasks/log.rake diff --git a/railties/lib/tasks/middleware.rake b/railties/lib/rails/tasks/middleware.rake index 05f159184e..e1ab309157 100644 --- a/railties/lib/tasks/middleware.rake +++ b/railties/lib/rails/tasks/middleware.rake @@ -1,7 +1,7 @@ desc 'Prints out your Rack middleware stack' task :middleware => :environment do - ActionController::Dispatcher.middleware.active.each do |middleware| + Rails.configuration.middleware.active.each do |middleware| puts "use #{middleware.inspect}" end - puts "run ActionController::Dispatcher.new" + puts "run ActionController::Routing::Routes" end diff --git a/railties/lib/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake index fb2fc31dc1..fb2fc31dc1 100644 --- a/railties/lib/tasks/misc.rake +++ b/railties/lib/rails/tasks/misc.rake diff --git a/railties/lib/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake index abbf3258c1..abbf3258c1 100644 --- a/railties/lib/tasks/routes.rake +++ b/railties/lib/rails/tasks/routes.rake diff --git a/railties/lib/tasks/statistics.rake b/railties/lib/rails/tasks/statistics.rake index 5ab27a0f62..2dcc7bdf9d 100644 --- a/railties/lib/tasks/statistics.rake +++ b/railties/lib/rails/tasks/statistics.rake @@ -12,6 +12,6 @@ STATS_DIRECTORIES = [ desc "Report code statistics (KLOCs, etc) from the application" task :stats do - require 'code_statistics' + require 'rails/code_statistics' CodeStatistics.new(*STATS_DIRECTORIES).to_s end diff --git a/railties/lib/tasks/testing.rake b/railties/lib/rails/tasks/testing.rake index fd5e52a05b..fd5e52a05b 100644 --- a/railties/lib/tasks/testing.rake +++ b/railties/lib/rails/tasks/testing.rake diff --git a/railties/lib/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake index fea15058bb..fea15058bb 100644 --- a/railties/lib/tasks/tmp.rake +++ b/railties/lib/rails/tasks/tmp.rake diff --git a/railties/lib/test_help.rb b/railties/lib/rails/test_help.rb index 53f28264e8..8bd4475c7b 100644 --- a/railties/lib/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -4,13 +4,11 @@ silence_warnings { RAILS_ENV = "test" } require 'rubygems' gem "rack", "~> 1.0.0" -gem "rack-test", "~> 0.4.2" +gem "rack-test", "~> 0.5.0" require 'test/unit' require 'active_support/core_ext/kernel/requires' -require 'action_controller/testing/test_case' require 'action_view/test_case' -require 'action_controller/testing/integration' require 'action_mailer/test_case' if defined?(ActionMailer) if defined?(ActiveRecord) diff --git a/railties/lib/vendor/bundler/LICENSE b/railties/lib/rails/vendor/bundler/LICENSE index 41decca113..41decca113 100644 --- a/railties/lib/vendor/bundler/LICENSE +++ b/railties/lib/rails/vendor/bundler/LICENSE diff --git a/railties/lib/vendor/bundler/README.markdown b/railties/lib/rails/vendor/bundler/README.markdown index 26863e96f2..26863e96f2 100644 --- a/railties/lib/vendor/bundler/README.markdown +++ b/railties/lib/rails/vendor/bundler/README.markdown diff --git a/railties/lib/vendor/bundler/Rakefile b/railties/lib/rails/vendor/bundler/Rakefile index dc4c3d6d46..dc4c3d6d46 100644 --- a/railties/lib/vendor/bundler/Rakefile +++ b/railties/lib/rails/vendor/bundler/Rakefile diff --git a/railties/lib/vendor/bundler/lib/bundler.rb b/railties/lib/rails/vendor/bundler/lib/bundler.rb index 1ede3517dd..1ede3517dd 100644 --- a/railties/lib/vendor/bundler/lib/bundler.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/cli.rb b/railties/lib/rails/vendor/bundler/lib/bundler/cli.rb index df9181fbc4..df9181fbc4 100644 --- a/railties/lib/vendor/bundler/lib/bundler/cli.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/cli.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/commands/bundle_command.rb b/railties/lib/rails/vendor/bundler/lib/bundler/commands/bundle_command.rb index a1f9590f75..a1f9590f75 100644 --- a/railties/lib/vendor/bundler/lib/bundler/commands/bundle_command.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/commands/bundle_command.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/commands/exec_command.rb b/railties/lib/rails/vendor/bundler/lib/bundler/commands/exec_command.rb index 228aa60619..228aa60619 100644 --- a/railties/lib/vendor/bundler/lib/bundler/commands/exec_command.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/commands/exec_command.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/dependency.rb b/railties/lib/rails/vendor/bundler/lib/bundler/dependency.rb index b627b58662..b627b58662 100644 --- a/railties/lib/vendor/bundler/lib/bundler/dependency.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/dependency.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/dsl.rb b/railties/lib/rails/vendor/bundler/lib/bundler/dsl.rb index d9a86ee1fd..d9a86ee1fd 100644 --- a/railties/lib/vendor/bundler/lib/bundler/dsl.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/dsl.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/environment.rb b/railties/lib/rails/vendor/bundler/lib/bundler/environment.rb index f07a9e2c6f..f07a9e2c6f 100644 --- a/railties/lib/vendor/bundler/lib/bundler/environment.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/environment.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/finder.rb b/railties/lib/rails/vendor/bundler/lib/bundler/finder.rb index b77ca65709..b77ca65709 100644 --- a/railties/lib/vendor/bundler/lib/bundler/finder.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/finder.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/gem_bundle.rb b/railties/lib/rails/vendor/bundler/lib/bundler/gem_bundle.rb index 80d7710683..80d7710683 100644 --- a/railties/lib/vendor/bundler/lib/bundler/gem_bundle.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/gem_bundle.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/gem_ext.rb b/railties/lib/rails/vendor/bundler/lib/bundler/gem_ext.rb index 155ad04c7e..155ad04c7e 100644 --- a/railties/lib/vendor/bundler/lib/bundler/gem_ext.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/gem_ext.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/repository.rb b/railties/lib/rails/vendor/bundler/lib/bundler/repository.rb index 1a1dc7497d..1a1dc7497d 100644 --- a/railties/lib/vendor/bundler/lib/bundler/repository.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/repository.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/repository/directory_repository.rb b/railties/lib/rails/vendor/bundler/lib/bundler/repository/directory_repository.rb index e97dd38dd5..e97dd38dd5 100644 --- a/railties/lib/vendor/bundler/lib/bundler/repository/directory_repository.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/repository/directory_repository.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/repository/gem_repository.rb b/railties/lib/rails/vendor/bundler/lib/bundler/repository/gem_repository.rb index 90de49d83d..90de49d83d 100644 --- a/railties/lib/vendor/bundler/lib/bundler/repository/gem_repository.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/repository/gem_repository.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/resolver.rb b/railties/lib/rails/vendor/bundler/lib/bundler/resolver.rb index 2a6a6371c2..2a6a6371c2 100644 --- a/railties/lib/vendor/bundler/lib/bundler/resolver.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/resolver.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/runtime.rb b/railties/lib/rails/vendor/bundler/lib/bundler/runtime.rb index 27e0254966..27e0254966 100644 --- a/railties/lib/vendor/bundler/lib/bundler/runtime.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/runtime.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/source.rb b/railties/lib/rails/vendor/bundler/lib/bundler/source.rb index 37828ca316..37828ca316 100644 --- a/railties/lib/vendor/bundler/lib/bundler/source.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/source.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/templates/app_script.erb b/railties/lib/rails/vendor/bundler/lib/bundler/templates/app_script.erb index 3e47a53ca8..3e47a53ca8 100644 --- a/railties/lib/vendor/bundler/lib/bundler/templates/app_script.erb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/templates/app_script.erb diff --git a/railties/lib/vendor/bundler/lib/bundler/templates/environment.erb b/railties/lib/rails/vendor/bundler/lib/bundler/templates/environment.erb index 21f3de8854..21f3de8854 100644 --- a/railties/lib/vendor/bundler/lib/bundler/templates/environment.erb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/templates/environment.erb diff --git a/railties/lib/vendor/thor-0.11.6/CHANGELOG.rdoc b/railties/lib/rails/vendor/thor-0.11.6/CHANGELOG.rdoc index dba25b7205..dba25b7205 100644 --- a/railties/lib/vendor/thor-0.11.6/CHANGELOG.rdoc +++ b/railties/lib/rails/vendor/thor-0.11.6/CHANGELOG.rdoc diff --git a/railties/lib/vendor/thor-0.11.6/LICENSE b/railties/lib/rails/vendor/thor-0.11.6/LICENSE index 98722da459..98722da459 100644 --- a/railties/lib/vendor/thor-0.11.6/LICENSE +++ b/railties/lib/rails/vendor/thor-0.11.6/LICENSE diff --git a/railties/lib/vendor/thor-0.11.6/README.rdoc b/railties/lib/rails/vendor/thor-0.11.6/README.rdoc index f1106f02b6..f1106f02b6 100644 --- a/railties/lib/vendor/thor-0.11.6/README.rdoc +++ b/railties/lib/rails/vendor/thor-0.11.6/README.rdoc diff --git a/railties/lib/vendor/thor-0.11.6/bin/rake2thor b/railties/lib/rails/vendor/thor-0.11.6/bin/rake2thor index 50c7410d80..50c7410d80 100755 --- a/railties/lib/vendor/thor-0.11.6/bin/rake2thor +++ b/railties/lib/rails/vendor/thor-0.11.6/bin/rake2thor diff --git a/railties/lib/vendor/thor-0.11.6/bin/thor b/railties/lib/rails/vendor/thor-0.11.6/bin/thor index eaf849fb4a..eaf849fb4a 100755 --- a/railties/lib/vendor/thor-0.11.6/bin/thor +++ b/railties/lib/rails/vendor/thor-0.11.6/bin/thor diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor.rb index 3b45c4e9b7..3b45c4e9b7 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/actions.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions.rb index d561ccb2aa..d561ccb2aa 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/actions.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/create_file.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/create_file.rb index 8f6badee27..8f6badee27 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/create_file.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/create_file.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/directory.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/directory.rb index be5eb822ac..be5eb822ac 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/directory.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/directory.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb index 03c1fe4af1..03c1fe4af1 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb index d77d90d448..d77d90d448 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb index 0636ec6591..0636ec6591 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/base.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/base.rb index 700d794123..700d794123 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/base.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/base.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb index 78bc5cf4bf..78bc5cf4bf 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb index 27fea5bb35..27fea5bb35 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/error.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/error.rb index f9b31a35d1..f9b31a35d1 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/error.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/error.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/group.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/group.rb index 1e59df2313..1e59df2313 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/group.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/group.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/invocation.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/invocation.rb index 32e6a72454..32e6a72454 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/invocation.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/invocation.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/parser.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser.rb index 57a3f6e1a5..57a3f6e1a5 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/parser.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/argument.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/argument.rb index aa8ace4719..aa8ace4719 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/argument.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/argument.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/arguments.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/arguments.rb index fb5d965e06..fb5d965e06 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/arguments.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/arguments.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/option.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/option.rb index 9e40ec73fa..9e40ec73fa 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/option.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/option.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/options.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/options.rb index 75092308b5..75092308b5 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/options.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/options.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/rake_compat.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/rake_compat.rb index 3ab6bb21f5..3ab6bb21f5 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/rake_compat.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/rake_compat.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/runner.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/runner.rb index 43da09b336..43da09b336 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/runner.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/runner.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/shell.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell.rb index 0d3f4d5951..0d3f4d5951 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/shell.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/shell/basic.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell/basic.rb index ea9665380b..ea9665380b 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/shell/basic.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell/basic.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/shell/color.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell/color.rb index 24704f7885..24704f7885 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/shell/color.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell/color.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/task.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/task.rb index 91c7564d3f..91c7564d3f 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/task.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/task.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/util.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/util.rb index fd820d7462..fd820d7462 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/util.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/util.rb diff --git a/railties/lib/webrick_server.rb b/railties/lib/rails/webrick_server.rb index 2f60151b22..2f60151b22 100644 --- a/railties/lib/webrick_server.rb +++ b/railties/lib/rails/webrick_server.rb |