Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit f0dd77c6be6a86fe384bb0015151e0a497973d39 1 parent 610b81b
Yehuda Katz + Carl Lerche authored
Showing with 141 additions and 108 deletions.
  1. +3 −1 .gitignore
  2. +1 −0  actionpack/lib/action_controller/testing/process.rb
  3. +1 −1  railties/Rakefile
  4. +14 −4 railties/bin/rails
  5. 0  railties/lib/{ → rails}/code_statistics.rb
  6. 0  railties/lib/{ → rails}/commands.rb
  7. 0  railties/lib/{ → rails}/commands/about.rb
  8. +3 −3 railties/lib/{ → rails}/commands/console.rb
  9. 0  railties/lib/{ → rails}/commands/dbconsole.rb
  10. 0  railties/lib/{ → rails}/commands/destroy.rb
  11. 0  railties/lib/{ → rails}/commands/generate.rb
  12. 0  railties/lib/{ → rails}/commands/ncgi/listener
  13. 0  railties/lib/{ → rails}/commands/ncgi/tracker
  14. 0  railties/lib/{ → rails}/commands/performance/benchmarker.rb
  15. 0  railties/lib/{ → rails}/commands/performance/profiler.rb
  16. 0  railties/lib/{ → rails}/commands/plugin.rb
  17. 0  railties/lib/{ → rails}/commands/runner.rb
  18. 0  railties/lib/{ → rails}/commands/server.rb
  19. 0  railties/lib/{ → rails}/commands/update.rb
  20. 0  railties/lib/{ → rails}/console_app.rb
  21. 0  railties/lib/{ → rails}/console_sandbox.rb
  22. 0  railties/lib/{ → rails}/console_with_helpers.rb
  23. 0  railties/lib/{ → rails}/dispatcher.rb
  24. +1 −1  railties/lib/{ → rails}/fcgi_handler.rb
  25. +3 −3 railties/lib/{ → rails}/generators.rb
  26. 0  railties/lib/{ → rails}/generators/actions.rb
  27. 0  railties/lib/{ → rails}/generators/active_model.rb
  28. +3 −3 railties/lib/{ → rails}/generators/active_record.rb
  29. +1 −1  railties/lib/{ → rails}/generators/active_record/migration/migration_generator.rb
  30. 0  railties/lib/{ → rails}/generators/active_record/migration/templates/migration.rb
  31. +1 −1  railties/lib/{ → rails}/generators/active_record/model/model_generator.rb
  32. 0  railties/lib/{ → rails}/generators/active_record/model/templates/migration.rb
  33. 0  railties/lib/{ → rails}/generators/active_record/model/templates/model.rb
  34. +1 −1  railties/lib/{ → rails}/generators/active_record/observer/observer_generator.rb
  35. 0  railties/lib/{ → rails}/generators/active_record/observer/templates/observer.rb
  36. +1 −1  railties/lib/{ → rails}/generators/active_record/session_migration/session_migration_generator.rb
  37. 0  railties/lib/{ → rails}/generators/active_record/session_migration/templates/migration.rb
  38. +1 −1  railties/lib/{ → rails}/generators/base.rb
  39. +1 −1  railties/lib/{ → rails}/generators/erb.rb
  40. +1 −1  railties/lib/{ → rails}/generators/erb/controller/controller_generator.rb
  41. 0  railties/lib/{ → rails}/generators/erb/controller/templates/view.html.erb
  42. +1 −1  railties/lib/{ → rails}/generators/erb/mailer/mailer_generator.rb
  43. 0  railties/lib/{ → rails}/generators/erb/mailer/templates/view.erb
  44. +2 −2 railties/lib/{ → rails}/generators/erb/scaffold/scaffold_generator.rb
  45. 0  railties/lib/{ → rails}/generators/erb/scaffold/templates/_form.html.erb
  46. 0  railties/lib/{ → rails}/generators/erb/scaffold/templates/edit.html.erb
  47. 0  railties/lib/{ → rails}/generators/erb/scaffold/templates/index.html.erb
  48. 0  railties/lib/{ → rails}/generators/erb/scaffold/templates/layout.html.erb
  49. 0  railties/lib/{ → rails}/generators/erb/scaffold/templates/new.html.erb
  50. 0  railties/lib/{ → rails}/generators/erb/scaffold/templates/show.html.erb
  51. 0  railties/lib/{ → rails}/generators/generated_attribute.rb
  52. 0  railties/lib/{ → rails}/generators/migration.rb
  53. +2 −2 railties/lib/{ → rails}/generators/named_base.rb
  54. 0  railties/lib/{ → rails}/generators/rails/app/USAGE
  55. 0  railties/lib/{ → rails}/generators/rails/app/app_generator.rb
  56. 0  railties/lib/{ → rails}/generators/rails/app/templates/README
  57. +1 −1  railties/lib/{ → rails}/generators/rails/app/templates/Rakefile
  58. 0  railties/lib/{ → rails}/generators/rails/app/templates/app/controllers/application_controller.rb
  59. 0  railties/lib/{ → rails}/generators/rails/app/templates/app/helpers/application_helper.rb
  60. 0  ...ails/generator/templates/templates → rails/generators/rails/app/templates/app/models}/.empty_directory
  61. 0  ...ils/app/templates/test/unit → rails/generators/rails/app/templates/app/views/layouts}/.empty_directory
  62. +6 −2 railties/lib/{ → rails}/generators/rails/app/templates/config/boot.rb
  63. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/databases/frontbase.yml
  64. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/databases/ibm_db.yml
  65. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/databases/mysql.yml
  66. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/databases/oracle.yml
  67. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/databases/postgresql.yml
  68. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/databases/sqlite3.yml
  69. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/environment.rb
  70. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/environments/development.rb
  71. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/environments/production.rb
  72. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/environments/test.rb
  73. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/backtrace_silencers.rb
  74. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/inflections.rb
  75. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/mime_types.rb
  76. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/new_rails_defaults.rb
  77. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/initializers/session_store.rb.tt
  78. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/locales/en.yml
  79. 0  railties/lib/{ → rails}/generators/rails/app/templates/config/routes.rb
  80. 0  railties/lib/{ → rails}/generators/rails/app/templates/db/seeds.rb
  81. 0  railties/lib/{ → rails}/generators/rails/app/templates/dispatchers/config.ru
  82. 0  railties/lib/{ → rails}/generators/rails/app/templates/dispatchers/dispatch.fcgi
  83. 0  railties/lib/{ → rails}/generators/rails/app/templates/dispatchers/dispatch.rb
  84. 0  railties/lib/{ → rails}/generators/rails/app/templates/dispatchers/gateway.cgi
  85. 0  railties/lib/{ → rails}/generators/rails/app/templates/doc/README_FOR_APP
  86. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/404.html
  87. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/422.html
  88. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/500.html
  89. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/favicon.ico
  90. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/images/rails.png
  91. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/index.html
  92. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/application.js
  93. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/controls.js
  94. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/dragdrop.js
  95. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/effects.js
  96. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/javascripts/prototype.js
  97. 0  railties/lib/{ → rails}/generators/rails/app/templates/public/robots.txt
  98. 0  ...templates/test/integration → rails/generators/rails/app/templates/public/stylesheets}/.empty_directory
  99. +1 −1  railties/lib/{ → rails}/generators/rails/app/templates/script/about.tt
  100. +1 −1  railties/lib/{ → rails}/generators/rails/app/templates/script/console.tt
  101. +1 −1  railties/lib/{ → rails}/generators/rails/app/templates/script/dbconsole.tt
  102. +1 −1  railties/lib/{ → rails}/generators/rails/app/templates/script/destroy.tt
  103. +1 −1  railties/lib/{ → rails}/generators/rails/app/templates/script/generate.tt
  104. +1 −1  railties/lib/{ → rails}/generators/rails/app/templates/script/performance/benchmarker.tt
  105. +1 −1  railties/lib/{ → rails}/generators/rails/app/templates/script/performance/profiler.tt
  106. +1 −1  railties/lib/{ → rails}/generators/rails/app/templates/script/plugin.tt
  107. +1 −1  railties/lib/{ → rails}/generators/rails/app/templates/script/runner.tt
  108. +1 −1  railties/lib/{ → rails}/generators/rails/app/templates/script/server.tt
  109. 0  ...s/app/templates/test/functional → rails/generators/rails/app/templates/test/fixtures}/.empty_directory
  110. 0  ...s/app/templates/test/fixtures → rails/generators/rails/app/templates/test/functional}/.empty_directory
  111. 0  ...templates/public/stylesheets → rails/generators/rails/app/templates/test/integration}/.empty_directory
  112. 0  railties/lib/{ → rails}/generators/rails/app/templates/test/performance/browsing_test.rb
  113. +1 −1  railties/lib/{ → rails}/generators/rails/app/templates/test/test_helper.rb
  114. 0  ...ils/app/templates/app/views/layouts → rails/generators/rails/app/templates/test/unit}/.empty_directory
  115. 0  railties/lib/{ → rails}/generators/rails/controller/USAGE
  116. 0  railties/lib/{ → rails}/generators/rails/controller/controller_generator.rb
  117. 0  railties/lib/{ → rails}/generators/rails/controller/templates/controller.rb
  118. 0  railties/lib/{ → rails}/generators/rails/generator/USAGE
  119. 0  railties/lib/{ → rails}/generators/rails/generator/generator_generator.rb
  120. 0  railties/lib/{ → rails}/generators/rails/generator/templates/%file_name%_generator.rb.tt
  121. 0  railties/lib/{ → rails}/generators/rails/generator/templates/USAGE.tt
  122. 0  ...ails/app/templates/app/models → rails/generators/rails/generator/templates/templates}/.empty_directory
  123. 0  railties/lib/{ → rails}/generators/rails/helper/USAGE
  124. 0  railties/lib/{ → rails}/generators/rails/helper/helper_generator.rb
  125. 0  railties/lib/{ → rails}/generators/rails/helper/templates/helper.rb
  126. 0  railties/lib/{ → rails}/generators/rails/integration_test/USAGE
  127. 0  railties/lib/{ → rails}/generators/rails/integration_test/integration_test_generator.rb
  128. 0  railties/lib/{ → rails}/generators/rails/mailer/USAGE
  129. 0  railties/lib/{ → rails}/generators/rails/mailer/mailer_generator.rb
  130. 0  railties/lib/{ → rails}/generators/rails/mailer/templates/mailer.rb
  131. 0  railties/lib/{ → rails}/generators/rails/metal/USAGE
  132. 0  railties/lib/{ → rails}/generators/rails/metal/metal_generator.rb
  133. 0  railties/lib/{ → rails}/generators/rails/metal/templates/metal.rb
  134. 0  railties/lib/{ → rails}/generators/rails/migration/USAGE
  135. 0  railties/lib/{ → rails}/generators/rails/migration/migration_generator.rb
  136. 0  railties/lib/{ → rails}/generators/rails/model/USAGE
  137. 0  railties/lib/{ → rails}/generators/rails/model/model_generator.rb
  138. 0  railties/lib/{ → rails}/generators/rails/model_subclass/model_subclass_generator.rb
  139. 0  railties/lib/{ → rails}/generators/rails/observer/USAGE
  140. 0  railties/lib/{ → rails}/generators/rails/observer/observer_generator.rb
  141. 0  railties/lib/{ → rails}/generators/rails/performance_test/USAGE
  142. 0  railties/lib/{ → rails}/generators/rails/performance_test/performance_test_generator.rb
  143. 0  railties/lib/{ → rails}/generators/rails/plugin/USAGE
  144. +1 −1  railties/lib/{ → rails}/generators/rails/plugin/plugin_generator.rb
  145. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/MIT-LICENSE
  146. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/README
  147. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/Rakefile
  148. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/init.rb
  149. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/install.rb
  150. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/lib/%file_name%.rb.tt
  151. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt
  152. 0  railties/lib/{ → rails}/generators/rails/plugin/templates/uninstall.rb
  153. 0  railties/lib/{ → rails}/generators/rails/resource/USAGE
  154. +2 −2 railties/lib/{ → rails}/generators/rails/resource/resource_generator.rb
  155. 0  railties/lib/{ → rails}/generators/rails/scaffold/USAGE
  156. +1 −1  railties/lib/{ → rails}/generators/rails/scaffold/scaffold_generator.rb
  157. 0  railties/lib/{ → rails}/generators/rails/scaffold_controller/USAGE
  158. +1 −1  railties/lib/{ → rails}/generators/rails/scaffold_controller/scaffold_controller_generator.rb
  159. 0  railties/lib/{ → rails}/generators/rails/scaffold_controller/templates/controller.rb
  160. 0  railties/lib/{ → rails}/generators/rails/session_migration/USAGE
  161. 0  railties/lib/{ → rails}/generators/rails/session_migration/session_migration_generator.rb
  162. 0  railties/lib/{ → rails}/generators/rails/stylesheets/USAGE
  163. 0  railties/lib/{ → rails}/generators/rails/stylesheets/stylesheets_generator.rb
  164. 0  railties/lib/{ → rails}/generators/rails/stylesheets/templates/scaffold.css
  165. +1 −1  railties/lib/{ → rails}/generators/resource_helpers.rb
  166. +1 −1  railties/lib/{ → rails}/generators/test_unit.rb
  167. +1 −1  railties/lib/{ → rails}/generators/test_unit/controller/controller_generator.rb
  168. 0  railties/lib/{ → rails}/generators/test_unit/controller/templates/functional_test.rb
  169. +1 −1  railties/lib/{ → rails}/generators/test_unit/helper/helper_generator.rb
  170. 0  railties/lib/{ → rails}/generators/test_unit/helper/templates/helper_test.rb
  171. +1 −1  railties/lib/{ → rails}/generators/test_unit/integration/integration_generator.rb
  172. 0  railties/lib/{ → rails}/generators/test_unit/integration/templates/integration_test.rb
  173. +1 −1  railties/lib/{ → rails}/generators/test_unit/mailer/mailer_generator.rb
  174. 0  railties/lib/{ → rails}/generators/test_unit/mailer/templates/fixture
  175. 0  railties/lib/{ → rails}/generators/test_unit/mailer/templates/unit_test.rb
  176. +1 −1  railties/lib/{ → rails}/generators/test_unit/model/model_generator.rb
  177. 0  railties/lib/{ → rails}/generators/test_unit/model/templates/fixtures.yml
  178. 0  railties/lib/{ → rails}/generators/test_unit/model/templates/unit_test.rb
  179. +1 −1  railties/lib/{ → rails}/generators/test_unit/observer/observer_generator.rb
  180. 0  railties/lib/{ → rails}/generators/test_unit/observer/templates/unit_test.rb
  181. +1 −1  railties/lib/{ → rails}/generators/test_unit/performance/performance_generator.rb
  182. 0  railties/lib/{ → rails}/generators/test_unit/performance/templates/performance_test.rb
  183. +1 −1  railties/lib/{ → rails}/generators/test_unit/plugin/plugin_generator.rb
  184. 0  railties/lib/{ → rails}/generators/test_unit/plugin/templates/%file_name%_test.rb.tt
  185. 0  railties/lib/{ → rails}/generators/test_unit/plugin/templates/test_helper.rb
  186. +2 −2 railties/lib/{ → rails}/generators/test_unit/scaffold/scaffold_generator.rb
  187. 0  railties/lib/{ → rails}/generators/test_unit/scaffold/templates/functional_test.rb
  188. +3 −4 railties/lib/{ → rails}/initializer.rb
  189. 0  railties/lib/{ → rails}/initializer_old.rb
  190. 0  railties/lib/{ → rails}/performance_test_help.rb
  191. +1 −1  railties/lib/{ → rails}/railties_path.rb
  192. 0  railties/lib/{ → rails}/ruby_version_check.rb
  193. 0  railties/lib/{ → rails}/rubyprof_ext.rb
  194. 0  railties/lib/{ → rails}/source_annotation_extractor.rb
  195. +17 −1 railties/lib/{tasks/rails.rb → rails/tasks.rb}
  196. +1 −1  railties/lib/{ → rails}/tasks/annotations.rake
  197. +2 −2 railties/lib/{ → rails}/tasks/databases.rake
  198. 0  railties/lib/{ → rails}/tasks/documentation.rake
  199. +1 −1  railties/lib/{ → rails}/tasks/framework.rake
  200. 0  railties/lib/{ → rails}/tasks/gems.rake
  201. 0  railties/lib/{ → rails}/tasks/log.rake
  202. 0  railties/lib/{ → rails}/tasks/middleware.rake
  203. 0  railties/lib/{ → rails}/tasks/misc.rake
  204. 0  railties/lib/{ → rails}/tasks/routes.rake
  205. +1 −1  railties/lib/{ → rails}/tasks/statistics.rake
  206. 0  railties/lib/{ → rails}/tasks/testing.rake
  207. 0  railties/lib/{ → rails}/tasks/tmp.rake
  208. 0  railties/lib/{ → rails}/test_help.rb
  209. 0  railties/lib/{ → rails}/vendor/bundler/LICENSE
  210. 0  railties/lib/{ → rails}/vendor/bundler/README.markdown
  211. 0  railties/lib/{ → rails}/vendor/bundler/Rakefile
  212. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler.rb
  213. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/cli.rb
  214. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/commands/bundle_command.rb
  215. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/commands/exec_command.rb
  216. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/dependency.rb
  217. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/dsl.rb
  218. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/environment.rb
  219. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/finder.rb
  220. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/gem_bundle.rb
  221. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/gem_ext.rb
  222. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/repository.rb
  223. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/repository/directory_repository.rb
  224. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/repository/gem_repository.rb
  225. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/resolver.rb
  226. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/runtime.rb
  227. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/source.rb
  228. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/templates/app_script.erb
  229. 0  railties/lib/{ → rails}/vendor/bundler/lib/bundler/templates/environment.erb
  230. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/CHANGELOG.rdoc
  231. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/LICENSE
  232. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/README.rdoc
  233. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/bin/rake2thor
  234. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/bin/thor
  235. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor.rb
  236. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/actions.rb
  237. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/actions/create_file.rb
  238. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/actions/directory.rb
  239. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb
  240. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb
  241. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb
  242. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/base.rb
  243. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb
  244. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb
  245. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/error.rb
  246. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/group.rb
  247. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/invocation.rb
  248. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/parser.rb
  249. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/parser/argument.rb
  250. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/parser/arguments.rb
  251. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/parser/option.rb
  252. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/parser/options.rb
  253. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/rake_compat.rb
  254. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/runner.rb
  255. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/shell.rb
  256. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/shell/basic.rb
  257. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/shell/color.rb
  258. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/task.rb
  259. 0  railties/lib/{ → rails}/vendor/thor-0.11.6/lib/thor/util.rb
  260. 0  railties/lib/{ → rails}/webrick_server.rb
  261. +1 −1  railties/test/backtrace_cleaner_test.rb
  262. +4 −4 railties/test/boot_test.rb
  263. +2 −2 railties/test/console_app_test.rb
  264. +1 −1  railties/test/fcgi_dispatcher_test.rb
  265. +1 −1  railties/test/fixtures/lib/generators/active_record/fixjour/fixjour_generator.rb
  266. +1 −1  railties/test/generators/actions_test.rb
  267. +1 −1  railties/test/generators/app_generator_test.rb
  268. +1 −1  railties/test/generators/controller_generator_test.rb
  269. +1 −1  railties/test/generators/generator_generator_test.rb
  270. +1 −1  railties/test/generators/generators_test_helper.rb
  271. +1 −1  railties/test/generators/helper_generator_test.rb
  272. +1 −1  railties/test/generators/integration_test_generator_test.rb
  273. +1 −1  railties/test/generators/mailer_generator_test.rb
  274. +1 −1  railties/test/generators/metal_generator_test.rb
  275. +1 −1  railties/test/generators/migration_generator_test.rb
  276. +1 −1  railties/test/generators/model_generator_test.rb
  277. +1 −1  railties/test/generators/named_base_test.rb
  278. +1 −1  railties/test/generators/observer_generator_test.rb
  279. +1 −1  railties/test/generators/performance_test_generator_test.rb
  280. +1 −1  railties/test/generators/plugin_generator_test.rb
  281. +1 −1  railties/test/generators/resource_generator_test.rb
  282. +2 −2 railties/test/generators/scaffold_controller_generator_test.rb
  283. +1 −1  railties/test/generators/scaffold_generator_test.rb
  284. +1 −1  railties/test/generators/session_migration_generator_test.rb
  285. +1 −1  railties/test/generators/stylesheets_generator_test.rb
  286. +2 −2 railties/test/generators_test.rb
  287. +2 −1  railties/test/initializer/test_helper.rb
  288. +2 −2 railties/test/initializer_test.rb
  289. +1 −1  railties/test/metal_test.rb
  290. +1 −1  railties/test/new_initializer_test.rb
  291. +1 −1  railties/test/plugin_test_helper.rb
4 .gitignore
View
@@ -28,4 +28,6 @@ railties/guides/output
*.swp
*.swo
actionpack/bin
-*/vendor/gems
+vendor/gems/
+*/vendor/gems/
+bin/
1  actionpack/lib/action_controller/testing/process.rb
View
@@ -1,4 +1,5 @@
require 'active_support/core_ext/object/conversions'
+require "rack/test"
module ActionController #:nodoc:
# Essentially generates a modified Tempfile object similar to the object
2  railties/Rakefile
View
@@ -81,7 +81,7 @@ end
task :create_rails do
require File.join(File.dirname(__FILE__), 'lib', 'generators')
- require 'generators/rails/app/app_generator'
+ require 'rails/generators/rails/app/app_generator'
Rails::Generators::AppGenerator.start [ File.basename(PKG_DESTINATION), "--quiet" ],
:destination_root => File.expand_path(File.dirname(PKG_DESTINATION))
end
18 railties/bin/rails
View
@@ -1,7 +1,17 @@
-require File.dirname(__FILE__) + '/../lib/ruby_version_check'
+begin
+ require 'rails/ruby_version_check'
+rescue LoadError
+ # If people are not using gems, the load path must still
+ # be correct.
+ # TODO: Remove the begin / rescue block somehow
+ $:.unshift File.dirname(__FILE__) + '/../lib'
+ $:.unshift File.dirname(__FILE__) + '/../../activesupport/lib'
+ retry
+end
+
Signal.trap("INT") { puts; exit }
-require File.dirname(__FILE__) + '/../lib/rails/version'
+require 'rails/version'
if %w(--version -v).include? ARGV.first
puts "Rails #{Rails::VERSION::STRING}"
exit(0)
@@ -9,7 +19,7 @@ end
ARGV << "--help" if ARGV.empty?
-require File.dirname(__FILE__) + '/../lib/generators'
-require 'generators/rails/app/app_generator'
+require 'rails/generators'
+require 'rails/generators/rails/app/app_generator'
Rails::Generators::AppGenerator.start
0  railties/lib/code_statistics.rb → railties/lib/rails/code_statistics.rb
View
File renamed without changes
0  railties/lib/commands.rb → railties/lib/rails/commands.rb
View
File renamed without changes
0  railties/lib/commands/about.rb → railties/lib/rails/commands/about.rb
View
File renamed without changes
6 railties/lib/commands/console.rb → railties/lib/rails/commands/console.rb
View
@@ -13,9 +13,9 @@
libs = " -r irb/completion"
libs << %( -r "#{RAILS_ROOT}/config/environment")
-libs << " -r console_app"
-libs << " -r console_sandbox" if options[:sandbox]
-libs << " -r console_with_helpers"
+libs << " -r rails/console_app"
+libs << " -r rails/console_sandbox" if options[:sandbox]
+libs << " -r rails/console_with_helpers"
if options[:debugger]
begin
0  railties/lib/commands/dbconsole.rb → railties/lib/rails/commands/dbconsole.rb
View
File renamed without changes
0  railties/lib/commands/destroy.rb → railties/lib/rails/commands/destroy.rb
View
File renamed without changes
0  railties/lib/commands/generate.rb → railties/lib/rails/commands/generate.rb
View
File renamed without changes
0  railties/lib/commands/ncgi/listener → railties/lib/rails/commands/ncgi/listener
View
File renamed without changes
0  railties/lib/commands/ncgi/tracker → railties/lib/rails/commands/ncgi/tracker
View
File renamed without changes
0  railties/lib/commands/performance/benchmarker.rb → ...ies/lib/rails/commands/performance/benchmarker.rb
View
File renamed without changes
0  railties/lib/commands/performance/profiler.rb → railties/lib/rails/commands/performance/profiler.rb
View
File renamed without changes
0  railties/lib/commands/plugin.rb → railties/lib/rails/commands/plugin.rb
View
File renamed without changes
0  railties/lib/commands/runner.rb → railties/lib/rails/commands/runner.rb
View
File renamed without changes
0  railties/lib/commands/server.rb → railties/lib/rails/commands/server.rb
View
File renamed without changes
0  railties/lib/commands/update.rb → railties/lib/rails/commands/update.rb
View
File renamed without changes
0  railties/lib/console_app.rb → railties/lib/rails/console_app.rb
View
File renamed without changes
0  railties/lib/console_sandbox.rb → railties/lib/rails/console_sandbox.rb
View
File renamed without changes
0  railties/lib/console_with_helpers.rb → railties/lib/rails/console_with_helpers.rb
View
File renamed without changes
0  railties/lib/dispatcher.rb → railties/lib/rails/dispatcher.rb
View
File renamed without changes
2  railties/lib/fcgi_handler.rb → railties/lib/rails/fcgi_handler.rb
View
@@ -1,6 +1,6 @@
require 'fcgi'
require 'logger'
-require 'dispatcher'
+require 'rails/dispatcher'
require 'rbconfig'
class RailsFCGIHandler
6 railties/lib/generators.rb → railties/lib/rails/generators.rb
View
@@ -8,10 +8,10 @@
require 'active_support/core_ext/module/attribute_accessors'
require 'active_support/core_ext/string/inflections'
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+# TODO: Do not always push on vendored thor
$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/vendor/thor-0.11.6/lib")
-require 'generators/base'
-require 'generators/named_base'
+require 'rails/generators/base'
+require 'rails/generators/named_base'
module Rails
module Generators
0  railties/lib/generators/actions.rb → railties/lib/rails/generators/actions.rb
View
File renamed without changes
0  railties/lib/generators/active_model.rb → railties/lib/rails/generators/active_model.rb
View
File renamed without changes
6 railties/lib/generators/active_record.rb → railties/lib/rails/generators/active_record.rb
View
@@ -1,6 +1,6 @@
-require 'generators/named_base'
-require 'generators/migration'
-require 'generators/active_model'
+require 'rails/generators/named_base'
+require 'rails/generators/migration'
+require 'rails/generators/active_model'
module ActiveRecord
module Generators
2  ...rs/active_record/migration/migration_generator.rb → ...rs/active_record/migration/migration_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
0  ...rs/active_record/migration/templates/migration.rb → ...rs/active_record/migration/templates/migration.rb
View
File renamed without changes
2  ...generators/active_record/model/model_generator.rb → ...generators/active_record/model/model_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
0  ...rators/active_record/model/templates/migration.rb → ...rators/active_record/model/templates/migration.rb
View
File renamed without changes
0  ...generators/active_record/model/templates/model.rb → ...generators/active_record/model/templates/model.rb
View
File renamed without changes
2  ...tors/active_record/observer/observer_generator.rb → ...tors/active_record/observer/observer_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
0  ...tors/active_record/observer/templates/observer.rb → ...tors/active_record/observer/templates/observer.rb
View
File renamed without changes
2  .../session_migration/session_migration_generator.rb → .../session_migration/session_migration_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
0  ...e_record/session_migration/templates/migration.rb → ...e_record/session_migration/templates/migration.rb
View
File renamed without changes
2  railties/lib/generators/base.rb → railties/lib/rails/generators/base.rb
View
@@ -1,5 +1,5 @@
require 'thor'
-require 'generators/actions'
+require 'rails/generators/actions'
module Rails
module Generators
2  railties/lib/generators/erb.rb → railties/lib/rails/generators/erb.rb
View
@@ -1,4 +1,4 @@
-require 'generators/named_base'
+require 'rails/generators/named_base'
module Erb
module Generators
2  ...generators/erb/controller/controller_generator.rb → ...generators/erb/controller/controller_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
module Erb
module Generators
0  ...generators/erb/controller/templates/view.html.erb → ...generators/erb/controller/templates/view.html.erb
View
File renamed without changes
2  ...ies/lib/generators/erb/mailer/mailer_generator.rb → ...b/rails/generators/erb/mailer/mailer_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
module Erb
module Generators
0  ...ties/lib/generators/erb/mailer/templates/view.erb → ...ib/rails/generators/erb/mailer/templates/view.erb
View
File renamed without changes
4 ...lib/generators/erb/scaffold/scaffold_generator.rb → ...ils/generators/erb/scaffold/scaffold_generator.rb
View
@@ -1,5 +1,5 @@
-require 'generators/erb'
-require 'generators/resource_helpers'
+require 'rails/generators/erb'
+require 'rails/generators/resource_helpers'
module Erb
module Generators
0  .../generators/erb/scaffold/templates/_form.html.erb → .../generators/erb/scaffold/templates/_form.html.erb
View
File renamed without changes
0  ...b/generators/erb/scaffold/templates/edit.html.erb → ...s/generators/erb/scaffold/templates/edit.html.erb
View
File renamed without changes
0  .../generators/erb/scaffold/templates/index.html.erb → .../generators/erb/scaffold/templates/index.html.erb
View
File renamed without changes
0  ...generators/erb/scaffold/templates/layout.html.erb → ...generators/erb/scaffold/templates/layout.html.erb
View
File renamed without changes
0  ...ib/generators/erb/scaffold/templates/new.html.erb → ...ls/generators/erb/scaffold/templates/new.html.erb
View
File renamed without changes
0  ...b/generators/erb/scaffold/templates/show.html.erb → ...s/generators/erb/scaffold/templates/show.html.erb
View
File renamed without changes
0  railties/lib/generators/generated_attribute.rb → railties/lib/rails/generators/generated_attribute.rb
View
File renamed without changes
0  railties/lib/generators/migration.rb → railties/lib/rails/generators/migration.rb
View
File renamed without changes
4 railties/lib/generators/named_base.rb → railties/lib/rails/generators/named_base.rb
View
@@ -1,5 +1,5 @@
-require 'generators/base'
-require 'generators/generated_attribute'
+require 'rails/generators/base'
+require 'rails/generators/generated_attribute'
module Rails
module Generators
0  railties/lib/generators/rails/app/USAGE → railties/lib/rails/generators/rails/app/USAGE
View
File renamed without changes
0  railties/lib/generators/rails/app/app_generator.rb → ...s/lib/rails/generators/rails/app/app_generator.rb
View
File renamed without changes
0  railties/lib/generators/rails/app/templates/README → ...s/lib/rails/generators/rails/app/templates/README
View
File renamed without changes
2  railties/lib/generators/rails/app/templates/Rakefile → ...lib/rails/generators/rails/app/templates/Rakefile
View
@@ -7,4 +7,4 @@ require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-require 'tasks/rails'
+require 'rails/tasks'
0  ...mplates/app/controllers/application_controller.rb → ...mplates/app/controllers/application_controller.rb
View
File renamed without changes
0  ...s/app/templates/app/helpers/application_helper.rb → ...s/app/templates/app/helpers/application_helper.rb
View
File renamed without changes
0  ...ls/generator/templates/templates/.empty_directory → ...s/rails/app/templates/app/models/.empty_directory
View
File renamed without changes
0  ...rs/rails/app/templates/test/unit/.empty_directory → .../app/templates/app/views/layouts/.empty_directory
View
File renamed without changes
8 ...lib/generators/rails/app/templates/config/boot.rb → ...ils/generators/rails/app/templates/config/boot.rb
View
@@ -42,7 +42,11 @@ def run
class VendorBoot < Boot
def load_initializer
- require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+ # activesupport/lib
+ %w(railties/lib).each do |path|
+ $:.unshift("#{RAILS_ROOT}/vendor/rails/#{path}")
+ end
+ require "rails/initializer"
Rails::Initializer.run(:install_gem_spec_stubs)
Rails::GemDependency.add_frozen_gem_path
end
@@ -52,7 +56,7 @@ class GemBoot < Boot
def load_initializer
self.class.load_rubygems
load_rails_gem
- require 'initializer'
+ require 'rails/initializer'
end
def load_rails_gem
0  ...ails/app/templates/config/databases/frontbase.yml → ...ails/app/templates/config/databases/frontbase.yml
View
File renamed without changes
0  ...s/rails/app/templates/config/databases/ibm_db.yml → ...s/rails/app/templates/config/databases/ibm_db.yml
View
File renamed without changes
0  ...rs/rails/app/templates/config/databases/mysql.yml → ...rs/rails/app/templates/config/databases/mysql.yml
View
File renamed without changes
0  ...s/rails/app/templates/config/databases/oracle.yml → ...s/rails/app/templates/config/databases/oracle.yml
View
File renamed without changes
0  ...ils/app/templates/config/databases/postgresql.yml → ...ils/app/templates/config/databases/postgresql.yml
View
File renamed without changes
0  .../rails/app/templates/config/databases/sqlite3.yml → .../rails/app/templates/config/databases/sqlite3.yml
View
File renamed without changes
0  ...erators/rails/app/templates/config/environment.rb → ...erators/rails/app/templates/config/environment.rb
View
File renamed without changes
0  .../app/templates/config/environments/development.rb → .../app/templates/config/environments/development.rb
View
File renamed without changes
0  ...s/app/templates/config/environments/production.rb → ...s/app/templates/config/environments/production.rb
View
File renamed without changes
0  ...s/rails/app/templates/config/environments/test.rb → ...s/rails/app/templates/config/environments/test.rb
View
File renamed without changes
0  ...plates/config/initializers/backtrace_silencers.rb → ...plates/config/initializers/backtrace_silencers.rb
View
File renamed without changes
0  .../app/templates/config/initializers/inflections.rb → .../app/templates/config/initializers/inflections.rb
View
File renamed without changes
0  ...s/app/templates/config/initializers/mime_types.rb → ...s/app/templates/config/initializers/mime_types.rb
View
File renamed without changes
0  ...mplates/config/initializers/new_rails_defaults.rb → ...mplates/config/initializers/new_rails_defaults.rb
View
File renamed without changes
0  ...templates/config/initializers/session_store.rb.tt → ...templates/config/initializers/session_store.rb.tt
View
File renamed without changes
0  ...erators/rails/app/templates/config/locales/en.yml → ...erators/rails/app/templates/config/locales/en.yml
View
File renamed without changes
0  ...b/generators/rails/app/templates/config/routes.rb → ...s/generators/rails/app/templates/config/routes.rb
View
File renamed without changes
0  ...es/lib/generators/rails/app/templates/db/seeds.rb → .../rails/generators/rails/app/templates/db/seeds.rb
View
File renamed without changes
0  ...erators/rails/app/templates/dispatchers/config.ru → ...erators/rails/app/templates/dispatchers/config.ru
View
File renamed without changes
0  ...ors/rails/app/templates/dispatchers/dispatch.fcgi → ...ors/rails/app/templates/dispatchers/dispatch.fcgi
View
File renamed without changes
0  ...ators/rails/app/templates/dispatchers/dispatch.rb → ...ators/rails/app/templates/dispatchers/dispatch.rb
View
File renamed without changes
0  ...ators/rails/app/templates/dispatchers/gateway.cgi → ...ators/rails/app/templates/dispatchers/gateway.cgi
View
File renamed without changes
0  ...generators/rails/app/templates/doc/README_FOR_APP → ...generators/rails/app/templates/doc/README_FOR_APP
View
File renamed without changes
0  ...ib/generators/rails/app/templates/public/404.html → ...ls/generators/rails/app/templates/public/404.html
View
File renamed without changes
0  ...ib/generators/rails/app/templates/public/422.html → ...ls/generators/rails/app/templates/public/422.html
View
File renamed without changes
0  ...ib/generators/rails/app/templates/public/500.html → ...ls/generators/rails/app/templates/public/500.html
View
File renamed without changes
0  ...generators/rails/app/templates/public/favicon.ico → ...generators/rails/app/templates/public/favicon.ico
View
File renamed without changes
0  ...ators/rails/app/templates/public/images/rails.png → ...ators/rails/app/templates/public/images/rails.png
View
File renamed without changes
0  .../generators/rails/app/templates/public/index.html → .../generators/rails/app/templates/public/index.html
View
File renamed without changes
0  ...s/app/templates/public/javascripts/application.js → ...s/app/templates/public/javascripts/application.js
View
File renamed without changes
0  ...ails/app/templates/public/javascripts/controls.js → ...ails/app/templates/public/javascripts/controls.js
View
File renamed without changes
0  ...ails/app/templates/public/javascripts/dragdrop.js → ...ails/app/templates/public/javascripts/dragdrop.js
View
File renamed without changes
0  ...rails/app/templates/public/javascripts/effects.js → ...rails/app/templates/public/javascripts/effects.js
View
File renamed without changes
0  ...ils/app/templates/public/javascripts/prototype.js → ...ils/app/templates/public/javascripts/prototype.js
View
File renamed without changes
0  .../generators/rails/app/templates/public/robots.txt → .../generators/rails/app/templates/public/robots.txt
View
File renamed without changes
0  ...s/app/templates/test/integration/.empty_directory → ...app/templates/public/stylesheets/.empty_directory
View
File renamed without changes
2  ...ib/generators/rails/app/templates/script/about.tt → ...ls/generators/rails/app/templates/script/about.tt
View
@@ -1,4 +1,4 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
-require 'commands/about'
+require 'rails/commands/about'
2  .../generators/rails/app/templates/script/console.tt → .../generators/rails/app/templates/script/console.tt
View
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/console'
+require 'rails/commands/console'
2  ...enerators/rails/app/templates/script/dbconsole.tt → ...enerators/rails/app/templates/script/dbconsole.tt
View
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/dbconsole'
+require 'rails/commands/dbconsole'
2  .../generators/rails/app/templates/script/destroy.tt → .../generators/rails/app/templates/script/destroy.tt
View
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/destroy'
+require 'rails/commands/destroy'
2  ...generators/rails/app/templates/script/generate.tt → ...generators/rails/app/templates/script/generate.tt
View
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/generate'
+require 'rails/commands/generate'
2  ...s/app/templates/script/performance/benchmarker.tt → ...s/app/templates/script/performance/benchmarker.tt
View
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../../config/boot', __FILE__)
-require 'commands/performance/benchmarker'
+require 'rails/commands/performance/benchmarker'
2  ...ails/app/templates/script/performance/profiler.tt → ...ails/app/templates/script/performance/profiler.tt
View
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../../config/boot', __FILE__)
-require 'commands/performance/profiler'
+require 'rails/commands/performance/profiler'
2  ...b/generators/rails/app/templates/script/plugin.tt → ...s/generators/rails/app/templates/script/plugin.tt
View
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/plugin'
+require 'rails/commands/plugin'
2  ...b/generators/rails/app/templates/script/runner.tt → ...s/generators/rails/app/templates/script/runner.tt
View
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/runner'
+require 'rails/commands/runner'
2  ...b/generators/rails/app/templates/script/server.tt → ...s/generators/rails/app/templates/script/server.tt
View
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/server'
+require 'rails/commands/server'
0  ...ls/app/templates/test/functional/.empty_directory → ...ails/app/templates/test/fixtures/.empty_directory
View
File renamed without changes
0  ...ails/app/templates/test/fixtures/.empty_directory → ...ls/app/templates/test/functional/.empty_directory
View
File renamed without changes
0  ...app/templates/public/stylesheets/.empty_directory → ...s/app/templates/test/integration/.empty_directory
View
File renamed without changes
0  ...s/app/templates/test/performance/browsing_test.rb → ...s/app/templates/test/performance/browsing_test.rb
View
File renamed without changes
2  ...enerators/rails/app/templates/test/test_helper.rb → ...enerators/rails/app/templates/test/test_helper.rb
View
@@ -1,6 +1,6 @@
ENV["RAILS_ENV"] = "test"
require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
+require 'rails/test_help'
class ActiveSupport::TestCase
# Transactional fixtures accelerate your tests by wrapping each test method
0  .../app/templates/app/views/layouts/.empty_directory → ...rs/rails/app/templates/test/unit/.empty_directory
View
File renamed without changes
0  railties/lib/generators/rails/controller/USAGE → railties/lib/rails/generators/rails/controller/USAGE
View
File renamed without changes
0  ...nerators/rails/controller/controller_generator.rb → ...nerators/rails/controller/controller_generator.rb
View
File renamed without changes
0  ...nerators/rails/controller/templates/controller.rb → ...nerators/rails/controller/templates/controller.rb
View
File renamed without changes
0  railties/lib/generators/rails/generator/USAGE → railties/lib/rails/generators/rails/generator/USAGE
View
File renamed without changes
0  ...generators/rails/generator/generator_generator.rb → ...generators/rails/generator/generator_generator.rb
View
File renamed without changes
0  ...s/generator/templates/%file_name%_generator.rb.tt → ...s/generator/templates/%file_name%_generator.rb.tt
View
File renamed without changes
0  ...lib/generators/rails/generator/templates/USAGE.tt → ...ils/generators/rails/generator/templates/USAGE.tt
View
File renamed without changes
0  ...s/rails/app/templates/app/models/.empty_directory → ...ls/generator/templates/templates/.empty_directory
View
File renamed without changes
0  railties/lib/generators/rails/helper/USAGE → railties/lib/rails/generators/rails/helper/USAGE
View
File renamed without changes
0  ...s/lib/generators/rails/helper/helper_generator.rb → ...rails/generators/rails/helper/helper_generator.rb
View
File renamed without changes
0  ...s/lib/generators/rails/helper/templates/helper.rb → ...rails/generators/rails/helper/templates/helper.rb
View
File renamed without changes
0  railties/lib/generators/rails/integration_test/USAGE → ...lib/rails/generators/rails/integration_test/USAGE
View
File renamed without changes
0  ...ls/integration_test/integration_test_generator.rb → ...ls/integration_test/integration_test_generator.rb
View
File renamed without changes
0  railties/lib/generators/rails/mailer/USAGE → railties/lib/rails/generators/rails/mailer/USAGE
View
File renamed without changes
0  ...s/lib/generators/rails/mailer/mailer_generator.rb → ...rails/generators/rails/mailer/mailer_generator.rb
View
File renamed without changes
0  ...s/lib/generators/rails/mailer/templates/mailer.rb → ...rails/generators/rails/mailer/templates/mailer.rb
View
File renamed without changes
0  railties/lib/generators/rails/metal/USAGE → railties/lib/rails/generators/rails/metal/USAGE
View
File renamed without changes
0  ...ies/lib/generators/rails/metal/metal_generator.rb → ...b/rails/generators/rails/metal/metal_generator.rb
View
File renamed without changes
0  ...ies/lib/generators/rails/metal/templates/metal.rb → ...b/rails/generators/rails/metal/templates/metal.rb
View
File renamed without changes
0  railties/lib/generators/rails/migration/USAGE → railties/lib/rails/generators/rails/migration/USAGE
View
File renamed without changes
0  ...generators/rails/migration/migration_generator.rb → ...generators/rails/migration/migration_generator.rb
View
File renamed without changes
0  railties/lib/generators/rails/model/USAGE → railties/lib/rails/generators/rails/model/USAGE
View
File renamed without changes
0  ...ies/lib/generators/rails/model/model_generator.rb → ...b/rails/generators/rails/model/model_generator.rb
View
File renamed without changes
0  .../rails/model_subclass/model_subclass_generator.rb → .../rails/model_subclass/model_subclass_generator.rb
View
File renamed without changes
0  railties/lib/generators/rails/observer/USAGE → railties/lib/rails/generators/rails/observer/USAGE
View
File renamed without changes
0  ...b/generators/rails/observer/observer_generator.rb → ...s/generators/rails/observer/observer_generator.rb
View
File renamed without changes
0  railties/lib/generators/rails/performance_test/USAGE → ...lib/rails/generators/rails/performance_test/USAGE
View
File renamed without changes
0  ...ls/performance_test/performance_test_generator.rb → ...ls/performance_test/performance_test_generator.rb
View
File renamed without changes
0  railties/lib/generators/rails/plugin/USAGE → railties/lib/rails/generators/rails/plugin/USAGE
View
File renamed without changes
2  ...s/lib/generators/rails/plugin/plugin_generator.rb → ...rails/generators/rails/plugin/plugin_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/rails/generator/generator_generator'
+require 'rails/generators/rails/generator/generator_generator'
module Rails
module Generators
0  ...lib/generators/rails/plugin/templates/MIT-LICENSE → ...ils/generators/rails/plugin/templates/MIT-LICENSE
View
File renamed without changes
0  ...ties/lib/generators/rails/plugin/templates/README → ...ib/rails/generators/rails/plugin/templates/README
View
File renamed without changes
0  ...es/lib/generators/rails/plugin/templates/Rakefile → .../rails/generators/rails/plugin/templates/Rakefile
View
File renamed without changes
0  ...ies/lib/generators/rails/plugin/templates/init.rb → ...b/rails/generators/rails/plugin/templates/init.rb
View
File renamed without changes
0  .../lib/generators/rails/plugin/templates/install.rb → ...ails/generators/rails/plugin/templates/install.rb
View
File renamed without changes
0  ...tors/rails/plugin/templates/lib/%file_name%.rb.tt → ...tors/rails/plugin/templates/lib/%file_name%.rb.tt
View
File renamed without changes
0  .../plugin/templates/tasks/%file_name%_tasks.rake.tt → .../plugin/templates/tasks/%file_name%_tasks.rake.tt
View
File renamed without changes
0  ...ib/generators/rails/plugin/templates/uninstall.rb → ...ls/generators/rails/plugin/templates/uninstall.rb
View
File renamed without changes
0  railties/lib/generators/rails/resource/USAGE → railties/lib/rails/generators/rails/resource/USAGE
View
File renamed without changes
4 ...b/generators/rails/resource/resource_generator.rb → ...s/generators/rails/resource/resource_generator.rb
View
@@ -1,5 +1,5 @@
-require 'generators/rails/model/model_generator'
-require 'generators/resource_helpers'
+require 'rails/generators/rails/model/model_generator'
+require 'rails/generators/resource_helpers'
module Rails
module Generators
0  railties/lib/generators/rails/scaffold/USAGE → railties/lib/rails/generators/rails/scaffold/USAGE
View
File renamed without changes
2  ...b/generators/rails/scaffold/scaffold_generator.rb → ...s/generators/rails/scaffold/scaffold_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/rails/resource/resource_generator'
+require 'rails/generators/rails/resource/resource_generator'
module Rails
module Generators
0  ...es/lib/generators/rails/scaffold_controller/USAGE → .../rails/generators/rails/scaffold_controller/USAGE
View
File renamed without changes
2  ...ffold_controller/scaffold_controller_generator.rb → ...ffold_controller/scaffold_controller_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/resource_helpers'
+require 'rails/generators/resource_helpers'
module Rails
module Generators
0  ...rails/scaffold_controller/templates/controller.rb → ...rails/scaffold_controller/templates/controller.rb
View
File renamed without changes
0  ...ties/lib/generators/rails/session_migration/USAGE → ...ib/rails/generators/rails/session_migration/USAGE
View
File renamed without changes
0  .../session_migration/session_migration_generator.rb → .../session_migration/session_migration_generator.rb
View
File renamed without changes
0  railties/lib/generators/rails/stylesheets/USAGE → ...ties/lib/rails/generators/rails/stylesheets/USAGE
View
File renamed without changes
0  ...rators/rails/stylesheets/stylesheets_generator.rb → ...rators/rails/stylesheets/stylesheets_generator.rb
View
File renamed without changes
0  ...nerators/rails/stylesheets/templates/scaffold.css → ...nerators/rails/stylesheets/templates/scaffold.css
View
File renamed without changes
2  railties/lib/generators/resource_helpers.rb → railties/lib/rails/generators/resource_helpers.rb
View
@@ -54,7 +54,7 @@ def orm_class
begin
klass = active_model.constantize
rescue NameError
- require "generators/#{options[:orm]}"
+ require "rails/generators/#{options[:orm]}"
end
# Try once again after loading the file with success.
2  railties/lib/generators/test_unit.rb → railties/lib/rails/generators/test_unit.rb
View
@@ -1,4 +1,4 @@
-require 'generators/named_base'
+require 'rails/generators/named_base'
module TestUnit
module Generators
2  ...tors/test_unit/controller/controller_generator.rb → ...tors/test_unit/controller/controller_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
0  ...test_unit/controller/templates/functional_test.rb → ...test_unit/controller/templates/functional_test.rb
View
File renamed without changes
2  ...b/generators/test_unit/helper/helper_generator.rb → ...s/generators/test_unit/helper/helper_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
0  ...erators/test_unit/helper/templates/helper_test.rb → ...erators/test_unit/helper/templates/helper_test.rb
View
File renamed without changes
2  ...rs/test_unit/integration/integration_generator.rb → ...rs/test_unit/integration/integration_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
0  ...st_unit/integration/templates/integration_test.rb → ...st_unit/integration/templates/integration_test.rb
View
File renamed without changes
2  ...b/generators/test_unit/mailer/mailer_generator.rb → ...s/generators/test_unit/mailer/mailer_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
0  ...lib/generators/test_unit/mailer/templates/fixture → ...ils/generators/test_unit/mailer/templates/fixture
View
File renamed without changes
0  ...enerators/test_unit/mailer/templates/unit_test.rb → ...enerators/test_unit/mailer/templates/unit_test.rb
View
File renamed without changes
2  ...lib/generators/test_unit/model/model_generator.rb → ...ils/generators/test_unit/model/model_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
0  ...generators/test_unit/model/templates/fixtures.yml → ...generators/test_unit/model/templates/fixtures.yml
View
File renamed without changes
0  ...generators/test_unit/model/templates/unit_test.rb → ...generators/test_unit/model/templates/unit_test.rb
View
File renamed without changes
2  ...nerators/test_unit/observer/observer_generator.rb → ...nerators/test_unit/observer/observer_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
0  ...erators/test_unit/observer/templates/unit_test.rb → ...erators/test_unit/observer/templates/unit_test.rb
View
File renamed without changes
2  ...rs/test_unit/performance/performance_generator.rb → ...rs/test_unit/performance/performance_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
0  ...st_unit/performance/templates/performance_test.rb → ...st_unit/performance/templates/performance_test.rb
View
File renamed without changes
2  ...b/generators/test_unit/plugin/plugin_generator.rb → ...s/generators/test_unit/plugin/plugin_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
0  ...test_unit/plugin/templates/%file_name%_test.rb.tt → ...test_unit/plugin/templates/%file_name%_test.rb.tt
View
File renamed without changes
0  ...erators/test_unit/plugin/templates/test_helper.rb → ...erators/test_unit/plugin/templates/test_helper.rb
View
File renamed without changes
4 ...nerators/test_unit/scaffold/scaffold_generator.rb → ...nerators/test_unit/scaffold/scaffold_generator.rb
View
@@ -1,5 +1,5 @@
-require 'generators/test_unit'
-require 'generators/resource_helpers'
+require 'rails/generators/test_unit'
+require 'rails/generators/resource_helpers'
module TestUnit
module Generators
0  ...s/test_unit/scaffold/templates/functional_test.rb → ...s/test_unit/scaffold/templates/functional_test.rb
View
File renamed without changes
7 railties/lib/initializer.rb → railties/lib/rails/initializer.rb
View
@@ -1,7 +1,6 @@
require "pathname"
-$LOAD_PATH.unshift File.dirname(__FILE__)
-require 'railties_path'
+require 'rails/railties_path'
require 'rails/version'
require 'rails/gem_dependency'
require 'rails/rack'
@@ -114,7 +113,7 @@ def self.run(initializer = nil, config = nil)
# Check for valid Ruby version (1.8.2 or 1.8.4 or higher). This is done in an
# external file, so we can use it from the `rails` program as well without duplication.
Initializer.default.add :check_ruby_version do
- require 'ruby_version_check'
+ require 'rails/ruby_version_check'
end
# If Rails is vendored and RubyGems is available, install stub GemSpecs
@@ -523,7 +522,7 @@ def self.run(initializer = nil, config = nil)
# # Prepare dispatcher callbacks and run 'prepare' callbacks
Initializer.default.add :prepare_dispatcher do
next unless configuration.frameworks.include?(:action_controller)
- require 'dispatcher' unless defined?(::Dispatcher)
+ require 'rails/dispatcher' unless defined?(::Dispatcher)
Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
end
0  railties/lib/initializer_old.rb → railties/lib/rails/initializer_old.rb
View
File renamed without changes
0  railties/lib/performance_test_help.rb → railties/lib/rails/performance_test_help.rb
View
File renamed without changes
2  railties/lib/railties_path.rb → railties/lib/rails/railties_path.rb
View
@@ -1 +1 @@
-RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
0  railties/lib/ruby_version_check.rb → railties/lib/rails/ruby_version_check.rb
View
File renamed without changes
0  railties/lib/rubyprof_ext.rb → railties/lib/rails/rubyprof_ext.rb
View
File renamed without changes
0  railties/lib/source_annotation_extractor.rb → railties/lib/rails/source_annotation_extractor.rb
View
File renamed without changes
18 railties/lib/tasks/rails.rb → railties/lib/rails/tasks.rb
View
@@ -1,8 +1,24 @@
$VERBOSE = nil
# Load Rails rakefile extensions
-Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
+%w(
+ annotations
+ databases
+ documentation
+ framework
+ gems
+ log
+ middleware
+ misc
+ routes
+ statistics
+ testing
+ tmp
+).each do |task|
+ load "rails/tasks/#{task}.rake"
+end
# Load any custom rakefile extensions
+# TODO: Don't hardcode these paths.
Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
2  railties/lib/tasks/annotations.rake → railties/lib/rails/tasks/annotations.rake
View
@@ -1,4 +1,4 @@
-require 'source_annotation_extractor'
+require 'rails/source_annotation_extractor'
desc "Enumerate all annotations"
task :notes do
4 railties/lib/tasks/databases.rake → railties/lib/rails/tasks/databases.rake
View
@@ -426,8 +426,8 @@ namespace :db do
desc "Creates a sessions migration for use with ActiveRecord::SessionStore"
task :create => :environment do
raise "Task unavailable to this database (no migration support)" unless ActiveRecord::Base.connection.supports_migrations?
- require 'generators'
- require 'generators/rails/session_migration/session_migration_generator'
+ require 'rails/generators'
+ require 'rails/generators/rails/session_migration/session_migration_generator'
Rails::Generators::SessionMigrationGenerator.start [ ENV["MIGRATION"] || "add_sessions_table" ]
end
0  railties/lib/tasks/documentation.rake → railties/lib/rails/tasks/documentation.rake
View
File renamed without changes
2  railties/lib/tasks/framework.rake → railties/lib/rails/tasks/framework.rake
View
@@ -93,7 +93,7 @@ namespace :rails do
namespace :update do
def invoke_from_app_generator(method)
require 'generators'
- require 'generators/rails/app/app_generator'
+ require 'rails/generators/rails/app/app_generator'
generator = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true },
:destination_root => RAILS_ROOT
0  railties/lib/tasks/gems.rake → railties/lib/rails/tasks/gems.rake
View
File renamed without changes
0  railties/lib/tasks/log.rake → railties/lib/rails/tasks/log.rake
View
File renamed without changes
0  railties/lib/tasks/middleware.rake → railties/lib/rails/tasks/middleware.rake
View
File renamed without changes
0  railties/lib/tasks/misc.rake → railties/lib/rails/tasks/misc.rake
View
File renamed without changes
0  railties/lib/tasks/routes.rake → railties/lib/rails/tasks/routes.rake
View
File renamed without changes
2  railties/lib/tasks/statistics.rake → railties/lib/rails/tasks/statistics.rake
View
@@ -12,6 +12,6 @@ STATS_DIRECTORIES = [
desc "Report code statistics (KLOCs, etc) from the application"
task :stats do
- require 'code_statistics'
+ require 'rails/code_statistics'
CodeStatistics.new(*STATS_DIRECTORIES).to_s
end
0  railties/lib/tasks/testing.rake → railties/lib/rails/tasks/testing.rake
View
File renamed without changes
0  railties/lib/tasks/tmp.rake → railties/lib/rails/tasks/tmp.rake
View
File renamed without changes
0  railties/lib/test_help.rb → railties/lib/rails/test_help.rb
View
File renamed without changes
0  railties/lib/vendor/bundler/LICENSE → railties/lib/rails/vendor/bundler/LICENSE
View
File renamed without changes
0  railties/lib/vendor/bundler/README.markdown → railties/lib/rails/vendor/bundler/README.markdown
View
File renamed without changes
0  railties/lib/vendor/bundler/Rakefile → railties/lib/rails/vendor/bundler/Rakefile
View
File renamed without changes
0  railties/lib/vendor/bundler/lib/bundler.rb → railties/lib/rails/vendor/bundler/lib/bundler.rb
View
File renamed without changes
0  railties/lib/vendor/bundler/lib/bundler/cli.rb → railties/lib/rails/vendor/bundler/lib/bundler/cli.rb
View
File renamed without changes
0  ...or/bundler/lib/bundler/commands/bundle_command.rb → ...or/bundler/lib/bundler/commands/bundle_command.rb
View
File renamed without changes
0  ...ndor/bundler/lib/bundler/commands/exec_command.rb → ...ndor/bundler/lib/bundler/commands/exec_command.rb
View
File renamed without changes
0  ...ties/lib/vendor/bundler/lib/bundler/dependency.rb → ...ib/rails/vendor/bundler/lib/bundler/dependency.rb
View
File renamed without changes
0  railties/lib/vendor/bundler/lib/bundler/dsl.rb → railties/lib/rails/vendor/bundler/lib/bundler/dsl.rb
View
File renamed without changes
0  ...ies/lib/vendor/bundler/lib/bundler/environment.rb → ...b/rails/vendor/bundler/lib/bundler/environment.rb
View
File renamed without changes
0  railties/lib/vendor/bundler/lib/bundler/finder.rb → ...es/lib/rails/vendor/bundler/lib/bundler/finder.rb
View
File renamed without changes
0  ...ties/lib/vendor/bundler/lib/bundler/gem_bundle.rb → ...ib/rails/vendor/bundler/lib/bundler/gem_bundle.rb
View
File renamed without changes
0  railties/lib/vendor/bundler/lib/bundler/gem_ext.rb → ...s/lib/rails/vendor/bundler/lib/bundler/gem_ext.rb
View
File renamed without changes
0  ...ties/lib/vendor/bundler/lib/bundler/repository.rb → ...ib/rails/vendor/bundler/lib/bundler/repository.rb
View
File renamed without changes
0  ...er/lib/bundler/repository/directory_repository.rb → ...er/lib/bundler/repository/directory_repository.rb
View
File renamed without changes
0  .../bundler/lib/bundler/repository/gem_repository.rb → .../bundler/lib/bundler/repository/gem_repository.rb
View
File renamed without changes
0  railties/lib/vendor/bundler/lib/bundler/resolver.rb → .../lib/rails/vendor/bundler/lib/bundler/resolver.rb
View
File renamed without changes
0  railties/lib/vendor/bundler/lib/bundler/runtime.rb → ...s/lib/rails/vendor/bundler/lib/bundler/runtime.rb
View
File renamed without changes
0  railties/lib/vendor/bundler/lib/bundler/source.rb → ...es/lib/rails/vendor/bundler/lib/bundler/source.rb
View
File renamed without changes
0  ...ndor/bundler/lib/bundler/templates/app_script.erb → ...ndor/bundler/lib/bundler/templates/app_script.erb
View
File renamed without changes
0  ...dor/bundler/lib/bundler/templates/environment.erb → ...dor/bundler/lib/bundler/templates/environment.erb
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/CHANGELOG.rdoc → railties/lib/rails/vendor/thor-0.11.6/CHANGELOG.rdoc
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/LICENSE → railties/lib/rails/vendor/thor-0.11.6/LICENSE
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/README.rdoc → railties/lib/rails/vendor/thor-0.11.6/README.rdoc
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/bin/rake2thor → railties/lib/rails/vendor/thor-0.11.6/bin/rake2thor
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/bin/thor → railties/lib/rails/vendor/thor-0.11.6/bin/thor
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/lib/thor.rb → railties/lib/rails/vendor/thor-0.11.6/lib/thor.rb
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/lib/thor/actions.rb → .../lib/rails/vendor/thor-0.11.6/lib/thor/actions.rb
View
File renamed without changes
0  ...endor/thor-0.11.6/lib/thor/actions/create_file.rb → ...endor/thor-0.11.6/lib/thor/actions/create_file.rb
View
File renamed without changes
0  .../vendor/thor-0.11.6/lib/thor/actions/directory.rb → .../vendor/thor-0.11.6/lib/thor/actions/directory.rb
View
File renamed without changes
0  ...r/thor-0.11.6/lib/thor/actions/empty_directory.rb → ...r/thor-0.11.6/lib/thor/actions/empty_directory.rb
View
File renamed without changes
0  ...thor-0.11.6/lib/thor/actions/file_manipulation.rb → ...thor-0.11.6/lib/thor/actions/file_manipulation.rb
View
File renamed without changes
0  .../thor-0.11.6/lib/thor/actions/inject_into_file.rb → .../thor-0.11.6/lib/thor/actions/inject_into_file.rb
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/lib/thor/base.rb → ...ies/lib/rails/vendor/thor-0.11.6/lib/thor/base.rb
View
File renamed without changes
0  ...lib/thor/core_ext/hash_with_indifferent_access.rb → ...lib/thor/core_ext/hash_with_indifferent_access.rb
View
File renamed without changes
0  ...dor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb → ...dor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/lib/thor/error.rb → ...es/lib/rails/vendor/thor-0.11.6/lib/thor/error.rb
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/lib/thor/group.rb → ...es/lib/rails/vendor/thor-0.11.6/lib/thor/group.rb
View
File renamed without changes
0  ...ies/lib/vendor/thor-0.11.6/lib/thor/invocation.rb → ...b/rails/vendor/thor-0.11.6/lib/thor/invocation.rb
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/lib/thor/parser.rb → ...s/lib/rails/vendor/thor-0.11.6/lib/thor/parser.rb
View
File renamed without changes
0  ...ib/vendor/thor-0.11.6/lib/thor/parser/argument.rb → ...ls/vendor/thor-0.11.6/lib/thor/parser/argument.rb
View
File renamed without changes
0  ...b/vendor/thor-0.11.6/lib/thor/parser/arguments.rb → ...s/vendor/thor-0.11.6/lib/thor/parser/arguments.rb
View
File renamed without changes
0  .../lib/vendor/thor-0.11.6/lib/thor/parser/option.rb → ...ails/vendor/thor-0.11.6/lib/thor/parser/option.rb
View
File renamed without changes
0  ...lib/vendor/thor-0.11.6/lib/thor/parser/options.rb → ...ils/vendor/thor-0.11.6/lib/thor/parser/options.rb
View
File renamed without changes
0  ...es/lib/vendor/thor-0.11.6/lib/thor/rake_compat.rb → .../rails/vendor/thor-0.11.6/lib/thor/rake_compat.rb
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/lib/thor/runner.rb → ...s/lib/rails/vendor/thor-0.11.6/lib/thor/runner.rb
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/lib/thor/shell.rb → ...es/lib/rails/vendor/thor-0.11.6/lib/thor/shell.rb
View
File renamed without changes
0  ...es/lib/vendor/thor-0.11.6/lib/thor/shell/basic.rb → .../rails/vendor/thor-0.11.6/lib/thor/shell/basic.rb
View
File renamed without changes
0  ...es/lib/vendor/thor-0.11.6/lib/thor/shell/color.rb → .../rails/vendor/thor-0.11.6/lib/thor/shell/color.rb
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/lib/thor/task.rb → ...ies/lib/rails/vendor/thor-0.11.6/lib/thor/task.rb
View
File renamed without changes
0  railties/lib/vendor/thor-0.11.6/lib/thor/util.rb → ...ies/lib/rails/vendor/thor-0.11.6/lib/thor/util.rb
View
File renamed without changes
0  railties/lib/webrick_server.rb → railties/lib/rails/webrick_server.rb
View
File renamed without changes
2  railties/test/backtrace_cleaner_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
-require 'initializer'
+require 'rails/initializer'
require 'rails/backtrace_cleaner'
if defined? Test::Unit::Util::BacktraceFilter
8 railties/test/boot_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
-require 'initializer'
-require "#{File.dirname(__FILE__)}/../lib/generators/rails/app/templates/config/boot"
+require 'rails/initializer'
+require "#{File.dirname(__FILE__)}/../lib/rails/generators/rails/app/templates/config/boot"
require 'rails/gem_dependency'
class BootTest < Test::Unit::TestCase
@@ -62,7 +62,7 @@ class VendorBootTest < Test::Unit::TestCase
def test_load_initializer_requires_from_vendor_rails
boot = VendorBoot.new
- boot.expects(:require).with("#{RAILS_ROOT}/vendor/rails/railties/lib/initializer")
+ boot.expects(:require).with("rails/initializer")
Rails::Initializer.expects(:run).with(:install_gem_spec_stubs)
Rails::GemDependency.expects(:add_frozen_gem_path)
boot.load_initializer
@@ -76,7 +76,7 @@ def test_load_initializer_loads_rubygems_and_the_rails_gem
boot = GemBoot.new
GemBoot.expects(:load_rubygems)
boot.expects(:load_rails_gem)
- boot.expects(:require).with('initializer')
+ boot.expects(:require).with('rails/initializer')
boot.load_initializer
end
4 railties/test/console_app_test.rb
View
@@ -7,8 +7,8 @@ class ApplicationController < ActionController::Base; end
ActionController::Base.session_store = nil
end
-require 'dispatcher'
-require 'console_app'
+require 'rails/dispatcher'
+require 'rails/console_app'
# console_app sets Test::Unit.run to work around the at_exit hook in test/unit, which kills IRB
if Test::Unit.respond_to?(:run=)
2  railties/test/fcgi_dispatcher_test.rb
View
@@ -3,7 +3,7 @@
uses_gem "fcgi", "0.8.7" do
require 'action_controller'
-require 'fcgi_handler'
+require 'rails/fcgi_handler'
Dispatcher.middleware.clear
2  railties/test/fixtures/lib/generators/active_record/fixjour/fixjour_generator.rb
View
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
2  railties/test/generators/actions_test.rb
View
@@ -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 ActionsTest < GeneratorsTestCase
def setup
2  railties/test/generators/app_generator_test.rb
View
@@ -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 < GeneratorsTestCase
2  railties/test/generators/controller_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/controller/controller_generator'
+require 'rails/generators/rails/controller/controller_generator'
class ControllerGeneratorTest < GeneratorsTestCase
2  railties/test/generators/generator_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/generator/generator_generator'
+require 'rails/generators/rails/generator/generator_generator'
class GeneratorGeneratorTest < GeneratorsTestCase
2  railties/test/generators/generators_test_helper.rb
View
@@ -9,7 +9,7 @@
end
$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
-require 'generators'
+require 'rails/generators'
require 'rubygems'
$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../activerecord/lib"
2  railties/test/generators/helper_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/helper/helper_generator'
+require 'rails/generators/rails/helper/helper_generator'
ObjectHelper = Class.new
AnotherObjectHelperTest = Class.new
2  railties/test/generators/integration_test_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/integration_test/integration_test_generator'
+require 'rails/generators/rails/integration_test/integration_test_generator'
class IntegrationTestGeneratorTest < GeneratorsTestCase
2  railties/test/generators/mailer_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/mailer/mailer_generator'
+require 'rails/generators/rails/mailer/mailer_generator'
class MailerGeneratorTest < GeneratorsTestCase
2  railties/test/generators/metal_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/metal/metal_generator'
+require 'rails/generators/rails/metal/metal_generator'
class MetalGeneratorTest < GeneratorsTestCase
2  railties/test/generators/migration_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/migration/migration_generator'
+require 'rails/generators/rails/migration/migration_generator'
class MigrationGeneratorTest < GeneratorsTestCase
2  railties/test/generators/model_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/model/model_generator'
+require 'rails/generators/rails/model/model_generator'
class ModelGeneratorTest < GeneratorsTestCase
2  railties/test/generators/named_base_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
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
2  railties/test/generators/observer_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/observer/observer_generator'
+require 'rails/generators/rails/observer/observer_generator'
class ObserverGeneratorTest < GeneratorsTestCase
2  railties/test/generators/performance_test_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/performance_test/performance_test_generator'
+require 'rails/generators/rails/performance_test/performance_test_generator'
class PerformanceTestGeneratorTest < GeneratorsTestCase
2  railties/test/generators/plugin_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/plugin/plugin_generator'
+require 'rails/generators/rails/plugin/plugin_generator'
class PluginGeneratorTest < GeneratorsTestCase
2  railties/test/generators/resource_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/resource/resource_generator'
+require 'rails/generators/rails/resource/resource_generator'
class ResourceGeneratorTest < GeneratorsTestCase
4 railties/test/generators/scaffold_controller_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/scaffold_controller/scaffold_controller_generator'
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
class ScaffoldControllerGeneratorTest < GeneratorsTestCase
@@ -100,7 +100,7 @@ def test_skip_layout_if_required
def test_error_is_shown_if_orm_does_not_provide_interface
error = capture(:stderr){ run_generator ["User", "--orm=unknown"] }
assert_equal "Could not load Unknown::Generators::ActiveModel, skipping controller. " <<
- "Error: no such file to load -- generators/unknown.\n", error
+ "Error: no such file to load -- rails/generators/unknown.\n", error
end
protected
2  railties/test/generators/scaffold_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/scaffold/scaffold_generator'
+require 'rails/generators/rails/scaffold/scaffold_generator'
class ScaffoldGeneratorTest < GeneratorsTestCase
2  railties/test/generators/session_migration_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/session_migration/session_migration_generator'
+require 'rails/generators/rails/session_migration/session_migration_generator'
class SessionMigrationGeneratorTest < GeneratorsTestCase
2  railties/test/generators/stylesheets_generator_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'generators/generators_test_helper'
-require 'generators/rails/stylesheets/stylesheets_generator'
+require 'rails/generators/rails/stylesheets/stylesheets_generator'
class StylesheetsGeneratorTest < GeneratorsTestCase
4 railties/test/generators_test.rb
View
@@ -1,6 +1,6 @@
require File.join(File.dirname(__FILE__), '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 < GeneratorsTestCase
3  railties/test/initializer/test_helper.rb
View
@@ -38,7 +38,8 @@ def vendor_rails?
def boot!
# Require the initializer
- require "#{RAILS_FRAMEWORK_ROOT}/railties/lib/initializer"
+ $:.unshift "#{RAILS_FRAMEWORK_ROOT}/railties/lib"
+ require "rails/initializer"
# Run the initializer the same way boot.rb does it
Rails::Initializer.run(:install_gem_spec_stubs)
Rails::GemDependency.add_frozen_gem_path
4 railties/test/initializer_test.rb
View
@@ -1,6 +1,6 @@
require 'abstract_unit'
-require 'initializer'
-require 'generators'
+require 'rails/initializer'
+require 'rails/generators'