5737a09475cf06a0ac21789bb3091bf3f2372dde Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/284933f51f42df41d2ddf42092f925f247640751 284933f51f42df41d2ddf42092f925f247640751 2008-10-10T23:16:22-07:00 2008-10-10T23:16:22-07:00 Fixes given again 0613c9dec643d50881ab2e71a40bb92bb7eab64b Yehuda Katz wycats@gmail.com 671699bddd373f94bffbfe993bfaee686c558b30 aa173048fbb331980bdfdb802f38574f8ed91803 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/5737a09475cf06a0ac21789bb3091bf3f2372dde 5737a09475cf06a0ac21789bb3091bf3f2372dde 2008-10-10T19:32:51-07:00 2008-10-10T19:32:51-07:00 Merge branch 'sprint' of git@github.com:wycats/merb-core into sprint fed13a54e791462a64f4b27d503b25648454e1ee Yehuda Katz wycats@gmail.com cba16e656dbf091771bd10a04729e31a993964c1 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/671699bddd373f94bffbfe993bfaee686c558b30 671699bddd373f94bffbfe993bfaee686c558b30 2008-10-10T19:32:36-07:00 2008-10-10T19:32:36-07:00 Fixes a bug with given 7ee1e3c47f85845bc11a25579ae6d57a8e3e8c80 Yehuda Katz wycats@gmail.com 51498cd40c2efa0112bd02d3c45005fc404d1e41 Wayne E. Seguin wayneeseguin@gmail.com http://github.com/wycats/merb-core/commit/aa173048fbb331980bdfdb802f38574f8ed91803 aa173048fbb331980bdfdb802f38574f8ed91803 2008-10-10T15:28:05-07:00 2008-10-10T15:28:05-07:00 Log Configuration when SIGUSR1 is received. bdbb510eb6e472a236f4a2f402518f254f6ecda1 Wayne E. Seguin wayneeseguin@gmail.com cba16e656dbf091771bd10a04729e31a993964c1 Wayne E. Seguin wayneeseguin@gmail.com http://github.com/wycats/merb-core/commit/51498cd40c2efa0112bd02d3c45005fc404d1e41 51498cd40c2efa0112bd02d3c45005fc404d1e41 2008-10-10T15:27:00-07:00 2008-10-10T15:27:00-07:00 Changed the "Killing of children" to the "Reaping of Workers" and improved the wording of some comments. 811f4e8368cd8209c43fad14b1054844beb68c67 Wayne E. Seguin wayneeseguin@gmail.com 75862997bcc7c16c8d985be0d87cf33e73b2121f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/cba16e656dbf091771bd10a04729e31a993964c1 cba16e656dbf091771bd10a04729e31a993964c1 2008-10-10T14:59:32-07:00 2008-10-10T14:59:32-07:00 Fixes ruby bug + makes the has_xpath matcher work right f86e202deadb27a85b1c0b91d327ffa904bc903e Yehuda Katz wycats@gmail.com db55fff490cd3c341e6f7038920e5e2b18f4b1d2 Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/75862997bcc7c16c8d985be0d87cf33e73b2121f 75862997bcc7c16c8d985be0d87cf33e73b2121f 2008-10-10T13:06:06-07:00 2008-10-10T12:55:29-07:00 Allow routing deferred blocks to return a rack array Improved the dispatcher and router so that deferred blocks are able to return a rack array. Also added some helper methods to create a redirecting rack array. 9ac6d501de2476b64a5c73fe2c38c20b9985c3bf Carl Lerche carllerche@mac.com c7147693cd0b9ba5b21de82246a8c917739b97dd Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/db55fff490cd3c341e6f7038920e5e2b18f4b1d2 db55fff490cd3c341e6f7038920e5e2b18f4b1d2 2008-10-10T13:03:59-07:00 2008-10-10T13:03:59-07:00 Use Kernel.system instead of 'sh' 0a7a0a70391de65d82ced3ad18d820e14f24769e Fabien Franzen info@atelierfabien.be 0a55cb2ea134970d216a503606885f29724a57d9 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/c7147693cd0b9ba5b21de82246a8c917739b97dd c7147693cd0b9ba5b21de82246a8c917739b97dd 2008-10-10T12:30:34-07:00 2008-10-10T12:30:34-07:00 Fixed flaw in recursive logic in package_all 70eb2f6ddbe39c81da741135a28e0fc1cfac7787 Fabien Franzen info@atelierfabien.be 77d9ce0c4f138a7bcae3e42d87093c5dde63c59a Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/0a55cb2ea134970d216a503606885f29724a57d9 0a55cb2ea134970d216a503606885f29724a57d9 2008-10-10T10:29:26-07:00 2008-10-10T10:29:26-07:00 Renamed install_from_source => install_gem_from_source (as it was before) 20523df3be3f58094496fe7de5938d220e654746 Fabien Franzen info@atelierfabien.be 776a6ec852dc74f9f92ee34030f996fcf78f1852 bf1b0112fa5ae15f01c9054481d5202f812316b0 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/77d9ce0c4f138a7bcae3e42d87093c5dde63c59a 77d9ce0c4f138a7bcae3e42d87093c5dde63c59a 2008-10-10T10:24:54-07:00 2008-10-10T10:24:54-07:00 Merge branch 'sprint' of git@github.com:wycats/merb-core into sprint faf2df44021cda3f0e2c61839d3ae49349b1b8b6 Fabien Franzen info@atelierfabien.be b5530d95689fe3663525b6bf6839ae5f31084001 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/776a6ec852dc74f9f92ee34030f996fcf78f1852 776a6ec852dc74f9f92ee34030f996fcf78f1852 2008-10-10T10:20:12-07:00 2008-10-10T10:20:12-07:00 More robust GemManagement#install_from_source da50b0284ae1efb7ef00e082bdd919a49da95843 Fabien Franzen info@atelierfabien.be b5530d95689fe3663525b6bf6839ae5f31084001 ea52be274b4dc5369553736c2b93e4988a2bb18e Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/bf1b0112fa5ae15f01c9054481d5202f812316b0 bf1b0112fa5ae15f01c9054481d5202f812316b0 2008-10-10T09:57:03-07:00 2008-10-10T09:57:03-07:00 Merge branch 'master' into sprint * master: #use_test is inconsistent with the rest of the framework. Add #use_testing_framework but keep #use_test around for a while. Update documentation, params[:exception] is long gone now. a781b04326dc84a20370da3308f1940c371e378a Michael S. Klishin michael@novemberain.com 037c6ece4b745eb7042bd49df2806ab4f77db332 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-core/commit/b5530d95689fe3663525b6bf6839ae5f31084001 b5530d95689fe3663525b6bf6839ae5f31084001 2008-10-10T00:14:55-07:00 2008-10-10T00:14:55-07:00 Adds a load path for stack d34cba2e66b6690bb484dca39840639bace03514 Daniel Neighman has.sox@gmail.com 6958852ac4177eef45abacd99acacacdab5d5b5d Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/ea52be274b4dc5369553736c2b93e4988a2bb18e ea52be274b4dc5369553736c2b93e4988a2bb18e 2008-10-09T17:11:05-07:00 2008-10-09T17:11:05-07:00 #use_test is inconsistent with the rest of the framework. Add #use_testing_framework but keep #use_test around for a while. 2b9b23852a80dd87d2194c0194ccdea609f93c0c Michael S. Klishin michael@novemberain.com 037c6ece4b745eb7042bd49df2806ab4f77db332 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/6958852ac4177eef45abacd99acacacdab5d5b5d 6958852ac4177eef45abacd99acacacdab5d5b5d 2008-10-09T17:06:42-07:00 2008-10-09T17:06:42-07:00 Update documentation, params[:exception] is long gone now. fe106007182644c95685160fe4250fe4212e1d8a Michael S. Klishin michael@novemberain.com 428d9480a49cee31e72d709a9fed0a6785d0b14c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/037c6ece4b745eb7042bd49df2806ab4f77db332 037c6ece4b745eb7042bd49df2806ab4f77db332 2008-10-09T16:13:19-07:00 2008-10-09T16:13:19-07:00 Handle cases when testing env is set using and so forth. 9dd480ac5f35a238f01022684c5aa03c617a7c10 Michael S. Klishin michael@novemberain.com 7b330e0273609dc113cc4d617f3e626496f72cfb Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/428d9480a49cee31e72d709a9fed0a6785d0b14c 428d9480a49cee31e72d709a9fed0a6785d0b14c 2008-10-09T16:04:59-07:00 2008-10-09T16:04:59-07:00 Load both general and env-specific init file conditionally. afa07cff0ac234c6df5a0a388ad5e611656eba2c Michael S. Klishin michael@novemberain.com d31b11e483cfe263063c33bad23d6d71dedf1a35 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/7b330e0273609dc113cc4d617f3e626496f72cfb 7b330e0273609dc113cc4d617f3e626496f72cfb 2008-10-09T16:01:58-07:00 2008-10-09T16:01:58-07:00 Revert "I lost my sleep because of this!!! Half of spec suites were broken, too." This reverts commit d31b11e483cfe263063c33bad23d6d71dedf1a35. After heated discussion about generators, straints people seem to have, shell prompts, The Great Bailout and weird nature of human beings, we decided to REVERT it! 738dbd70cff1b021731eaf37ab5fdc9b851ed937 Michael S. Klishin michael@novemberain.com ddd62763f25cb7766f382502a3479462f3616a37 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/d31b11e483cfe263063c33bad23d6d71dedf1a35 d31b11e483cfe263063c33bad23d6d71dedf1a35 2008-10-09T15:15:34-07:00 2008-10-09T15:15:34-07:00 I lost my sleep because of this!!! Half of spec suites were broken, too. 00dee35a5b29590887503c1687babbca1eee457e Michael S. Klishin michael@novemberain.com 600c76cddc67161efc39a83e6c3b5d013eccf8a3 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/ddd62763f25cb7766f382502a3479462f3616a37 ddd62763f25cb7766f382502a3479462f3616a37 2008-10-09T14:57:09-07:00 2008-10-09T14:57:09-07:00 Kill children only if we fork for class loading. 738dbd70cff1b021731eaf37ab5fdc9b851ed937 Michael S. Klishin michael@novemberain.com 03d985f2bb550d310c9158b9487f5772d5a0e944 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/600c76cddc67161efc39a83e6c3b5d013eccf8a3 600c76cddc67161efc39a83e6c3b5d013eccf8a3 2008-10-09T14:49:43-07:00 2008-10-09T14:49:43-07:00 Master process should kill children when TERM is received. 23eb2fb1c399edd42bc5cdd3ba258e110d352e7d Michael S. Klishin michael@novemberain.com 0af24ffa6e0a5de5b9f50d406eb7bd1b8bdb2ce7 72d687e0d78d76f10d704b2e6e6441569050f8a7 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/03d985f2bb550d310c9158b9487f5772d5a0e944 03d985f2bb550d310c9158b9487f5772d5a0e944 2008-10-09T11:51:22-07:00 2008-10-09T11:51:22-07:00 Merge branch 'master' of git@github.com:wycats/merb-core 2131203eea6211c1d3348d77dcbacdb2890031ac Yehuda Katz wycats@gmail.com 0ff7b0b5cd6660f409e7aebb9772b68427ba01e7 1a97f4a3b0c53470410ace9a97c073a0c5062792 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/0af24ffa6e0a5de5b9f50d406eb7bd1b8bdb2ce7 0af24ffa6e0a5de5b9f50d406eb7bd1b8bdb2ce7 2008-10-09T11:51:09-07:00 2008-10-09T11:51:09-07:00 Merge branch 'sprint' c25c0211d8ec709a86bd119ccfa46d118fd1be04 Yehuda Katz wycats@gmail.com 25ac2a2fe589bc5b448f905ad3617fda17d45b95 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/1a97f4a3b0c53470410ace9a97c073a0c5062792 1a97f4a3b0c53470410ace9a97c073a0c5062792 2008-10-09T11:51:05-07:00 2008-10-09T11:51:05-07:00 Fixes spec ext issue f6a79406ccac18b74cc36828f9a420f4197e3910 Yehuda Katz wycats@gmail.com fe7624959ec4700a751cb6d65152a4c937b4735c 25ac2a2fe589bc5b448f905ad3617fda17d45b95 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/0ff7b0b5cd6660f409e7aebb9772b68427ba01e7 0ff7b0b5cd6660f409e7aebb9772b68427ba01e7 2008-10-09T11:17:16-07:00 2008-10-09T11:17:16-07:00 Merge branch 'sprint' 0a8580655dd6903c0302803425fb1c464b3c7e11 Yehuda Katz wycats@gmail.com ce31ac5f21a9dd66664cd878a76ec64f0fae898c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/25ac2a2fe589bc5b448f905ad3617fda17d45b95 25ac2a2fe589bc5b448f905ad3617fda17d45b95 2008-10-09T11:17:01-07:00 2008-10-09T11:17:01-07:00 Fixes rspec extension 2a896b205d4ce1a8d47b0f6b74f81bca88971915 Yehuda Katz wycats@gmail.com fe7624959ec4700a751cb6d65152a4c937b4735c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/72d687e0d78d76f10d704b2e6e6441569050f8a7 72d687e0d78d76f10d704b2e6e6441569050f8a7 2008-10-09T11:00:42-07:00 2008-10-09T10:59:03-07:00 Check whether to use forking a tad better. 991c5e5833c768116059ecaa26ec36f9d17bb033 Michael S. Klishin michael@novemberain.com 64ec85f0beba00a292b5fcb3c1e0b11f891830d1 ce31ac5f21a9dd66664cd878a76ec64f0fae898c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/fe7624959ec4700a751cb6d65152a4c937b4735c fe7624959ec4700a751cb6d65152a4c937b4735c 2008-10-09T10:16:35-07:00 2008-10-09T10:16:35-07:00 Merge branch 'sprint' 9128b91c7a601d63481fb656cee2faa4176daff2 Yehuda Katz wycats@gmail.com 12006028f7be46ea04b039bfa9e4c46f905e0613 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/ce31ac5f21a9dd66664cd878a76ec64f0fae898c ce31ac5f21a9dd66664cd878a76ec64f0fae898c 2008-10-09T10:15:58-07:00 2008-10-09T10:15:58-07:00 Make rspec xpath matcher work again 77e300494afa97db80a8a5c7d0aca9ede035a792 Yehuda Katz wycats@gmail.com