GitHub Sale: sign up for any paid plan this week and pay nothing until January 1, 2009!  [ hide ]

public
Rubygem
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-core.git
I lost my sleep because of this!!! Half of spec suites were broken, too.
Thu Oct 09 15:15:34 -0700 2008
commit  d31b11e483cfe263063c33bad23d6d71dedf1a35
tree    00dee35a5b29590887503c1687babbca1eee457e
parent  ddd62763f25cb7766f382502a3479462f3616a37
...
272
273
274
275
276
 
 
 
 
 
277
278
279
...
344
345
346
347
348
349
350
351
352
353
...
478
479
480
481
 
482
483
484
...
272
273
274
 
 
275
276
277
278
279
280
281
282
...
347
348
349
 
 
 
 
350
351
352
...
477
478
479
 
480
481
482
483
0
@@ -272,8 +272,11 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
0
     # this is crucial: load init file with all the preferences
0
     # then environment init file, then start enabling specific
0
     # components, load dependencies and update logger.
0
- load_initfile unless Merb::disabled?(:initfile)
0
- load_env_config
0
+ unless Merb::disabled?(:initfile)
0
+ load_initfile
0
+ load_env_config
0
+ end
0
+
0
     enable_json_gem unless Merb::disabled?(:json)
0
     load_dependencies
0
     update_logger
0
@@ -344,10 +347,6 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
0
       if File.exists?(initfile)
0
         STDOUT.puts "Loading init file from #{initfile}" unless Merb.testing?
0
         load(initfile)
0
- elsif Merb.env != "test"
0
- Merb.fatal! "You are not in a Merb application, or you are in " \
0
- "a flat application and have not specified the init file. If you " \
0
- "are trying to create a new merb application, use merb-gen app."
0
       end
0
     end
0
 end
0
@@ -478,7 +477,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
0
         reader_ary = [reader]
0
         loop do
0
           # wait for child to exit and capture exit status
0
- #
0
+ #
0
           #
0
           # WNOHANG specifies that wait2 exists without waiting
0
           # if no child process are ready to be noticed.

Comments

    No one has commented yet.