5078b8bf11f23b1f4e42c701438c37c6140fd93e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9191176c4c189bb793688dcce1f6075182c6ecc0 9191176c4c189bb793688dcce1f6075182c6ecc0 2008-10-29T13:30:01-07:00 2008-10-29T13:27:37-07:00 Removes merb-core de52a19262c08e7dbd41ebb6d0c08a489f0c5732 Yehuda Katz wycats@gmail.com 3ae019fe96ffaa6cdaa79181279a1f8ef192eb69 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/42da35e9861d0ca0ef228a017316a31d76cf0e29 42da35e9861d0ca0ef228a017316a31d76cf0e29 2008-10-11T21:30:03-07:00 2008-10-11T21:30:03-07:00 Log syntax errors when loading the app. cba5dac7c5570b3c1164d3544e4b1a62dbd7a3ba Michael S. Klishin michael@novemberain.com 2d721c48372e8aaf85b5b6c4b653b83df0402915 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/20fd63f05d75d10f8a6afc54c2295da259d89f78 20fd63f05d75d10f8a6afc54c2295da259d89f78 2008-10-11T20:58:20-07:00 2008-10-11T20:58:20-07:00 (put my Frankenstein voice on) It's alive! 3a9822e7340c15f2c8eaeea43dbd864d98cd119c Michael S. Klishin michael@novemberain.com a68e147e759021d2e6ab1bd0e2d89fe4d9b1c2a1 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/2d721c48372e8aaf85b5b6c4b653b83df0402915 2d721c48372e8aaf85b5b6c4b653b83df0402915 2008-10-11T07:49:52-07:00 2008-10-11T07:49:52-07:00 Merge upstream, re-apply stash. 0fa3912b71ee6f8d5266b56fc69b28848a7aa1f6 Michael S. Klishin michael@novemberain.com e7cbe925c04d322823e0a6afcc05e586d5c3b0b5 5737a09475cf06a0ac21789bb3091bf3f2372dde Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/b9b87a7443611995dd97cfc40104bc6cfbffde53 b9b87a7443611995dd97cfc40104bc6cfbffde53 2008-10-10T20:24:36-07:00 2008-10-10T20:24:36-07:00 Merge branch 'sprint' of git://github.com/wycats/merb-core into sprint Conflicts: lib/merb-core/bootloader.rb 891d464e553e3425e970aef18ead22806828526b Drew Colthorp colthorp@atomicobject.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 d0a53b95473d7ba7c1d50ae104a4bade81e8e09b Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/b808cb9afb2165e6ecb0d7ccf0833421593179f7 b808cb9afb2165e6ecb0d7ccf0833421593179f7 2008-10-10T10:54:14-07:00 2008-10-09T12:47:10-07:00 docs for the bootloader. bootloader_spec doesn't use RackUpApplication#run return value 92b0f39045a872643b90e300d9423f63f1e249bc Drew Colthorp colthorp@atomicobject.com aab853358bfd3930808402be110162e51bc40d91 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/d0a53b95473d7ba7c1d50ae104a4bade81e8e09b d0a53b95473d7ba7c1d50ae104a4bade81e8e09b 2008-10-10T10:54:14-07:00 2008-10-09T16:13:19-07:00 Handle cases when testing env is set using and so forth. 1eebe394320d9d3f023bc6ef74f7757eae13867a Drew Colthorp colthorp@atomicobject.com a580665008b6623540ab8987e22f1da5d4dcb0fa Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/aab853358bfd3930808402be110162e51bc40d91 aab853358bfd3930808402be110162e51bc40d91 2008-10-10T10:54:14-07:00 2008-10-09T16:04:59-07:00 Load both general and env-specific init file conditionally. c04cb205f5adde8765a94b0ba309b96eb427e694 Drew Colthorp colthorp@atomicobject.com db58b08ad24b38a098a14c766c1ec85ef2f49478 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/a580665008b6623540ab8987e22f1da5d4dcb0fa a580665008b6623540ab8987e22f1da5d4dcb0fa 2008-10-10T10:54:14-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! 4e2fa9054a5a7aaeb64fa2bd348cdae9151fb5aa Drew Colthorp colthorp@atomicobject.com bc78d636846b92465280ecae618f15695aa5dd83 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/db58b08ad24b38a098a14c766c1ec85ef2f49478 db58b08ad24b38a098a14c766c1ec85ef2f49478 2008-10-10T10:54:14-07:00 2008-10-09T15:15:34-07:00 I lost my sleep because of this!!! Half of spec suites were broken, too. e6b2f41a688a7875963c949a60f2776ee1fc0bf0 Drew Colthorp colthorp@atomicobject.com 0806e2806286e5434f7751452833e71408a90a2b Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/a3434bd2c77b675632e006a7fdb64978f5bacf4c a3434bd2c77b675632e006a7fdb64978f5bacf4c 2008-10-10T10:54:14-07:00 2008-10-09T14:49:43-07:00 Master process should kill children when TERM is received. 13dba0b2af133a45e3d96002d6acf04cf5cefeab Drew Colthorp colthorp@atomicobject.com 2abe501f0a718c70910db86ac4312af04822a631 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/bd049fab450757dd2cb9ce030bd7ab48adb0cdef bd049fab450757dd2cb9ce030bd7ab48adb0cdef 2008-10-10T10:54:13-07:00 2008-10-08T22:17:08-07:00 allow opt-out of init.rb c85c6bfcbeb4edd923d1de7a93ca9833147f6640 Drew Colthorp colthorp@atomicobject.com a877697638bafa3ef4a3e536916a08ee27df821d Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/2abe501f0a718c70910db86ac4312af04822a631 2abe501f0a718c70910db86ac4312af04822a631 2008-10-10T10:54:13-07:00 2008-10-08T21:45:26-07:00 Makes specs work again without init.rb 8e05027a72270273adc542e55fb14bb0867714c0 Drew Colthorp colthorp@atomicobject.com 285a8e1a23f303da2f186218c236d149584490cc Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/a877697638bafa3ef4a3e536916a08ee27df821d a877697638bafa3ef4a3e536916a08ee27df821d 2008-10-10T10:54:13-07:00 2008-10-08T18:34:43-07:00 Set up worker thread in worker processes 3cea79b095f2a03d7cde5a86abab4809bba4a2a8 Drew Colthorp colthorp@atomicobject.com 3d4aa1efad1d25de4d8cf93f2fde64b83bb9c30b Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/285a8e1a23f303da2f186218c236d149584490cc 285a8e1a23f303da2f186218c236d149584490cc 2008-10-10T10:54:13-07:00 2008-10-08T17:43:50-07:00 Fixes logger delimiter, adds new Merb.fatal! catches, and changes Merb.logger = nil to Merb.reset_logger! b3695208a777ae145f10f417a9bd56abbf633d41 Drew Colthorp colthorp@atomicobject.com 906cbe4e3979374774e5ed43491b45877237fb46 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9fac4f3596316effa432996a2f8fdf523f12c2a0 9fac4f3596316effa432996a2f8fdf523f12c2a0 2008-10-10T10:54:12-07:00 2008-10-08T15:36:13-07:00 Adds better warnings when things go wrong early in a Merb app 93395f40013f8e35c529be5f9497427bbcf162c3 Drew Colthorp colthorp@atomicobject.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 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 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 81d79fa679d59d593d99358c7018cb333f3de06c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/eba7840ec7b1086eea6111fa2ed12b6fadfd18e9 eba7840ec7b1086eea6111fa2ed12b6fadfd18e9 2008-10-08T22:17:08-07:00 2008-10-08T22:17:08-07:00 allow opt-out of init.rb c85c6bfcbeb4edd923d1de7a93ca9833147f6640 Yehuda Katz wycats@gmail.com 9ee9b838c4406020d05b63cee81052175ea528fe Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/81d79fa679d59d593d99358c7018cb333f3de06c 81d79fa679d59d593d99358c7018cb333f3de06c 2008-10-08T21:45:26-07:00 2008-10-08T21:45:26-07:00 Makes specs work again without init.rb 8e05027a72270273adc542e55fb14bb0867714c0 Yehuda Katz wycats@gmail.com 39f59bba97cf1fe49fc431a91fb8be886b7c051a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9ee9b838c4406020d05b63cee81052175ea528fe 9ee9b838c4406020d05b63cee81052175ea528fe 2008-10-08T18:34:43-07:00 2008-10-08T18:34:43-07:00 Set up worker thread in worker processes 3cea79b095f2a03d7cde5a86abab4809bba4a2a8 Yehuda Katz wycats@gmail.com 0aa3adaf5af6bb554a06cfff0e645afad404db07 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/39f59bba97cf1fe49fc431a91fb8be886b7c051a 39f59bba97cf1fe49fc431a91fb8be886b7c051a 2008-10-08T17:44:14-07:00 2008-10-08T17:43:50-07:00 Fixes logger delimiter, adds new Merb.fatal! catches, and changes Merb.logger = nil to Merb.reset_logger! b3695208a777ae145f10f417a9bd56abbf633d41 Yehuda Katz wycats@gmail.com 906cbe4e3979374774e5ed43491b45877237fb46 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/a84863d5f54134d51677247a489543c5c7a5f3ad a84863d5f54134d51677247a489543c5c7a5f3ad 2008-10-08T15:36:42-07:00 2008-10-08T15:36:13-07:00 Adds better warnings when things go wrong early in a Merb app 93395f40013f8e35c529be5f9497427bbcf162c3 Yehuda Katz wycats@gmail.com 06a92fdd64917f24a27d6f3caa6eb6a1ef290325 Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/906cbe4e3979374774e5ed43491b45877237fb46 906cbe4e3979374774e5ed43491b45877237fb46 2008-10-08T14:05:47-07:00 2008-10-07T11:41:48-07:00 Death to all zombies (zombie processes at least)! Fixes a bug where zombie processes are created when the code is reloaded in development mode. 7702855a12e56d6a290701d268fd033f0353fcea Carl Lerche carllerche@mac.com 4c4f24ad393999037e34e5f0791674217c6862dd Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/5a10f1840c3af5e1ddfc5895b85512d649541ffa 5a10f1840c3af5e1ddfc5895b85512d649541ffa 2008-10-07T05:06:24-07:00 2008-10-07T04:26:07-07:00 Use new logger options log_stream/log_file the same way everywhere. dbdbd644d6a3826d599cbb0554f4c0f54bcfeb55 Michael S. Klishin michael@novemberain.com d5089a671e45a74071b917fbc84de9aeac14ec06 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/4e83c3c3af7cbb5a4705a0dd58529ea748cec63c 4e83c3c3af7cbb5a4705a0dd58529ea748cec63c 2008-10-06T13:31:39-07:00 2008-10-06T13:31:39-07:00 Nillify Merb.logger first. 1de69c66d81030918d07ba5c6dc2f317c43c3e07 Michael S. Klishin michael@novemberain.com de635515deaa3d148340643b5e54631c0ceb4506 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/d5089a671e45a74071b917fbc84de9aeac14ec06 d5089a671e45a74071b917fbc84de9aeac14ec06 2008-10-06T13:23:56-07:00 2008-10-06T13:23:56-07:00 Legacy Merb apps log again. And Merb tells you where it logs on boot unless you are testing. 0184cd6f5a6d6584f39e3c20ece9ffd2fa2562cc Michael S. Klishin michael@novemberain.com 3ef9115ad5c332abdbc0f880e4d455259b649854 Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/59c0379aac67576e470e06e8c0cece67d25cb491 59c0379aac67576e470e06e8c0cece67d25cb491 2008-10-05T19:23:20-07:00 2008-10-05T10:03:08-07:00 compile templates with preambles to assign locals, support recompiling partial templates if previously unseen locals are provided Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 91b044abb37fc095dcf5c65ca2dc931619b4efe0 Ezra Zygmuntowicz ez@engineyard.com