Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Load generators from both lib/rails/generators and lib/generators. Us…

…ing the former since it's less obstrusive.
  • Loading branch information...
commit b61f6f59805eec4f5bb873a85910c9fe00e839a9 1 parent b144b56
@josevalim josevalim authored
Showing with 46 additions and 46 deletions.
  1. 0  activerecord/lib/{ → rails}/generators/active_record.rb
  2. +1 −1  activerecord/lib/{ → rails}/generators/active_record/migration/migration_generator.rb
  3. 0  activerecord/lib/{ → rails}/generators/active_record/migration/templates/migration.rb
  4. +1 −1  activerecord/lib/{ → rails}/generators/active_record/model/model_generator.rb
  5. 0  activerecord/lib/{ → rails}/generators/active_record/model/templates/migration.rb
  6. 0  activerecord/lib/{ → rails}/generators/active_record/model/templates/model.rb
  7. +1 −1  activerecord/lib/{ → rails}/generators/active_record/observer/observer_generator.rb
  8. 0  activerecord/lib/{ → rails}/generators/active_record/observer/templates/observer.rb
  9. +1 −1  activerecord/lib/{ → rails}/generators/active_record/session_migration/session_migration_generator.rb
  10. 0  activerecord/lib/{ → rails}/generators/active_record/session_migration/templates/migration.rb
  11. +2 −2 railties/lib/rails/generators.rb
  12. +1 −1  railties/lib/rails/generators/base.rb
  13. 0  railties/lib/{ → rails}/generators/erb.rb
  14. +1 −1  railties/lib/{ → rails}/generators/erb/controller/controller_generator.rb
  15. 0  railties/lib/{ → rails}/generators/erb/controller/templates/view.html.erb
  16. +1 −1  railties/lib/{ → rails}/generators/erb/mailer/mailer_generator.rb
  17. 0  railties/lib/{ → rails}/generators/erb/mailer/templates/view.text.erb
  18. +1 −1  railties/lib/{ → rails}/generators/erb/scaffold/scaffold_generator.rb
  19. 0  railties/lib/{ → rails}/generators/erb/scaffold/templates/_form.html.erb
  20. 0  railties/lib/{ → rails}/generators/erb/scaffold/templates/edit.html.erb
  21. 0  railties/lib/{ → rails}/generators/erb/scaffold/templates/index.html.erb
  22. 0  railties/lib/{ → rails}/generators/erb/scaffold/templates/layout.html.erb
  23. 0  railties/lib/{ → rails}/generators/erb/scaffold/templates/new.html.erb
  24. 0  railties/lib/{ → rails}/generators/erb/scaffold/templates/show.html.erb
  25. 0  railties/lib/{ → rails}/generators/rails/app/USAGE
  26. +1 −1  railties/lib/{ → rails}/generators/rails/app/app_generator.rb
  27. 0  railties/lib/{ → rails}/generators/rails/app/templates/Gemfile
  28. 0  railties/lib/{ → rails}/generators/rails/app/templates/README
  29. 0  railties/lib/{ → rails}/generators/rails/app/templates/Rakefile
  30. 0  railties/lib/{ → rails}/generators/rails/app/templates/app/controllers/application_controller.rb
  31. 0  railties/lib/{ → rails}/generators/rails/app/templates/app/helpers/application_helper.rb
  32. 0  ...ails/generator/templates/templates → rails/generators/rails/app/templates/app/models}/.empty_directory
  33. 0  ...ils/app/templates/test/unit → rails/generators/rails/app/templates/app/views/layouts}/.empty_directory
  34. 0  railties/lib/{ → rails}/generators/rails/app/templates/config.ru
  35. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/application.rb
  36. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/boot.rb
  37. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/databases/frontbase.yml
  38. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/databases/ibm_db.yml
  39. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/databases/mysql.yml
  40. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/databases/oracle.yml
  41. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/databases/postgresql.yml
  42. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/databases/sqlite3.yml
  43. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/environment.rb
  44. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/environments/development.rb.tt
  45. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/environments/production.rb.tt
  46. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/environments/test.rb.tt
  47. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/backtrace_silencers.rb
  48. 0  ...ies/lib/{ → rails}/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt
  49. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/inflections.rb
  50. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/mime_types.rb
  51. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/session_store.rb.tt
  52. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/locales/en.yml
  53. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/routes.rb
  54. 0  railties/lib/{ → rails}/generators/rails/app/templates/db/seeds.rb
  55. 0  railties/lib/{ → rails}/generators/rails/app/templates/doc/README_FOR_APP
  56. 0  railties/lib/{ → rails}/generators/rails/app/templates/gitignore
  57. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/404.html
  58. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/422.html
  59. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/500.html
  60. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/favicon.ico
  61. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/images/rails.png
  62. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/index.html
  63. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/application.js
  64. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/controls.js
  65. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/dragdrop.js
  66. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/effects.js
  67. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/prototype.js
  68. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/rails.js
  69. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/robots.txt
  70. 0  ...templates/test/integration → rails/generators/rails/app/templates/public/stylesheets}/.empty_directory
  71. 0  railties/lib/{ → rails}/generators/rails/app/templates/script/rails
  72. 0  ...s/app/templates/test/functional → rails/generators/rails/app/templates/test/fixtures}/.empty_directory
  73. 0  ...s/app/templates/test/fixtures → rails/generators/rails/app/templates/test/functional}/.empty_directory
  74. 0  ...templates/public/stylesheets → rails/generators/rails/app/templates/test/integration}/.empty_directory
  75. 0  railties/lib/{ → rails}/generators/rails/app/templates/test/performance/browsing_test.rb
  76. 0  railties/lib/{ → rails}/generators/rails/app/templates/test/test_helper.rb
  77. 0  ...ils/app/templates/app/views/layouts → rails/generators/rails/app/templates/test/unit}/.empty_directory
  78. 0  railties/lib/{ → rails}/generators/rails/controller/USAGE
  79. 0  railties/lib/{ → rails}/generators/rails/controller/controller_generator.rb
  80. 0  railties/lib/{ → rails}/generators/rails/controller/templates/controller.rb
  81. 0  railties/lib/{ → rails}/generators/rails/generator/USAGE
  82. 0  railties/lib/{ → rails}/generators/rails/generator/generator_generator.rb
  83. 0  railties/lib/{ → rails}/generators/rails/generator/templates/%file_name%_generator.rb.tt
  84. 0  railties/lib/{ → rails}/generators/rails/generator/templates/USAGE.tt
  85. 0  ...ails/app/templates/app/models → rails/generators/rails/generator/templates/templates}/.empty_directory
  86. 0  railties/lib/{ → rails}/generators/rails/helper/USAGE
  87. 0  railties/lib/{ → rails}/generators/rails/helper/helper_generator.rb
  88. 0  railties/lib/{ → rails}/generators/rails/helper/templates/helper.rb
  89. 0  railties/lib/{ → rails}/generators/rails/integration_test/USAGE
  90. 0  railties/lib/{ → rails}/generators/rails/integration_test/integration_test_generator.rb
  91. 0  railties/lib/{ → rails}/generators/rails/mailer/USAGE
  92. 0  railties/lib/{ → rails}/generators/rails/mailer/mailer_generator.rb
  93. 0  railties/lib/{ → rails}/generators/rails/mailer/templates/mailer.rb
  94. 0  railties/lib/{ → rails}/generators/rails/metal/USAGE
  95. 0  railties/lib/{ → rails}/generators/rails/metal/metal_generator.rb
  96. 0  railties/lib/{ → rails}/generators/rails/metal/templates/metal.rb
  97. 0  railties/lib/{ → rails}/generators/rails/migration/USAGE
  98. 0  railties/lib/{ → rails}/generators/rails/migration/migration_generator.rb
  99. 0  railties/lib/{ → rails}/generators/rails/model/USAGE
  100. 0  railties/lib/{ → rails}/generators/rails/model/model_generator.rb
  101. 0  railties/lib/{ → rails}/generators/rails/model_subclass/model_subclass_generator.rb
  102. 0  railties/lib/{ → rails}/generators/rails/observer/USAGE
  103. 0  railties/lib/{ → rails}/generators/rails/observer/observer_generator.rb
  104. 0  railties/lib/{ → rails}/generators/rails/performance_test/USAGE
  105. 0  railties/lib/{ → rails}/generators/rails/performance_test/performance_test_generator.rb
  106. 0  railties/lib/{ → rails}/generators/rails/plugin/USAGE
  107. +1 −1  railties/lib/{ → rails}/generators/rails/plugin/plugin_generator.rb
  108. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/MIT-LICENSE.tt
  109. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/README.tt
  110. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/Rakefile.tt
  111. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/init.rb
  112. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/install.rb
  113. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/lib/%file_name%.rb.tt
  114. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/lib/tasks/%file_name%_tasks.rake.tt
  115. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/uninstall.rb
  116. 0  railties/lib/{ → rails}/generators/rails/resource/USAGE
  117. +1 −1  railties/lib/{ → rails}/generators/rails/resource/resource_generator.rb
  118. 0  railties/lib/{ → rails}/generators/rails/scaffold/USAGE
  119. +1 −1  railties/lib/{ → rails}/generators/rails/scaffold/scaffold_generator.rb
  120. 0  railties/lib/{ → rails}/generators/rails/scaffold_controller/USAGE
  121. 0  railties/lib/{ → rails}/generators/rails/scaffold_controller/scaffold_controller_generator.rb
  122. 0  railties/lib/{ → rails}/generators/rails/scaffold_controller/templates/controller.rb
  123. 0  railties/lib/{ → rails}/generators/rails/session_migration/USAGE
  124. 0  railties/lib/{ → rails}/generators/rails/session_migration/session_migration_generator.rb
  125. 0  railties/lib/{ → rails}/generators/rails/stylesheets/USAGE
  126. 0  railties/lib/{ → rails}/generators/rails/stylesheets/stylesheets_generator.rb
  127. 0  railties/lib/{ → rails}/generators/rails/stylesheets/templates/scaffold.css
  128. 0  railties/lib/{ → rails}/generators/test_unit.rb
  129. +1 −1  railties/lib/{ → rails}/generators/test_unit/controller/controller_generator.rb
  130. 0  railties/lib/{ → rails}/generators/test_unit/controller/templates/functional_test.rb
  131. +1 −1  railties/lib/{ → rails}/generators/test_unit/helper/helper_generator.rb
  132. 0  railties/lib/{ → rails}/generators/test_unit/helper/templates/helper_test.rb
  133. +1 −1  railties/lib/{ → rails}/generators/test_unit/integration/integration_generator.rb
  134. 0  railties/lib/{ → rails}/generators/test_unit/integration/templates/integration_test.rb
  135. +1 −1  railties/lib/{ → rails}/generators/test_unit/mailer/mailer_generator.rb
  136. 0  railties/lib/{ → rails}/generators/test_unit/mailer/templates/functional_test.rb
  137. +1 −1  railties/lib/{ → rails}/generators/test_unit/model/model_generator.rb
  138. 0  railties/lib/{ → rails}/generators/test_unit/model/templates/fixtures.yml
  139. 0  railties/lib/{ → rails}/generators/test_unit/model/templates/unit_test.rb
  140. +1 −1  railties/lib/{ → rails}/generators/test_unit/observer/observer_generator.rb
  141. 0  railties/lib/{ → rails}/generators/test_unit/observer/templates/unit_test.rb
  142. +1 −1  railties/lib/{ → rails}/generators/test_unit/performance/performance_generator.rb
  143. 0  railties/lib/{ → rails}/generators/test_unit/performance/templates/performance_test.rb
  144. +1 −1  railties/lib/{ → rails}/generators/test_unit/plugin/plugin_generator.rb
  145. 0  railties/lib/{ → rails}/generators/test_unit/plugin/templates/%file_name%_test.rb.tt
  146. 0  railties/lib/{ → rails}/generators/test_unit/plugin/templates/test_helper.rb
  147. +1 −1  railties/lib/{ → rails}/generators/test_unit/scaffold/scaffold_generator.rb
  148. 0  railties/lib/{ → rails}/generators/test_unit/scaffold/templates/functional_test.rb
  149. +1 −1  railties/test/fixtures/lib/generators/active_record/fixjour_generator.rb
  150. 0  railties/test/fixtures/lib/{rails_generators → rails/generators}/foobar/foobar_generator.rb
  151. +1 −1  railties/test/generators/actions_test.rb
  152. +1 −1  railties/test/generators/app_generator_test.rb
  153. +1 −1  railties/test/generators/controller_generator_test.rb
  154. +1 −1  railties/test/generators/generator_generator_test.rb
  155. +1 −1  railties/test/generators/generators_test_helper.rb
  156. +1 −1  railties/test/generators/helper_generator_test.rb
  157. +1 −1  railties/test/generators/integration_test_generator_test.rb
  158. +1 −1  railties/test/generators/mailer_generator_test.rb
  159. +1 −1  railties/test/generators/metal_generator_test.rb
  160. +1 −1  railties/test/generators/migration_generator_test.rb
  161. +1 −1  railties/test/generators/model_generator_test.rb
  162. +1 −1  railties/test/generators/named_base_test.rb
  163. +1 −1  railties/test/generators/observer_generator_test.rb
  164. +1 −1  railties/test/generators/performance_test_generator_test.rb
  165. +1 −1  railties/test/generators/plugin_generator_test.rb
  166. +1 −1  railties/test/generators/resource_generator_test.rb
  167. +1 −1  railties/test/generators/scaffold_controller_generator_test.rb
  168. +1 −1  railties/test/generators/scaffold_generator_test.rb
  169. +1 −1  railties/test/generators/session_migration_generator_test.rb
  170. +1 −1  railties/test/generators/stylesheets_generator_test.rb
  171. +2 −2 railties/test/generators_test.rb
View
0  activerecord/lib/generators/active_record.rb → ...ord/lib/rails/generators/active_record.rb
File renamed without changes
View
2  ...e_record/migration/migration_generator.rb → ...e_record/migration/migration_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
View
0  ...e_record/migration/templates/migration.rb → ...e_record/migration/templates/migration.rb
File renamed without changes
View
2  ...rs/active_record/model/model_generator.rb → ...rs/active_record/model/model_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
View
0  ...ctive_record/model/templates/migration.rb → ...ctive_record/model/templates/migration.rb
File renamed without changes
View
0  ...rs/active_record/model/templates/model.rb → ...rs/active_record/model/templates/model.rb
File renamed without changes
View
2  ...ive_record/observer/observer_generator.rb → ...ive_record/observer/observer_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
View
0  ...ive_record/observer/templates/observer.rb → ...ive_record/observer/templates/observer.rb
File renamed without changes
View
2  ..._migration/session_migration_generator.rb → ..._migration/session_migration_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
View
0  .../session_migration/templates/migration.rb → .../session_migration/templates/migration.rb
File renamed without changes
View
4 railties/lib/rails/generators.rb
@@ -242,7 +242,7 @@ def self.lookup(namespaces) #:nodoc:
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 @@ def self.lookup! #:nodoc:
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
View
2  railties/lib/rails/generators/base.rb
@@ -25,7 +25,7 @@ class Base < Thor::Group
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
View
0  railties/lib/generators/erb.rb → railties/lib/rails/generators/erb.rb
File renamed without changes
View
2  ...rs/erb/controller/controller_generator.rb → ...rs/erb/controller/controller_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
module Erb
module Generators
View
0  ...rs/erb/controller/templates/view.html.erb → ...rs/erb/controller/templates/view.html.erb
File renamed without changes
View
2  ...generators/erb/mailer/mailer_generator.rb → ...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
View
0  ...rators/erb/mailer/templates/view.text.erb → ...rators/erb/mailer/templates/view.text.erb
File renamed without changes
View
2  ...rators/erb/scaffold/scaffold_generator.rb → ...rators/erb/scaffold/scaffold_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
require 'rails/generators/resource_helpers'
module Erb
View
0  ...ors/erb/scaffold/templates/_form.html.erb → ...ors/erb/scaffold/templates/_form.html.erb
File renamed without changes
View
0  ...tors/erb/scaffold/templates/edit.html.erb → ...tors/erb/scaffold/templates/edit.html.erb
File renamed without changes
View
0  ...ors/erb/scaffold/templates/index.html.erb → ...ors/erb/scaffold/templates/index.html.erb
File renamed without changes
View
0  ...rs/erb/scaffold/templates/layout.html.erb → ...rs/erb/scaffold/templates/layout.html.erb
File renamed without changes
View
0  ...ators/erb/scaffold/templates/new.html.erb → ...ators/erb/scaffold/templates/new.html.erb
File renamed without changes
View
0  ...tors/erb/scaffold/templates/show.html.erb → ...tors/erb/scaffold/templates/show.html.erb
File renamed without changes
View
0  railties/lib/generators/rails/app/USAGE → ...ties/lib/rails/generators/rails/app/USAGE
File renamed without changes
View
2  ...lib/generators/rails/app/app_generator.rb → ...ils/generators/rails/app/app_generator.rb
@@ -5,7 +5,7 @@
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
View
0  ...ib/generators/rails/app/templates/Gemfile → ...ls/generators/rails/app/templates/Gemfile
File renamed without changes
View
0  ...lib/generators/rails/app/templates/README → ...ils/generators/rails/app/templates/README
File renamed without changes
View
0  ...b/generators/rails/app/templates/Rakefile → ...s/generators/rails/app/templates/Rakefile
File renamed without changes
View
0  ...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb
File renamed without changes
View
0  ...mplates/app/helpers/application_helper.rb → ...mplates/app/helpers/application_helper.rb
File renamed without changes
View
0  ...ator/templates/templates/.empty_directory → ...app/templates/app/models/.empty_directory
File renamed without changes
View
0  .../app/templates/test/unit/.empty_directory → ...plates/app/views/layouts/.empty_directory
File renamed without changes
View
0  .../generators/rails/app/templates/config.ru → .../generators/rails/app/templates/config.ru
File renamed without changes
View
0  ...rails/app/templates/config/application.rb → ...rails/app/templates/config/application.rb
File renamed without changes
View
0  ...rators/rails/app/templates/config/boot.rb → ...rators/rails/app/templates/config/boot.rb
File renamed without changes
View
0  .../templates/config/databases/frontbase.yml → .../templates/config/databases/frontbase.yml
File renamed without changes
View
0  ...app/templates/config/databases/ibm_db.yml → ...app/templates/config/databases/ibm_db.yml
File renamed without changes
View
0  .../app/templates/config/databases/mysql.yml → .../app/templates/config/databases/mysql.yml
File renamed without changes
View
0  ...app/templates/config/databases/oracle.yml → ...app/templates/config/databases/oracle.yml
File renamed without changes
View
0  ...templates/config/databases/postgresql.yml → ...templates/config/databases/postgresql.yml
File renamed without changes
View
0  ...pp/templates/config/databases/sqlite3.yml → ...pp/templates/config/databases/sqlite3.yml
File renamed without changes
View
0  ...rails/app/templates/config/environment.rb → ...rails/app/templates/config/environment.rb
File renamed without changes
View
0  ...tes/config/environments/development.rb.tt → ...tes/config/environments/development.rb.tt
File renamed without changes
View
0  ...ates/config/environments/production.rb.tt → ...ates/config/environments/production.rb.tt
File renamed without changes
View
0  .../templates/config/environments/test.rb.tt → .../templates/config/environments/test.rb.tt
File renamed without changes
View
0  ...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb
File renamed without changes
View
0  ...ializers/cookie_verification_secret.rb.tt → ...ializers/cookie_verification_secret.rb.tt
File renamed without changes
View
0  ...plates/config/initializers/inflections.rb → ...plates/config/initializers/inflections.rb
File renamed without changes
View
0  ...mplates/config/initializers/mime_types.rb → ...mplates/config/initializers/mime_types.rb
File renamed without changes
View
0  ...s/config/initializers/session_store.rb.tt → ...s/config/initializers/session_store.rb.tt
File renamed without changes
View
0  ...rails/app/templates/config/locales/en.yml → ...rails/app/templates/config/locales/en.yml
File renamed without changes
View
0  ...tors/rails/app/templates/config/routes.rb → ...tors/rails/app/templates/config/routes.rb
File renamed without changes
View
0  ...enerators/rails/app/templates/db/seeds.rb → ...enerators/rails/app/templates/db/seeds.rb
File renamed without changes
View
0  ...rs/rails/app/templates/doc/README_FOR_APP → ...rs/rails/app/templates/doc/README_FOR_APP
File renamed without changes
View
0  .../generators/rails/app/templates/gitignore → .../generators/rails/app/templates/gitignore
File renamed without changes
View
0  ...ators/rails/app/templates/public/404.html → ...ators/rails/app/templates/public/404.html
File renamed without changes
View
0  ...ators/rails/app/templates/public/422.html → ...ators/rails/app/templates/public/422.html
File renamed without changes
View
0  ...ators/rails/app/templates/public/500.html → ...ators/rails/app/templates/public/500.html
File renamed without changes
View
0  ...rs/rails/app/templates/public/favicon.ico → ...rs/rails/app/templates/public/favicon.ico
File renamed without changes
View
0  ...ils/app/templates/public/images/rails.png → ...ils/app/templates/public/images/rails.png
File renamed without changes
View
0  ...ors/rails/app/templates/public/index.html → ...ors/rails/app/templates/public/index.html
File renamed without changes
View
0  ...mplates/public/javascripts/application.js → ...mplates/public/javascripts/application.js
File renamed without changes
View
0  .../templates/public/javascripts/controls.js → .../templates/public/javascripts/controls.js
File renamed without changes
View
0  .../templates/public/javascripts/dragdrop.js → .../templates/public/javascripts/dragdrop.js
File renamed without changes
View
0  ...p/templates/public/javascripts/effects.js → ...p/templates/public/javascripts/effects.js
File renamed without changes
View
0  ...templates/public/javascripts/prototype.js → ...templates/public/javascripts/prototype.js
File renamed without changes
View
0  ...app/templates/public/javascripts/rails.js → ...app/templates/public/javascripts/rails.js
File renamed without changes
View
0  ...ors/rails/app/templates/public/robots.txt → ...ors/rails/app/templates/public/robots.txt
File renamed without changes
View
0  ...mplates/test/integration/.empty_directory → ...lates/public/stylesheets/.empty_directory
File renamed without changes
View
0  ...nerators/rails/app/templates/script/rails → ...nerators/rails/app/templates/script/rails
File renamed without changes
View
0  ...emplates/test/functional/.empty_directory → .../templates/test/fixtures/.empty_directory
File renamed without changes
View
0  .../templates/test/fixtures/.empty_directory → ...emplates/test/functional/.empty_directory
File renamed without changes
View
0  ...lates/public/stylesheets/.empty_directory → ...mplates/test/integration/.empty_directory
File renamed without changes
View
0  ...mplates/test/performance/browsing_test.rb → ...mplates/test/performance/browsing_test.rb
File renamed without changes
View
0  ...s/rails/app/templates/test/test_helper.rb → ...s/rails/app/templates/test/test_helper.rb
File renamed without changes
View
0  ...plates/app/views/layouts/.empty_directory → .../app/templates/test/unit/.empty_directory
File renamed without changes
View
0  ...ies/lib/generators/rails/controller/USAGE → ...b/rails/generators/rails/controller/USAGE
File renamed without changes
View
0  .../rails/controller/controller_generator.rb → .../rails/controller/controller_generator.rb
File renamed without changes
View
0  .../rails/controller/templates/controller.rb → .../rails/controller/templates/controller.rb
File renamed without changes
View
0  ...ties/lib/generators/rails/generator/USAGE → ...ib/rails/generators/rails/generator/USAGE
File renamed without changes
View
0  ...rs/rails/generator/generator_generator.rb → ...rs/rails/generator/generator_generator.rb
File renamed without changes
View
0  ...tor/templates/%file_name%_generator.rb.tt → ...tor/templates/%file_name%_generator.rb.tt
File renamed without changes
View
0  ...rators/rails/generator/templates/USAGE.tt → ...rators/rails/generator/templates/USAGE.tt
File renamed without changes
View
0  ...app/templates/app/models/.empty_directory → ...ator/templates/templates/.empty_directory
File renamed without changes
View
0  railties/lib/generators/rails/helper/USAGE → ...s/lib/rails/generators/rails/helper/USAGE
File renamed without changes
View
0  ...nerators/rails/helper/helper_generator.rb → ...nerators/rails/helper/helper_generator.rb
File renamed without changes
View
0  ...nerators/rails/helper/templates/helper.rb → ...nerators/rails/helper/templates/helper.rb
File renamed without changes
View
0  ...b/generators/rails/integration_test/USAGE → ...s/generators/rails/integration_test/USAGE
File renamed without changes
View
0  ...ration_test/integration_test_generator.rb → ...ration_test/integration_test_generator.rb
File renamed without changes
View
0  railties/lib/generators/rails/mailer/USAGE → ...s/lib/rails/generators/rails/mailer/USAGE
File renamed without changes
View
0  ...nerators/rails/mailer/mailer_generator.rb → ...nerators/rails/mailer/mailer_generator.rb
File renamed without changes
View
0  ...nerators/rails/mailer/templates/mailer.rb → ...nerators/rails/mailer/templates/mailer.rb
File renamed without changes
View
0  railties/lib/generators/rails/metal/USAGE → ...es/lib/rails/generators/rails/metal/USAGE
File renamed without changes
View
0  ...generators/rails/metal/metal_generator.rb → ...generators/rails/metal/metal_generator.rb
File renamed without changes
View
0  ...generators/rails/metal/templates/metal.rb → ...generators/rails/metal/templates/metal.rb
File renamed without changes
View
0  ...ties/lib/generators/rails/migration/USAGE → ...ib/rails/generators/rails/migration/USAGE
File renamed without changes
View
0  ...rs/rails/migration/migration_generator.rb → ...rs/rails/migration/migration_generator.rb
File renamed without changes
View
0  railties/lib/generators/rails/model/USAGE → ...es/lib/rails/generators/rails/model/USAGE
File renamed without changes
View
0  ...generators/rails/model/model_generator.rb → ...generators/rails/model/model_generator.rb
File renamed without changes
View
0  ...odel_subclass/model_subclass_generator.rb → ...odel_subclass/model_subclass_generator.rb
File renamed without changes
View
0  railties/lib/generators/rails/observer/USAGE → ...lib/rails/generators/rails/observer/USAGE
File renamed without changes
View
0  ...tors/rails/observer/observer_generator.rb → ...tors/rails/observer/observer_generator.rb
File renamed without changes
View
0  ...b/generators/rails/performance_test/USAGE → ...s/generators/rails/performance_test/USAGE
File renamed without changes
View
0  ...rmance_test/performance_test_generator.rb → ...rmance_test/performance_test_generator.rb
File renamed without changes
View
0  railties/lib/generators/rails/plugin/USAGE → ...s/lib/rails/generators/rails/plugin/USAGE
File renamed without changes
View
2  ...nerators/rails/plugin/plugin_generator.rb → ...nerators/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
View
0  ...ors/rails/plugin/templates/MIT-LICENSE.tt → ...ors/rails/plugin/templates/MIT-LICENSE.tt
File renamed without changes
View
0  ...nerators/rails/plugin/templates/README.tt → ...nerators/rails/plugin/templates/README.tt
File renamed without changes
View
0  ...rators/rails/plugin/templates/Rakefile.tt → ...rators/rails/plugin/templates/Rakefile.tt
File renamed without changes
View
0  ...generators/rails/plugin/templates/init.rb → ...generators/rails/plugin/templates/init.rb
File renamed without changes
View
0  ...erators/rails/plugin/templates/install.rb → ...erators/rails/plugin/templates/install.rb
File renamed without changes
View
0  ...ls/plugin/templates/lib/%file_name%.rb.tt → ...ls/plugin/templates/lib/%file_name%.rb.tt
File renamed without changes
View
0  ...lates/lib/tasks/%file_name%_tasks.rake.tt → ...lates/lib/tasks/%file_name%_tasks.rake.tt
File renamed without changes
View
0  ...ators/rails/plugin/templates/uninstall.rb → ...ators/rails/plugin/templates/uninstall.rb
File renamed without changes
View
0  railties/lib/generators/rails/resource/USAGE → ...lib/rails/generators/rails/resource/USAGE
File renamed without changes
View
2  ...tors/rails/resource/resource_generator.rb → ...tors/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
View
0  railties/lib/generators/rails/scaffold/USAGE → ...lib/rails/generators/rails/scaffold/USAGE
File renamed without changes
View
2  ...tors/rails/scaffold/scaffold_generator.rb → ...tors/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
View
0  ...enerators/rails/scaffold_controller/USAGE → ...enerators/rails/scaffold_controller/USAGE
File renamed without changes
View
0  ...ntroller/scaffold_controller_generator.rb → ...ntroller/scaffold_controller_generator.rb
File renamed without changes
View
0  ...affold_controller/templates/controller.rb → ...affold_controller/templates/controller.rb
File renamed without changes
View
0  .../generators/rails/session_migration/USAGE → .../generators/rails/session_migration/USAGE
File renamed without changes
View
0  ..._migration/session_migration_generator.rb → ..._migration/session_migration_generator.rb
File renamed without changes
View
0  ...es/lib/generators/rails/stylesheets/USAGE → .../rails/generators/rails/stylesheets/USAGE
File renamed without changes
View
0  ...ails/stylesheets/stylesheets_generator.rb → ...ails/stylesheets/stylesheets_generator.rb
File renamed without changes
View
0  .../rails/stylesheets/templates/scaffold.css → .../rails/stylesheets/templates/scaffold.css
File renamed without changes
View
0  railties/lib/generators/test_unit.rb → railties/lib/rails/generators/test_unit.rb
File renamed without changes
View
2  ...t_unit/controller/controller_generator.rb → ...t_unit/controller/controller_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
View
0  ...t/controller/templates/functional_test.rb → ...t/controller/templates/functional_test.rb
File renamed without changes
View
2  ...tors/test_unit/helper/helper_generator.rb → ...tors/test_unit/helper/helper_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
View
0  ...test_unit/helper/templates/helper_test.rb → ...test_unit/helper/templates/helper_test.rb
File renamed without changes
View
2  ...unit/integration/integration_generator.rb → ...unit/integration/integration_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
View
0  ...integration/templates/integration_test.rb → ...integration/templates/integration_test.rb
File renamed without changes
View
2  ...tors/test_unit/mailer/mailer_generator.rb → ...tors/test_unit/mailer/mailer_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
View
0  ..._unit/mailer/templates/functional_test.rb → ..._unit/mailer/templates/functional_test.rb
File renamed without changes
View
2  ...rators/test_unit/model/model_generator.rb → ...rators/test_unit/model/model_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
View
0  ...rs/test_unit/model/templates/fixtures.yml → ...rs/test_unit/model/templates/fixtures.yml
File renamed without changes
View
0  ...rs/test_unit/model/templates/unit_test.rb → ...rs/test_unit/model/templates/unit_test.rb
File renamed without changes
View
2  .../test_unit/observer/observer_generator.rb → .../test_unit/observer/observer_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
View
0  ...test_unit/observer/templates/unit_test.rb → ...test_unit/observer/templates/unit_test.rb
File renamed without changes
View
2  ...unit/performance/performance_generator.rb → ...unit/performance/performance_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
View
0  ...performance/templates/performance_test.rb → ...performance/templates/performance_test.rb
File renamed without changes
View
2  ...tors/test_unit/plugin/plugin_generator.rb → ...tors/test_unit/plugin/plugin_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
View
0  ...t/plugin/templates/%file_name%_test.rb.tt → ...t/plugin/templates/%file_name%_test.rb.tt
File renamed without changes
View
0  ...test_unit/plugin/templates/test_helper.rb → ...test_unit/plugin/templates/test_helper.rb
File renamed without changes
View
2  .../test_unit/scaffold/scaffold_generator.rb → .../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
View
0  ...nit/scaffold/templates/functional_test.rb → ...nit/scaffold/templates/functional_test.rb
File renamed without changes
View
2  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
View
0  ...ils_generators/foobar/foobar_generator.rb → ...ils/generators/foobar/foobar_generator.rb
File renamed without changes
View
2  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
View
2  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
View
2  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
View
2  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
View
2  railties/test/generators/generators_test_helper.rb
@@ -28,7 +28,7 @@ def self.included(base)
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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
2  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
View
4 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
Please sign in to comment.
Something went wrong with that request. Please try again.