From b61f6f59805eec4f5bb873a85910c9fe00e839a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 23 Mar 2010 13:40:19 +0100 Subject: [PATCH] Load generators from both lib/rails/generators and lib/generators. Using the former since it's less obstrusive. --- .../lib/{ => rails}/generators/active_record.rb | 0 .../active_record/migration/migration_generator.rb | 2 +- .../active_record/migration/templates/migration.rb | 0 .../active_record/model/model_generator.rb | 2 +- .../active_record/model/templates/migration.rb | 0 .../active_record/model/templates/model.rb | 0 .../active_record/observer/observer_generator.rb | 2 +- .../active_record/observer/templates/observer.rb | 0 .../session_migration_generator.rb | 2 +- .../session_migration/templates/migration.rb | 0 railties/lib/rails/generators.rb | 4 ++-- railties/lib/rails/generators/base.rb | 2 +- railties/lib/{ => rails}/generators/erb.rb | 0 .../erb/controller/controller_generator.rb | 2 +- .../erb/controller/templates/view.html.erb | 0 .../generators/erb/mailer/mailer_generator.rb | 2 +- .../generators/erb/mailer/templates/view.text.erb | 0 .../generators/erb/scaffold/scaffold_generator.rb | 2 +- .../erb/scaffold/templates/_form.html.erb | 0 .../generators/erb/scaffold/templates/edit.html.erb | 0 .../erb/scaffold/templates/index.html.erb | 0 .../erb/scaffold/templates/layout.html.erb | 0 .../generators/erb/scaffold/templates/new.html.erb | 0 .../generators/erb/scaffold/templates/show.html.erb | 0 railties/lib/{ => rails}/generators/rails/app/USAGE | 0 .../generators/rails/app/app_generator.rb | 2 +- .../generators/rails/app/templates/Gemfile | 0 .../generators/rails/app/templates/README | 0 .../generators/rails/app/templates/Rakefile | 0 .../app/controllers/application_controller.rb | 0 .../app/templates/app/helpers/application_helper.rb | 0 .../rails/app/templates/app/models/.empty_directory | 0 .../templates/app/views/layouts/.empty_directory | 0 .../generators/rails/app/templates/config.ru | 0 .../rails/app/templates/config/application.rb | 0 .../generators/rails/app/templates/config/boot.rb | 0 .../app/templates/config/databases/frontbase.yml | 0 .../rails/app/templates/config/databases/ibm_db.yml | 0 .../rails/app/templates/config/databases/mysql.yml | 0 .../rails/app/templates/config/databases/oracle.yml | 0 .../app/templates/config/databases/postgresql.yml | 0 .../app/templates/config/databases/sqlite3.yml | 0 .../rails/app/templates/config/environment.rb | 0 .../templates/config/environments/development.rb.tt | 0 .../templates/config/environments/production.rb.tt | 0 .../app/templates/config/environments/test.rb.tt | 0 .../config/initializers/backtrace_silencers.rb | 0 .../initializers/cookie_verification_secret.rb.tt | 0 .../templates/config/initializers/inflections.rb | 0 .../app/templates/config/initializers/mime_types.rb | 0 .../config/initializers/session_store.rb.tt | 0 .../rails/app/templates/config/locales/en.yml | 0 .../generators/rails/app/templates/config/routes.rb | 0 .../generators/rails/app/templates/db/seeds.rb | 0 .../rails/app/templates/doc/README_FOR_APP | 0 .../generators/rails/app/templates/gitignore | 0 .../generators/rails/app/templates/public/404.html | 0 .../generators/rails/app/templates/public/422.html | 0 .../generators/rails/app/templates/public/500.html | 0 .../rails/app/templates/public/favicon.ico | 0 .../rails/app/templates/public/images/rails.png | Bin .../rails/app/templates/public/index.html | 0 .../app/templates/public/javascripts/application.js | 0 .../app/templates/public/javascripts/controls.js | 0 .../app/templates/public/javascripts/dragdrop.js | 0 .../app/templates/public/javascripts/effects.js | 0 .../app/templates/public/javascripts/prototype.js | 0 .../rails/app/templates/public/javascripts/rails.js | 0 .../rails/app/templates/public/robots.txt | 0 .../templates/public/stylesheets/.empty_directory | 0 .../generators/rails/app/templates/script/rails | 0 .../app/templates/test/fixtures/.empty_directory | 0 .../app/templates/test/functional/.empty_directory | 0 .../app/templates/test/integration/.empty_directory | 0 .../app/templates/test/performance/browsing_test.rb | 0 .../rails/app/templates/test/test_helper.rb | 0 .../rails/app/templates/test/unit/.empty_directory | 0 .../{ => rails}/generators/rails/controller/USAGE | 0 .../rails/controller/controller_generator.rb | 0 .../rails/controller/templates/controller.rb | 0 .../{ => rails}/generators/rails/generator/USAGE | 0 .../rails/generator/generator_generator.rb | 0 .../generator/templates/%file_name%_generator.rb.tt | 0 .../generators/rails/generator/templates/USAGE.tt | 0 .../generator/templates/templates/.empty_directory | 0 .../lib/{ => rails}/generators/rails/helper/USAGE | 0 .../generators/rails/helper/helper_generator.rb | 0 .../generators/rails/helper/templates/helper.rb | 0 .../generators/rails/integration_test/USAGE | 0 .../integration_test/integration_test_generator.rb | 0 .../lib/{ => rails}/generators/rails/mailer/USAGE | 0 .../generators/rails/mailer/mailer_generator.rb | 0 .../generators/rails/mailer/templates/mailer.rb | 0 .../lib/{ => rails}/generators/rails/metal/USAGE | 0 .../generators/rails/metal/metal_generator.rb | 0 .../generators/rails/metal/templates/metal.rb | 0 .../{ => rails}/generators/rails/migration/USAGE | 0 .../rails/migration/migration_generator.rb | 0 .../lib/{ => rails}/generators/rails/model/USAGE | 0 .../generators/rails/model/model_generator.rb | 0 .../model_subclass/model_subclass_generator.rb | 0 .../lib/{ => rails}/generators/rails/observer/USAGE | 0 .../generators/rails/observer/observer_generator.rb | 0 .../generators/rails/performance_test/USAGE | 0 .../performance_test/performance_test_generator.rb | 0 .../lib/{ => rails}/generators/rails/plugin/USAGE | 0 .../generators/rails/plugin/plugin_generator.rb | 2 +- .../rails/plugin/templates/MIT-LICENSE.tt | 0 .../generators/rails/plugin/templates/README.tt | 0 .../generators/rails/plugin/templates/Rakefile.tt | 0 .../generators/rails/plugin/templates/init.rb | 0 .../generators/rails/plugin/templates/install.rb | 0 .../rails/plugin/templates/lib/%file_name%.rb.tt | 0 .../templates/lib/tasks/%file_name%_tasks.rake.tt | 0 .../generators/rails/plugin/templates/uninstall.rb | 0 .../lib/{ => rails}/generators/rails/resource/USAGE | 0 .../generators/rails/resource/resource_generator.rb | 2 +- .../lib/{ => rails}/generators/rails/scaffold/USAGE | 0 .../generators/rails/scaffold/scaffold_generator.rb | 2 +- .../generators/rails/scaffold_controller/USAGE | 0 .../scaffold_controller_generator.rb | 0 .../scaffold_controller/templates/controller.rb | 0 .../generators/rails/session_migration/USAGE | 0 .../session_migration_generator.rb | 0 .../{ => rails}/generators/rails/stylesheets/USAGE | 0 .../rails/stylesheets/stylesheets_generator.rb | 0 .../rails/stylesheets/templates/scaffold.css | 0 railties/lib/{ => rails}/generators/test_unit.rb | 0 .../test_unit/controller/controller_generator.rb | 2 +- .../controller/templates/functional_test.rb | 0 .../generators/test_unit/helper/helper_generator.rb | 2 +- .../test_unit/helper/templates/helper_test.rb | 0 .../test_unit/integration/integration_generator.rb | 2 +- .../integration/templates/integration_test.rb | 0 .../generators/test_unit/mailer/mailer_generator.rb | 2 +- .../test_unit/mailer/templates/functional_test.rb | 0 .../generators/test_unit/model/model_generator.rb | 2 +- .../test_unit/model/templates/fixtures.yml | 0 .../test_unit/model/templates/unit_test.rb | 0 .../test_unit/observer/observer_generator.rb | 2 +- .../test_unit/observer/templates/unit_test.rb | 0 .../test_unit/performance/performance_generator.rb | 2 +- .../performance/templates/performance_test.rb | 0 .../generators/test_unit/plugin/plugin_generator.rb | 2 +- .../plugin/templates/%file_name%_test.rb.tt | 0 .../test_unit/plugin/templates/test_helper.rb | 0 .../test_unit/scaffold/scaffold_generator.rb | 2 +- .../test_unit/scaffold/templates/functional_test.rb | 0 .../generators/active_record/fixjour_generator.rb | 2 +- .../generators}/foobar/foobar_generator.rb | 0 railties/test/generators/actions_test.rb | 2 +- railties/test/generators/app_generator_test.rb | 2 +- .../test/generators/controller_generator_test.rb | 2 +- .../test/generators/generator_generator_test.rb | 2 +- railties/test/generators/generators_test_helper.rb | 2 +- railties/test/generators/helper_generator_test.rb | 2 +- .../generators/integration_test_generator_test.rb | 2 +- railties/test/generators/mailer_generator_test.rb | 2 +- railties/test/generators/metal_generator_test.rb | 2 +- .../test/generators/migration_generator_test.rb | 2 +- railties/test/generators/model_generator_test.rb | 2 +- railties/test/generators/named_base_test.rb | 2 +- railties/test/generators/observer_generator_test.rb | 2 +- .../generators/performance_test_generator_test.rb | 2 +- railties/test/generators/plugin_generator_test.rb | 2 +- railties/test/generators/resource_generator_test.rb | 2 +- .../scaffold_controller_generator_test.rb | 2 +- railties/test/generators/scaffold_generator_test.rb | 2 +- .../generators/session_migration_generator_test.rb | 2 +- .../test/generators/stylesheets_generator_test.rb | 2 +- railties/test/generators_test.rb | 4 ++-- 171 files changed, 46 insertions(+), 46 deletions(-) rename activerecord/lib/{ => rails}/generators/active_record.rb (100%) rename activerecord/lib/{ => rails}/generators/active_record/migration/migration_generator.rb (93%) rename activerecord/lib/{ => rails}/generators/active_record/migration/templates/migration.rb (100%) rename activerecord/lib/{ => rails}/generators/active_record/model/model_generator.rb (95%) rename activerecord/lib/{ => rails}/generators/active_record/model/templates/migration.rb (100%) rename activerecord/lib/{ => rails}/generators/active_record/model/templates/model.rb (100%) rename activerecord/lib/{ => rails}/generators/active_record/observer/observer_generator.rb (88%) rename activerecord/lib/{ => rails}/generators/active_record/observer/templates/observer.rb (100%) rename activerecord/lib/{ => rails}/generators/active_record/session_migration/session_migration_generator.rb (94%) rename activerecord/lib/{ => rails}/generators/active_record/session_migration/templates/migration.rb (100%) rename railties/lib/{ => rails}/generators/erb.rb (100%) rename railties/lib/{ => rails}/generators/erb/controller/controller_generator.rb (94%) rename railties/lib/{ => rails}/generators/erb/controller/templates/view.html.erb (100%) rename railties/lib/{ => rails}/generators/erb/mailer/mailer_generator.rb (71%) rename railties/lib/{ => rails}/generators/erb/mailer/templates/view.text.erb (100%) rename railties/lib/{ => rails}/generators/erb/scaffold/scaffold_generator.rb (97%) rename railties/lib/{ => rails}/generators/erb/scaffold/templates/_form.html.erb (100%) rename railties/lib/{ => rails}/generators/erb/scaffold/templates/edit.html.erb (100%) rename railties/lib/{ => rails}/generators/erb/scaffold/templates/index.html.erb (100%) rename railties/lib/{ => rails}/generators/erb/scaffold/templates/layout.html.erb (100%) rename railties/lib/{ => rails}/generators/erb/scaffold/templates/new.html.erb (100%) rename railties/lib/{ => rails}/generators/erb/scaffold/templates/show.html.erb (100%) rename railties/lib/{ => rails}/generators/rails/app/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/app/app_generator.rb (99%) rename railties/lib/{ => rails}/generators/rails/app/templates/Gemfile (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/README (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/Rakefile (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/app/controllers/application_controller.rb (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/app/helpers/application_helper.rb (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/app/models/.empty_directory (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/app/views/layouts/.empty_directory (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config.ru (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/application.rb (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/boot.rb (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/databases/frontbase.yml (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/databases/ibm_db.yml (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/databases/mysql.yml (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/databases/oracle.yml (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/databases/postgresql.yml (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/databases/sqlite3.yml (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/environment.rb (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/environments/development.rb.tt (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/environments/production.rb.tt (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/environments/test.rb.tt (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/initializers/backtrace_silencers.rb (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/initializers/inflections.rb (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/initializers/mime_types.rb (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/initializers/session_store.rb.tt (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/locales/en.yml (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/config/routes.rb (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/db/seeds.rb (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/doc/README_FOR_APP (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/gitignore (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/404.html (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/422.html (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/500.html (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/favicon.ico (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/images/rails.png (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/index.html (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/javascripts/application.js (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/javascripts/controls.js (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/javascripts/dragdrop.js (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/javascripts/effects.js (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/javascripts/prototype.js (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/javascripts/rails.js (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/robots.txt (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/public/stylesheets/.empty_directory (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/script/rails (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/test/fixtures/.empty_directory (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/test/functional/.empty_directory (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/test/integration/.empty_directory (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/test/performance/browsing_test.rb (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/test/test_helper.rb (100%) rename railties/lib/{ => rails}/generators/rails/app/templates/test/unit/.empty_directory (100%) rename railties/lib/{ => rails}/generators/rails/controller/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/controller/controller_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/controller/templates/controller.rb (100%) rename railties/lib/{ => rails}/generators/rails/generator/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/generator/generator_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/generator/templates/%file_name%_generator.rb.tt (100%) rename railties/lib/{ => rails}/generators/rails/generator/templates/USAGE.tt (100%) rename railties/lib/{ => rails}/generators/rails/generator/templates/templates/.empty_directory (100%) rename railties/lib/{ => rails}/generators/rails/helper/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/helper/helper_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/helper/templates/helper.rb (100%) rename railties/lib/{ => rails}/generators/rails/integration_test/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/integration_test/integration_test_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/mailer/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/mailer/mailer_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/mailer/templates/mailer.rb (100%) rename railties/lib/{ => rails}/generators/rails/metal/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/metal/metal_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/metal/templates/metal.rb (100%) rename railties/lib/{ => rails}/generators/rails/migration/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/migration/migration_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/model/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/model/model_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/model_subclass/model_subclass_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/observer/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/observer/observer_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/performance_test/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/performance_test/performance_test_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/plugin/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/plugin/plugin_generator.rb (94%) rename railties/lib/{ => rails}/generators/rails/plugin/templates/MIT-LICENSE.tt (100%) rename railties/lib/{ => rails}/generators/rails/plugin/templates/README.tt (100%) rename railties/lib/{ => rails}/generators/rails/plugin/templates/Rakefile.tt (100%) rename railties/lib/{ => rails}/generators/rails/plugin/templates/init.rb (100%) rename railties/lib/{ => rails}/generators/rails/plugin/templates/install.rb (100%) rename railties/lib/{ => rails}/generators/rails/plugin/templates/lib/%file_name%.rb.tt (100%) rename railties/lib/{ => rails}/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt (100%) rename railties/lib/{ => rails}/generators/rails/plugin/templates/uninstall.rb (100%) rename railties/lib/{ => rails}/generators/rails/resource/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/resource/resource_generator.rb (94%) rename railties/lib/{ => rails}/generators/rails/scaffold/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/scaffold/scaffold_generator.rb (81%) rename railties/lib/{ => rails}/generators/rails/scaffold_controller/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/scaffold_controller/scaffold_controller_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/scaffold_controller/templates/controller.rb (100%) rename railties/lib/{ => rails}/generators/rails/session_migration/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/session_migration/session_migration_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/stylesheets/USAGE (100%) rename railties/lib/{ => rails}/generators/rails/stylesheets/stylesheets_generator.rb (100%) rename railties/lib/{ => rails}/generators/rails/stylesheets/templates/scaffold.css (100%) rename railties/lib/{ => rails}/generators/test_unit.rb (100%) rename railties/lib/{ => rails}/generators/test_unit/controller/controller_generator.rb (91%) rename railties/lib/{ => rails}/generators/test_unit/controller/templates/functional_test.rb (100%) rename railties/lib/{ => rails}/generators/test_unit/helper/helper_generator.rb (88%) rename railties/lib/{ => rails}/generators/test_unit/helper/templates/helper_test.rb (100%) rename railties/lib/{ => rails}/generators/test_unit/integration/integration_generator.rb (88%) rename railties/lib/{ => rails}/generators/test_unit/integration/templates/integration_test.rb (100%) rename railties/lib/{ => rails}/generators/test_unit/mailer/mailer_generator.rb (90%) rename railties/lib/{ => rails}/generators/test_unit/mailer/templates/functional_test.rb (100%) rename railties/lib/{ => rails}/generators/test_unit/model/model_generator.rb (94%) rename railties/lib/{ => rails}/generators/test_unit/model/templates/fixtures.yml (100%) rename railties/lib/{ => rails}/generators/test_unit/model/templates/unit_test.rb (100%) rename railties/lib/{ => rails}/generators/test_unit/observer/observer_generator.rb (88%) rename railties/lib/{ => rails}/generators/test_unit/observer/templates/unit_test.rb (100%) rename railties/lib/{ => rails}/generators/test_unit/performance/performance_generator.rb (88%) rename railties/lib/{ => rails}/generators/test_unit/performance/templates/performance_test.rb (100%) rename railties/lib/{ => rails}/generators/test_unit/plugin/plugin_generator.rb (84%) rename railties/lib/{ => rails}/generators/test_unit/plugin/templates/%file_name%_test.rb.tt (100%) rename railties/lib/{ => rails}/generators/test_unit/plugin/templates/test_helper.rb (100%) rename railties/lib/{ => rails}/generators/test_unit/scaffold/scaffold_generator.rb (93%) rename railties/lib/{ => rails}/generators/test_unit/scaffold/templates/functional_test.rb (100%) rename railties/test/fixtures/lib/{rails_generators => rails/generators}/foobar/foobar_generator.rb (100%) diff --git a/activerecord/lib/generators/active_record.rb b/activerecord/lib/rails/generators/active_record.rb similarity index 100% rename from activerecord/lib/generators/active_record.rb rename to activerecord/lib/rails/generators/active_record.rb diff --git a/activerecord/lib/generators/active_record/migration/migration_generator.rb b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb similarity index 93% rename from activerecord/lib/generators/active_record/migration/migration_generator.rb rename to activerecord/lib/rails/generators/active_record/migration/migration_generator.rb index 7939977f72..f6159deeeb 100644 --- a/activerecord/lib/generators/active_record/migration/migration_generator.rb +++ b/activerecord/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/activerecord/lib/generators/active_record/migration/templates/migration.rb b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb similarity index 100% rename from activerecord/lib/generators/active_record/migration/templates/migration.rb rename to activerecord/lib/rails/generators/active_record/migration/templates/migration.rb diff --git a/activerecord/lib/generators/active_record/model/model_generator.rb b/activerecord/lib/rails/generators/active_record/model/model_generator.rb similarity index 95% rename from activerecord/lib/generators/active_record/model/model_generator.rb rename to activerecord/lib/rails/generators/active_record/model/model_generator.rb index 2641083e0d..3e72fbeca8 100644 --- a/activerecord/lib/generators/active_record/model/model_generator.rb +++ b/activerecord/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/activerecord/lib/generators/active_record/model/templates/migration.rb b/activerecord/lib/rails/generators/active_record/model/templates/migration.rb similarity index 100% rename from activerecord/lib/generators/active_record/model/templates/migration.rb rename to activerecord/lib/rails/generators/active_record/model/templates/migration.rb diff --git a/activerecord/lib/generators/active_record/model/templates/model.rb b/activerecord/lib/rails/generators/active_record/model/templates/model.rb similarity index 100% rename from activerecord/lib/generators/active_record/model/templates/model.rb rename to activerecord/lib/rails/generators/active_record/model/templates/model.rb diff --git a/activerecord/lib/generators/active_record/observer/observer_generator.rb b/activerecord/lib/rails/generators/active_record/observer/observer_generator.rb similarity index 88% rename from activerecord/lib/generators/active_record/observer/observer_generator.rb rename to activerecord/lib/rails/generators/active_record/observer/observer_generator.rb index a6b57423b8..c1c0e3f25b 100644 --- a/activerecord/lib/generators/active_record/observer/observer_generator.rb +++ b/activerecord/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/activerecord/lib/generators/active_record/observer/templates/observer.rb b/activerecord/lib/rails/generators/active_record/observer/templates/observer.rb similarity index 100% rename from activerecord/lib/generators/active_record/observer/templates/observer.rb rename to activerecord/lib/rails/generators/active_record/observer/templates/observer.rb diff --git a/activerecord/lib/generators/active_record/session_migration/session_migration_generator.rb b/activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb similarity index 94% rename from activerecord/lib/generators/active_record/session_migration/session_migration_generator.rb rename to activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb index 59c4792066..afcda2a98a 100644 --- a/activerecord/lib/generators/active_record/session_migration/session_migration_generator.rb +++ b/activerecord/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/activerecord/lib/generators/active_record/session_migration/templates/migration.rb b/activerecord/lib/rails/generators/active_record/session_migration/templates/migration.rb similarity index 100% rename from activerecord/lib/generators/active_record/session_migration/templates/migration.rb rename to activerecord/lib/rails/generators/active_record/session_migration/templates/migration.rb diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 9a51171cf5..57462707f4 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -242,7 +242,7 @@ module Rails paths = namespaces_to_paths(namespaces) paths.each do |raw_path| - ["rails_generators", "generators"].each do |base| + ["rails/generators", "generators"].each do |base| path = "#{base}/#{raw_path}_generator" begin @@ -265,7 +265,7 @@ module Rails load_generators_from_railties! $LOAD_PATH.each do |base| - Dir[File.join(base, "{generators,rails_generators}", "**", "*_generator.rb")].each do |path| + Dir[File.join(base, "{rails/generators,generators}", "**", "*_generator.rb")].each do |path| begin require path rescue Exception => e diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb index dbc759fbe5..0da85ea4a4 100644 --- a/railties/lib/rails/generators/base.rb +++ b/railties/lib/rails/generators/base.rb @@ -25,7 +25,7 @@ module Rails def self.source_root @_rails_source_root ||= begin if base_name && generator_name - File.expand_path(File.join("../../generators", base_name, generator_name, 'templates'), File.dirname(__FILE__)) + File.expand_path(File.join(base_name, generator_name, 'templates'), File.dirname(__FILE__)) end end end diff --git a/railties/lib/generators/erb.rb b/railties/lib/rails/generators/erb.rb similarity index 100% rename from railties/lib/generators/erb.rb rename to railties/lib/rails/generators/erb.rb diff --git a/railties/lib/generators/erb/controller/controller_generator.rb b/railties/lib/rails/generators/erb/controller/controller_generator.rb similarity index 94% rename from railties/lib/generators/erb/controller/controller_generator.rb rename to railties/lib/rails/generators/erb/controller/controller_generator.rb index b8e8898900..ac57140c23 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 similarity index 100% rename from railties/lib/generators/erb/controller/templates/view.html.erb rename to 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 similarity index 71% rename from railties/lib/generators/erb/mailer/mailer_generator.rb rename to railties/lib/rails/generators/erb/mailer/mailer_generator.rb index 65fa4a86c5..943d0c9f8d 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/controller/controller_generator' +require 'rails/generators/erb/controller/controller_generator' module Erb module Generators diff --git a/railties/lib/generators/erb/mailer/templates/view.text.erb b/railties/lib/rails/generators/erb/mailer/templates/view.text.erb similarity index 100% rename from railties/lib/generators/erb/mailer/templates/view.text.erb rename to railties/lib/rails/generators/erb/mailer/templates/view.text.erb diff --git a/railties/lib/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb similarity index 97% rename from railties/lib/generators/erb/scaffold/scaffold_generator.rb rename to railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb index 267c9c8063..f607e580a5 100644 --- a/railties/lib/generators/erb/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb @@ -1,4 +1,4 @@ -require 'generators/erb' +require 'rails/generators/erb' require 'rails/generators/resource_helpers' module Erb diff --git a/railties/lib/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb similarity index 100% rename from railties/lib/generators/erb/scaffold/templates/_form.html.erb rename to 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 similarity index 100% rename from railties/lib/generators/erb/scaffold/templates/edit.html.erb rename to 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 similarity index 100% rename from railties/lib/generators/erb/scaffold/templates/index.html.erb rename to 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 similarity index 100% rename from railties/lib/generators/erb/scaffold/templates/layout.html.erb rename to 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 similarity index 100% rename from railties/lib/generators/erb/scaffold/templates/new.html.erb rename to 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 similarity index 100% rename from railties/lib/generators/erb/scaffold/templates/show.html.erb rename to railties/lib/rails/generators/erb/scaffold/templates/show.html.erb diff --git a/railties/lib/generators/rails/app/USAGE b/railties/lib/rails/generators/rails/app/USAGE similarity index 100% rename from railties/lib/generators/rails/app/USAGE rename to 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 similarity index 99% rename from railties/lib/generators/rails/app/app_generator.rb rename to railties/lib/rails/generators/rails/app/app_generator.rb index 1e1acc1141..fccae9190a 100644 --- a/railties/lib/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -5,7 +5,7 @@ require 'rails/version' unless defined?(Rails::VERSION) module Rails::Generators # We need to store the RAILS_DEV_PATH in a constant, otherwise the path # can change in Ruby 1.8.7 when we FileUtils.cd. - RAILS_DEV_PATH = File.expand_path("../../../../..", File.dirname(__FILE__)) + RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__)) RESERVED_NAMES = %w[generate console server dbconsole application destroy benchmarker profiler diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile similarity index 100% rename from railties/lib/generators/rails/app/templates/Gemfile rename to railties/lib/rails/generators/rails/app/templates/Gemfile diff --git a/railties/lib/generators/rails/app/templates/README b/railties/lib/rails/generators/rails/app/templates/README similarity index 100% rename from railties/lib/generators/rails/app/templates/README rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/Rakefile rename to railties/lib/rails/generators/rails/app/templates/Rakefile 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/app/controllers/application_controller.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/app/helpers/application_helper.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/app/models/.empty_directory rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/app/views/layouts/.empty_directory rename to railties/lib/rails/generators/rails/app/templates/app/views/layouts/.empty_directory diff --git a/railties/lib/generators/rails/app/templates/config.ru b/railties/lib/rails/generators/rails/app/templates/config.ru similarity index 100% rename from railties/lib/generators/rails/app/templates/config.ru rename to railties/lib/rails/generators/rails/app/templates/config.ru diff --git a/railties/lib/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb similarity index 100% rename from railties/lib/generators/rails/app/templates/config/application.rb rename to railties/lib/rails/generators/rails/app/templates/config/application.rb diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb similarity index 100% rename from railties/lib/generators/rails/app/templates/config/boot.rb rename to railties/lib/rails/generators/rails/app/templates/config/boot.rb 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/databases/frontbase.yml rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/databases/mysql.yml rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/databases/oracle.yml rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/databases/postgresql.yml rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/databases/sqlite3.yml rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/environment.rb rename to railties/lib/rails/generators/rails/app/templates/config/environment.rb diff --git a/railties/lib/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt similarity index 100% rename from railties/lib/generators/rails/app/templates/config/environments/development.rb.tt rename to railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt diff --git a/railties/lib/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt similarity index 100% rename from railties/lib/generators/rails/app/templates/config/environments/production.rb.tt rename to railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt diff --git a/railties/lib/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt similarity index 100% rename from railties/lib/generators/rails/app/templates/config/environments/test.rb.tt rename to railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/initializers/backtrace_silencers.rb rename to railties/lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb diff --git a/railties/lib/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt similarity index 100% rename from railties/lib/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt rename to railties/lib/rails/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/initializers/inflections.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/initializers/mime_types.rb rename to railties/lib/rails/generators/rails/app/templates/config/initializers/mime_types.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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/locales/en.yml rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/config/routes.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/db/seeds.rb rename to railties/lib/rails/generators/rails/app/templates/db/seeds.rb 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/doc/README_FOR_APP rename to railties/lib/rails/generators/rails/app/templates/doc/README_FOR_APP diff --git a/railties/lib/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore similarity index 100% rename from railties/lib/generators/rails/app/templates/gitignore rename to railties/lib/rails/generators/rails/app/templates/gitignore diff --git a/railties/lib/generators/rails/app/templates/public/404.html b/railties/lib/rails/generators/rails/app/templates/public/404.html similarity index 100% rename from railties/lib/generators/rails/app/templates/public/404.html rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/public/422.html rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/public/500.html rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/public/favicon.ico rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/public/images/rails.png rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/public/index.html rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/public/javascripts/application.js rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/public/javascripts/controls.js rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/public/javascripts/dragdrop.js rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/public/javascripts/effects.js rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/public/javascripts/prototype.js rename to railties/lib/rails/generators/rails/app/templates/public/javascripts/prototype.js diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/rails.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/rails.js similarity index 100% rename from railties/lib/generators/rails/app/templates/public/javascripts/rails.js rename to railties/lib/rails/generators/rails/app/templates/public/javascripts/rails.js diff --git a/railties/lib/generators/rails/app/templates/public/robots.txt b/railties/lib/rails/generators/rails/app/templates/public/robots.txt similarity index 100% rename from railties/lib/generators/rails/app/templates/public/robots.txt rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/public/stylesheets/.empty_directory rename to railties/lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory diff --git a/railties/lib/generators/rails/app/templates/script/rails b/railties/lib/rails/generators/rails/app/templates/script/rails similarity index 100% rename from railties/lib/generators/rails/app/templates/script/rails rename to railties/lib/rails/generators/rails/app/templates/script/rails 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/test/fixtures/.empty_directory rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/test/functional/.empty_directory rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/test/integration/.empty_directory rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/test/performance/browsing_test.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/test/test_helper.rb rename to railties/lib/rails/generators/rails/app/templates/test/test_helper.rb 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 similarity index 100% rename from railties/lib/generators/rails/app/templates/test/unit/.empty_directory rename to 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 similarity index 100% rename from railties/lib/generators/rails/controller/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/controller/controller_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/controller/templates/controller.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/generator/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/generator/generator_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/generator/templates/%file_name%_generator.rb.tt rename to 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 similarity index 100% rename from railties/lib/generators/rails/generator/templates/USAGE.tt rename to 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 similarity index 100% rename from railties/lib/generators/rails/generator/templates/templates/.empty_directory rename to 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 similarity index 100% rename from railties/lib/generators/rails/helper/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/helper/helper_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/helper/templates/helper.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/integration_test/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/integration_test/integration_test_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/mailer/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/mailer/mailer_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/mailer/templates/mailer.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/metal/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/metal/metal_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/metal/templates/metal.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/migration/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/migration/migration_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/model/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/model/model_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/model_subclass/model_subclass_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/observer/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/observer/observer_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/performance_test/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/performance_test/performance_test_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/plugin/USAGE rename to 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 similarity index 94% rename from railties/lib/generators/rails/plugin/plugin_generator.rb rename to railties/lib/rails/generators/rails/plugin/plugin_generator.rb index 8f01dcd589..40ed2062d3 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.tt b/railties/lib/rails/generators/rails/plugin/templates/MIT-LICENSE.tt similarity index 100% rename from railties/lib/generators/rails/plugin/templates/MIT-LICENSE.tt rename to railties/lib/rails/generators/rails/plugin/templates/MIT-LICENSE.tt diff --git a/railties/lib/generators/rails/plugin/templates/README.tt b/railties/lib/rails/generators/rails/plugin/templates/README.tt similarity index 100% rename from railties/lib/generators/rails/plugin/templates/README.tt rename to railties/lib/rails/generators/rails/plugin/templates/README.tt diff --git a/railties/lib/generators/rails/plugin/templates/Rakefile.tt b/railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt similarity index 100% rename from railties/lib/generators/rails/plugin/templates/Rakefile.tt rename to railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt diff --git a/railties/lib/generators/rails/plugin/templates/init.rb b/railties/lib/rails/generators/rails/plugin/templates/init.rb similarity index 100% rename from railties/lib/generators/rails/plugin/templates/init.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/plugin/templates/install.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/plugin/templates/lib/%file_name%.rb.tt rename to railties/lib/rails/generators/rails/plugin/templates/lib/%file_name%.rb.tt diff --git a/railties/lib/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt b/railties/lib/rails/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt similarity index 100% rename from railties/lib/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt rename to railties/lib/rails/generators/rails/plugin/templates/lib/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 similarity index 100% rename from railties/lib/generators/rails/plugin/templates/uninstall.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/resource/USAGE rename to 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 similarity index 94% rename from railties/lib/generators/rails/resource/resource_generator.rb rename to railties/lib/rails/generators/rails/resource/resource_generator.rb index 02c1c39209..1e78945a7e 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 'rails/generators/resource_helpers' -require 'generators/rails/model/model_generator' +require 'rails/generators/rails/model/model_generator' module Rails module Generators diff --git a/railties/lib/generators/rails/scaffold/USAGE b/railties/lib/rails/generators/rails/scaffold/USAGE similarity index 100% rename from railties/lib/generators/rails/scaffold/USAGE rename to 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 similarity index 81% rename from railties/lib/generators/rails/scaffold/scaffold_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/scaffold_controller/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb rename to railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb diff --git a/railties/lib/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb similarity index 100% rename from railties/lib/generators/rails/scaffold_controller/templates/controller.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/session_migration/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/session_migration/session_migration_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/stylesheets/USAGE rename to 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 similarity index 100% rename from railties/lib/generators/rails/stylesheets/stylesheets_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/rails/stylesheets/templates/scaffold.css rename to railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css diff --git a/railties/lib/generators/test_unit.rb b/railties/lib/rails/generators/test_unit.rb similarity index 100% rename from railties/lib/generators/test_unit.rb rename to railties/lib/rails/generators/test_unit.rb diff --git a/railties/lib/generators/test_unit/controller/controller_generator.rb b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb similarity index 91% rename from railties/lib/generators/test_unit/controller/controller_generator.rb rename to railties/lib/rails/generators/test_unit/controller/controller_generator.rb index 847d482335..20f3bd8965 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 similarity index 100% rename from railties/lib/generators/test_unit/controller/templates/functional_test.rb rename to 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 similarity index 88% rename from railties/lib/generators/test_unit/helper/helper_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/test_unit/helper/templates/helper_test.rb rename to 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 similarity index 88% rename from railties/lib/generators/test_unit/integration/integration_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/test_unit/integration/templates/integration_test.rb rename to 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 similarity index 90% rename from railties/lib/generators/test_unit/mailer/mailer_generator.rb rename to railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb index 1b5985db6d..1a49286d41 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/functional_test.rb b/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb similarity index 100% rename from railties/lib/generators/test_unit/mailer/templates/functional_test.rb rename to railties/lib/rails/generators/test_unit/mailer/templates/functional_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 similarity index 94% rename from railties/lib/generators/test_unit/model/model_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/test_unit/model/templates/fixtures.yml rename to 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 similarity index 100% rename from railties/lib/generators/test_unit/model/templates/unit_test.rb rename to 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 similarity index 88% rename from railties/lib/generators/test_unit/observer/observer_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/test_unit/observer/templates/unit_test.rb rename to 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 similarity index 88% rename from railties/lib/generators/test_unit/performance/performance_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/test_unit/performance/templates/performance_test.rb rename to 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 similarity index 84% rename from railties/lib/generators/test_unit/plugin/plugin_generator.rb rename to 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 similarity index 100% rename from railties/lib/generators/test_unit/plugin/templates/%file_name%_test.rb.tt rename to 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 similarity index 100% rename from railties/lib/generators/test_unit/plugin/templates/test_helper.rb rename to 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 similarity index 93% rename from railties/lib/generators/test_unit/scaffold/scaffold_generator.rb rename to railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb index a95916ae13..c0315c7fe6 100644 --- a/railties/lib/generators/test_unit/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' require 'rails/generators/resource_helpers' module TestUnit 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 similarity index 100% rename from railties/lib/generators/test_unit/scaffold/templates/functional_test.rb rename to railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb diff --git a/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb b/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb index 7a4edb8bcb..a7d079a1bc 100644 --- a/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb +++ b/railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb @@ -1,4 +1,4 @@ -require 'generators/active_record' +require 'rails/generators/active_record' module ActiveRecord module Generators diff --git a/railties/test/fixtures/lib/rails_generators/foobar/foobar_generator.rb b/railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb similarity index 100% rename from railties/test/fixtures/lib/rails_generators/foobar/foobar_generator.rb rename to railties/test/fixtures/lib/rails/generators/foobar/foobar_generator.rb diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb index 9a9d0e9dab..44e0640552 100644 --- a/railties/test/generators/actions_test.rb +++ b/railties/test/generators/actions_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/app/app_generator' +require 'rails/generators/rails/app/app_generator' class ActionsTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 4fc26563ff..95ca2acf2c 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/app/app_generator' +require 'rails/generators/rails/app/app_generator' class AppGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb index 2251622e02..be99dc068d 100644 --- a/railties/test/generators/controller_generator_test.rb +++ b/railties/test/generators/controller_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/controller/controller_generator' +require 'rails/generators/rails/controller/controller_generator' class ControllerGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/generator_generator_test.rb b/railties/test/generators/generator_generator_test.rb index f3fd688e4f..26f975a191 100644 --- a/railties/test/generators/generator_generator_test.rb +++ b/railties/test/generators/generator_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/generator/generator_generator' +require 'rails/generators/rails/generator/generator_generator' class GeneratorGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb index 9e56b3732f..d8bdb344f2 100644 --- a/railties/test/generators/generators_test_helper.rb +++ b/railties/test/generators/generators_test_helper.rb @@ -28,7 +28,7 @@ module GeneratorsTestHelper end def copy_routes - routes = File.expand_path("../../../lib/generators/rails/app/templates/config/routes.rb", __FILE__) + routes = File.expand_path("../../../lib/rails/generators/rails/app/templates/config/routes.rb", __FILE__) destination = File.join(destination_root, "config") FileUtils.mkdir_p(destination) FileUtils.cp File.expand_path(routes), destination diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb index 6d7168738e..f0bfebd57f 100644 --- a/railties/test/generators/helper_generator_test.rb +++ b/railties/test/generators/helper_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/helper/helper_generator' +require 'rails/generators/rails/helper/helper_generator' ObjectHelper = Class.new AnotherObjectHelperTest = Class.new diff --git a/railties/test/generators/integration_test_generator_test.rb b/railties/test/generators/integration_test_generator_test.rb index d7fc324c88..cf282a0911 100644 --- a/railties/test/generators/integration_test_generator_test.rb +++ b/railties/test/generators/integration_test_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/integration_test/integration_test_generator' +require 'rails/generators/rails/integration_test/integration_test_generator' class IntegrationTestGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb index e4fccb33ed..81d6afa221 100644 --- a/railties/test/generators/mailer_generator_test.rb +++ b/railties/test/generators/mailer_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/mailer/mailer_generator' +require 'rails/generators/rails/mailer/mailer_generator' class MailerGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/metal_generator_test.rb b/railties/test/generators/metal_generator_test.rb index e3a2384885..615122c882 100644 --- a/railties/test/generators/metal_generator_test.rb +++ b/railties/test/generators/metal_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/metal/metal_generator' +require 'rails/generators/rails/metal/metal_generator' class MetalGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb index 811a712fd5..762f84d579 100644 --- a/railties/test/generators/migration_generator_test.rb +++ b/railties/test/generators/migration_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/migration/migration_generator' +require 'rails/generators/rails/migration/migration_generator' class MigrationGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb index 79ce9a2a7b..f5cfd8eeca 100644 --- a/railties/test/generators/model_generator_test.rb +++ b/railties/test/generators/model_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/model/model_generator' +require 'rails/generators/rails/model/model_generator' class ModelGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb index d30880d64e..e73dd237fb 100644 --- a/railties/test/generators/named_base_test.rb +++ b/railties/test/generators/named_base_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/scaffold_controller/scaffold_controller_generator' +require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator' # Mock out what we need from AR::Base. module ActiveRecord diff --git a/railties/test/generators/observer_generator_test.rb b/railties/test/generators/observer_generator_test.rb index 058a19228d..45fe8dfbd3 100644 --- a/railties/test/generators/observer_generator_test.rb +++ b/railties/test/generators/observer_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/observer/observer_generator' +require 'rails/generators/rails/observer/observer_generator' class ObserverGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/performance_test_generator_test.rb b/railties/test/generators/performance_test_generator_test.rb index c95063a127..8fda83b36f 100644 --- a/railties/test/generators/performance_test_generator_test.rb +++ b/railties/test/generators/performance_test_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/performance_test/performance_test_generator' +require 'rails/generators/rails/performance_test/performance_test_generator' class PerformanceTestGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 065dbe1423..c1f646f7c1 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/plugin/plugin_generator' +require 'rails/generators/rails/plugin/plugin_generator' class PluginGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb index 5f0dc0c594..96fd7a0a72 100644 --- a/railties/test/generators/resource_generator_test.rb +++ b/railties/test/generators/resource_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/resource/resource_generator' +require 'rails/generators/rails/resource/resource_generator' class ResourceGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb index f971598d18..77ed63b1bb 100644 --- a/railties/test/generators/scaffold_controller_generator_test.rb +++ b/railties/test/generators/scaffold_controller_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/scaffold_controller/scaffold_controller_generator' +require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator' module Unknown module Generators diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb index 3ac6c6ad17..6cf2efca45 100644 --- a/railties/test/generators/scaffold_generator_test.rb +++ b/railties/test/generators/scaffold_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/scaffold/scaffold_generator' +require 'rails/generators/rails/scaffold/scaffold_generator' class ScaffoldGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/session_migration_generator_test.rb b/railties/test/generators/session_migration_generator_test.rb index de28b4c75b..9fee948d7c 100644 --- a/railties/test/generators/session_migration_generator_test.rb +++ b/railties/test/generators/session_migration_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/session_migration/session_migration_generator' +require 'rails/generators/rails/session_migration/session_migration_generator' class SessionMigrationGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators/stylesheets_generator_test.rb b/railties/test/generators/stylesheets_generator_test.rb index 718fcb1fa7..aaeb686daa 100644 --- a/railties/test/generators/stylesheets_generator_test.rb +++ b/railties/test/generators/stylesheets_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/rails/stylesheets/stylesheets_generator' +require 'rails/generators/rails/stylesheets/stylesheets_generator' class StylesheetsGeneratorTest < Rails::Generators::TestCase include GeneratorsTestHelper diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb index 2975e3e3ef..16f8f43b99 100644 --- a/railties/test/generators_test.rb +++ b/railties/test/generators_test.rb @@ -1,6 +1,6 @@ require 'generators/generators_test_helper' -require 'generators/rails/model/model_generator' -require 'generators/test_unit/model/model_generator' +require 'rails/generators/rails/model/model_generator' +require 'rails/generators/test_unit/model/model_generator' require 'mocha' class GeneratorsTest < Rails::Generators::TestCase