From f03890e151d7a8b9cc413ea9955efc95ff4fbfe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sun, 21 Jun 2009 10:06:02 +0200 Subject: [PATCH] Use Rails generators files organization. --- railties/bin/rails | 2 +- railties/lib/generator/base.rb | 17 ++++++++++------- .../{templates => generators}/app/USAGE | 0 .../{app.rb => app/app_generator.rb} | 3 +-- .../app => generators/app/templates}/README | 0 .../app => generators/app/templates}/Rakefile | 0 .../app/controllers/application_controller.rb | 0 .../app/helpers/application_helper.rb | 0 .../app/templates}/app/models/.empty_directory | 0 .../app/views/layouts/.empty_directory | 0 .../app/templates}/config/boot.rb | 0 .../templates}/config/databases/frontbase.yml | 0 .../app/templates}/config/databases/ibm_db.yml | 0 .../app/templates}/config/databases/mysql.yml | 0 .../app/templates}/config/databases/oracle.yml | 0 .../templates}/config/databases/postgresql.yml | 0 .../templates}/config/databases/sqlite2.yml | 0 .../templates}/config/databases/sqlite3.yml | 0 .../app/templates}/config/environment.rb | 0 .../config/environments/development.rb | 0 .../config/environments/production.rb | 0 .../app/templates}/config/environments/test.rb | 0 .../config/initializers/backtrace_silencers.rb | 0 .../config/initializers/inflections.rb | 0 .../config/initializers/mime_types.rb | 0 .../config/initializers/new_rails_defaults.rb | 0 .../config/initializers/session_store.rb.tt | 0 .../app/templates}/config/locales/en.yml | 0 .../app/templates}/config/routes.rb | 0 .../app/templates}/db/seeds.rb | 0 .../app/templates}/dispatchers/config.ru | 0 .../app/templates}/dispatchers/dispatch.fcgi | 0 .../app/templates}/dispatchers/dispatch.rb | 0 .../app/templates}/dispatchers/gateway.cgi | 0 .../app/templates}/doc/README_FOR_APP | 0 .../app/templates}/public/404.html | 0 .../app/templates}/public/422.html | 0 .../app/templates}/public/500.html | 0 .../app/templates}/public/favicon.ico | 0 .../app/templates}/public/images/rails.png | Bin .../app/templates}/public/index.html | 0 .../public/javascripts/application.js | 0 .../templates}/public/javascripts/controls.js | 0 .../templates}/public/javascripts/dragdrop.js | 0 .../templates}/public/javascripts/effects.js | 0 .../templates}/public/javascripts/prototype.js | 0 .../app/templates}/public/robots.txt | 0 .../public/stylesheets/.empty_directory | 0 .../app/templates}/script/about.tt | 0 .../app/templates}/script/console.tt | 0 .../app/templates}/script/dbconsole.tt | 0 .../app/templates}/script/destroy.tt | 0 .../app/templates}/script/generate.tt | 0 .../script/performance/benchmarker.tt | 0 .../templates}/script/performance/profiler.tt | 0 .../app/templates}/script/plugin.tt | 0 .../app/templates}/script/runner.tt | 0 .../app/templates}/script/server.tt | 0 .../templates}/test/fixtures/.empty_directory | 0 .../test/functional/.empty_directory | 0 .../test/integration/.empty_directory | 0 .../test/performance/performance_test.rb | 0 .../app/templates}/test/test_helper.rb | 0 .../app/templates}/test/unit/.empty_directory | 0 .../test/generator/generator_test_helper.rb | 4 ++-- 65 files changed, 14 insertions(+), 12 deletions(-) rename railties/lib/generator/{templates => generators}/app/USAGE (100%) rename railties/lib/generator/generators/{app.rb => app/app_generator.rb} (97%) rename railties/lib/generator/{templates/app => generators/app/templates}/README (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/Rakefile (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/app/controllers/application_controller.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/app/helpers/application_helper.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/app/models/.empty_directory (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/app/views/layouts/.empty_directory (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/boot.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/databases/frontbase.yml (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/databases/ibm_db.yml (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/databases/mysql.yml (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/databases/oracle.yml (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/databases/postgresql.yml (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/databases/sqlite2.yml (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/databases/sqlite3.yml (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/environment.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/environments/development.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/environments/production.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/environments/test.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/initializers/backtrace_silencers.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/initializers/inflections.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/initializers/mime_types.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/initializers/new_rails_defaults.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/initializers/session_store.rb.tt (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/locales/en.yml (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/config/routes.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/db/seeds.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/dispatchers/config.ru (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/dispatchers/dispatch.fcgi (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/dispatchers/dispatch.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/dispatchers/gateway.cgi (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/doc/README_FOR_APP (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/404.html (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/422.html (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/500.html (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/favicon.ico (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/images/rails.png (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/index.html (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/javascripts/application.js (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/javascripts/controls.js (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/javascripts/dragdrop.js (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/javascripts/effects.js (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/javascripts/prototype.js (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/robots.txt (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/public/stylesheets/.empty_directory (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/script/about.tt (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/script/console.tt (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/script/dbconsole.tt (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/script/destroy.tt (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/script/generate.tt (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/script/performance/benchmarker.tt (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/script/performance/profiler.tt (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/script/plugin.tt (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/script/runner.tt (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/script/server.tt (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/test/fixtures/.empty_directory (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/test/functional/.empty_directory (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/test/integration/.empty_directory (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/test/performance/performance_test.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/test/test_helper.rb (100%) rename railties/lib/generator/{templates/app => generators/app/templates}/test/unit/.empty_directory (100%) diff --git a/railties/bin/rails b/railties/bin/rails index 7d79faff4a..e13118500a 100755 --- a/railties/bin/rails +++ b/railties/bin/rails @@ -9,5 +9,5 @@ end ARGV << "--help" if ARGV.empty? -require File.dirname(__FILE__) + '/../lib/generator/generators/app' +require File.dirname(__FILE__) + '/../lib/generator/generators/app/app_generator' Rails::Generators::App.start diff --git a/railties/lib/generator/base.rb b/railties/lib/generator/base.rb index 2e0923a33d..8751cb08fb 100644 --- a/railties/lib/generator/base.rb +++ b/railties/lib/generator/base.rb @@ -1,10 +1,16 @@ -require File.dirname(__FILE__) + '/actions' +# Load ActiveSupport mini +activesupport_path = "#{File.dirname(__FILE__)}/../../../activesupport/lib" +$:.unshift(activesupport_path) if File.directory?(activesupport_path) +require 'active_support/all' # TODO Use vendored Thor require 'rubygems' gem 'josevalim-thor' require 'thor' +require File.dirname(__FILE__) + '/../rails/version' unless defined?(Rails::VERSION) +require File.dirname(__FILE__) + '/actions' + module Rails module Generators class Error < Thor::Error @@ -18,11 +24,8 @@ module Rails # def self.source_root @source_root ||= begin - klass_name = self.name - klass_name.gsub!(/^Rails::Generators::/, '') - klass_name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2') - klass_name.gsub!(/([a-z\d])([A-Z])/,'\1_\2') - File.expand_path(File.join(File.dirname(__FILE__), 'templates', klass_name.downcase)) + klass_name = self.name.gsub(/^Rails::Generators::/, '') + File.expand_path(File.join(File.dirname(__FILE__), 'generators', klass_name.underscore, 'templates')) end end @@ -31,7 +34,7 @@ module Rails # Use Rails default banner. # def self.banner - "#{$0} #{self.arguments.map{ |a| a.usage }.join(' ')} [options]" + "#{$0} #{self.arguments.map(&:usage).join(' ')} [options]" end # Small macro to ruby as an option to the generator with proper default diff --git a/railties/lib/generator/templates/app/USAGE b/railties/lib/generator/generators/app/USAGE similarity index 100% rename from railties/lib/generator/templates/app/USAGE rename to railties/lib/generator/generators/app/USAGE diff --git a/railties/lib/generator/generators/app.rb b/railties/lib/generator/generators/app/app_generator.rb similarity index 97% rename from railties/lib/generator/generators/app.rb rename to railties/lib/generator/generators/app/app_generator.rb index c785e72d8e..6f5cb5f2c6 100644 --- a/railties/lib/generator/generators/app.rb +++ b/railties/lib/generator/generators/app/app_generator.rb @@ -1,5 +1,4 @@ -require File.dirname(__FILE__) + '/../../rails/version' unless defined?(Rails::VERSION) -require File.dirname(__FILE__) + '/../base' +require File.dirname(__FILE__) + '/../../base' require 'digest/md5' require 'active_support/secure_random' diff --git a/railties/lib/generator/templates/app/README b/railties/lib/generator/generators/app/templates/README similarity index 100% rename from railties/lib/generator/templates/app/README rename to railties/lib/generator/generators/app/templates/README diff --git a/railties/lib/generator/templates/app/Rakefile b/railties/lib/generator/generators/app/templates/Rakefile similarity index 100% rename from railties/lib/generator/templates/app/Rakefile rename to railties/lib/generator/generators/app/templates/Rakefile diff --git a/railties/lib/generator/templates/app/app/controllers/application_controller.rb b/railties/lib/generator/generators/app/templates/app/controllers/application_controller.rb similarity index 100% rename from railties/lib/generator/templates/app/app/controllers/application_controller.rb rename to railties/lib/generator/generators/app/templates/app/controllers/application_controller.rb diff --git a/railties/lib/generator/templates/app/app/helpers/application_helper.rb b/railties/lib/generator/generators/app/templates/app/helpers/application_helper.rb similarity index 100% rename from railties/lib/generator/templates/app/app/helpers/application_helper.rb rename to railties/lib/generator/generators/app/templates/app/helpers/application_helper.rb diff --git a/railties/lib/generator/templates/app/app/models/.empty_directory b/railties/lib/generator/generators/app/templates/app/models/.empty_directory similarity index 100% rename from railties/lib/generator/templates/app/app/models/.empty_directory rename to railties/lib/generator/generators/app/templates/app/models/.empty_directory diff --git a/railties/lib/generator/templates/app/app/views/layouts/.empty_directory b/railties/lib/generator/generators/app/templates/app/views/layouts/.empty_directory similarity index 100% rename from railties/lib/generator/templates/app/app/views/layouts/.empty_directory rename to railties/lib/generator/generators/app/templates/app/views/layouts/.empty_directory diff --git a/railties/lib/generator/templates/app/config/boot.rb b/railties/lib/generator/generators/app/templates/config/boot.rb similarity index 100% rename from railties/lib/generator/templates/app/config/boot.rb rename to railties/lib/generator/generators/app/templates/config/boot.rb diff --git a/railties/lib/generator/templates/app/config/databases/frontbase.yml b/railties/lib/generator/generators/app/templates/config/databases/frontbase.yml similarity index 100% rename from railties/lib/generator/templates/app/config/databases/frontbase.yml rename to railties/lib/generator/generators/app/templates/config/databases/frontbase.yml diff --git a/railties/lib/generator/templates/app/config/databases/ibm_db.yml b/railties/lib/generator/generators/app/templates/config/databases/ibm_db.yml similarity index 100% rename from railties/lib/generator/templates/app/config/databases/ibm_db.yml rename to railties/lib/generator/generators/app/templates/config/databases/ibm_db.yml diff --git a/railties/lib/generator/templates/app/config/databases/mysql.yml b/railties/lib/generator/generators/app/templates/config/databases/mysql.yml similarity index 100% rename from railties/lib/generator/templates/app/config/databases/mysql.yml rename to railties/lib/generator/generators/app/templates/config/databases/mysql.yml diff --git a/railties/lib/generator/templates/app/config/databases/oracle.yml b/railties/lib/generator/generators/app/templates/config/databases/oracle.yml similarity index 100% rename from railties/lib/generator/templates/app/config/databases/oracle.yml rename to railties/lib/generator/generators/app/templates/config/databases/oracle.yml diff --git a/railties/lib/generator/templates/app/config/databases/postgresql.yml b/railties/lib/generator/generators/app/templates/config/databases/postgresql.yml similarity index 100% rename from railties/lib/generator/templates/app/config/databases/postgresql.yml rename to railties/lib/generator/generators/app/templates/config/databases/postgresql.yml diff --git a/railties/lib/generator/templates/app/config/databases/sqlite2.yml b/railties/lib/generator/generators/app/templates/config/databases/sqlite2.yml similarity index 100% rename from railties/lib/generator/templates/app/config/databases/sqlite2.yml rename to railties/lib/generator/generators/app/templates/config/databases/sqlite2.yml diff --git a/railties/lib/generator/templates/app/config/databases/sqlite3.yml b/railties/lib/generator/generators/app/templates/config/databases/sqlite3.yml similarity index 100% rename from railties/lib/generator/templates/app/config/databases/sqlite3.yml rename to railties/lib/generator/generators/app/templates/config/databases/sqlite3.yml diff --git a/railties/lib/generator/templates/app/config/environment.rb b/railties/lib/generator/generators/app/templates/config/environment.rb similarity index 100% rename from railties/lib/generator/templates/app/config/environment.rb rename to railties/lib/generator/generators/app/templates/config/environment.rb diff --git a/railties/lib/generator/templates/app/config/environments/development.rb b/railties/lib/generator/generators/app/templates/config/environments/development.rb similarity index 100% rename from railties/lib/generator/templates/app/config/environments/development.rb rename to railties/lib/generator/generators/app/templates/config/environments/development.rb diff --git a/railties/lib/generator/templates/app/config/environments/production.rb b/railties/lib/generator/generators/app/templates/config/environments/production.rb similarity index 100% rename from railties/lib/generator/templates/app/config/environments/production.rb rename to railties/lib/generator/generators/app/templates/config/environments/production.rb diff --git a/railties/lib/generator/templates/app/config/environments/test.rb b/railties/lib/generator/generators/app/templates/config/environments/test.rb similarity index 100% rename from railties/lib/generator/templates/app/config/environments/test.rb rename to railties/lib/generator/generators/app/templates/config/environments/test.rb diff --git a/railties/lib/generator/templates/app/config/initializers/backtrace_silencers.rb b/railties/lib/generator/generators/app/templates/config/initializers/backtrace_silencers.rb similarity index 100% rename from railties/lib/generator/templates/app/config/initializers/backtrace_silencers.rb rename to railties/lib/generator/generators/app/templates/config/initializers/backtrace_silencers.rb diff --git a/railties/lib/generator/templates/app/config/initializers/inflections.rb b/railties/lib/generator/generators/app/templates/config/initializers/inflections.rb similarity index 100% rename from railties/lib/generator/templates/app/config/initializers/inflections.rb rename to railties/lib/generator/generators/app/templates/config/initializers/inflections.rb diff --git a/railties/lib/generator/templates/app/config/initializers/mime_types.rb b/railties/lib/generator/generators/app/templates/config/initializers/mime_types.rb similarity index 100% rename from railties/lib/generator/templates/app/config/initializers/mime_types.rb rename to railties/lib/generator/generators/app/templates/config/initializers/mime_types.rb diff --git a/railties/lib/generator/templates/app/config/initializers/new_rails_defaults.rb b/railties/lib/generator/generators/app/templates/config/initializers/new_rails_defaults.rb similarity index 100% rename from railties/lib/generator/templates/app/config/initializers/new_rails_defaults.rb rename to railties/lib/generator/generators/app/templates/config/initializers/new_rails_defaults.rb diff --git a/railties/lib/generator/templates/app/config/initializers/session_store.rb.tt b/railties/lib/generator/generators/app/templates/config/initializers/session_store.rb.tt similarity index 100% rename from railties/lib/generator/templates/app/config/initializers/session_store.rb.tt rename to railties/lib/generator/generators/app/templates/config/initializers/session_store.rb.tt diff --git a/railties/lib/generator/templates/app/config/locales/en.yml b/railties/lib/generator/generators/app/templates/config/locales/en.yml similarity index 100% rename from railties/lib/generator/templates/app/config/locales/en.yml rename to railties/lib/generator/generators/app/templates/config/locales/en.yml diff --git a/railties/lib/generator/templates/app/config/routes.rb b/railties/lib/generator/generators/app/templates/config/routes.rb similarity index 100% rename from railties/lib/generator/templates/app/config/routes.rb rename to railties/lib/generator/generators/app/templates/config/routes.rb diff --git a/railties/lib/generator/templates/app/db/seeds.rb b/railties/lib/generator/generators/app/templates/db/seeds.rb similarity index 100% rename from railties/lib/generator/templates/app/db/seeds.rb rename to railties/lib/generator/generators/app/templates/db/seeds.rb diff --git a/railties/lib/generator/templates/app/dispatchers/config.ru b/railties/lib/generator/generators/app/templates/dispatchers/config.ru similarity index 100% rename from railties/lib/generator/templates/app/dispatchers/config.ru rename to railties/lib/generator/generators/app/templates/dispatchers/config.ru diff --git a/railties/lib/generator/templates/app/dispatchers/dispatch.fcgi b/railties/lib/generator/generators/app/templates/dispatchers/dispatch.fcgi similarity index 100% rename from railties/lib/generator/templates/app/dispatchers/dispatch.fcgi rename to railties/lib/generator/generators/app/templates/dispatchers/dispatch.fcgi diff --git a/railties/lib/generator/templates/app/dispatchers/dispatch.rb b/railties/lib/generator/generators/app/templates/dispatchers/dispatch.rb similarity index 100% rename from railties/lib/generator/templates/app/dispatchers/dispatch.rb rename to railties/lib/generator/generators/app/templates/dispatchers/dispatch.rb diff --git a/railties/lib/generator/templates/app/dispatchers/gateway.cgi b/railties/lib/generator/generators/app/templates/dispatchers/gateway.cgi similarity index 100% rename from railties/lib/generator/templates/app/dispatchers/gateway.cgi rename to railties/lib/generator/generators/app/templates/dispatchers/gateway.cgi diff --git a/railties/lib/generator/templates/app/doc/README_FOR_APP b/railties/lib/generator/generators/app/templates/doc/README_FOR_APP similarity index 100% rename from railties/lib/generator/templates/app/doc/README_FOR_APP rename to railties/lib/generator/generators/app/templates/doc/README_FOR_APP diff --git a/railties/lib/generator/templates/app/public/404.html b/railties/lib/generator/generators/app/templates/public/404.html similarity index 100% rename from railties/lib/generator/templates/app/public/404.html rename to railties/lib/generator/generators/app/templates/public/404.html diff --git a/railties/lib/generator/templates/app/public/422.html b/railties/lib/generator/generators/app/templates/public/422.html similarity index 100% rename from railties/lib/generator/templates/app/public/422.html rename to railties/lib/generator/generators/app/templates/public/422.html diff --git a/railties/lib/generator/templates/app/public/500.html b/railties/lib/generator/generators/app/templates/public/500.html similarity index 100% rename from railties/lib/generator/templates/app/public/500.html rename to railties/lib/generator/generators/app/templates/public/500.html diff --git a/railties/lib/generator/templates/app/public/favicon.ico b/railties/lib/generator/generators/app/templates/public/favicon.ico similarity index 100% rename from railties/lib/generator/templates/app/public/favicon.ico rename to railties/lib/generator/generators/app/templates/public/favicon.ico diff --git a/railties/lib/generator/templates/app/public/images/rails.png b/railties/lib/generator/generators/app/templates/public/images/rails.png similarity index 100% rename from railties/lib/generator/templates/app/public/images/rails.png rename to railties/lib/generator/generators/app/templates/public/images/rails.png diff --git a/railties/lib/generator/templates/app/public/index.html b/railties/lib/generator/generators/app/templates/public/index.html similarity index 100% rename from railties/lib/generator/templates/app/public/index.html rename to railties/lib/generator/generators/app/templates/public/index.html diff --git a/railties/lib/generator/templates/app/public/javascripts/application.js b/railties/lib/generator/generators/app/templates/public/javascripts/application.js similarity index 100% rename from railties/lib/generator/templates/app/public/javascripts/application.js rename to railties/lib/generator/generators/app/templates/public/javascripts/application.js diff --git a/railties/lib/generator/templates/app/public/javascripts/controls.js b/railties/lib/generator/generators/app/templates/public/javascripts/controls.js similarity index 100% rename from railties/lib/generator/templates/app/public/javascripts/controls.js rename to railties/lib/generator/generators/app/templates/public/javascripts/controls.js diff --git a/railties/lib/generator/templates/app/public/javascripts/dragdrop.js b/railties/lib/generator/generators/app/templates/public/javascripts/dragdrop.js similarity index 100% rename from railties/lib/generator/templates/app/public/javascripts/dragdrop.js rename to railties/lib/generator/generators/app/templates/public/javascripts/dragdrop.js diff --git a/railties/lib/generator/templates/app/public/javascripts/effects.js b/railties/lib/generator/generators/app/templates/public/javascripts/effects.js similarity index 100% rename from railties/lib/generator/templates/app/public/javascripts/effects.js rename to railties/lib/generator/generators/app/templates/public/javascripts/effects.js diff --git a/railties/lib/generator/templates/app/public/javascripts/prototype.js b/railties/lib/generator/generators/app/templates/public/javascripts/prototype.js similarity index 100% rename from railties/lib/generator/templates/app/public/javascripts/prototype.js rename to railties/lib/generator/generators/app/templates/public/javascripts/prototype.js diff --git a/railties/lib/generator/templates/app/public/robots.txt b/railties/lib/generator/generators/app/templates/public/robots.txt similarity index 100% rename from railties/lib/generator/templates/app/public/robots.txt rename to railties/lib/generator/generators/app/templates/public/robots.txt diff --git a/railties/lib/generator/templates/app/public/stylesheets/.empty_directory b/railties/lib/generator/generators/app/templates/public/stylesheets/.empty_directory similarity index 100% rename from railties/lib/generator/templates/app/public/stylesheets/.empty_directory rename to railties/lib/generator/generators/app/templates/public/stylesheets/.empty_directory diff --git a/railties/lib/generator/templates/app/script/about.tt b/railties/lib/generator/generators/app/templates/script/about.tt similarity index 100% rename from railties/lib/generator/templates/app/script/about.tt rename to railties/lib/generator/generators/app/templates/script/about.tt diff --git a/railties/lib/generator/templates/app/script/console.tt b/railties/lib/generator/generators/app/templates/script/console.tt similarity index 100% rename from railties/lib/generator/templates/app/script/console.tt rename to railties/lib/generator/generators/app/templates/script/console.tt diff --git a/railties/lib/generator/templates/app/script/dbconsole.tt b/railties/lib/generator/generators/app/templates/script/dbconsole.tt similarity index 100% rename from railties/lib/generator/templates/app/script/dbconsole.tt rename to railties/lib/generator/generators/app/templates/script/dbconsole.tt diff --git a/railties/lib/generator/templates/app/script/destroy.tt b/railties/lib/generator/generators/app/templates/script/destroy.tt similarity index 100% rename from railties/lib/generator/templates/app/script/destroy.tt rename to railties/lib/generator/generators/app/templates/script/destroy.tt diff --git a/railties/lib/generator/templates/app/script/generate.tt b/railties/lib/generator/generators/app/templates/script/generate.tt similarity index 100% rename from railties/lib/generator/templates/app/script/generate.tt rename to railties/lib/generator/generators/app/templates/script/generate.tt diff --git a/railties/lib/generator/templates/app/script/performance/benchmarker.tt b/railties/lib/generator/generators/app/templates/script/performance/benchmarker.tt similarity index 100% rename from railties/lib/generator/templates/app/script/performance/benchmarker.tt rename to railties/lib/generator/generators/app/templates/script/performance/benchmarker.tt diff --git a/railties/lib/generator/templates/app/script/performance/profiler.tt b/railties/lib/generator/generators/app/templates/script/performance/profiler.tt similarity index 100% rename from railties/lib/generator/templates/app/script/performance/profiler.tt rename to railties/lib/generator/generators/app/templates/script/performance/profiler.tt diff --git a/railties/lib/generator/templates/app/script/plugin.tt b/railties/lib/generator/generators/app/templates/script/plugin.tt similarity index 100% rename from railties/lib/generator/templates/app/script/plugin.tt rename to railties/lib/generator/generators/app/templates/script/plugin.tt diff --git a/railties/lib/generator/templates/app/script/runner.tt b/railties/lib/generator/generators/app/templates/script/runner.tt similarity index 100% rename from railties/lib/generator/templates/app/script/runner.tt rename to railties/lib/generator/generators/app/templates/script/runner.tt diff --git a/railties/lib/generator/templates/app/script/server.tt b/railties/lib/generator/generators/app/templates/script/server.tt similarity index 100% rename from railties/lib/generator/templates/app/script/server.tt rename to railties/lib/generator/generators/app/templates/script/server.tt diff --git a/railties/lib/generator/templates/app/test/fixtures/.empty_directory b/railties/lib/generator/generators/app/templates/test/fixtures/.empty_directory similarity index 100% rename from railties/lib/generator/templates/app/test/fixtures/.empty_directory rename to railties/lib/generator/generators/app/templates/test/fixtures/.empty_directory diff --git a/railties/lib/generator/templates/app/test/functional/.empty_directory b/railties/lib/generator/generators/app/templates/test/functional/.empty_directory similarity index 100% rename from railties/lib/generator/templates/app/test/functional/.empty_directory rename to railties/lib/generator/generators/app/templates/test/functional/.empty_directory diff --git a/railties/lib/generator/templates/app/test/integration/.empty_directory b/railties/lib/generator/generators/app/templates/test/integration/.empty_directory similarity index 100% rename from railties/lib/generator/templates/app/test/integration/.empty_directory rename to railties/lib/generator/generators/app/templates/test/integration/.empty_directory diff --git a/railties/lib/generator/templates/app/test/performance/performance_test.rb b/railties/lib/generator/generators/app/templates/test/performance/performance_test.rb similarity index 100% rename from railties/lib/generator/templates/app/test/performance/performance_test.rb rename to railties/lib/generator/generators/app/templates/test/performance/performance_test.rb diff --git a/railties/lib/generator/templates/app/test/test_helper.rb b/railties/lib/generator/generators/app/templates/test/test_helper.rb similarity index 100% rename from railties/lib/generator/templates/app/test/test_helper.rb rename to railties/lib/generator/generators/app/templates/test/test_helper.rb diff --git a/railties/lib/generator/templates/app/test/unit/.empty_directory b/railties/lib/generator/generators/app/templates/test/unit/.empty_directory similarity index 100% rename from railties/lib/generator/templates/app/test/unit/.empty_directory rename to railties/lib/generator/generators/app/templates/test/unit/.empty_directory diff --git a/railties/test/generator/generator_test_helper.rb b/railties/test/generator/generator_test_helper.rb index cdfd9bac0d..ebd3547e5e 100644 --- a/railties/test/generator/generator_test_helper.rb +++ b/railties/test/generator/generator_test_helper.rb @@ -4,13 +4,13 @@ require 'fileutils' $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib" # For this while, let's load all generators by hand -require 'generator/generators/app' +require 'generator/generators/app/app_generator' class GeneratorTestCase < Test::Unit::TestCase include FileUtils def destination_root - @destinartion_root ||= File.expand_path("#{File.dirname(__FILE__)}/../fixtures/tmp") + @destination_root ||= File.expand_path("#{File.dirname(__FILE__)}/../fixtures/tmp") end def setup