Permalink
Browse files

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

  • Loading branch information...
1 parent 610b81b commit f0dd77c6be6a86fe384bb0015151e0a497973d39 Yehuda Katz + Carl Lerche committed Sep 24, 2009
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 ...generator/templates/templates → rails/generators/rails/app/templates/app/models}/.empty_directory
  61. 0 ...pp/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. BIN 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 ...ates/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 .../templates/test/functional → rails/generators/rails/app/templates/test/fixtures}/.empty_directory
  110. 0 .../templates/test/fixtures → rails/generators/rails/app/templates/test/functional}/.empty_directory
  111. 0 ...ates/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 ...pp/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 ...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
View
@@ -28,4 +28,6 @@ railties/guides/output
*.swp
*.swo
actionpack/bin
-*/vendor/gems
+vendor/gems/
+*/vendor/gems/
+bin/
@@ -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
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
View
@@ -1,15 +1,25 @@
-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)
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
File renamed without changes.
@@ -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
File renamed without changes.
@@ -1,6 +1,6 @@
require 'fcgi'
require 'logger'
-require 'dispatcher'
+require 'rails/dispatcher'
require 'rbconfig'
class RailsFCGIHandler
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
module ActiveRecord
module Generators
@@ -1,5 +1,5 @@
require 'thor'
-require 'generators/actions'
+require 'rails/generators/actions'
module Rails
module Generators
@@ -1,4 +1,4 @@
-require 'generators/named_base'
+require 'rails/generators/named_base'
module Erb
module Generators
@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
module Erb
module Generators
@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
module Erb
module Generators
@@ -1,5 +1,5 @@
-require 'generators/erb'
-require 'generators/resource_helpers'
+require 'rails/generators/erb'
+require 'rails/generators/resource_helpers'
module Erb
module Generators
@@ -1,5 +1,5 @@
-require 'generators/base'
-require 'generators/generated_attribute'
+require 'rails/generators/base'
+require 'rails/generators/generated_attribute'
module Rails
module Generators
@@ -7,4 +7,4 @@ require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-require 'tasks/rails'
+require 'rails/tasks'
@@ -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
@@ -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'
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/console'
+require 'rails/commands/console'
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/dbconsole'
+require 'rails/commands/dbconsole'
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/destroy'
+require 'rails/commands/destroy'
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/generate'
+require 'rails/commands/generate'
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../../config/boot', __FILE__)
-require 'commands/performance/benchmarker'
+require 'rails/commands/performance/benchmarker'
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../../config/boot', __FILE__)
-require 'commands/performance/profiler'
+require 'rails/commands/performance/profiler'
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/plugin'
+require 'rails/commands/plugin'
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/runner'
+require 'rails/commands/runner'
@@ -1,3 +1,3 @@
<%= shebang %>
require File.expand_path('../../config/boot', __FILE__)
-require 'commands/server'
+require 'rails/commands/server'
@@ -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
@@ -1,4 +1,4 @@
-require 'generators/rails/generator/generator_generator'
+require 'rails/generators/rails/generator/generator_generator'
module Rails
module Generators
@@ -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
@@ -1,4 +1,4 @@
-require 'generators/rails/resource/resource_generator'
+require 'rails/generators/rails/resource/resource_generator'
module Rails
module Generators
@@ -1,4 +1,4 @@
-require 'generators/resource_helpers'
+require 'rails/generators/resource_helpers'
module Rails
module Generators
@@ -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.
@@ -1,4 +1,4 @@
-require 'generators/named_base'
+require 'rails/generators/named_base'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
module TestUnit
module Generators
@@ -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
@@ -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
@@ -1 +1 @@
-RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
Oops, something went wrong. Retry.

3 comments on commit f0dd77c

@carllerche

It seems the commit message is wrong.

@imajes
imajes commented on f0dd77c Sep 25, 2009

that's what he wants you to think. :P

Please sign in to comment.